- Add USES=libtool and INSTALL_TARGET=install-strip

- Don't install static modules
- Finish staging support

2 files changed, 7 insertions, 28 deletions

diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index 0601fc740473..5a7a5d94206d 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	c-icap
 PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.3.x/
@@ -15,6 +15,8 @@ COMMENT=	ICAP server implementation
 LICENSE=	LGPL21
 
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		libtool
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	c-icap
 
@@ -33,8 +35,7 @@ CICAP_GID=	959
 USERS=		${CICAP_USER}
 GROUPS=		${CICAP_GROUP}
 
-CONFIGURE_ARGS+=	--enable-static \
-			--sysconfdir="${PREFIX}/etc/c-icap" \
+CONFIGURE_ARGS+=	--sysconfdir="${PREFIX}/etc/c-icap" \
 			--localstatedir=/var
 
 .include <bsd.port.options.mk>
@@ -63,8 +64,6 @@ USE_OPENLDAP=	YES
 USES+=		perl5
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${PORT_OPTIONS:MBDB}
 CFLAGS+=	-I${BDB_INCLUDE_DIR}
 LDFLAGS+=	-L${BDB_LIB_DIR}
@@ -113,10 +112,4 @@ post-patch:
 		${WRKSRC}/include/c-icap-conf.h.in
 .endif
 
-post-install:
-	@${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/c-icap.conf.default \
-		${STAGEDIR}${PREFIX}/etc/c-icap/c-icap.conf || ${TRUE}
-	@${CP} -np ${STAGEDIR}${PREFIX}/etc/c-icap/c-icap.magic.default \
-		${STAGEDIR}${PREFIX}/etc/c-icap/c-icap.magic || ${TRUE}
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/c-icap/pkg-plist b/www/c-icap/pkg-plist
index 5e1e82f3c550..f09f28f2a91a 100644
--- a/www/c-icap/pkg-plist
+++ b/www/c-icap/pkg-plist
@@ -44,31 +44,17 @@ include/c_icap/txt_format.h
 include/c_icap/types_ops.h
 include/c_icap/util.h
 @dirrm include/c_icap
-%%BDB%%lib/c_icap/bdb_tables.a
-%%BDB%%lib/c_icap/bdb_tables.la
 %%BDB%%lib/c_icap/bdb_tables.so
-lib/c_icap/dnsbl_tables.a
-lib/c_icap/dnsbl_tables.la
 lib/c_icap/dnsbl_tables.so
-%%LDAP%%lib/c_icap/ldap_module.a
-%%LDAP%%lib/c_icap/ldap_module.la
 %%LDAP%%lib/c_icap/ldap_module.so
-%%PERL%%lib/c_icap/perl_handler.a
-%%PERL%%lib/c_icap/perl_handler.la
 %%PERL%%lib/c_icap/perl_handler.so
-lib/c_icap/srv_echo.a
-lib/c_icap/srv_echo.la
 lib/c_icap/srv_echo.so
-lib/c_icap/srv_ex206.a
-lib/c_icap/srv_ex206.la
 lib/c_icap/srv_ex206.so
-lib/c_icap/sys_logger.a
-lib/c_icap/sys_logger.la
 lib/c_icap/sys_logger.so
 @dirrm lib/c_icap
-lib/libicapapi.la
-lib/libicapapi.so.3
 lib/libicapapi.so
+lib/libicapapi.so.3
+lib/libicapapi.so.3.0.3
 man/man8/c-icap-client.8.gz
 man/man8/c-icap-config.8.gz
 man/man8/c-icap-libicapapi-config.8.gz