svn commit: r379338 - in head/www: trac-email2trac trac-email2trac-postfix

[Jan Beich]

Author: jbeich
Date: Thu Feb 19 11:14:23 2015
New Revision: 379338
URL: https://svnweb.freebsd.org/changeset/ports/379338
QAT: https://qat.redports.org/buildarchive/r379338/

Log:
  - Convert to @sample
  - Convert to @(user,group,mode)
  - Convert to OPTIONS_SLAVE
  - Register CONFLICTS with -postfix slave port

Modified:
  head/www/trac-email2trac-postfix/Makefile
  head/www/trac-email2trac/Makefile
  head/www/trac-email2trac/pkg-plist

Modified: head/www/trac-email2trac-postfix/Makefile
==============================================================================
--- head/www/trac-email2trac-postfix/Makefile	Thu Feb 19 09:29:12 2015	(r379337)
+++ head/www/trac-email2trac-postfix/Makefile	Thu Feb 19 11:14:23 2015	(r379338)
@@ -2,7 +2,9 @@
 
 PKGNAMESUFFIX=		-postfix
 
-WITH_POSTFIX=		yes
+CONFLICTS_INSTALL=	trac-email2trac-[0-9]*
+
+OPTIONS_SLAVE=		POSTFIX
 
 MASTERDIR=		${.CURDIR}/../trac-email2trac
 

Modified: head/www/trac-email2trac/Makefile
==============================================================================
--- head/www/trac-email2trac/Makefile	Thu Feb 19 09:29:12 2015	(r379337)
+++ head/www/trac-email2trac/Makefile	Thu Feb 19 11:14:23 2015	(r379338)
@@ -29,6 +29,10 @@ PORTDOCS=	AUTHORS ChangeLog INSTALL READ
 
 .include <bsd.port.options.mk>
 
+.if ${SLAVE_PORT} == no
+CONFLICTS_INSTALL+=	trac-email2trac-postfix-[0-9]*
+.endif
+
 .if ${PORT_OPTIONS:MPOSTFIX}
 MTAUSER?=	nobody
 .else
@@ -38,14 +42,10 @@ MTAUSER?=	mailnull
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/delete_spam.py ${STAGEDIR}${PREFIX}/bin/delete_spam
 	@${INSTALL_SCRIPT} ${WRKSRC}/email2trac.py ${STAGEDIR}${PREFIX}/bin/email2trac
-	@${INSTALL} ${COPY} ${STRIP} ${_BINOWNGRP} -m 4111 \
+	@${INSTALL_PROGRAM} \
 	    ${WRKSRC}/run_email2trac ${STAGEDIR}${PREFIX}/bin
 	@${INSTALL_DATA} ${WRKSRC}/email2trac.conf \
 	    ${STAGEDIR}${PREFIX}/etc/email2trac.conf.sample
-	@if [ ! -e ${STAGEDIR}${PREFIX}/etc/email2trac.conf ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/email2trac.conf.sample \
-		    ${STAGEDIR}${PREFIX}/etc/email2trac.conf ; \
-	fi
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}

Modified: head/www/trac-email2trac/pkg-plist
==============================================================================
--- head/www/trac-email2trac/pkg-plist	Thu Feb 19 09:29:12 2015	(r379337)
+++ head/www/trac-email2trac/pkg-plist	Thu Feb 19 11:14:23 2015	(r379338)
@@ -1,6 +1,4 @@
 bin/delete_spam
 bin/email2trac
-bin/run_email2trac
- at unexec if cmp -s %D/etc/email2trac.conf %D/etc/email2trac.conf.sample; then rm -f %D/etc/email2trac.conf; fi
-etc/email2trac.conf.sample
- at exec if [ ! -e %D/etc/email2trac.conf ]; then cp %D/etc/email2trac.conf.sample %D/etc/email2trac.conf; fi
+@(,,4111) bin/run_email2trac
+ at sample etc/email2trac.conf.sample