Index: head/www/c-icap/Makefile
===================================================================
--- head/www/c-icap/Makefile	(revision 415382)
+++ head/www/c-icap/Makefile	(revision 415383)
@@ -1,127 +1,85 @@
 # Created by: Elisey Savateev <b3k@mail.ru>
 # $FreeBSD$
 
 PORTNAME=	c-icap
 PORTVERSION=	0.4.3
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.4.x/
 DISTNAME=	c_icap-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ICAP server implementation
 
-LICENSE=	LGPL21
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--sysconfdir="${PREFIX}/etc/c-icap" \
+		--localstatedir=/var
 INSTALL_TARGET=	install-strip
-USES=		cpe libtool
+USES=		cpe libtool localbase
 CPE_VENDOR=	c-icap_project
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	c-icap
 
-OPTIONS_DEFINE=	BDB IPV6 LDAP PERL POSIXSEM LARGE_FILES MEMCACHE
-OPTIONS_DEFAULT=	IPV6
-LARGE_FILES_DESC=	Enable large files support
-POSIXSEM_DESC=		Use POSIX Semaphores instead of SYSV IPC
-MEMCACHE_DESC=		Enable memcached
+USERS=		${CICAP_USER}
+GROUPS=		${CICAP_GROUP}
 
 CICAP_USER=	c_icap
 CICAP_UID=	959
 CICAP_GROUP=	c_icap
 CICAP_GID=	959
 
-USERS=		${CICAP_USER}
-GROUPS=		${CICAP_GROUP}
+LOG_DIR=	/var/log/c-icap
+RUN_DIR=	/var/run/c-icap
+PLIST_SUB=	LOG_DIR=${LOG_DIR} RUN_DIR=${RUN_DIR} \
+		CICAP_USER=${CICAP_USER} CICAP_GROUP=${CICAP_GROUP}
+SUB_LIST=	RUN_DIR=${RUN_DIR} CICAP_USER=${CICAP_USER}
 
-CONFIGURE_ARGS+=	--sysconfdir="${PREFIX}/etc/c-icap" \
-			--localstatedir=/var
+OPTIONS_DEFINE=		BDB IPV6 LDAP PERL POSIXSEM LARGE_FILES MEMCACHE
+OPTIONS_DEFAULT=	IPV6
+OPTIONS_SUB=		yes
+LARGE_FILES_DESC=	Enable large files support
+POSIXSEM_DESC=		Use POSIX Semaphores instead of SYSV IPC
+MEMCACHE_DESC=		Enable memcached
 
-.include <bsd.port.options.mk>
+IPV6_CONFIGURE_ENABLE=	ipv6
 
-.if ${PORT_OPTIONS:MBDB}
-USE_BDB=	yes
-.endif
+LARGE_FILES_CONFIGURE_ENABLE=	large-files
 
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
+MEMCACHE_CONFIGURE_WITH=	memcached
+MEMCACHE_LIB_DEPENDS=		libmemcached.so:databases/libmemcached
 
-.if ${PORT_OPTIONS:MLARGE_FILES}
-CONFIGURE_ARGS+=	--enable-large-files
-.else
-CONFIGURE_ARGS+=	--disable-large-files
-.endif
+LDAP_USE=		OPENLDAP=yes
+LDAP_CONFIGURE_ON=	--with-ldap=yes
+LDAP_CONFIGURE_OFF=	--with-ldap=no
 
-.if ${PORT_OPTIONS:MMEMCACHE}
-CONFIGURE_ARGS+=	--with-memcached
-BUILD_DEPENDS=		memcached:databases/memcached
-PLIST_SUB+=		MEMCACHE=""
-.else
-CONFIGURE_ARGS+=	--without-memcached
-PLIST_SUB+=		MEMCACHE="@comment "
-.endif
+PERL_USES=		perl5
+PERL_CONFIGURE_ON=	--with-perl=${PERL}
+PERL_CONFIGURE_OFF=	--without-perl
 
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	YES
-.endif
+BDB_USE=		BDB=yes
+BDB_CFLAGS=		-I${BDB_INCLUDE_DIR}
+BDB_LDFLAGS=		-L${BDB_LIB_DIR}
+BDB_CONFIGURE_ON=	--with-bdb=yes
+BDB_CONFIGURE_OFF=	--with-bdb=no
 
-.if ${PORT_OPTIONS:MPERL}
-USES+=		perl5
-.endif
-
-.if ${PORT_OPTIONS:MBDB}
-CFLAGS+=	-I${BDB_INCLUDE_DIR}
-LDFLAGS+=	-L${BDB_LIB_DIR}
-CONFIGURE_ARGS+=	--with-bdb=yes
-PLIST_SUB+=	BDB=""
-.else
-CONFIGURE_ARGS+=	--with-bdb=no
-PLIST_SUB+=	BDB="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=	--with-ldap=yes
-PLIST_SUB+=	LDAP=""
-.else
-CONFIGURE_ARGS+=	--with-ldap=no
-PLIST_SUB+=	LDAP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPERL}
-PLIST_SUB+=	PERL=""
-CONFIGURE_ARGS+=	--with-perl=${PERL}
-.else
-PLIST_SUB+=	PERL="@comment "
-CONFIGURE_ARGS+=	--without-perl
-.endif
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-LOG_DIR=	/var/log/c-icap
-RUN_DIR=	/var/run/c-icap
-PLIST_SUB+=	LOG_DIR=${LOG_DIR} RUN_DIR=${RUN_DIR} \
-		CICAP_USER=${CICAP_USER} CICAP_GROUP=${CICAP_GROUP}
-SUB_LIST+=	RUN_DIR=${RUN_DIR} CICAP_USER=${CICAP_USER}
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|@prefix@/var/log|/var/log/c-icap|g' \
 		-e 's|@prefix@/etc/|@sysconfdir@/|g' \
 		${WRKSRC}/c-icap.conf.in
 	@${REINPLACE_CMD} \
 		-e 's|\.default|.sample|g' \
 		${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.in
-.if ${PORT_OPTIONS:MPOSIXSEM}
+
+post-patch-POSIXSEM-on:
 	@${REINPLACE_CMD} \
 		-e 's|@SYSV_IPC@|0|g' \
 		${WRKSRC}/include/c-icap-conf.h.in
-.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/${LOG_DIR} ${STAGEDIR}/${RUN_DIR}
 
 .include <bsd.port.mk>
Index: head/www/c-icap/pkg-descr
===================================================================
--- head/www/c-icap/pkg-descr	(revision 415382)
+++ head/www/c-icap/pkg-descr	(revision 415383)
@@ -1,22 +1,22 @@
 From the c-icap homepage:
 
 c-icap is an implementation of an ICAP server. It can be used with HTTP
 proxies that support the ICAP protocol to implement content adaptation and
 filtering services.
 
 Most of the commercial HTTP proxies must support the ICAP protocol. The open
-source Squid 3.x proxy server supports it. 
+source Squid 3.x proxy server supports it.
 
 Major features:
 
     basic C API for developing custom content adaptation and filtering services
     plugins interface
     LDAP integration
     simple ICAP client API
 
 Currently the following services have been implemented for the c-icap server:
 
     Web antivirus service, using the clamav open-source antivirus engine
     basic URL filtering service
 
 WWW: http://c-icap.sourceforge.net/