From df2543d780a6ea170ed3a01407074de022f96f26 Mon Sep 17 00:00:00 2001 From: obache Date: Mon, 22 Sep 2008 04:40:56 +0000 Subject: * Fix genshi dpendency pattern, require >=0.5. * Install workflow sample files, it is key feature of 0.11. * Fix PLIST, add missing EGG_INFO and @dirrm entries. Bump PKGREVISION and PR 39538 should be fixed . --- www/trac/Makefile | 21 +++++++++++++-------- www/trac/PLIST | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 9 deletions(-) (limited to 'www/trac') diff --git a/www/trac/Makefile b/www/trac/Makefile index b2eaf2d8f0e..aabd4d1b55f 100644 --- a/www/trac/Makefile +++ b/www/trac/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.39 2008/09/16 19:29:59 joerg Exp $ +# $NetBSD: Makefile,v 1.40 2008/09/22 04:40:56 obache Exp $ # DISTNAME= Trac-0.11.1 -PKGREVISION= 2 +PKGREVISION= 3 PKGNAME= ${DISTNAME:tl} -EGG_NAME= ${DISTNAME} CATEGORIES= devel www MASTER_SITES= http://ftp.edgewall.org/pub/trac/ \ ftp://ftp.edgewall.org/pub/trac/ @@ -13,9 +12,13 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://trac.edgewall.org/ COMMENT= Subversion repository browser, wiki, and issue tracking system -DEPENDS+= ${PYPKGPREFIX}-genshi>=0:../../www/py-genshi +PKG_DESTDIR_SUPPORT= user-destdir + +DEPENDS+= ${PYPKGPREFIX}-genshi>=0.5:../../www/py-genshi DEPENDS+= ${PYPKGPREFIX}-subversion>=1.1.0:../../devel/py-subversion +USE_TOOLS+= pax + PKG_OPTIONS_VAR= PKG_OPTIONS.trac PKG_OPTIONS_REQUIRED_GROUPS= db PKG_OPTIONS_GROUP.db= sqlite pgsql psycopg2 @@ -26,6 +29,7 @@ PKG_SUGGESTED_OPTIONS= sqlite PYDISTUTILSPKG= YES PY_PATCHPLIST= YES PYTHON_PATCH_SCRIPTS= cgi-bin/trac.* contrib/*.py contrib/*-hook +PYTHON_PATCH_SCRIPTS+= trac/tests/functional/*.py .include "../../lang/python/application.mk" @@ -50,10 +54,11 @@ EGDIR= ${PREFIX}/share/examples/trac CGIBINDIR= ${PREFIX}/libexec/trac post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_PROGRAM_DIR} ${CGIBINDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/[A-qs-v]* ${EGDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/trac.* ${CGIBINDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} + ${INSTALL_PROGRAM_DIR} ${DESTDIR}${CGIBINDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/trac.* ${DESTDIR}${CGIBINDIR} + cd ${WRKSRC}/contrib && pax -rwppm -s ',./rpm/.*$$,,' -s ',./rpm$$,,' \ + . ${DESTDIR}${EGDIR} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/trac/PLIST b/www/trac/PLIST index 1fdfc2aceb6..08a79bcfada 100644 --- a/www/trac/PLIST +++ b/www/trac/PLIST @@ -1,8 +1,15 @@ -@comment $NetBSD: PLIST,v 1.14 2008/09/12 10:18:11 abs Exp $ +@comment $NetBSD: PLIST,v 1.15 2008/09/22 04:40:56 obache Exp $ bin/trac-admin bin/tracd libexec/trac/trac.cgi libexec/trac/trac.fcgi +${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/entry_points.txt +${PYSITELIB}/${EGG_INFODIR}/not-zip-safe +${PYSITELIB}/${EGG_INFODIR}/requires.txt +${PYSITELIB}/${EGG_INFODIR}/top_level.txt ${PYSITELIB}/trac/__init__.py ${PYSITELIB}/trac/__init__.pyc ${PYSITELIB}/trac/__init__.pyo @@ -569,15 +576,45 @@ share/examples/trac/sourceforge2trac.py share/examples/trac/trac-post-commit-hook share/examples/trac/trac-post-commit-hook.cmd share/examples/trac/trac-pre-commit-hook +share/examples/trac/workflow/README +share/examples/trac/workflow/enterprise-workflow.ini +share/examples/trac/workflow/migrate_original_to_basic.py +share/examples/trac/workflow/opensource-workflow.ini +share/examples/trac/workflow/showworkflow +share/examples/trac/workflow/simple-workflow.ini +share/examples/trac/workflow/trivial-workflow.ini +share/examples/trac/workflow/workflow_parser.py @dirrm libexec/trac +@dirrm share/examples/trac/workflow @dirrm share/examples/trac +@dirrm ${PYSITELIB}/trac/wiki/templates +@dirrm ${PYSITELIB}/trac/wiki/default-pages @dirrm ${PYSITELIB}/trac/wiki @dirrm ${PYSITELIB}/trac/web @dirrm ${PYSITELIB}/trac/versioncontrol/web_ui +@dirrm ${PYSITELIB}/trac/versioncontrol/templates @dirrm ${PYSITELIB}/trac/versioncontrol @dirrm ${PYSITELIB}/trac/util @dirrm ${PYSITELIB}/trac/upgrades +@dirrm ${PYSITELIB}/trac/timeline/templates +@dirrm ${PYSITELIB}/trac/timeline +@dirrm ${PYSITELIB}/trac/ticket/workflows +@dirrm ${PYSITELIB}/trac/ticket/templates @dirrm ${PYSITELIB}/trac/ticket +@dirrm ${PYSITELIB}/trac/tests/functional +@dirrm ${PYSITELIB}/trac/tests +@dirrm ${PYSITELIB}/trac/templates +@dirrm ${PYSITELIB}/trac/search/templates +@dirrm ${PYSITELIB}/trac/search +@dirrm ${PYSITELIB}/trac/prefs/templates +@dirrm ${PYSITELIB}/trac/prefs @dirrm ${PYSITELIB}/trac/mimeview +@dirrm ${PYSITELIB}/trac/htdocs/js +@dirrm ${PYSITELIB}/trac/htdocs/guide +@dirrm ${PYSITELIB}/trac/htdocs/css +@dirrm ${PYSITELIB}/trac/htdocs @dirrm ${PYSITELIB}/trac/db +@dirrm ${PYSITELIB}/trac/admin/templates +@dirrm ${PYSITELIB}/trac/admin @dirrm ${PYSITELIB}/trac +@dirrm ${PYSITELIB}/${EGG_INFODIR} -- cgit v1.2.3