Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 May 2016 01:29:08 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416081 - in head/www: trac-OhlohWidgetsMacro trac-OhlohWidgetsMacro/files trac-TracGoogleAnalytics trac-accountmanager trac-advancedticketworkflow trac-attachmentpolicy trac-autocomple...
Message-ID:  <201605290129.u4T1T8GM091719@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Sun May 29 01:29:08 2016
New Revision: 416081
URL: https://svnweb.freebsd.org/changeset/ports/416081

Log:
  www/trac-*: minor cleanup
  
  - Don't use trac/plugin.mk which is now empty and unneeded
  - Add some NO_ARCH'es
  - Add/fix some LICENSEs and LICENSE_FILES
  - Pet portlint
  - Regenerate some patches
  
  Approved by:	portmgr blanket

Added:
  head/www/trac-keywords/files/patch-trackeywords_web__ui.py
     - copied, changed from r416080, head/www/trac-keywords/files/patch-web_ui.py
  head/www/trac-watchlist/files/patch-tracwatchlist_plugin.py
     - copied, changed from r416080, head/www/trac-watchlist/files/patch-trachwatchlist_plugin.py
Deleted:
  head/www/trac-keywords/files/patch-web_ui.py
  head/www/trac-watchlist/files/patch-trachwatchlist_plugin.py
Modified:
  head/www/trac-OhlohWidgetsMacro/Makefile
  head/www/trac-OhlohWidgetsMacro/files/patch-ohloh_widgets__macro.py
  head/www/trac-TracGoogleAnalytics/Makefile
  head/www/trac-accountmanager/Makefile
  head/www/trac-advancedticketworkflow/Makefile
  head/www/trac-attachmentpolicy/Makefile
  head/www/trac-autocomplete/Makefile
  head/www/trac-bzr/Makefile
  head/www/trac-childtickets/Makefile
  head/www/trac-customfieldadmin/Makefile
  head/www/trac-datefield/Makefile
  head/www/trac-defaultcc/Makefile
  head/www/trac-discussion/Makefile
  head/www/trac-down/Makefile
  head/www/trac-estimator/Makefile
  head/www/trac-fivestarvote/Makefile
  head/www/trac-fullblog/Makefile
  head/www/trac-fullblognotification/Makefile
  head/www/trac-graphviz/Makefile
  head/www/trac-graphviz/files/patch-graphviz_graphviz.py
  head/www/trac-iniadmin/Makefile
  head/www/trac-keywords/Makefile
  head/www/trac-keywords/files/patch-fix-javascript
  head/www/trac-keywordsecretticket/Makefile
  head/www/trac-ldap/Makefile
  head/www/trac-ldapauthstore/Makefile
  head/www/trac-mastertickets/Makefile
  head/www/trac-math/Makefile
  head/www/trac-math/files/patch-tracmath_tracmath.py
  head/www/trac-mercurial/Makefile
  head/www/trac-navadd/Makefile
  head/www/trac-permredirect/Makefile
  head/www/trac-privatetickets/Makefile
  head/www/trac-pydotorgtheme/Makefile
  head/www/trac-robotstxt/Makefile
  head/www/trac-scrumburndown/Makefile
  head/www/trac-spam-filter/Makefile
  head/www/trac-subtickets/Makefile
  head/www/trac-subtickets/files/patch-setup.cfg
  head/www/trac-subtickets/files/patch-tracsubtickets_api.py
  head/www/trac-tags/Makefile
  head/www/trac-tags/files/patch-tractags_model.py
  head/www/trac-themeengine/Makefile
  head/www/trac-ticketimport/Makefile
  head/www/trac-tickettemplate/Makefile
  head/www/trac-timingandestimation/Makefile
  head/www/trac-tocmacro/Makefile
  head/www/trac-tracdragdrop/Makefile
  head/www/trac-tweakui/Makefile
  head/www/trac-tweakui/pkg-descr
  head/www/trac-vote/Makefile
  head/www/trac-watchlist/Makefile
  head/www/trac-watchlist/files/patch-tracwatchlist_util.py
  head/www/trac-wikigoodies/Makefile
  head/www/trac-wikinotification/Makefile
  head/www/trac-wikinotification/files/patch-WikiNotification__notification.py
  head/www/trac-wikinotification/files/patch-WikiNotification__templates__wiki_notification_email_template.txt
  head/www/trac-wikitemplates/Makefile
  head/www/trac-wikitopdf/Makefile
  head/www/trac-wysiwyg/Makefile
  head/www/trac-xmlrpc/Makefile

Modified: head/www/trac-OhlohWidgetsMacro/Makefile
==============================================================================
--- head/www/trac-OhlohWidgetsMacro/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-OhlohWidgetsMacro/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -18,5 +18,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyce
 
 USES=		python
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

Modified: head/www/trac-OhlohWidgetsMacro/files/patch-ohloh_widgets__macro.py
==============================================================================
--- head/www/trac-OhlohWidgetsMacro/files/patch-ohloh_widgets__macro.py	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-OhlohWidgetsMacro/files/patch-ohloh_widgets__macro.py	Sun May 29 01:29:08 2016	(r416081)
@@ -1,6 +1,6 @@
---- ./ohloh_widgets/macro.py.orig	2013-06-17 12:52:47.000000000 -0700
-+++ ./ohloh_widgets/macro.py	2013-06-17 12:53:17.000000000 -0700
-@@ -46,7 +46,7 @@
+--- ohloh_widgets/macro.py.orig	2010-07-04 06:54:44 UTC
++++ ohloh_widgets/macro.py
+@@ -46,7 +46,7 @@ class OhlohWidgetMacro(MacroWithValidati
         ![[OhlohWidget(project_id, widget_name)]]
      
      The macro gets two parameters which you can get from Ohloh's widget page
@@ -9,7 +9,7 @@
      look at the embeddable HTML snippet:
      
       * project_id -- a 6 digit number which identifies your project
-@@ -70,7 +70,7 @@
+@@ -70,7 +70,7 @@ class OhlohWidgetMacro(MacroWithValidati
      
      def url(self, parameters):
          query_string = ''

Modified: head/www/trac-TracGoogleAnalytics/Makefile
==============================================================================
--- head/www/trac-TracGoogleAnalytics/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-TracGoogleAnalytics/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,6 +12,7 @@ MAINTAINER=	douglas@douglasthrift.net
 COMMENT=	Trac plugin to enable logging by Google Analytics
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	tracd:www/trac \
 		${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:textproc/py-genshi
@@ -19,6 +20,6 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-accountmanager/Makefile
==============================================================================
--- head/www/trac-accountmanager/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-accountmanager/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -2,8 +2,8 @@
 
 PORTNAME=	accountmanager
 PORTVERSION=	0.5.${REV}
-PORTEPOCH=	1
 PORTREVISION=	1
+PORTEPOCH=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/kuriyama \
 		http://trac-hacks.org/changeset/${REV}/accountmanagerplugin/trunk?old_path=/&format=zip&filename=
@@ -13,6 +13,9 @@ DIST_SUBDIR=	trac
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Account Manager Plugin for trac
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 RUN_DEPENDS=	tracd:www/trac
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
@@ -20,6 +23,7 @@ REV=			12583
 USES=			python:2 zip
 USE_PYTHON=		distutils autoplist
 WRKSRC=			${WRKDIR}/accountmanagerplugin/trunk
+NO_ARCH=		yes
 
 # --- trac.ini
 # [components]
@@ -32,5 +36,4 @@ WRKSRC=			${WRKDIR}/accountmanagerplugin
 # --- httpd.conf
 # SetEnv PYTHON_EGG_CACHE "/tmp/cache"
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-advancedticketworkflow/Makefile
==============================================================================
--- head/www/trac-advancedticketworkflow/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-advancedticketworkflow/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,11 +12,11 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSIO
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Advanced Ticket Workflow Plugin for Trac
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
 USES=		python
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-attachmentpolicy/Makefile
==============================================================================
--- head/www/trac-attachmentpolicy/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-attachmentpolicy/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -22,8 +22,8 @@ RUN_DEPENDS+=	tracd:www/trac
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.12
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-autocomplete/Makefile
==============================================================================
--- head/www/trac-autocomplete/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-autocomplete/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,12 +12,12 @@ DISTNAME=	autocompleteusersplugin-r${REL
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Plugin for autocompletion of user names in ticket fields
 
-RUN_DEPENDS+=	trac>=0.11:www/trac
+RUN_DEPENDS=	trac>=0.11:www/trac
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
 WRKSRC=		${WRKDIR}/autocompleteusersplugin/0.11
+NO_ARCH=	yes
 REL=		8451
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-bzr/Makefile
==============================================================================
--- head/www/trac-bzr/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-bzr/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,16 +12,17 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${
 MAINTAINER=	hsn@sendmail.cz
 COMMENT=	Bazaar-NG plugin for Trac
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	tracd:www/trac \
 		bzr:devel/bzr
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 post-patch:
-	${REINPLACE_CMD} -e 's|tag_date = 1||' ${WRKSRC}/setup.cfg
+	@${REINPLACE_CMD} -e 's|tag_date = 1||' ${WRKSRC}/setup.cfg
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-childtickets/Makefile
==============================================================================
--- head/www/trac-childtickets/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-childtickets/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,16 +12,17 @@ MAINTAINER=	hsn@sendmail.cz
 COMMENT=	Support for having child-tickets in Trac
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	trac>=0.12:www/trac
+RUN_DEPENDS=	trac>=0.12:www/trac
 
 USES=		python:2 zip
 
 WRKSRC=		${WRKDIR}/childticketsplugin/0.12
 
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-customfieldadmin/Makefile
==============================================================================
--- head/www/trac-customfieldadmin/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-customfieldadmin/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -14,11 +14,15 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSIO
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web interface to administer Trac ticket custom fields
 
-RUN_DEPENDS+=	tracd:www/trac
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	tracd:www/trac
 
 USES=		python:2 zip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

Modified: head/www/trac-datefield/Makefile
==============================================================================
--- head/www/trac-datefield/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-datefield/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,12 +12,12 @@ DISTNAME=	datefieldplugin-r${REL}
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Plugin for creating date fields
 
-RUN_DEPENDS+=	trac>=0.11:www/trac
+RUN_DEPENDS=	trac>=0.11:www/trac
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/datefieldplugin/0.11
 REL=		7267
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-defaultcc/Makefile
==============================================================================
--- head/www/trac-defaultcc/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-defaultcc/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,14 +12,16 @@ DISTNAME=	${PORTNAME}plugin-r${REL}
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Plugin that adds default CC value for tickets
 
-RUN_DEPENDS+=	trac>=0.11:www/trac
+LICENSE=	GPLv2
+
+RUN_DEPENDS=	trac>=0.11:www/trac
 
 USES=		python:2 zip
 
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/trunk
 REL=		10605
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-discussion/Makefile
==============================================================================
--- head/www/trac-discussion/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-discussion/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -10,11 +10,12 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Discussion forum plugin for Trac
 
-RUN_DEPENDS+=	tracd:www/trac \
+RUN_DEPENDS=	tracd:www/trac \
 		trac-TracSpamFilter>=0.2.1:www/trac-spam-filter
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 # Maintainter targets below this point
 
@@ -26,8 +27,7 @@ do-fetch:
 	cd ${WRKDIR} && \
 	    svn export http://trac-hacks.org/svn/discussionplugin/0.11/ \
 	    ${DISTNAME}
-	cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
+	cd ${WRKDIR} && ${TAR} cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-down/Makefile
==============================================================================
--- head/www/trac-down/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-down/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -16,6 +16,6 @@ RUN_DEPENDS=	tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-estimator/Makefile
==============================================================================
--- head/www/trac-estimator/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-estimator/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,10 +12,11 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSIO
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Produce detailed range-based estimations for Trac tickets
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

Modified: head/www/trac-fivestarvote/Makefile
==============================================================================
--- head/www/trac-fivestarvote/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-fivestarvote/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -10,10 +10,11 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Five star plugin for voting on Trac resources
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 # Maintainter targets below this point
 
@@ -28,5 +29,4 @@ do-fetch:
 	cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-fullblog/Makefile
==============================================================================
--- head/www/trac-fullblog/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-fullblog/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,11 +12,12 @@ DIST_SUBDIR=	trac
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin that provides a project Blog
 
-RUN_DEPENDS+=	htmldoc:textproc/htmldoc \
+RUN_DEPENDS=	htmldoc:textproc/htmldoc \
 		tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .if defined(BOOTSTRAP)
 do-fetch:
@@ -24,8 +25,7 @@ do-fetch:
 	svn export http://trac-hacks.org/svn/fullblogplugin/0.11/ ${WRKSRC}
 	${MKDIR} ${_DISTDIR}
 	cd ${WRKDIR} && \
-	    tar cfvz ${_DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
+	    ${TAR} cfvz ${_DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-fullblognotification/Makefile
==============================================================================
--- head/www/trac-fullblognotification/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-fullblognotification/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,10 +12,11 @@ DIST_SUBDIR=	trac
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin that provides a project Blog
 
-RUN_DEPENDS+=	trac-fullblog>=0.1.1:www/trac-fullblog
+RUN_DEPENDS=	trac-fullblog>=0.1.1:www/trac-fullblog
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .if defined(BOOTSTRAP)
 do-fetch:
@@ -27,5 +28,4 @@ do-fetch:
 	    tar cfvz ${_DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-graphviz/Makefile
==============================================================================
--- head/www/trac-graphviz/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-graphviz/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,8 +12,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphviz plugin for Trac's wiki
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	urwfonts>0:x11-fonts/urwfonts \
+RUN_DEPENDS=	urwfonts>0:x11-fonts/urwfonts \
 		dot:graphics/graphviz \
 		tracd:www/trac
 
@@ -24,9 +25,9 @@ NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 	    -e 's|%%PREFIX%%|${PREFIX}|' \
 	    -e 's|%%OSMAJOR%%|${OSREL:C/\..*$//}|' \
-	${WRKSRC}/graphviz/graphviz.py
+		${WRKSRC}/graphviz/graphviz.py
 
 .include <bsd.port.mk>

Modified: head/www/trac-graphviz/files/patch-graphviz_graphviz.py
==============================================================================
--- head/www/trac-graphviz/files/patch-graphviz_graphviz.py	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-graphviz/files/patch-graphviz_graphviz.py	Sun May 29 01:29:08 2016	(r416081)
@@ -1,6 +1,6 @@
---- graphviz/graphviz.py.orig
+--- graphviz/graphviz.py.orig	2008-10-13 16:24:45 UTC
 +++ graphviz/graphviz.py
-@@ -16,11 +16,11 @@
+@@ -16,11 +16,11 @@ __docformat__ = 'restructuredtext'
  __version__   = '0.7.2'
  
  
@@ -13,7 +13,7 @@
  import subprocess
  import sys
  
-@@ -59,10 +59,7 @@
+@@ -59,10 +59,7 @@ class Graphviz(Component):
                       'c:\\Program Files\\ATT\\Graphviz\\bin',
                       ],
          
@@ -25,7 +25,7 @@
                       ],
          
          'darwin':   ['/opt/local/bin',
-@@ -312,7 +309,7 @@
+@@ -312,7 +309,7 @@ class Graphviz(Component):
          encoded_cmd = (processor + unicode(self.processor_options)) \
                  .encode(self.encoding)
          encoded_content = content.encode(self.encoding)

Modified: head/www/trac-iniadmin/Makefile
==============================================================================
--- head/www/trac-iniadmin/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-iniadmin/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,11 +12,11 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSIO
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Edit all trac.ini option via the WebAdminPlugin
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
 USES=		python
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes`
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-keywords/Makefile
==============================================================================
--- head/www/trac-keywords/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-keywords/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,11 +12,14 @@ DISTNAME=	trackeywordsplugin-r${REL}
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Plugin for using pre-configured keywords
 
-RUN_DEPENDS+=	trac>=0.11:www/trac
+LICENSE=	BSD3CLAUSE
+
+RUN_DEPENDS=	trac>=0.11:www/trac
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
 WRKSRC=		${WRKDIR}/trackeywordsplugin/0.11
+NO_ARCH=	yes
 REL=		7273
 
 post-extract:
@@ -25,5 +28,4 @@ post-extract:
 # Seems like web_ui.py was misplaced too.
 	@${MV} ${WRKDIR}/trackeywordsplugin/0.10/trackeywords/web_ui.py ${WRKSRC}/trackeywords/
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-keywords/files/patch-fix-javascript
==============================================================================
--- head/www/trac-keywords/files/patch-fix-javascript	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-keywords/files/patch-fix-javascript	Sun May 29 01:29:08 2016	(r416081)
@@ -1,6 +1,6 @@
---- trackeywords/templates/keywords.cs.orig	2010-09-12 23:33:05.000000000 +0400
-+++ trackeywords/templates/keywords.cs	2010-09-12 23:33:25.000000000 +0400
-@@ -9,7 +9,7 @@
+--- trackeywords/templates/keywords.cs.orig	2007-09-11 15:09:40 UTC
++++ trackeywords/templates/keywords.cs
+@@ -9,7 +9,7 @@ function initTags() {
      var el = document.getElementById('keywords');
      var currentTags = el.value.split(/\s+/);
      for(i in currentTags) {
@@ -9,9 +9,9 @@
          if(link)
              link.className = "sel";
      }
---- trackeywords/templates/keywords.html.orig	2010-09-12 23:33:05.000000000 +0400
-+++ trackeywords/templates/keywords.html	2010-09-12 23:33:46.000000000 +0400
-@@ -14,7 +14,7 @@
+--- trackeywords/templates/keywords.html.orig	2009-09-09 13:18:34 UTC
++++ trackeywords/templates/keywords.html
+@@ -14,7 +14,7 @@ function initTags() {
      var currentTags = el.value.split(/\s+/);
  
      for(i in currentTags) {

Copied and modified: head/www/trac-keywords/files/patch-trackeywords_web__ui.py (from r416080, head/www/trac-keywords/files/patch-web_ui.py)
==============================================================================
--- head/www/trac-keywords/files/patch-web_ui.py	Sun May 29 01:22:26 2016	(r416080, copy source)
+++ head/www/trac-keywords/files/patch-trackeywords_web__ui.py	Sun May 29 01:29:08 2016	(r416081)
@@ -1,6 +1,6 @@
---- trackeywords/web_ui.py.orig	2009-09-09 17:18:34.000000000 +0400
-+++ trackeywords/web_ui.py	2010-04-05 11:32:50.000000000 +0400
-@@ -80,7 +80,8 @@
+--- trackeywords/web_ui.py.orig	2009-09-09 13:18:34 UTC
++++ trackeywords/web_ui.py
+@@ -80,7 +80,8 @@ class TracKeywordsComponent(core.Compone
  
      # changed to Genshi signature
      def post_process_request(self, req, template, data, content_type):

Modified: head/www/trac-keywordsecretticket/Makefile
==============================================================================
--- head/www/trac-keywordsecretticket/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-keywordsecretticket/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -10,6 +10,9 @@ MAINTAINER=	gaod@hychen.org
 COMMENT=	Ticket security policy based on keyword for Trac
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS=	tracd:www/trac
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	KKBOX
@@ -17,9 +20,8 @@ GH_PROJECT=	trac-keyword-secret-ticket-p
 GH_TAGNAME=	98edea2
 GITDATE=	20130401
 
-RUN_DEPENDS+=	tracd:www/trac
-
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

Modified: head/www/trac-ldap/Makefile
==============================================================================
--- head/www/trac-ldap/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-ldap/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -13,7 +13,7 @@ COMMENT=	Trac plugin to use LDAP to stor
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	tracd:www/trac \
+RUN_DEPENDS=	tracd:www/trac \
 		trac-accountmanager>0:www/trac-accountmanager
 
 NO_ARCH=	yes
@@ -39,5 +39,4 @@ do-fetch:
 	cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-ldapauthstore/Makefile
==============================================================================
--- head/www/trac-ldapauthstore/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-ldapauthstore/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -13,7 +13,7 @@ COMMENT=	Trac AccountManager plugin usin
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	tracd:www/trac \
+RUN_DEPENDS=	tracd:www/trac \
 		trac-accountmanager>0:www/trac-accountmanager \
 		trac-ldap>0:www/trac-ldap \
 		${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap
@@ -41,5 +41,4 @@ do-fetch:
 	cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-mastertickets/Makefile
==============================================================================
--- head/www/trac-mastertickets/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-mastertickets/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -13,13 +13,12 @@ DISTNAME=	coderanger-trac-${PORTNAME}-43
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Support for ticket dependencies
 
-BROKEN=		unfetchable
-
-RUN_DEPENDS+=	trac>=0.12:www/trac
+RUN_DEPENDS=	trac>=0.12:www/trac
 
-WRKSRC=			${WRKDIR}/${DISTNAME}
+BROKEN=		unfetchable
 
 USES=		python
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

Modified: head/www/trac-math/Makefile
==============================================================================
--- head/www/trac-math/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-math/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Support for LaTeX math formulas in wiki pages
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USE_TEX=	latex
 SUB_FILES=	pkg-message
@@ -18,6 +18,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 # Maintainter targets below this point
 
@@ -32,5 +33,4 @@ do-fetch:
 	cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-math/files/patch-tracmath_tracmath.py
==============================================================================
--- head/www/trac-math/files/patch-tracmath_tracmath.py	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-math/files/patch-tracmath_tracmath.py	Sun May 29 01:29:08 2016	(r416081)
@@ -1,6 +1,6 @@
---- tracmath/tracmath.py.orig
+--- tracmath/tracmath.py.orig	2008-04-04 08:58:46 UTC
 +++ tracmath/tracmath.py
-@@ -4,8 +4,8 @@
+@@ -4,8 +4,8 @@ This has currently been tested only on t
  """
  
  import codecs
@@ -10,7 +10,7 @@
  from cStringIO import StringIO
  import os
  import sys
-@@ -142,7 +142,7 @@
+@@ -142,7 +142,7 @@ class TracMathPlugin(Component):
              if m:
                  label = m.group(1)
  

Modified: head/www/trac-mercurial/Makefile
==============================================================================
--- head/www/trac-mercurial/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-mercurial/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,11 +12,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin to use Mercurial instead of Subversion in Trac
 
 LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	hg:devel/mercurial \
 		tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

Modified: head/www/trac-navadd/Makefile
==============================================================================
--- head/www/trac-navadd/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-navadd/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -11,11 +11,11 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSIO
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin for adding navigation items into Trac navigation bars
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-permredirect/Makefile
==============================================================================
--- head/www/trac-permredirect/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-permredirect/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -20,6 +20,6 @@ REV=			13353
 USES=			python zip:infozip
 USE_PYTHON=		distutils autoplist
 WRKSRC=			${WRKDIR}/${PORTNAME}plugin/tags/${PORTVERSION}
+NO_ARCH=		yes
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-privatetickets/Makefile
==============================================================================
--- head/www/trac-privatetickets/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-privatetickets/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -16,6 +16,6 @@ RUN_DEPENDS=	tracd:www/trac
 
 USES=		python
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-pydotorgtheme/Makefile
==============================================================================
--- head/www/trac-pydotorgtheme/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-pydotorgtheme/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -10,12 +10,12 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Theme that emulates the look of python.org
 
-RUN_DEPENDS+=	tracd:www/trac \
+RUN_DEPENDS=	tracd:www/trac \
 		trac-themeengine>=2.0:www/trac-themeengine
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-robotstxt/Makefile
==============================================================================
--- head/www/trac-robotstxt/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-robotstxt/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,12 +12,12 @@ DISTNAME=	TracRobotsTxt-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows simple management of a robots.txt
 
-BROKEN=		unfetchable
-
 RUN_DEPENDS=	tracd:www/trac
 
+BROKEN=		unfetchable
+
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-scrumburndown/Makefile
==============================================================================
--- head/www/trac-scrumburndown/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-scrumburndown/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,11 +12,14 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin to enable Scrum burndown chart capabilities
 
-RUN_DEPENDS+=	tracd:www/trac \
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	tracd:www/trac \
 		trac-timingandestimation>=0:www/trac-timingandestimation
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

Modified: head/www/trac-spam-filter/Makefile
==============================================================================
--- head/www/trac-spam-filter/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-spam-filter/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -18,6 +18,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-subtickets/Makefile
==============================================================================
--- head/www/trac-subtickets/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-subtickets/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -25,6 +25,6 @@ GITDATE=	20130328
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-subtickets/files/patch-setup.cfg
==============================================================================
--- head/www/trac-subtickets/files/patch-setup.cfg	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-subtickets/files/patch-setup.cfg	Sun May 29 01:29:08 2016	(r416081)
@@ -1,5 +1,5 @@
---- setup.cfg.orig	2013-03-28 05:06:54.072148000 +0800
-+++ setup.cfg	2013-03-28 05:06:59.650566000 +0800
+--- setup.cfg.orig	2012-10-27 18:40:31 UTC
++++ setup.cfg
 @@ -1,6 +1,6 @@
  [egg_info]
  tag_build = .dev

Modified: head/www/trac-subtickets/files/patch-tracsubtickets_api.py
==============================================================================
--- head/www/trac-subtickets/files/patch-tracsubtickets_api.py	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-subtickets/files/patch-tracsubtickets_api.py	Sun May 29 01:29:08 2016	(r416081)
@@ -1,6 +1,6 @@
---- tracsubtickets/api.py.orig	2013-03-28 05:19:20.898573000 +0800
-+++ tracsubtickets/api.py	2013-03-28 05:19:46.107341000 +0800
-@@ -153,7 +153,7 @@
+--- tracsubtickets/api.py.orig	2012-10-27 18:40:31 UTC
++++ tracsubtickets/api.py
+@@ -153,7 +153,7 @@ class SubTicketsSystem(Component):
                             (parent, ticket.id))
              # add a comment to old parent
              xticket = Ticket(self.env, parent)
@@ -9,7 +9,7 @@
              tn = TicketNotifyEmail(self.env)
              tn.notify(xticket, newticket=False, modtime=xticket['changetime'])
  
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ class SubTicketsSystem(Component):
                             (parent, ticket.id))
              # add a comment to new parent
              xticket = Ticket(self.env, parent)

Modified: head/www/trac-tags/Makefile
==============================================================================
--- head/www/trac-tags/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-tags/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,12 +12,12 @@ DIST_SUBDIR=	trac
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic tags frontend for trac
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.pre.mk>
 
 .if !defined(SVN_REV)

Modified: head/www/trac-tags/files/patch-tractags_model.py
==============================================================================
--- head/www/trac-tags/files/patch-tractags_model.py	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-tags/files/patch-tractags_model.py	Sun May 29 01:29:08 2016	(r416081)
@@ -1,6 +1,6 @@
---- tractags/model.py.orig
+--- tractags/model.py.orig	2011-12-14 21:19:06 UTC
 +++ tractags/model.py
-@@ -62,17 +62,7 @@
+@@ -62,17 +62,7 @@ class TagModelProvider(Component):
          self._upgrade_db(db)
  
      def _need_migration(self, db):

Modified: head/www/trac-themeengine/Makefile
==============================================================================
--- head/www/trac-themeengine/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-themeengine/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,11 +12,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin to simplify distributing and deploying themes and styles
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USES=		python:2 tar:bzip2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-ticketimport/Makefile
==============================================================================
--- head/www/trac-ticketimport/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-ticketimport/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -10,11 +10,14 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Import or update tickets from a CSV file or Excel file
 
-RUN_DEPENDS+=	tracd:www/trac \
+LICENSE=	BSD3CLAUSE # "same license as trac"
+
+RUN_DEPENDS=	tracd:www/trac \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:textproc/py-xlrd
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 # Maintainter targets below this point
 
@@ -29,5 +32,4 @@ do-fetch:
 	cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-tickettemplate/Makefile
==============================================================================
--- head/www/trac-tickettemplate/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-tickettemplate/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -12,13 +12,13 @@ DISTNAME=	trac${PORTNAME}plugin-r${REL}
 MAINTAINER=	rea@FreeBSD.org
 COMMENT=	Plugin for making ticket templates
 
-RUN_DEPENDS+=	trac>=0.11:www/trac
+RUN_DEPENDS=	trac>=0.11:www/trac
 
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 WRKSRC=		${WRKDIR}/trac${PORTNAME}plugin/0.11
 REL=		10605
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-timingandestimation/Makefile
==============================================================================
--- head/www/trac-timingandestimation/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-timingandestimation/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -13,10 +13,11 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSIO
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Add estimation and time tracking functionality to Trac
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/branches/trac0.12-Permissions
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

Modified: head/www/trac-tocmacro/Makefile
==============================================================================
--- head/www/trac-tocmacro/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-tocmacro/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -11,10 +11,11 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Table of contents macro
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USES=		python
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 .include <bsd.port.mk>

Modified: head/www/trac-tracdragdrop/Makefile
==============================================================================
--- head/www/trac-tracdragdrop/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-tracdragdrop/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -15,15 +15,15 @@ COMMENT=	Provides extends attachments li
 
 LICENSE=	BSD3CLAUSE
 
-SVN_REV=	12822
+RUN_DEPENDS=	tracd:www/trac
 
-RUN_DEPENDS+=	tracd:www/trac
+SVN_REV=	12822
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.12
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-tweakui/Makefile
==============================================================================
--- head/www/trac-tweakui/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-tweakui/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -13,10 +13,12 @@ DISTNAME=	${PORTNAME}plugin-${PORTVERSIO
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easily tweak Trac pages with JavaScript expressions
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USES=		dos2unix python zip
 DOS2UNIX_REGEX=	.*\.(css|html|js|py|txt)$
+USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
 PORTEXAMPLES=	*
@@ -24,7 +26,6 @@ PORTEXAMPLES=	*
 SUB_FILES=	pkg-message
 
 WRKSRC=		${WRKDIR}/trac${PORTNAME}plugin/0.11
-USE_PYTHON=	distutils autoplist
 
 post-install:
 	cd ${WRKSRC}/tractweakui/htdocs && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}

Modified: head/www/trac-tweakui/pkg-descr
==============================================================================
--- head/www/trac-tweakui/pkg-descr	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-tweakui/pkg-descr	Sun May 29 01:29:08 2016	(r416081)
@@ -6,4 +6,4 @@ The plugin supports the Trac web admin s
 Javascript tweaks to multiple pages by matching their names with
 regular expressions.
 
-WWW:    http://trac-hacks.org/wiki/TracTweakUiPlugin
+WWW: http://trac-hacks.org/wiki/TracTweakUiPlugin

Modified: head/www/trac-vote/Makefile
==============================================================================
--- head/www/trac-vote/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-vote/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -10,10 +10,11 @@ PKGNAMEPREFIX=	trac-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plugin for voting on Trac resources
 
-RUN_DEPENDS+=	tracd:www/trac
+RUN_DEPENDS=	tracd:www/trac
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 # Maintainter targets below this point
 
@@ -28,5 +29,4 @@ do-fetch:
 	cd ${WRKDIR} && tar cvf ${DISTDIR}/${DISTNAME}.tar.gz ${DISTNAME}
 .endif
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Modified: head/www/trac-watchlist/Makefile
==============================================================================
--- head/www/trac-watchlist/Makefile	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-watchlist/Makefile	Sun May 29 01:29:08 2016	(r416081)
@@ -13,15 +13,16 @@ DISTNAME=	${PORTNAME}plugin-r${SVN_REV}
 MAINTAINER=	gaod@hychen.org
 COMMENT=	Watchlist feature for wikis and tickets of Trac
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 
-SVN_REV=	11526
+RUN_DEPENDS=	tracd:www/trac
 
-RUN_DEPENDS+=	tracd:www/trac
+SVN_REV=	11526
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.12
 USES=		python:2 zip
 USE_PYTHON=	distutils autoplist
+NO_ARCH=	yes
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 
@@ -29,5 +30,4 @@ post-extract:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${CHMOD} 644
 	@${FIND} ${WRKSRC} -type d | ${XARGS} ${CHMOD} 755
 
-.include "${.CURDIR}/../../www/trac/plugin.mk"
 .include <bsd.port.mk>

Copied and modified: head/www/trac-watchlist/files/patch-tracwatchlist_plugin.py (from r416080, head/www/trac-watchlist/files/patch-trachwatchlist_plugin.py)
==============================================================================
--- head/www/trac-watchlist/files/patch-trachwatchlist_plugin.py	Sun May 29 01:22:26 2016	(r416080, copy source)
+++ head/www/trac-watchlist/files/patch-tracwatchlist_plugin.py	Sun May 29 01:29:08 2016	(r416081)
@@ -1,6 +1,6 @@
---- tracwatchlist/plugin.py.orig	2013-08-30 19:07:32.000000000 +0800
-+++ tracwatchlist/plugin.py	2013-08-30 19:08:43.000000000 +0800
-@@ -527,7 +527,7 @@
+--- tracwatchlist/plugin.py.orig	2012-04-05 10:15:12 UTC
++++ tracwatchlist/plugin.py
+@@ -527,7 +527,7 @@ class WatchlistPlugin(Component):
                      self.set_notify(req, realm, res)
                  db.commit()
              if redirectback and len(new_res) == 1:

Modified: head/www/trac-watchlist/files/patch-tracwatchlist_util.py
==============================================================================
--- head/www/trac-watchlist/files/patch-tracwatchlist_util.py	Sun May 29 01:22:26 2016	(r416080)
+++ head/www/trac-watchlist/files/patch-tracwatchlist_util.py	Sun May 29 01:29:08 2016	(r416081)
@@ -1,6 +1,6 @@
---- tracwatchlist/util.py.orig	2013-08-15 04:15:56.000000000 +0800
-+++ tracwatchlist/util.py	2013-08-15 04:16:05.000000000 +0800
-@@ -198,8 +198,8 @@
+--- tracwatchlist/util.py.orig	2010-09-25 16:12:54 UTC
++++ tracwatchlist/util.py
+@@ -198,8 +198,8 @@ def convert_LDML_to_MySQL( ldml_pattern 
  try:
      from  babel.dates        import  get_datetime_format, get_date_format, get_time_format

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605290129.u4T1T8GM091719>