svn commit: r416079 - head/www/trac-email2trac

[Dmitry Marakasov]

Author: amdmi3
Date: Sun May 29 01:22:00 2016
New Revision: 416079
URL: https://svnweb.freebsd.org/changeset/ports/416079

Log:
  - Fix license
  - Unsilence installation
  - Switch to options helpers

Modified:
  head/www/trac-email2trac/Makefile

Modified: head/www/trac-email2trac/Makefile
==============================================================================
--- head/www/trac-email2trac/Makefile	Sun May 29 01:21:55 2016	(r416078)
+++ head/www/trac-email2trac/Makefile	Sun May 29 01:22:00 2016	(r416079)
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Convert email to trac tickets
 
-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 CONFLICTS_INSTALL?=	trac-email2trac-postfix-[0-9]*
 
@@ -37,17 +37,17 @@ MTAUSER?=	mailnull
 .endif
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/delete_spam.py ${STAGEDIR}${PREFIX}/bin/delete_spam
-	@${INSTALL_SCRIPT} ${WRKSRC}/email2trac.py ${STAGEDIR}${PREFIX}/bin/email2trac
-	@${INSTALL_PROGRAM} \
+	${INSTALL_SCRIPT} ${WRKSRC}/delete_spam.py ${STAGEDIR}${PREFIX}/bin/delete_spam
+	${INSTALL_SCRIPT} ${WRKSRC}/email2trac.py ${STAGEDIR}${PREFIX}/bin/email2trac
+	${INSTALL_PROGRAM} \
 	    ${WRKSRC}/run_email2trac ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/email2trac.conf \
+	${INSTALL_DATA} ${WRKSRC}/email2trac.conf \
 	    ${STAGEDIR}${PREFIX}/etc/email2trac.conf.sample
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>