From owner-svn-ports-head@FreeBSD.ORG Sun Apr 27 15:40:32 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59049349; Sun, 27 Apr 2014 15:40:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 39E15127; Sun, 27 Apr 2014 15:40:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3RFeWw9008125; Sun, 27 Apr 2014 15:40:32 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3RFeVMv008123; Sun, 27 Apr 2014 15:40:31 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201404271540.s3RFeVMv008123@svn.freebsd.org> From: Olli Hauer Date: Sun, 27 Apr 2014 15:40:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352434 - in head/www: mod_asn mod_clamav X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Apr 2014 15:40:32 -0000 Author: ohauer Date: Sun Apr 27 15:40:31 2014 New Revision: 352434 URL: http://svnweb.freebsd.org/changeset/ports/352434 QAT: https://qat.redports.org/buildarchive/r352434/ Log: - add stage support - add LICENSE - use new LIB_DEPENDS notation Modified: head/www/mod_asn/Makefile head/www/mod_clamav/Makefile Modified: head/www/mod_asn/Makefile ============================================================================== --- head/www/mod_asn/Makefile Sun Apr 27 15:32:07 2014 (r352433) +++ head/www/mod_asn/Makefile Sun Apr 27 15:40:31 2014 (r352434) @@ -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 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 Modified: head/www/mod_clamav/Makefile ============================================================================== --- head/www/mod_clamav/Makefile Sun Apr 27 15:32:07 2014 (r352433) +++ head/www/mod_clamav/Makefile Sun Apr 27 15:40:31 2014 (r352434) @@ -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 .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