- add stage support

- add LICENSE
- use new LIB_DEPENDS notation

2 files changed, 16 insertions, 12 deletions

diff --git a/www/mod_asn/Makefile b/www/mod_asn/Makefile
index e41453ae0e46..8bc64647659c 100644
--- a/www/mod_asn/Makefile
+++ b/www/mod_asn/Makefile
@@ -11,23 +11,24 @@ MASTER_SITE_SUBDIR=	kuriyama
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Look up the AS and network prefix of IP address
 
-LIB_DEPENDS=	apr-1:${PORTSDIR}/devel/apr1
+LICENSE=	APACHE20
+
+LIB_DEPENDS=	libapr-1.so:${PORTSDIR}/devel/apr1
 
 USE_APACHE=	22
 AP_FAST_BUILD=	yes
 MANUAL_PACKAGE_BUILD=	devel/apr1 with pgsql option required
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 pre-build:
 	@[ -r ${PREFIX}/lib/apr-util-1/apr_dbd_pgsql.so ] || (${ECHO_MSG} "APR util with PostgreSQL required."; ${FALSE})
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/asn_import.py ${PREFIX}/bin/asn_import
-	${INSTALL_SCRIPT} ${WRKSRC}/asn_get_routeviews.py ${PREFIX}/bin/asn_get_routeviews
-	${MKDIR} ${DATADIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/asn.sql ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/mod_asn.conf ${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/asn_import.py ${STAGEDIR}${PREFIX}/bin/asn_import
+	${INSTALL_SCRIPT} ${WRKSRC}/asn_get_routeviews.py ${STAGEDIR}${PREFIX}/bin/asn_get_routeviews
+	${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/asn.sql ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/mod_asn.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 9488bcb2df1f..495649d02450 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -12,6 +12,7 @@ PKGNAMEPREFIX=	${APACHE_PKGNAMEPREFIX}
 MAINTAINER=	tmueko@kommunity.net
 COMMENT=	Scans content delivered by the Apache20 proxy module for viruses
 
+LICENSE=	GPLv2
 
 USE_AUTOTOOLS=	libtool
 USE_APACHE=	22
@@ -20,14 +21,13 @@ GNU_CONFIGURE=	yes
 OPTIONS_DEFINE=		CLAMAVDEVEL
 CLAMAVDEVEL_DESC=	development version of CLAMAV
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLAMAVDEVEL}
-LIB_DEPENDS+=	clamav.7:${PORTSDIR}/security/clamav-devel
+LIB_DEPENDS+=	libclamav.so:${PORTSDIR}/security/clamav-devel
 .else
 CLAMAV_PORT=	security/clamav
-LIB_DEPENDS+=	clamav.7:${PORTSDIR}/security/clamav
+LIB_DEPENDS+=	libclamav.so:${PORTSDIR}/security/clamav
 .endif
 
 CONFIGURE_ARGS=	--with-apxs=${APXS} \
@@ -43,7 +43,10 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^AC_CHECK_HEADERS/ s,regex.h ,,g' \
 		${WRKSRC}/configure.in
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
+	$(APXS) -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
+		-i -n 'clamav' ${WRKSRC}/.libs/mod_clamav.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 
 .include <bsd.port.mk>