6 files changed, 50 insertions, 35 deletions

diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index 9d724258a0a4..265caed81111 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	c-icap
-PORTVERSION=	220505
-PORTREVISION=	1
+PORTVERSION=	030606
+PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 				http://bio3k.softboard.ru/uploads/arch/
@@ -26,7 +26,9 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib %%PREFIX%%/lib/c_icap
 
 SUB_FILES=	pkg-install pkg-deinstall
 
-OPTIONS=	CLAMAV "With srv_clamav service" on
+OPTIONS=	CLAMAV "Build with srv_clamav service" on \
+			LARGE_FILES "Enable large files support" off \
+			IPV6 "Enable IPv6 support" off
 #		PERL "With Perl support" off
 
 .include <bsd.port.pre.mk>
@@ -54,6 +56,18 @@ PLIST_SUB+=	CLAMAV="@comment "
 CONFIGURE_ARGS+=	--without-clamav
 .endif
 
+.if defined(WITH_LARGE_FILES)
+CONFIGURE_ARGS+=	--enable-large-files
+.else
+CONFIGURE_ARGS+=	--disable-large-files
+.endif
+
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
 post-extract:
 	@${MV} ${WRKSRC}/c-icap.conf ${WRKSRC}/c-icap.conf.default
 	@${MV} ${WRKSRC}/c-icap.conf.in ${WRKSRC}/c-icap.conf.default.in
diff --git a/www/c-icap/distinfo b/www/c-icap/distinfo
index 483b14e5acde..b872c92d29c7 100644
--- a/www/c-icap/distinfo
+++ b/www/c-icap/distinfo
@@ -1,3 +1,3 @@
-MD5 (c_icap-220505.tar.gz) = acccc6a1c4dcae057b5cf5f90fa72fab
-SHA256 (c_icap-220505.tar.gz) = cfd83fc0ffaadfa098af1884c296999a51fcee06cebd95fe848b4c4766817ad6
-SIZE (c_icap-220505.tar.gz) = 394175
+MD5 (c_icap-030606.tar.gz) = 539625e3bc95340043761b0c70a98f57
+SHA256 (c_icap-030606.tar.gz) = 554bb95d1d9e26960e8091c7db9796282fd9c116177dc6d6d6cc585dd4a7de3c
+SIZE (c_icap-030606.tar.gz) = 413457
diff --git a/www/c-icap/files/c_icap.sh.in b/www/c-icap/files/c_icap.sh.in
index ea7722b70630..ac4d60ce036e 100644
--- a/www/c-icap/files/c_icap.sh.in
+++ b/www/c-icap/files/c_icap.sh.in
@@ -19,14 +19,17 @@
 
 name="c_icap"
 rcvar=`set_rcvar`
-command="%%PREFIX%%/bin/c-icap"
 
+command="%%PREFIX%%/bin/c-icap"
+pidfile="/var/run/c-icap.pid"
 required_dirs="/var/tmp"
 required_files="%%PREFIX%%/etc/c-icap.conf"
-stop_postcmd="rm -f /var/run/c-icap.pid"
 
-# set default
-c_icap_enable=${c_icap_enable:-"NO"}
+stop_postcmd="rm -f $pidfile"
 
+# read settings, set default values
 load_rc_config "$name"
+: ${c_icap_enable="NO"}
+: ${c_icap_flags=""}
+
 run_rc_command "$1"
diff --git a/www/c-icap/files/patch-Makefile.in b/www/c-icap/files/patch-Makefile.in
index 6ff6c79ecbac..c994a0dae8d6 100644
--- a/www/c-icap/files/patch-Makefile.in
+++ b/www/c-icap/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.bak	Fri Feb  3 13:14:20 2006
-+++ Makefile.in	Fri Feb  3 13:16:43 2006
+--- Makefile.in.bak	Sat Jun 10 17:27:22 2006
++++ Makefile.in	Sat Jun 10 17:31:14 2006
 @@ -44,7 +44,7 @@
  	icap-stretch$(EXEEXT)
  DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \
@@ -18,27 +18,27 @@
  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(pkgincludedir)"
  libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
-@@ -313,8 +313,8 @@
+@@ -321,8 +321,8 @@
  
  ALL_INCS = $(INCS:%.h=include/%.h)
  pkginclude_HEADERS = $(ALL_INCS)
 -sysconf_DATA = c-icap.conf c-icap.magic
--EXTRA_DIST = RECONF INSTALL.txt config-w32.h makefile.w32 c-icap.conf c_icap_dll.mak c-icap.conf.in c-icap.magic  c_icap.mak c_icap.def contrib/get_file.pl \
+-EXTRA_DIST = RECONF INSTALL.txt config-w32.h makefile.w32 c-icap.conf c_icap_dll.mak c-icap.conf.in c-icap.magic  c_icap.mak c_icap.def \
 +sysconf_DATA = c-icap.conf.default c-icap.magic.default
-+EXTRA_DIST = RECONF INSTALL.txt config-w32.h makefile.w32 c-icap.conf.default c_icap_dll.mak c-icap.conf.default.in c-icap.magic.default  c_icap.mak c_icap.def contrib/get_file.pl \
++EXTRA_DIST = RECONF INSTALL.txt config-w32.h makefile.w32 c-icap.conf.default c_icap_dll.mak c-icap.conf.default.in c-icap.magic.default  c_icap.mak c_icap.def \
+              contrib/get_file.pl contrib/convert_old_magic.pl \
               winnt_server.c  os/win32/dll_entry.c os/win32/makefile.w32 os/win32/net_io.c os/win32/proc_mutex.c\
               os/win32/shared_mem.c os/win32/threads.c os/win32/utilfunc.c
- 
-@@ -373,7 +373,7 @@
+@@ -382,7 +382,7 @@
  
  distclean-hdr:
  	-rm -f config.h stamp-h1
 -c-icap.conf: $(top_builddir)/config.status $(srcdir)/c-icap.conf.in
-+c-icap.conf: $(top_builddir)/config.status $(srcdir)/c-icap.conf.default.in
++c-icap.conf.default: $(top_builddir)/config.status $(srcdir)/c-icap.conf.default.in
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1484,7 +1484,7 @@
+@@ -1518,7 +1518,7 @@
  
  info-am:
  
@@ -47,7 +47,7 @@
  
  install-exec-am: install-binPROGRAMS install-libLTLIBRARIES \
  	install-sysconfDATA
-@@ -1530,7 +1530,7 @@
+@@ -1564,7 +1564,7 @@
  	distclean-recursive distclean-tags distcleancheck distdir \
  	distuninstallcheck dvi dvi-am html html-am info info-am \
  	install install-am install-binPROGRAMS install-data \
@@ -56,7 +56,7 @@
  	install-exec-am install-info install-info-am \
  	install-libLTLIBRARIES install-man install-pkgincludeHEADERS \
  	install-strip install-sysconfDATA installcheck installcheck-am \
-@@ -1544,8 +1544,6 @@
+@@ -1578,8 +1578,6 @@
  	uninstall-sysconfDATA
  
  
diff --git a/www/c-icap/files/patch-configure b/www/c-icap/files/patch-configure
index f6188fbadc63..b98fb67f9299 100644
--- a/www/c-icap/files/patch-configure
+++ b/www/c-icap/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.bak	Thu Feb  2 10:46:33 2006
-+++ configure	Thu Feb  2 10:47:13 2006
-@@ -20614,7 +20614,7 @@
+--- configure.bak	Sat Jun 10 17:33:25 2006
++++ configure	Sat Jun 10 17:34:38 2006
+@@ -21574,7 +21574,7 @@
  fi
  
  
--                                                                      ac_config_files="$ac_config_files Makefile c-icap.conf services/Makefile services/echo/Makefile services/sguard/Makefile services/clamav/Makefile modules/Makefile"
-+                                                                      ac_config_files="$ac_config_files Makefile c-icap.conf.default services/Makefile services/echo/Makefile services/sguard/Makefile services/clamav/Makefile modules/Makefile"
+-                                                                      ac_config_files="$ac_config_files Makefile c-icap.conf services/Makefile services/echo/Makefile services/url_check/Makefile services/clamav/Makefile modules/Makefile"
++                                                                      ac_config_files="$ac_config_files Makefile c-icap.conf.default services/Makefile services/echo/Makefile services/url_check/Makefile services/clamav/Makefile modules/Makefile"
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -21200,7 +21200,7 @@
+@@ -22160,7 +22160,7 @@
    case "$ac_config_target" in
    # Handling of arguments.
    "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@ -17,4 +17,4 @@
 +  "c-icap.conf.default" ) CONFIG_FILES="$CONFIG_FILES c-icap.conf.default" ;;
    "services/Makefile" ) CONFIG_FILES="$CONFIG_FILES services/Makefile" ;;
    "services/echo/Makefile" ) CONFIG_FILES="$CONFIG_FILES services/echo/Makefile" ;;
-   "services/sguard/Makefile" ) CONFIG_FILES="$CONFIG_FILES services/sguard/Makefile" ;;
+   "services/url_check/Makefile" ) CONFIG_FILES="$CONFIG_FILES services/url_check/Makefile" ;;
diff --git a/www/c-icap/pkg-plist b/www/c-icap/pkg-plist
index 592a1e5bde3f..999056537846 100644
--- a/www/c-icap/pkg-plist
+++ b/www/c-icap/pkg-plist
@@ -8,7 +8,7 @@ etc/c-icap.conf.default
 @unexec if cmp -s %D/etc/c-icap.magic %D/etc/c-icap.magic.default; then rm -f %D/etc/c-icap.magic; fi
 etc/c-icap.magic.default
 @exec [ -f %B/c-icap.magic ] || cp -p %%PREFIX%%/%F %B/c-icap.magic
-@unexec if [ -f /var/run/c-icap.pid ]; then %D/etc/rc.d/c_icap stop; fi
+@unexec [ ! -f /var/run/c-icap.pid ] || %D/etc/rc.d/c_icap stop
 include/c_icap/access.h
 include/c_icap/body.h
 include/c_icap/c-icap.h
@@ -37,18 +37,16 @@ include/c_icap/util.h
 lib/c_icap/srv_echo.a
 lib/c_icap/srv_echo.la
 lib/c_icap/srv_echo.so
-lib/c_icap/srv_sguard.a
-lib/c_icap/srv_sguard.la
-lib/c_icap/srv_sguard.so
 lib/c_icap/sys_logger.a
 lib/c_icap/sys_logger.la
 lib/c_icap/sys_logger.so
+lib/c_icap/srv_url_check.a
+lib/c_icap/srv_url_check.so
+lib/c_icap/srv_url_check.la
 @dirrm lib/c_icap
 lib/libicapapi.a
 lib/libicapapi.la
 lib/libicapapi.so.0
 lib/libicapapi.so
 @cwd /
-var/log/c_icap/access.log
-var/log/c_icap/server.log
-@dirrm var/log/c_icap
+@dirrmtry var/log/c_icap