Attachment 133009 Details for Bug 177382 – trac.patch

[patch] trac.patch

trac.patch (text/plain), 7.31 KB, created by William Grzybowski on 2013-03-25 22:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Grzybowski

Created: 2013-03-25 22:10:00 UTC

Size: 7.31 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 315237)
>+++ Makefile	(working copy)
>@@ -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 @@
> 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,13 +24,12 @@
> 
> CONFLICTS=	ja-trac-[0-9]*
> 
>-USE_PYTHON=	2.5+
>+USE_PYTHON=	2.7-
> USE_PYDISTUTILS=	easy_install
> PYDISTUTILS_PKGNAME=	Trac
> PYDISTUTILS_NOEGGINFO=	yes
> 
> USE_RC_SUBR=	tracd
>-SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
> 
> .include <bsd.port.options.mk>
> 
>@@ -74,19 +72,22 @@
> 		' | ${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} -p ${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}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 315237)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-trac__util__daemon.py
>===================================================================
>--- files/patch-trac__util__daemon.py	(revision 315237)
>+++ files/patch-trac__util__daemon.py	(working copy)
>@@ -1,25 +0,0 @@
>-Revert r10799 which breaks tracd startup
>-
>-beta# /usr/local/etc/rc.d/tracd start
>-Starting tracd.
>-Error writing to pid file: IOError: [Errno 2] No such file or directory: '/var/db/trac/redports/tracd.pid'
>-/usr/local/etc/rc.d/tracd: WARNING: failed to start tracd
>-
>-See:	http://trac.edgewall.org/changeset/10799/
>---- trac/util/daemon.py.orig	2012-02-06 21:53:52.000000000 +0100
>-+++ trac/util/daemon.py	2012-02-07 10:38:32.414621956 +0100
>-@@ -44,14 +44,6 @@
>-                 if e.errno != errno.ESRCH:
>-                     raise
>- 
>--        # The pid file must be writable
>--        try:
>--            fileobj = open(pidfile, 'r+')
>--            fileobj.close()
>--        except IOError, e:
>--            from trac.util.text import exception_to_unicode
>--            sys.exit('Error writing to pid file: %s' % exception_to_unicode(e))
>--
>-     # Perform first fork
>-     pid = os.fork()
>-     if pid > 0:
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 315237)
>+++ pkg-message	(working copy)
>@@ -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:
> 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 315237)
>+++ pkg-plist	(working copy)
>@@ -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%%

Actions: View | Diff

Attachments on bug 177382: 133009