diff options
| author | wiz <wiz@pkgsrc.org> | 2014-01-25 10:29:56 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-01-25 10:29:56 +0000 |
| commit | 26edaca7bb13575eca053bdeadc74df68dbe5b03 (patch) | |
| tree | 3bbaa4e1a32886abb417eed9e3a6c4c742388c9a /textproc | |
| parent | 064b605d8ade40e0dc1d43f538b1bdc8a0e5233b (diff) | |
| download | pkgsrc-26edaca7bb13575eca053bdeadc74df68dbe5b03.tar.gz | |
Mark packages as not ready for python-3.x where applicable;
either because they themselves are not ready or because a
dependency isn't. This is annotated by
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of x.y.z
or
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-foo, py-bar
respectively, please use the same style for other packages,
and check during updates.
Use versioned_dependencies.mk where applicable.
Use REPLACE_PYTHON instead of handcoded alternatives, where applicable.
Reorder Makefile sections into standard order, where applicable.
Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default
with the next commit.
Whitespace cleanups and other nits corrected, where necessary.
Diffstat (limited to 'textproc')
41 files changed, 120 insertions, 127 deletions
diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile index 9b0eec5e7ae..a06621faf6d 100644 --- a/textproc/asciidoc/Makefile +++ b/textproc/asciidoc/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2014/01/01 11:52:35 wiz Exp $ -# +# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:23 wiz Exp $ DISTNAME= asciidoc-8.6.9 PKGREVISION= 1 @@ -30,10 +29,8 @@ SUBST_MESSAGE.ad= Fixing hard-coded config file paths. SUBST_FILES.ad= a2x.py asciidoc.py SUBST_SED.ad= -e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",' -REPLACE_INTERPRETER+= python -REPLACE.python.old= /usr/bin/env python -REPLACE.python.new= ${PYTHONBIN} -REPLACE_FILES.python= a2x.py asciidoc.conf html5.conf xhtml11.conf xhtml11-quirks.conf +REPLACE_PYTHON= a2x.py asciidoc.conf html5.conf xhtml11.conf xhtml11-quirks.conf +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 8.6.9 (as seen e.g. in git-docs) INSTALLATION_DIRS= bin share/asciidoc share/asciidoc/filters \ share/asciidoc/docbook-xsl share/asciidoc/stylesheets \ diff --git a/textproc/coccigrep/Makefile b/textproc/coccigrep/Makefile index 00c5ecd7ea9..2ff9bce4221 100644 --- a/textproc/coccigrep/Makefile +++ b/textproc/coccigrep/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/06/11 14:05:24 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:23 wiz Exp $ DISTNAME= coccigrep-1.12 CATEGORIES= textproc @@ -16,6 +15,8 @@ USE_LANGUAGES= # none INSTALLATION_DIRS= ${PKGMANDIR}/man1 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.12 + post-install: ${INSTALL_DATA} ${WRKSRC}/coccigrep.1 \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile index 46bbe5cb993..84e4cb06a73 100644 --- a/textproc/dblatex/Makefile +++ b/textproc/dblatex/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2013/04/08 11:17:23 rodent Exp $ -# +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:23 wiz Exp $ DISTNAME= dblatex-0.3.2 PKGREVISION= 2 @@ -21,6 +20,7 @@ DEPENDS+= tex-ifxetex-[0-9]*:../../print/tex-ifxetex USE_LANGUAGES= # none REPLACE_PYTHON+= scripts/dblatex lib/dbtexmf/dblatex/xetex/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.2 SUBST_CLASSES+= man SUBST_MESSAGE.man= Fixing man page installation path. diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index ccf2a9b7a9d..48ef1183f43 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2014/01/01 11:52:36 wiz Exp $ -# +# $NetBSD: Makefile,v 1.61 2014/01/25 10:30:23 wiz Exp $ DISTNAME= gnome-doc-utils-0.20.10 PKGREVISION= 2 @@ -17,6 +16,8 @@ DEPENDS+= ${PYPKGPREFIX}-libxslt>=1.1.12:../../textproc/py-libxslt DEPENDS+= docbook-xml>=4.5:../../textproc/docbook-xml DEPENDS+= getopt-[0-9]*:../../misc/getopt +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-libxslt + USE_TOOLS+= intltool pkg-config gmake gawk msgfmt bash:run GNU_CONFIGURE= YES MAKE_JOBS_SAFE= no diff --git a/textproc/ispell-lt/Makefile b/textproc/ispell-lt/Makefile index f8b246762aa..443c0e2e65c 100644 --- a/textproc/ispell-lt/Makefile +++ b/textproc/ispell-lt/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/04/24 03:05:33 rodent Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:23 wiz Exp $ DISTNAME= ispell-lt-1.3 CATEGORIES= textproc @@ -14,6 +13,7 @@ DEPENDS+= ispell-[0-9]*:../../textproc/ispell USE_TOOLS+= gmake REPLACE_PYTHON+= tools/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.3 SUBST_CLASSES+= install SUBST_FILES.install= Makefile diff --git a/textproc/itstool/Makefile b/textproc/itstool/Makefile index 32b4f8488d2..2b4d40c65ea 100644 --- a/textproc/itstool/Makefile +++ b/textproc/itstool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/12/31 17:50:23 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:23 wiz Exp $ DISTNAME= itstool-2.0.2 CATEGORIES= textproc @@ -16,6 +16,16 @@ REPLACE_PYTHON= ${WRKSRC}/itstool.in DEPENDS+= ${PYPKGPREFIX}-libxml2-[0-9]*:../../textproc/py-libxml2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.0.2 +#Traceback (most recent call last): +# File "/usr/pkg/bin/itstool", line 1516, in <module> +# doc.apply_its_rules(not(opts.nobuiltins), params=params) +# File "/usr/pkg/bin/itstool", line 724, in apply_its_rules +# self.apply_its_file(os.path.join(itsdir, dfile), params=params) +# File "/usr/pkg/bin/itstool", line 754, in apply_its_file +# if not nss.has_key(nsdef.name): +#AttributeError: 'dict' object has no attribute 'has_key' + .include "../../lang/python/application.mk" .include "../../lang/python/tool.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/libplist/Makefile b/textproc/libplist/Makefile index ae9c84fc939..f54ecf3bd21 100644 --- a/textproc/libplist/Makefile +++ b/textproc/libplist/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/05/29 13:20:22 joerg Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:23 wiz Exp $ DISTNAME= libplist-1.8 PKGREVISION= 3 @@ -20,6 +19,7 @@ MAKE_JOBS_SAFE= no PKGCONFIG_OVERRIDE+= libplist++.pc.in PKGCONFIG_OVERRIDE+= libplist.pc.in PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.8 .include "../../textproc/libxml2/buildlink3.mk" .include "../../lang/python/extension.mk" diff --git a/textproc/py-4Suite/Makefile b/textproc/py-4Suite/Makefile index feaebf557b9..4b2e21e7a49 100644 --- a/textproc/py-4Suite/Makefile +++ b/textproc/py-4Suite/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/25 06:56:47 asau Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:23 wiz Exp $ VER= 1.0.2 DISTNAME= 4Suite-XML-${VER} @@ -28,6 +27,7 @@ SUBST_STAGE.python= post-build SUBST_SED.python= -e 's,\#![^ ]* python,\#! ${PYTHONBIN},' #PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0.2 do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ diff --git a/textproc/py-Excelerator/Makefile b/textproc/py-Excelerator/Makefile index 8797e98a1ed..890022278eb 100644 --- a/textproc/py-Excelerator/Makefile +++ b/textproc/py-Excelerator/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/25 06:56:47 asau Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:23 wiz Exp $ DISTNAME= pyexcelerator-${VERSION} PKGNAME= ${PYPKGPREFIX}-Excelerator-${VERSION} @@ -15,6 +14,8 @@ COMMENT= Python library for generating Excel 97/2000/XP/2003 files USE_LANGUAGES= #none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + EGG_NAME= pyExcelerator-${VERSION} REPLACE_PYTHON+= pyExcelerator/BIFFRecords.py diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile index e5f5d3ed7fa..918e37a633d 100644 --- a/textproc/py-HappyDoc/Makefile +++ b/textproc/py-HappyDoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/10/25 06:56:47 asau Exp $ +# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:23 wiz Exp $ DISTNAME= HappyDoc_r2_1 PKGNAME= ${PYPKGPREFIX}-HappyDoc-2.1 @@ -16,6 +16,8 @@ WRKSRC= ${WRKDIR}/HappyDoc-r2_1 PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} EGG_NAME= ${DISTNAME:S/_r/-/:S/_/./g} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1 + post-extract: ${MV} ${WRKSRC}/happydoc ${WRKSRC}/happydoc${PYVERSSUFFIX} diff --git a/textproc/py-Whoosh/Makefile b/textproc/py-Whoosh/Makefile index b1b4b3b0ecf..00549893bb2 100644 --- a/textproc/py-Whoosh/Makefile +++ b/textproc/py-Whoosh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/25 06:56:47 asau Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:23 wiz Exp $ # DISTNAME= Whoosh-0.1.13 @@ -13,5 +13,7 @@ LICENSE= apache-2.0 USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-cElementTree/Makefile b/textproc/py-cElementTree/Makefile index 2419631ab45..781b243f9ea 100644 --- a/textproc/py-cElementTree/Makefile +++ b/textproc/py-cElementTree/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/04/20 09:38:05 obache Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:23 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-cElementTree-${PY_DISTVERSION} CATEGORIES= textproc python @@ -8,8 +7,6 @@ MAINTAINER= obache@NetBSD.org HOMEPAGE= http://www.effbot.org/zone/celementtree.htm COMMENT= C implementation of Python ElementTree API -PYTHON_VERSIONS_INCLUDE_3X= yes - EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_elementtree.c USE_TOOLS+= patch diff --git a/textproc/py-cabocha/Makefile b/textproc/py-cabocha/Makefile index cf2fa1234d5..d913f44284f 100644 --- a/textproc/py-cabocha/Makefile +++ b/textproc/py-cabocha/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/05/22 13:14:30 obache Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:23 wiz Exp $ .include "../../textproc/cabocha/Makefile.common" @@ -11,6 +10,7 @@ COMMENT= CaboCha python module USE_LANGUAGES= c c++ PYSETUPSUBDIR= python +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.67 EGG_NAME= ${DISTNAME:S/-/_python-/} diff --git a/textproc/py-cmTemplate/Makefile b/textproc/py-cmTemplate/Makefile index bcc75fe21ca..2587307c9b3 100644 --- a/textproc/py-cmTemplate/Makefile +++ b/textproc/py-cmTemplate/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.5 2012/10/25 06:56:48 asau Exp $ -# +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:23 wiz Exp $ -DISTNAME= cmTemplate-0.3.2 +DISTNAME= cmTemplate-0.3.2 PKGNAME= ${PYPKGPREFIX}-cmTemplate-0.3.2 -CATEGORIES= textproc python -MASTER_SITES= http://www.bouncingchairs.net/oss/ +CATEGORIES= textproc python +MASTER_SITES= http://www.bouncingchairs.net/oss/ -MAINTAINER= joerg@NetBSD.org -HOMEPAGE= http://www.bouncingchairs.net/oss/ -COMMENT= Simple and fast Python template engine +MAINTAINER= joerg@NetBSD.org +HOMEPAGE= http://www.bouncingchairs.net/oss/ +COMMENT= Simple and fast Python template engine PY_PATCHPLIST= # empty PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.2 INSTALLATION_DIRS= ${PYSITELIB} share/doc/${PYPKGPREFIX}-cmTemplate diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile index 95e3e51f214..5dfcd0bc24c 100644 --- a/textproc/py-docutils/Makefile +++ b/textproc/py-docutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2013/07/28 12:47:46 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:24 wiz Exp $ DISTNAME= docutils-0.11 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,7 +10,6 @@ HOMEPAGE= http://docutils.sourceforge.net/ COMMENT= Python tool to generate documents LICENSE= public-domain AND 2-clause-bsd -PYTHON_VERSIONS_INCLUDE_3X= yes DEPENDS+= ${PYPKGPREFIX}-roman>=1.4:../../math/py-roman DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat diff --git a/textproc/py-elementtree/Makefile b/textproc/py-elementtree/Makefile index 4e800beb021..4f51a01e564 100644 --- a/textproc/py-elementtree/Makefile +++ b/textproc/py-elementtree/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2012/10/25 06:56:49 asau Exp $ -# +# $NetBSD: Makefile,v 1.13 2014/01/25 10:30:24 wiz Exp $ DISTNAME= elementtree-1.2.6-20050316 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-20050316//} @@ -17,5 +16,7 @@ USE_LANGUAGES= # empty EGG_NAME= elementtree-1.2.6_20050316 +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-empy/Makefile b/textproc/py-empy/Makefile index beca8c4584a..c7482c554ff 100644 --- a/textproc/py-empy/Makefile +++ b/textproc/py-empy/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/25 06:56:49 asau Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:24 wiz Exp $ DISTNAME= empy-3.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,6 +19,7 @@ PYDISTUTILSPKG= # yes PLIST_SUBST+= PYVERSSUFFIX="${PYVERSSUFFIX}" PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # Fix html path in documentation SUBST_CLASSES+= doc diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile index 98c5ff1801b..520d911c764 100644 --- a/textproc/py-expat/Makefile +++ b/textproc/py-expat/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/04/20 09:38:04 obache Exp $ -# +# $NetBSD: Makefile,v 1.22 2014/01/25 10:30:24 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-expat-${PY_DISTVERSION} CATEGORIES= textproc python @@ -8,8 +7,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.python.org/ COMMENT= Python interface to expat -PYTHON_VERSIONS_INCLUDE_3X= yes - EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/pyexpat.c PYDISTUTILSPKG= yes diff --git a/textproc/py-feedparser/Makefile b/textproc/py-feedparser/Makefile index 0c603e1fb11..268a33c022e 100644 --- a/textproc/py-feedparser/Makefile +++ b/textproc/py-feedparser/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/06/06 01:57:55 schmonz Exp $ -# +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:24 wiz Exp $ DISTNAME= feedparser-5.1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,8 +12,6 @@ LICENSE= 2-clause-bsd USE_LANGUAGES= #none -PYTHON_VERSIONS_INCLUDE_3X= yes - do-test: cd ${WRKSRC}/feedparser && ${PYTHONBIN} feedparsertest.py diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index 7260ec6baed..b360bbab827 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2013/06/06 01:52:01 schmonz Exp $ -# +# $NetBSD: Makefile,v 1.27 2014/01/25 10:30:24 wiz Exp $ DISTNAME= html2text-3.200.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +10,6 @@ HOMEPAGE= http://www.aaronsw.com/2002/html2text/ COMMENT= Convert HTML into easy-to-read plain ASCII text LICENSE= gnu-gpl-v2 -PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_SELF_CONFLICT= yes NO_BUILD= yes diff --git a/textproc/py-iniparse/Makefile b/textproc/py-iniparse/Makefile index 6465cbf1f72..c98b5c7812e 100644 --- a/textproc/py-iniparse/Makefile +++ b/textproc/py-iniparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/03 03:50:26 rodent Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:24 wiz Exp $ DISTNAME= iniparse-0.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +12,8 @@ LICENSE= mit AND python-software-foundation USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + post-install: ${CHMOD} -x ${DESTDIR}${PREFIX}/share/doc/iniparse-0.4/index.html diff --git a/textproc/py-jinja2/Makefile b/textproc/py-jinja2/Makefile index f08e49387bd..68edf6f5cb7 100644 --- a/textproc/py-jinja2/Makefile +++ b/textproc/py-jinja2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/01/19 08:39:00 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:24 wiz Exp $ DISTNAME= Jinja2-2.7.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -12,8 +12,6 @@ LICENSE= modified-bsd USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes - DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe SUBST_CLASSES+= unicode diff --git a/textproc/py-jsonlib3/Makefile b/textproc/py-jsonlib3/Makefile index c6e899a4a80..9eaa248526e 100644 --- a/textproc/py-jsonlib3/Makefile +++ b/textproc/py-jsonlib3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/20 11:10:05 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:24 wiz Exp $ DISTNAME= jsonlib-python3-1.6.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python3//} @@ -15,7 +15,6 @@ USE_LANGUAGES= c EGG_NAME= ${DISTNAME:S/b-p/b_p/} PYTHON_VERSIONS_INCOMPATIBLE= 26 27 -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-libxml2/Makefile b/textproc/py-libxml2/Makefile index 1c74a2a6363..668e400c655 100644 --- a/textproc/py-libxml2/Makefile +++ b/textproc/py-libxml2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2013/10/03 07:52:32 prlw1 Exp $ +# $NetBSD: Makefile,v 1.48 2014/01/25 10:30:24 wiz Exp $ DISTNAME= libxml2-2.9.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,8 +14,6 @@ LICENSE= modified-bsd WRKSRC= ${WRKDIR}/${DISTNAME}/python NO_CONFIGURE= YES -PYTHON_VERSIONS_INCLUDE_3X= yes - SUBST_CLASSES+= setup SUBST_MESSAGE.setup= Fixing hardcoded paths. SUBST_STAGE.setup= pre-build diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile index 2415a6fc39c..d9de5a11371 100644 --- a/textproc/py-libxslt/Makefile +++ b/textproc/py-libxslt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2014/01/01 11:52:36 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2014/01/25 10:30:24 wiz Exp $ DISTNAME= libxslt-1.1.28 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,6 +15,8 @@ LICENSE= mit # with no-advertising clause DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.6.8:../../textproc/py-libxml2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1.28 + WRKSRC= ${WRKDIR}/${DISTNAME}/python PYDISTUTILSPKG= yes NO_CONFIGURE= yes diff --git a/textproc/py-lxml/Makefile b/textproc/py-lxml/Makefile index 36cec1a8ca0..76986b2bd9b 100644 --- a/textproc/py-lxml/Makefile +++ b/textproc/py-lxml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2014/01/01 11:52:36 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:24 wiz Exp $ DISTNAME= lxml-3.2.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,6 @@ COMMENT= Python binding for libxml2 and libxslt LICENSE= modified-bsd TEST_TARGET= test_inplace -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/egg.mk" BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.7.8 diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile index 8b264db8699..824f29cdc4c 100644 --- a/textproc/py-markdown2/Makefile +++ b/textproc/py-markdown2/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/01/22 13:18:19 obache Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:24 wiz Exp $ DISTNAME= markdown2-2.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +13,6 @@ LICENSE= mit USE_LANGUAGES= # none -PYTHON_VERSIONS_INCLUDE_3X= yes PYTHON_SELF_CONFLICT= yes REPLACE_PYTHON= lib/markdown2.py diff --git a/textproc/py-markupsafe/Makefile b/textproc/py-markupsafe/Makefile index 48fa5127410..115aa4d1c52 100644 --- a/textproc/py-markupsafe/Makefile +++ b/textproc/py-markupsafe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/05/22 11:52:43 kleink Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:24 wiz Exp $ DISTNAME= MarkupSafe-0.18 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -10,7 +10,5 @@ HOMEPAGE= http://www.pocoo.org/projects/markupsafe/ COMMENT= Implements a XML/HTML/XHTML Markup safe string for Python LICENSE= modified-bsd -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-mecab/Makefile b/textproc/py-mecab/Makefile index d2cf7419b5b..20a2a0effbd 100644 --- a/textproc/py-mecab/Makefile +++ b/textproc/py-mecab/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/25 06:56:51 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:24 wiz Exp $ .include "../../textproc/mecab/Makefile.common" @@ -23,6 +22,8 @@ do-test: BUILDLINK_API_DEPENDS.mecab+= mecab>=${MECAB_VERSION} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.996 + .include "../../textproc/mecab/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile index 43023fb3eac..02a5949f20c 100644 --- a/textproc/py-pygments/Makefile +++ b/textproc/py-pygments/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/03/03 07:31:30 obache Exp $ -# +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:25 wiz Exp $ DISTNAME= Pygments-1.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -13,8 +12,6 @@ LICENSE= 2-clause-bsd USE_LANGUAGES= #none -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../mk/bsd.prefs.mk" .if !empty(PKGSRC_RUN_TEST:M[yY][eE][sS]) diff --git a/textproc/py-relatorio/Makefile b/textproc/py-relatorio/Makefile index 6629359de80..bb88643b887 100644 --- a/textproc/py-relatorio/Makefile +++ b/textproc/py-relatorio/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/07/21 12:15:29 richard Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:25 wiz Exp $ DISTNAME= relatorio-0.5.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -9,16 +8,17 @@ MASTER_SITES= http://pypi.python.org/packages/source/r/relatorio/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://relatorio.openhex.org/ COMMENT= Templating library able to output odt and pdf files - LICENSE= gnu-gpl-v3 -DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo -DEPENDS+= ${PYPKGPREFIX}-genshi>=0.5:../../www/py-genshi -DEPENDS+= ${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml -DEPENDS+= ${PYPKGPREFIX}-pycha-[0-9]*:../../graphics/py-pycha -DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml +DEPENDS+= ${PYPKGPREFIX}-genshi>=0.5:../../www/py-genshi +DEPENDS+= ${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml +DEPENDS+= ${PYPKGPREFIX}-pycha-[0-9]*:../../graphics/py-pycha +DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml USE_LANGUAGES= #none +PYTHON_VERSIONED_DEPENDENCIES= cairo +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 via py-pycha +.include "../../lang/python/versioned_dependencies.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-sphinx-theme-cloud/Makefile b/textproc/py-sphinx-theme-cloud/Makefile index af66d0c1a0f..1a86e8d8277 100644 --- a/textproc/py-sphinx-theme-cloud/Makefile +++ b/textproc/py-sphinx-theme-cloud/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2012/12/08 18:29:31 dholland Exp $ - +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:25 wiz Exp $ DISTNAME= cloud_sptheme-${VERSION} -PKGNAME= ${PYPKGPREFIX}sphinx-theme-cloud-${VERSION} -VERSION= 1.5 +PKGNAME= ${PYPKGPREFIX}sphinx-theme-cloud-${VERSION} +VERSION= 1.5 CATEGORIES= textproc python MASTER_SITES= http://pypi.python.org/packages/source/c/cloud_sptheme/ @@ -16,8 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx USE_LANGUAGES= #none -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile index 1d950484d69..dea221fa0ba 100644 --- a/textproc/py-sphinx/Makefile +++ b/textproc/py-sphinx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/01/02 17:58:22 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/25 10:30:25 wiz Exp $ DISTNAME= Sphinx-1.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-jinja2>=2.2:../../textproc/py-jinja2 DEPENDS+= ${PYPKGPREFIX}-pygments>=0.8:../../textproc/py-pygments USE_LANGUAGES= #none -PYTHON_VERSIONS_INCLUDE_3X= yes REPLACE_PYTHON+= sphinx/pycode/pgen2/token.py diff --git a/textproc/py-vobject/Makefile b/textproc/py-vobject/Makefile index 571558e2cea..d5f3a68643b 100644 --- a/textproc/py-vobject/Makefile +++ b/textproc/py-vobject/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/01/16 10:41:53 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:25 wiz Exp $ DISTNAME= vobject-0.8.1c PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +12,7 @@ COMMENT= Python iCalendar (ics) and vCard library LICENSE= apache-2.0 PYTHON_VERSIONED_DEPENDENCIES= dateutil +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.8.1c PYTHON_SELF_CONFLICT= yes diff --git a/textproc/py-xlwt/Makefile b/textproc/py-xlwt/Makefile index afec1013046..4cca76b09c5 100644 --- a/textproc/py-xlwt/Makefile +++ b/textproc/py-xlwt/Makefile @@ -1,22 +1,22 @@ -# $NetBSD: Makefile,v 1.1 2013/07/20 07:40:11 richard Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:25 wiz Exp $ -DISTNAME= xlwt-0.7.5 -PKGNAME= ${PYPKGPREFIX}-${DISTNAME} -CATEGORIES= textproc python +DISTNAME= xlwt-0.7.5 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +CATEGORIES= textproc python MASTER_SITES= http://pypi.python.org/packages/source/x/xlwt/ -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.python-excel.org/ -COMMENT= Writing data and formatting information from Excel files -LICENSE= original-bsd +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.python-excel.org/ +COMMENT= Writing data and formatting information from Excel files +LICENSE= original-bsd USE_LANGUAGES= #none -REPLACE_INTERPRETER+= python -REPLACE.python.old= /usr/bin/env python -REPLACE.python.new= ${PYTHONBIN} -REPLACE_FILES.python= xlwt/Formatting.py -REPLACE_FILES.python+= xlwt/examples/*.py +REPLACE_PYTHON+= xlwt/Formatting.py +REPLACE_PYTHON+= xlwt/examples/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.7.5 + +.include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile index 27fde5bab79..88694c76a13 100644 --- a/textproc/py-xml/Makefile +++ b/textproc/py-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/06/17 13:33:47 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/25 10:30:25 wiz Exp $ DISTNAME= PyXML-0.8.4 PKGNAME= ${PYPKGPREFIX}-xml-0.8.4 @@ -18,6 +18,8 @@ PYSETUPBUILDARGS+= --ldflags="${EXPAT_LDFLAGS}" EXPAT_LDFLAGS= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.expat}/lib FIX_RPATH+= EXPAT_LDFLAGS +PYTHON_VERSIONS_INCOMPATIBLE= 33 # dead upstream, no plans of porting + PYXML_SCRIPTS= scripts/xmlproc_parse \ scripts/xmlproc_val diff --git a/textproc/py-yamcha/Makefile b/textproc/py-yamcha/Makefile index 82884676f32..c77f27d51d7 100644 --- a/textproc/py-yamcha/Makefile +++ b/textproc/py-yamcha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/25 06:56:52 asau Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:25 wiz Exp $ # .include "../../textproc/yamcha/Makefile.common" @@ -12,6 +12,7 @@ COMMENT= YamCha python module USE_LANGUAGES= c c++ PYSETUPSUBDIR= python +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.33 EGG_NAME= ${DISTNAME:S/-/_python-/} diff --git a/textproc/py-yaml/Makefile b/textproc/py-yaml/Makefile index ab65f8ea603..669a57c0d79 100644 --- a/textproc/py-yaml/Makefile +++ b/textproc/py-yaml/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/25 06:56:53 asau Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:25 wiz Exp $ DISTNAME= PyYAML-3.10 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/PyYAML/yaml/} @@ -12,8 +11,6 @@ HOMEPAGE= http://www.pyyaml.org/ COMMENT= Collection of libraries to process YAML with Python LICENSE= mit -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/distutils.mk" .include "../../textproc/libyaml/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/queequeg/Makefile b/textproc/queequeg/Makefile index ac805d88999..ac15ed3850e 100644 --- a/textproc/queequeg/Makefile +++ b/textproc/queequeg/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2012/10/25 06:56:53 asau Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:25 wiz Exp $ DISTNAME= queequeg-0.91 PKGREVISION= 1 @@ -16,6 +15,7 @@ BUILD_DEPENDS+= WordNet-[0-9]*:../../textproc/WordNet USE_LANGUAGES= # none PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-cdb SUBST_CLASSES+= fix-python SUBST_STAGE.fix-python= pre-configure diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile index 8f3a29f8691..4a33ba818b3 100644 --- a/textproc/rubber/Makefile +++ b/textproc/rubber/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.26 2012/10/25 06:56:55 asau Exp $ -# +# $NetBSD: Makefile,v 1.27 2014/01/25 10:30:25 wiz Exp $ -DISTNAME= rubber-1.1 -PKGREVISION= 5 -CATEGORIES= textproc -MASTER_SITES= http://ebeffara.free.fr/pub/ +DISTNAME= rubber-1.1 +PKGREVISION= 5 +CATEGORIES= textproc +MASTER_SITES= http://ebeffara.free.fr/pub/ -MAINTAINER= tonio@NetBSD.org -HOMEPAGE= https://launchpad.net/rubber -COMMENT= Automated system for building LaTeX documents +MAINTAINER= tonio@NetBSD.org +HOMEPAGE= https://launchpad.net/rubber +COMMENT= Automated system for building LaTeX documents DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin @@ -27,5 +26,7 @@ CONFIGURE_ARGS+= --infodir=${PREFIX:Q}/${PKGINFODIR:Q} PLIST_SUBST+= RUBBERVERSUFFIX=${PKGVERSION_NOREV} PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1 + .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile index da7e7713486..6ef2d4227ad 100644 --- a/textproc/xmlada/Makefile +++ b/textproc/xmlada/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2013/07/02 22:13:56 marino Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:25 wiz Exp $ DISTNAME= xmlada-${XMLADA_VERS} CATEGORIES= textproc @@ -39,6 +38,7 @@ SUBST_SED.docs= -e 's/^all: \(.*\)/all: \1 docs/g' DESTSTATIC= ${DESTDIR}${PREFIX}/lib/xmlada/static DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.4.0.0 post-install: # There is no reason to install sphinx source files |