Mon Sep 22 04:40:56 2008 UTC ()
* 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 .


(obache)
diff -r1.39 -r1.40 pkgsrc/www/trac/Makefile
diff -r1.14 -r1.15 pkgsrc/www/trac/PLIST
cvs diff -r1.39 -r1.40 pkgsrc/www/trac/Makefile (expand / switch to unified diff)

--- pkgsrc/www/trac/Makefile 2008/09/16 19:29:59 1.39
+++ pkgsrc/www/trac/Makefile 2008/09/22 04:40:56 1.40
@@ -1,59 +1,64 @@ @@ -1,59 +1,64 @@
1# $NetBSD: Makefile,v 1.39 2008/09/16 19:29:59 joerg Exp $ 1# $NetBSD: Makefile,v 1.40 2008/09/22 04:40:56 obache Exp $
2# 2#
3 3
4DISTNAME= Trac-0.11.1 4DISTNAME= Trac-0.11.1
5PKGREVISION= 2 5PKGREVISION= 3
6PKGNAME= ${DISTNAME:tl} 6PKGNAME= ${DISTNAME:tl}
7EGG_NAME= ${DISTNAME} 
8CATEGORIES= devel www 7CATEGORIES= devel www
9MASTER_SITES= http://ftp.edgewall.org/pub/trac/ \ 8MASTER_SITES= http://ftp.edgewall.org/pub/trac/ \
10 ftp://ftp.edgewall.org/pub/trac/ 9 ftp://ftp.edgewall.org/pub/trac/
11 10
12MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://trac.edgewall.org/ 12HOMEPAGE= http://trac.edgewall.org/
14COMMENT= Subversion repository browser, wiki, and issue tracking system 13COMMENT= Subversion repository browser, wiki, and issue tracking system
15 14
16DEPENDS+= ${PYPKGPREFIX}-genshi>=0:../../www/py-genshi 15PKG_DESTDIR_SUPPORT= user-destdir
 16
 17DEPENDS+= ${PYPKGPREFIX}-genshi>=0.5:../../www/py-genshi
17DEPENDS+= ${PYPKGPREFIX}-subversion>=1.1.0:../../devel/py-subversion 18DEPENDS+= ${PYPKGPREFIX}-subversion>=1.1.0:../../devel/py-subversion
18 19
 20USE_TOOLS+= pax
 21
19PKG_OPTIONS_VAR= PKG_OPTIONS.trac 22PKG_OPTIONS_VAR= PKG_OPTIONS.trac
20PKG_OPTIONS_REQUIRED_GROUPS= db 23PKG_OPTIONS_REQUIRED_GROUPS= db
21PKG_OPTIONS_GROUP.db= sqlite pgsql psycopg2 24PKG_OPTIONS_GROUP.db= sqlite pgsql psycopg2
22PKG_SUGGESTED_OPTIONS= sqlite 25PKG_SUGGESTED_OPTIONS= sqlite
23 26
24.include "../../mk/bsd.options.mk" 27.include "../../mk/bsd.options.mk"
25 28
26PYDISTUTILSPKG= YES 29PYDISTUTILSPKG= YES
27PY_PATCHPLIST= YES 30PY_PATCHPLIST= YES
28PYTHON_PATCH_SCRIPTS= cgi-bin/trac.* contrib/*.py contrib/*-hook 31PYTHON_PATCH_SCRIPTS= cgi-bin/trac.* contrib/*.py contrib/*-hook
 32PYTHON_PATCH_SCRIPTS+= trac/tests/functional/*.py
29 33
30.include "../../lang/python/application.mk" 34.include "../../lang/python/application.mk"
31 35
32.if !empty(PKG_OPTIONS:Msqlite) 36.if !empty(PKG_OPTIONS:Msqlite)
33.if defined(PYPACKAGE) && \ 37.if defined(PYPACKAGE) && \
34 (${PYPACKAGE} == "python23" || ${PYPACKAGE} == "python24") 38 (${PYPACKAGE} == "python23" || ${PYPACKAGE} == "python24")
35DEPENDS+= ${PYPKGPREFIX}-sqlite2>=2:../../databases/py-sqlite2 39DEPENDS+= ${PYPKGPREFIX}-sqlite2>=2:../../databases/py-sqlite2
36.else 40.else
37DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3 41DEPENDS+= ${PYPKGPREFIX}-sqlite3>=0:../../databases/py-sqlite3
38.endif 42.endif
39.endif 43.endif
40.if !empty(PKG_OPTIONS:Mpgsql) 44.if !empty(PKG_OPTIONS:Mpgsql)
41DEPENDS+= ${PYPKGPREFIX}-PgSQL>=2.4:../../databases/py-PgSQL 45DEPENDS+= ${PYPKGPREFIX}-PgSQL>=2.4:../../databases/py-PgSQL
42.endif 46.endif
43.if !empty(PKG_OPTIONS:Mpsycopg2) 47.if !empty(PKG_OPTIONS:Mpsycopg2)
44DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2 48DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2
45.endif 49.endif
46# MySQL is sort of supported but not recommended by upstream and hence 50# MySQL is sort of supported but not recommended by upstream and hence
47# omitted. 51# omitted.
48 52
49EGDIR= ${PREFIX}/share/examples/trac 53EGDIR= ${PREFIX}/share/examples/trac
50CGIBINDIR= ${PREFIX}/libexec/trac 54CGIBINDIR= ${PREFIX}/libexec/trac
51 55
52post-install: 56post-install:
53 ${INSTALL_DATA_DIR} ${EGDIR} 57 ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
54 ${INSTALL_PROGRAM_DIR} ${CGIBINDIR} 58 ${INSTALL_PROGRAM_DIR} ${DESTDIR}${CGIBINDIR}
55 ${INSTALL_SCRIPT} ${WRKSRC}/contrib/[A-qs-v]* ${EGDIR} 59 ${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/trac.* ${DESTDIR}${CGIBINDIR}
56 ${INSTALL_SCRIPT} ${WRKSRC}/cgi-bin/trac.* ${CGIBINDIR} 60 cd ${WRKSRC}/contrib && pax -rwppm -s ',./rpm/.*$$,,' -s ',./rpm$$,,' \
 61 . ${DESTDIR}${EGDIR}
57 62
58.include "../../lang/python/egg.mk" 63.include "../../lang/python/egg.mk"
59.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/www/trac/PLIST (expand / switch to unified diff)

--- pkgsrc/www/trac/PLIST 2008/09/12 10:18:11 1.14
+++ pkgsrc/www/trac/PLIST 2008/09/22 04:40:56 1.15
@@ -1,18 +1,25 @@ @@ -1,18 +1,25 @@
1@comment $NetBSD: PLIST,v 1.14 2008/09/12 10:18:11 abs Exp $ 1@comment $NetBSD: PLIST,v 1.15 2008/09/22 04:40:56 obache Exp $
2bin/trac-admin 2bin/trac-admin
3bin/tracd 3bin/tracd
4libexec/trac/trac.cgi 4libexec/trac/trac.cgi
5libexec/trac/trac.fcgi 5libexec/trac/trac.fcgi
 6${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 7${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 8${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
 9${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 10${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 11${PYSITELIB}/${EGG_INFODIR}/requires.txt
 12${PYSITELIB}/${EGG_INFODIR}/top_level.txt
6${PYSITELIB}/trac/__init__.py 13${PYSITELIB}/trac/__init__.py
7${PYSITELIB}/trac/__init__.pyc 14${PYSITELIB}/trac/__init__.pyc
8${PYSITELIB}/trac/__init__.pyo 15${PYSITELIB}/trac/__init__.pyo
9${PYSITELIB}/trac/about.py 16${PYSITELIB}/trac/about.py
10${PYSITELIB}/trac/about.pyc 17${PYSITELIB}/trac/about.pyc
11${PYSITELIB}/trac/about.pyo 18${PYSITELIB}/trac/about.pyo
12${PYSITELIB}/trac/admin/__init__.py 19${PYSITELIB}/trac/admin/__init__.py
13${PYSITELIB}/trac/admin/__init__.pyc 20${PYSITELIB}/trac/admin/__init__.pyc
14${PYSITELIB}/trac/admin/__init__.pyo 21${PYSITELIB}/trac/admin/__init__.pyo
15${PYSITELIB}/trac/admin/api.py 22${PYSITELIB}/trac/admin/api.py
16${PYSITELIB}/trac/admin/api.pyc 23${PYSITELIB}/trac/admin/api.pyc
17${PYSITELIB}/trac/admin/api.pyo 24${PYSITELIB}/trac/admin/api.pyo
18${PYSITELIB}/trac/admin/console.py 25${PYSITELIB}/trac/admin/console.py
@@ -559,25 +566,55 @@ ${PYSITELIB}/trac/wiki/web_ui.py @@ -559,25 +566,55 @@ ${PYSITELIB}/trac/wiki/web_ui.py
559${PYSITELIB}/trac/wiki/web_ui.pyc 566${PYSITELIB}/trac/wiki/web_ui.pyc
560${PYSITELIB}/trac/wiki/web_ui.pyo 567${PYSITELIB}/trac/wiki/web_ui.pyo
561share/examples/trac/README 568share/examples/trac/README
562share/examples/trac/bugzilla2trac.py 569share/examples/trac/bugzilla2trac.py
563share/examples/trac/checkwiki.py 570share/examples/trac/checkwiki.py
564share/examples/trac/emailfilter.py 571share/examples/trac/emailfilter.py
565share/examples/trac/htdigest.py 572share/examples/trac/htdigest.py
566share/examples/trac/htpasswd.py 573share/examples/trac/htpasswd.py
567share/examples/trac/migrateticketmodel.py 574share/examples/trac/migrateticketmodel.py
568share/examples/trac/sourceforge2trac.py 575share/examples/trac/sourceforge2trac.py
569share/examples/trac/trac-post-commit-hook 576share/examples/trac/trac-post-commit-hook
570share/examples/trac/trac-post-commit-hook.cmd 577share/examples/trac/trac-post-commit-hook.cmd
571share/examples/trac/trac-pre-commit-hook 578share/examples/trac/trac-pre-commit-hook
 579share/examples/trac/workflow/README
 580share/examples/trac/workflow/enterprise-workflow.ini
 581share/examples/trac/workflow/migrate_original_to_basic.py
 582share/examples/trac/workflow/opensource-workflow.ini
 583share/examples/trac/workflow/showworkflow
 584share/examples/trac/workflow/simple-workflow.ini
 585share/examples/trac/workflow/trivial-workflow.ini
 586share/examples/trac/workflow/workflow_parser.py
572@dirrm libexec/trac 587@dirrm libexec/trac
 588@dirrm share/examples/trac/workflow
573@dirrm share/examples/trac 589@dirrm share/examples/trac
 590@dirrm ${PYSITELIB}/trac/wiki/templates
 591@dirrm ${PYSITELIB}/trac/wiki/default-pages
574@dirrm ${PYSITELIB}/trac/wiki 592@dirrm ${PYSITELIB}/trac/wiki
575@dirrm ${PYSITELIB}/trac/web 593@dirrm ${PYSITELIB}/trac/web
576@dirrm ${PYSITELIB}/trac/versioncontrol/web_ui 594@dirrm ${PYSITELIB}/trac/versioncontrol/web_ui
 595@dirrm ${PYSITELIB}/trac/versioncontrol/templates
577@dirrm ${PYSITELIB}/trac/versioncontrol 596@dirrm ${PYSITELIB}/trac/versioncontrol
578@dirrm ${PYSITELIB}/trac/util 597@dirrm ${PYSITELIB}/trac/util
579@dirrm ${PYSITELIB}/trac/upgrades 598@dirrm ${PYSITELIB}/trac/upgrades
 599@dirrm ${PYSITELIB}/trac/timeline/templates
 600@dirrm ${PYSITELIB}/trac/timeline
 601@dirrm ${PYSITELIB}/trac/ticket/workflows
 602@dirrm ${PYSITELIB}/trac/ticket/templates
580@dirrm ${PYSITELIB}/trac/ticket 603@dirrm ${PYSITELIB}/trac/ticket
 604@dirrm ${PYSITELIB}/trac/tests/functional
 605@dirrm ${PYSITELIB}/trac/tests
 606@dirrm ${PYSITELIB}/trac/templates
 607@dirrm ${PYSITELIB}/trac/search/templates
 608@dirrm ${PYSITELIB}/trac/search
 609@dirrm ${PYSITELIB}/trac/prefs/templates
 610@dirrm ${PYSITELIB}/trac/prefs
581@dirrm ${PYSITELIB}/trac/mimeview 611@dirrm ${PYSITELIB}/trac/mimeview
 612@dirrm ${PYSITELIB}/trac/htdocs/js
 613@dirrm ${PYSITELIB}/trac/htdocs/guide
 614@dirrm ${PYSITELIB}/trac/htdocs/css
 615@dirrm ${PYSITELIB}/trac/htdocs
582@dirrm ${PYSITELIB}/trac/db 616@dirrm ${PYSITELIB}/trac/db
 617@dirrm ${PYSITELIB}/trac/admin/templates
 618@dirrm ${PYSITELIB}/trac/admin
583@dirrm ${PYSITELIB}/trac 619@dirrm ${PYSITELIB}/trac
 620@dirrm ${PYSITELIB}/${EGG_INFODIR}