aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING9
-rw-r--r--www/trac-email2trac/Makefile37
-rw-r--r--www/trac-email2trac/distinfo6
-rw-r--r--www/trac-email2trac/pkg-plist8
4 files changed, 45 insertions, 15 deletions
diff --git a/UPDATING b/UPDATING
index b8273700cd0b..269c6c703e81 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,15 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20090410:
+ AFFECTS: users of www/trac-email2trac
+ AUTHOR: brooks@FreeBSD.org
+
+ bin/email2trac.py and bin/delete_spam.py are now installed without the
+ .py extension to make the suid run_email2trac work and match the online
+ documentation. If you were using them in scripts or alias entries, you
+ will need to update paths accordingly.
+
20090401:
AFFECTS: users of linux Fedora 8 infrastructure ports
AUTHOR: bsam@FreeBSD.org
diff --git a/www/trac-email2trac/Makefile b/www/trac-email2trac/Makefile
index acd43f6c8c87..42a754247582 100644
--- a/www/trac-email2trac/Makefile
+++ b/www/trac-email2trac/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= email2trac
-PORTVERSION= 0.40
+PORTVERSION= 0.80
CATEGORIES= www devel python
-MASTER_SITES= http://www.gerritbeine.de/download/trac/
+MASTER_SITES= ftp://ftp.sara.nl/pub/outgoing/
PKGNAMEPREFIX= trac-
MAINTAINER= gerrit.beine@gmx.de
@@ -17,22 +17,41 @@ COMMENT= Convert email to trac tickets
BUILD_DEPENDS+= easy_install:${PORTSDIR}/devel/py-setuptools
RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac
+OPTIONS= POSTFIX "Configure suid script for postfix" OFF
+
+TRACUSER?= ${WWWOWN}
+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --with-trac-user=${TRACUSER} --with-mta-user=${MTAUSER}
USE_PYTHON= 2.3+
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL README
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_POSTFIX)
+MTAUSER?= nobody
+.else
+MTAUSER?= mailnull
+.endif
+
do-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/delete_spam.py ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/email2trac.py ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/run_email2trac ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/email2trac.conf ${PREFIX}/etc
+ @${INSTALL_SCRIPT} ${WRKSRC}/delete_spam.py ${PREFIX}/bin/delete_spam
+ @${INSTALL_SCRIPT} ${WRKSRC}/email2trac.py ${PREFIX}/bin/email2trac
+ @${INSTALL} ${COPY} ${STRIP} ${_BINOWNGRP} -m 4111 \
+ ${WRKSRC}/run_email2trac ${PREFIX}/bin
+ @${INSTALL_DATA} ${WRKSRC}/email2trac.conf \
+ ${PREFIX}/etc/email2trac.conf.sample
+ @if [ ! -e ${PREFIX}/etc/email2trac.conf ]; then \
+ ${CP} -p ${PREFIX}/etc/email2trac.conf.sample \
+ ${PREFIX}/etc/email2trac.conf ; \
+ fi
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}
.for file in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/trac-email2trac/distinfo b/www/trac-email2trac/distinfo
index 4ca9790137ec..37762dc202c4 100644
--- a/www/trac-email2trac/distinfo
+++ b/www/trac-email2trac/distinfo
@@ -1,3 +1,3 @@
-MD5 (email2trac-0.40.tar.gz) = fcdb6bf864f257d8b4faa6e230f8fcd3
-SHA256 (email2trac-0.40.tar.gz) = 1b2633cb4369ad0b39585c25762ddb729c46ed33a65351e7546bbf78a34ab80a
-SIZE (email2trac-0.40.tar.gz) = 77614
+MD5 (email2trac-0.80.tar.gz) = d4d8831874f89d56b6bce9cdbad67df7
+SHA256 (email2trac-0.80.tar.gz) = a3c8ee2f8b9be28e6754e462a535cad34a4683391f8166baeecbaec85be8944f
+SIZE (email2trac-0.80.tar.gz) = 84419
diff --git a/www/trac-email2trac/pkg-plist b/www/trac-email2trac/pkg-plist
index 1bf22d97d91c..a5d431b2c013 100644
--- a/www/trac-email2trac/pkg-plist
+++ b/www/trac-email2trac/pkg-plist
@@ -1,4 +1,6 @@
-bin/delete_spam.py
-bin/email2trac.py
+bin/delete_spam
+bin/email2trac
bin/run_email2trac
-etc/email2trac.conf
+@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