From gslin@colo-p.gslin.org  Fri Oct 26 09:11:59 2012
Return-Path: <gslin@colo-p.gslin.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 195DB4AA;
	Fri, 26 Oct 2012 09:11:59 +0000 (UTC)
	(envelope-from gslin@colo-p.gslin.org)
Received: from colo-p.gslin.org (gslin-1-pt.tunnel.tserv3.fmt2.ipv6.he.net [IPv6:2001:470:1f04:18a1::2])
	by mx1.freebsd.org (Postfix) with ESMTP id D976B8FC12;
	Fri, 26 Oct 2012 09:11:58 +0000 (UTC)
Received: by colo-p.gslin.org (Postfix, from userid 1000)
	id A93267E827; Fri, 26 Oct 2012 17:11:50 +0800 (CST)
Message-Id: <20121026091150.A93267E827@colo-p.gslin.org>
Date: Fri, 26 Oct 2012 17:11:50 +0800 (CST)
From: Gea-Suan Lin <gslin@gslin.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: clsung@FreeBSD.org, gslin@gslin.org
Subject: [PATCH] www/trac: update to 0.12.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         173119
>Category:       ports
>Synopsis:       [PATCH] www/trac: update to 0.12.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bdrewery
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 26 09:20:01 UTC 2012
>Closed-Date:    Sun Jun 09 15:54:10 CDT 2013
>Last-Modified:  Mon Jun 10 01:00:01 UTC 2013
>Originator:     Gea-Suan Lin
>Release:        FreeBSD 9.0-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD colo-p.gslin.org 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 01:47:53 UTC 2012
>Description:
- Update to 0.12.4

Port maintainer (clsung@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:
>Fix:

--- trac-0.12.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/www/trac/Makefile ./Makefile
--- /usr/ports/www/trac/Makefile	2012-03-03 01:00:35.000000000 +0800
+++ ./Makefile	2012-10-26 16:44:12.000000000 +0800
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	trac
-PORTVERSION=	0.12.3
+PORTVERSION=	0.12.4
 CATEGORIES=	www devel python
 MASTER_SITES=	http://ftp.edgewall.com/pub/trac/ \
 		ftp://ftp.edgewall.com/pub/trac/
diff -ruN --exclude=CVS /usr/ports/www/trac/distinfo ./distinfo
--- /usr/ports/www/trac/distinfo	2012-03-03 01:00:35.000000000 +0800
+++ ./distinfo	2012-10-26 16:45:00.000000000 +0800
@@ -1,2 +1,2 @@
-SHA256 (Trac-0.12.3.tar.gz) = 0eefacc5ebb91158ed7351b8f9b2eec7f45ce03b692bdc72a3c8061951174506
-SIZE (Trac-0.12.3.tar.gz) = 2239934
+SHA256 (Trac-0.12.4.tar.gz) = 3c3d773442e9d9cf757ef6675250a89d635eaf5dd0c1324b6137051f875b457a
+SIZE (Trac-0.12.4.tar.gz) = 2329394
diff -ruN --exclude=CVS /usr/ports/www/trac/files/patch-trac__util__daemon.py ./files/patch-trac__util__daemon.py
--- /usr/ports/www/trac/files/patch-trac__util__daemon.py	2012-03-03 01:00:35.000000000 +0800
+++ ./files/patch-trac__util__daemon.py	2012-10-26 16:47:10.000000000 +0800
@@ -14,7 +14,7 @@
  
 -        # The pid file must be writable
 -        try:
--            fileobj = open(pidfile, 'r+')
+-            fileobj = open(pidfile, 'a+')
 -            fileobj.close()
 -        except IOError, e:
 -            from trac.util.text import exception_to_unicode
--- trac-0.12.4.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->clsung 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Oct 26 09:20:09 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173119 
Responsible-Changed-From-To: clsung->bdrewery 
Responsible-Changed-By: bdrewery 
Responsible-Changed-When: Sun Jun 2 09:51:53 CDT 2013 
Responsible-Changed-Why:  
maintainer timeout, take 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173119 
State-Changed-From-To: open->closed 
State-Changed-By: bdrewery 
State-Changed-When: Sun Jun 9 15:54:08 CDT 2013 
State-Changed-Why:  
Superceded by ports/177382 

http://www.freebsd.org/cgi/query-pr.cgi?pr=173119 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/173119: commit references a PR
Date: Mon, 10 Jun 2013 00:57:27 +0000 (UTC)

 Author: bdrewery
 Date: Mon Jun 10 00:57:13 2013
 New Revision: 320423
 URL: http://svnweb.freebsd.org/changeset/ports/320423
 
 Log:
   - Update to 1.0.1 [1]
   - Updates to 0.12.4, 0.12.5 and 1.0.0 were submitted but
     superceded by 1.0.1 [2][3][4]
   
   PR:		ports/177382 [1]
   Submitted by:	William Grzybowski <william88@gmail.com> [1]
   Approved by:	maintainer timeout (8 months)
   PR:		ports/173119 [2]
   Submitted by:	Gea-Suan Lin <gslin@gslin.org> [2]
   PR:		ports/175697 [3]
   Submitted by:	Dmitry <dmitry2006@yandex.ru> [3]
   PR:		ports/173393 [4]
   Submitted by:	Rustem Alimov <rustem.alimov@gmail.com> [4]
 
 Deleted:
   head/www/trac/files/patch-trac__util__daemon.py
 Modified:
   head/www/trac/Makefile
   head/www/trac/distinfo
   head/www/trac/pkg-message
   head/www/trac/pkg-plist
 
 Modified: head/www/trac/Makefile
 ==============================================================================
 --- head/www/trac/Makefile	Mon Jun 10 00:48:32 2013	(r320422)
 +++ head/www/trac/Makefile	Mon Jun 10 00:57:13 2013	(r320423)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	trac
 -PORTVERSION=	0.12.3
 +PORTVERSION=	1.0.1
  CATEGORIES=	www devel python
  MASTER_SITES=	http://ftp.edgewall.com/pub/trac/ \
  		ftp://ftp.edgewall.com/pub/trac/
 @@ -11,10 +11,9 @@ DISTNAME=	Trac-${PORTVERSION}
  MAINTAINER=	clsung@FreeBSD.org
  COMMENT=	An enhanced wiki and issue tracking system for software projects
  
 -BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi \
 -		${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel
 -RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.5:${PORTSDIR}/textproc/py-genshi \
 -		${PYTHON_PKGNAMEPREFIX}Babel>=0.9:${PORTSDIR}/devel/py-babel
 +BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Genshi>=0.6:${PORTSDIR}/textproc/py-genshi \
 +		${PYTHON_PKGNAMEPREFIX}Babel>=0.9.5:${PORTSDIR}/devel/py-babel
 +RUN_DEPENDS:=	${BUILD_DEPENDS}
  
  OPTIONS_DEFINE=		SILVERCITY DOCUTILS PYGMENTS TZ PGSQL SVN
  OPTIONS_DEFAULT=	SILVERCITY DOCUTILS PYGMENTS TZ SVN
 @@ -25,7 +24,7 @@ TZ_DESC=		Process Time Zones
  
  CONFLICTS=	ja-trac-[0-9]*
  
 -USE_PYTHON=	2.5+
 +USE_PYTHON=	2.7-
  USE_PYDISTUTILS=	easy_install
  PYDISTUTILS_PKGNAME=	Trac
  PYDISTUTILS_NOEGGINFO=	yes
 @@ -74,19 +73,22 @@ x-generate-plist:
  		' | ${TR} -s '\n') > temp-pkg-plist
  
  pre-install:
 -	@${REINPLACE_CMD} -i '' -e 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/cgi-bin/trac.fcgi \
 -	    ${WRKSRC}/cgi-bin/trac.cgi
 +	@${REINPLACE_CMD} -i '' -e 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/contrib/cgi-bin/trac.fcgi \
 +	    ${WRKSRC}/contrib/cgi-bin/trac.cgi
  
  post-install:
 -	@${MKDIR} ${EXAMPLESDIR}
 -. for d in rpm workflow
 -	@${MKDIR} ${EXAMPLESDIR}/${d}
 -	@${INSTALL_DATA} ${WRKSRC}/contrib/${d}/* ${EXAMPLESDIR}/${d}/
 +	@${MKDIR} ${EXAMPLESDIR}/sample-plugins
 +	@${MKDIR} ${EXAMPLESDIR}/rpm
 +	@${INSTALL_DATA} ${WRKSRC}/contrib/rpm/* ${EXAMPLESDIR}/rpm
 +	@${FIND} ${WRKSRC}/contrib -type f -maxdepth 1 -exec ${INSTALL_DATA} {} ${EXAMPLESDIR}/ \;
 +. for d in permissions workflow
 +	@${MKDIR} ${EXAMPLESDIR}/sample-plugins/${d}
 +	@${INSTALL_DATA} ${WRKSRC}/sample-plugins/${d}/* ${EXAMPLESDIR}/sample-plugins/${d}/
  	@${RM} -rf ${WRKSRC}/contrib/${d}
  . endfor
 -	@${INSTALL_DATA} ${WRKSRC}/contrib/* ${EXAMPLESDIR}
 +	@${INSTALL_DATA} ${WRKSRC}/sample-plugins/*.py ${EXAMPLESDIR}/sample-plugins/
  	@${MKDIR} ${DATADIR}/cgi-bin
 -	@${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/* ${DATADIR}/cgi-bin
 +	@${INSTALL_SCRIPT} ${WRKSRC}/contrib/cgi-bin/* ${DATADIR}/cgi-bin
  	@${ECHO_CMD}
  	@${CAT} ${PKGMESSAGE}
  	@${ECHO_CMD}
 
 Modified: head/www/trac/distinfo
 ==============================================================================
 --- head/www/trac/distinfo	Mon Jun 10 00:48:32 2013	(r320422)
 +++ head/www/trac/distinfo	Mon Jun 10 00:57:13 2013	(r320423)
 @@ -1,2 +1,2 @@
 -SHA256 (Trac-0.12.3.tar.gz) = 0eefacc5ebb91158ed7351b8f9b2eec7f45ce03b692bdc72a3c8061951174506
 -SIZE (Trac-0.12.3.tar.gz) = 2239934
 +SHA256 (Trac-1.0.1.tar.gz) = 9dd49065696a8d4dfcb1a1af81e51d6bd487f5a1e72b3325c1fe4ecb5c490adb
 +SIZE (Trac-1.0.1.tar.gz) = 3479896
 
 Modified: head/www/trac/pkg-message
 ==============================================================================
 --- head/www/trac/pkg-message	Mon Jun 10 00:48:32 2013	(r320422)
 +++ head/www/trac/pkg-message	Mon Jun 10 00:57:13 2013	(r320423)
 @@ -1,12 +1,12 @@
  *******************************************************************************
  
 -From 0.11.x to 0.12.x
 +From 0.12.x to 1.0.x
  ---------------------
  You should be careful to check that the plugins you depend on have
 -been ported to 0.12, as they most probably won't work without adaptation
 -due to the numerous internal changes that occurred during 0.12 development.
 +been ported to 1.0.1, as they most probably won't work without adaptation
 +due to the numerous internal changes that occurred during 1.0.1 development.
  
 -See:	http://trac.edgewall.org/wiki/TracDev/ApiChanges/0.12
 +See:	http://trac.edgewall.org/wiki/TracDev/ApiChanges/1.0
  
  Consult the upgrade instructions at:
  
 
 Modified: head/www/trac/pkg-plist
 ==============================================================================
 --- head/www/trac/pkg-plist	Mon Jun 10 00:48:32 2013	(r320422)
 +++ head/www/trac/pkg-plist	Mon Jun 10 00:57:13 2013	(r320423)
 @@ -1,31 +1,41 @@
 -bin/trac-admin
 -bin/tracd
  %%DATADIR%%/cgi-bin/trac.cgi
  %%DATADIR%%/cgi-bin/trac.fcgi
 -@dirrm %%DATADIR%%/cgi-bin
 -@dirrm %%DATADIR%%
 -%%EXAMPLESDIR%%/rpm/installscript
 -%%EXAMPLESDIR%%/rpm/makerpm
 -%%EXAMPLESDIR%%/workflow/README
 -%%EXAMPLESDIR%%/workflow/enterprise-workflow.ini
 -%%EXAMPLESDIR%%/workflow/migrate_original_to_basic.py
 -%%EXAMPLESDIR%%/workflow/opensource-workflow.ini
 -%%EXAMPLESDIR%%/workflow/showworkflow
 -%%EXAMPLESDIR%%/workflow/simple-workflow.ini
 -%%EXAMPLESDIR%%/workflow/trivial-workflow.ini
 -%%EXAMPLESDIR%%/workflow/workflow_parser.py
  %%EXAMPLESDIR%%/README
  %%EXAMPLESDIR%%/bugzilla2trac.py
  %%EXAMPLESDIR%%/checkwiki.py
  %%EXAMPLESDIR%%/emailfilter.py
  %%EXAMPLESDIR%%/htdigest.py
  %%EXAMPLESDIR%%/htpasswd.py
 +%%EXAMPLESDIR%%/l10n_diff_index.py
 +%%EXAMPLESDIR%%/l10n_reset_en_GB.py
 +%%EXAMPLESDIR%%/l10n_revert_lineno_conflicts.py
  %%EXAMPLESDIR%%/migrateticketmodel.py
 +%%EXAMPLESDIR%%/rpm/installscript
 +%%EXAMPLESDIR%%/rpm/makerpm
 +%%EXAMPLESDIR%%/sample-plugins/HelloWorld.py
 +%%EXAMPLESDIR%%/sample-plugins/Timestamp.py
 +%%EXAMPLESDIR%%/sample-plugins/milestone_to_version.py
 +%%EXAMPLESDIR%%/sample-plugins/permissions/debug_perm.py
 +%%EXAMPLESDIR%%/sample-plugins/permissions/public_wiki_policy.py
 +%%EXAMPLESDIR%%/sample-plugins/permissions/vulnerability_tickets.py
 +%%EXAMPLESDIR%%/sample-plugins/revision_links.py
 +%%EXAMPLESDIR%%/sample-plugins/workflow/CodeReview.py
 +%%EXAMPLESDIR%%/sample-plugins/workflow/DeleteTicket.py
 +%%EXAMPLESDIR%%/sample-plugins/workflow/MilestoneOperation.py
 +%%EXAMPLESDIR%%/sample-plugins/workflow/StatusFixer.py
 +%%EXAMPLESDIR%%/sample-plugins/workflow/VoteOperation.py
 +%%EXAMPLESDIR%%/sample-plugins/workflow/enterprise-review-workflow.ini
  %%EXAMPLESDIR%%/sourceforge2trac.py
  %%EXAMPLESDIR%%/trac-pre-commit-hook
  %%EXAMPLESDIR%%/trac-svn-hook
  %%EXAMPLESDIR%%/trac-svn-post-commit-hook.cmd
 -@dirrm %%EXAMPLESDIR%%/workflow
 +%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 +bin/trac-admin
 +bin/tracd
 +@dirrm %%DATADIR%%/cgi-bin
 +@dirrm %%DATADIR%%
 +@dirrm %%EXAMPLESDIR%%/sample-plugins/workflow
 +@dirrm %%EXAMPLESDIR%%/sample-plugins/permissions
 +@dirrm %%EXAMPLESDIR%%/sample-plugins
  @dirrm %%EXAMPLESDIR%%/rpm
  @dirrm %%EXAMPLESDIR%%
 -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
