svn commit: r349891 - in head/security: . amavis-stats amavis-stats/files

[Mark Felder]

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 at FreeBSD.org
+MAINTAINER=	feld at 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 <bsd.port.options.mk>
 
-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
+ at exec /usr/sbin/chown -R %%USERS%%:%%GROUPS%% %D/www/amavis-stats
+ at exec /usr/sbin/chown %%WWWOWN%%:%%WWWGRP%% %D/www/amavis-stats/img