From owner-svn-ports-all@FreeBSD.ORG Tue Apr 1 21:14:40 2014 Return-Path: Delivered-To: svn-ports-all@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 761C1C70; Tue, 1 Apr 2014 21:14:40 +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 6259BCE6; Tue, 1 Apr 2014 21:14:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31LEepB086635; Tue, 1 Apr 2014 21:14:40 GMT (envelope-from feld@svn.freebsd.org) Received: (from feld@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31LEdx4086632; Tue, 1 Apr 2014 21:14:39 GMT (envelope-from feld@svn.freebsd.org) Message-Id: <201404012114.s31LEdx4086632@svn.freebsd.org> From: Mark Felder Date: Tue, 1 Apr 2014 21:14:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349891 - in head/security: . amavis-stats amavis-stats/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2014 21:14:40 -0000 Author: feld Date: Tue Apr 1 21:14:39 2014 New Revision: 349891 URL: http://svnweb.freebsd.org/changeset/ports/349891 QAT: https://qat.redports.org/buildarchive/r349891/ Log: Bring back from the dead; take ownership Distfile is hosted in my public_distfiles Added: head/security/amavis-stats/ - copied from r347742, head/security/amavis-stats/ Deleted: head/security/amavis-stats/files/DEINSTALL.in head/security/amavis-stats/files/INSTALL.in Modified: head/security/Makefile head/security/amavis-stats/Makefile head/security/amavis-stats/pkg-plist Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Tue Apr 1 20:21:17 2014 (r349890) +++ head/security/Makefile Tue Apr 1 21:14:39 2014 (r349891) @@ -13,6 +13,7 @@ SUBDIR += aide SUBDIR += aimsniff SUBDIR += amap + SUBDIR += amavis-stats SUBDIR += amavisd-milter SUBDIR += amavisd-new SUBDIR += aolserver-nsencrypt Modified: head/security/amavis-stats/Makefile ============================================================================== --- head/security/amavis-stats/Makefile Mon Mar 10 11:50:26 2014 (r347742) +++ head/security/amavis-stats/Makefile Tue Apr 1 21:14:39 2014 (r349891) @@ -5,57 +5,46 @@ PORTNAME= amavis-stats PORTVERSION= 0.1.12 PORTREVISION= 3 CATEGORIES= security -MASTER_SITES= http://downloads.topicdesk.com/amavis_stats/ +MASTER_SITES= LOCAL +MASTER_SITE_SUBDIR= feld -MAINTAINER= ports@FreeBSD.org +MAINTAINER= feld@FreeBSD.org COMMENT= Simple AMaViS statistics generator based on rrdtool -DEPRECATED= No more public distfiles -EXPIRATION_DATE= 2014-03-10 - RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool USES= perl5 USE_PERL5= run USE_PHP= pcre -MAN1= amavis-stats.1 - NO_BUILD= yes PORTDOCS= README -WEBOWN?= www -WEBGRP?= www - AMAVISUSER?= amavis AMAVISGROUP?= amavis +USERS= ${AMAVISUSER} +GROUPS= ${AMAVISGROUP} +PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} USERS=${USERS} GROUPS=${GROUPS} -PKGINSTALL= ${WRKDIR}/INSTALL -PKGDEINSTALL= ${WRKDIR}/DEINSTALL PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= INSTALL DEINSTALL pkg-message -SUB_LIST+= AMAVISUSER=${AMAVISUSER} AMAVISGROUP=${AMAVISGROUP} +SUB_FILES= pkg-message -pre-install: apply-slist - @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL +.include -NO_STAGE= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/amavis-stats ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/amavis-stats.1 ${MAN1PREFIX}/man/man1 - ${MKDIR} ${PREFIX}/www/amavis-stats - ${MKDIR} ${PREFIX}/www/amavis-stats/img - ${TOUCH} ${PREFIX}/www/amavis-stats/img/.keep - ${INSTALL_DATA} ${WRKSRC}/amavis-stats.php ${PREFIX}/www/amavis-stats - cd ${PREFIX}/www/amavis-stats && ${LN} -s amavis-stats.php index.php - ${CHOWN} -R ${AMAVISUSER}:${AMAVISGROUP} ${PREFIX}/www/amavis-stats - ${CHOWN} ${WEBOWN}:${WEBGRP} ${PREFIX}/www/amavis-stats/img - -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/amavis-stats ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/amavis-stats.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + ${MKDIR} ${STAGEDIR}${PREFIX}/www/amavis-stats + ${MKDIR} ${STAGEDIR}${PREFIX}/www/amavis-stats/img + ${TOUCH} ${STAGEDIR}${PREFIX}/www/amavis-stats/img/.keep + ${INSTALL_DATA} ${WRKSRC}/amavis-stats.php ${STAGEDIR}${PREFIX}/www/amavis-stats + cd ${STAGEDIR}${PREFIX}/www/amavis-stats && ${LN} -s amavis-stats.php index.php + +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif post-install: Modified: head/security/amavis-stats/pkg-plist ============================================================================== --- head/security/amavis-stats/pkg-plist Mon Mar 10 11:50:26 2014 (r347742) +++ head/security/amavis-stats/pkg-plist Tue Apr 1 21:14:39 2014 (r349891) @@ -1,6 +1,9 @@ +man/man1/amavis-stats.1.gz sbin/amavis-stats www/amavis-stats/index.php www/amavis-stats/amavis-stats.php www/amavis-stats/img/.keep @dirrm www/amavis-stats/img @dirrm www/amavis-stats +@exec /usr/sbin/chown -R %%USERS%%:%%GROUPS%% %D/www/amavis-stats +@exec /usr/sbin/chown %%WWWOWN%%:%%WWWGRP%% %D/www/amavis-stats/img