diff options
| author | jbeich <jbeich@FreeBSD.org> | 2015-02-19 19:14:23 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2015-02-19 19:14:23 +0800 |
| commit | 0e315f45b51892e07f514266384b336303e2f624 (patch) | |
| tree | a84ce383579e27e56813f16aedbfb555439727b6 /www | |
| parent | fec7c97d7c69945fe795a78bcb5873dd251a20c3 (diff) | |
| download | freebsd-ports-gnome-0e315f45b51892e07f514266384b336303e2f624.tar.gz freebsd-ports-gnome-0e315f45b51892e07f514266384b336303e2f624.tar.zst freebsd-ports-gnome-0e315f45b51892e07f514266384b336303e2f624.zip | |
- Convert to @sample
- Convert to @(user,group,mode)
- Convert to OPTIONS_SLAVE
- Register CONFLICTS with -postfix slave port
Diffstat (limited to 'www')
| -rw-r--r-- | www/trac-email2trac-postfix/Makefile | 4 | ||||
| -rw-r--r-- | www/trac-email2trac/Makefile | 10 | ||||
| -rw-r--r-- | www/trac-email2trac/pkg-plist | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/www/trac-email2trac-postfix/Makefile b/www/trac-email2trac-postfix/Makefile index d7bf9b72243b..048ac6f07b32 100644 --- a/www/trac-email2trac-postfix/Makefile +++ b/www/trac-email2trac-postfix/Makefile @@ -2,7 +2,9 @@ PKGNAMESUFFIX= -postfix -WITH_POSTFIX= yes +CONFLICTS_INSTALL= trac-email2trac-[0-9]* + +OPTIONS_SLAVE= POSTFIX MASTERDIR= ${.CURDIR}/../trac-email2trac diff --git a/www/trac-email2trac/Makefile b/www/trac-email2trac/Makefile index 9144420be582..ee9fc3165cdc 100644 --- a/www/trac-email2trac/Makefile +++ b/www/trac-email2trac/Makefile @@ -29,6 +29,10 @@ PORTDOCS= AUTHORS ChangeLog INSTALL README .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} diff --git a/www/trac-email2trac/pkg-plist b/www/trac-email2trac/pkg-plist index a5d431b2c013..bebe28228b82 100644 --- a/www/trac-email2trac/pkg-plist +++ b/www/trac-email2trac/pkg-plist @@ -1,6 +1,4 @@ bin/delete_spam bin/email2trac -bin/run_email2trac -@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 -@exec if [ ! -e %D/etc/email2trac.conf ]; then cp %D/etc/email2trac.conf.sample %D/etc/email2trac.conf; fi +@(,,4111) bin/run_email2trac +@sample etc/email2trac.conf.sample |