diff options
| author | wiz <wiz@pkgsrc.org> | 2014-01-25 10:45:15 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-01-25 10:45:15 +0000 |
| commit | 88ae1948ea2a19ba29e276a5fe65983c60e159fa (patch) | |
| tree | 20b275e879e9a02978fb92613c271dbee7b21c37 | |
| parent | 31a7915deefbfedc3769561940e42e24ff9c0ea3 (diff) | |
| download | pkgsrc-88ae1948ea2a19ba29e276a5fe65983c60e159fa.tar.gz | |
No need to have two variables for the same logic.
Replace PYTHON_PATCH_SCRIPTS with REPLACE_PYTHON.
94 files changed, 444 insertions, 444 deletions
diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile index ade577348df..45463620beb 100644 --- a/archivers/rox-archive/Makefile +++ b/archivers/rox-archive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/09/11 19:47:00 asau Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/25 10:45:15 wiz Exp $ # DISTNAME= archive-2.0 @@ -21,7 +21,7 @@ USE_TOOLS+= pax NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= AppRun tests/testall.py +REPLACE_PYTHON= AppRun tests/testall.py REPLACE_SH= Messages/dist Messages/update-po INSTALLATION_DIRS= share/rox/Archive diff --git a/audio/amaroc/Makefile b/audio/amaroc/Makefile index fb4dd6b1549..d16c4c6b230 100644 --- a/audio/amaroc/Makefile +++ b/audio/amaroc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2012/09/11 23:59:23 asau Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/25 10:45:15 wiz Exp $ # DISTNAME= amaroc-0.3 @@ -14,7 +14,7 @@ COMMENT= Command line interface to Amarok DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses INSTALLATION_DIRS= bin share/doc/amaroc -PYTHON_PATCH_SCRIPTS= amaroc.py +REPLACE_PYTHON= amaroc.py NO_BUILD= yes diff --git a/audio/amarok-kde3/Makefile b/audio/amarok-kde3/Makefile index 1eca58a0432..783877cd0b3 100644 --- a/audio/amarok-kde3/Makefile +++ b/audio/amarok-kde3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2014/01/01 11:52:09 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2014/01/25 10:45:15 wiz Exp $ DISTNAME= amarok-${VERSION} VERSION= 1.4.10 @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --with-mp4v2-dir=${BUILDLINK_PREFIX.libmp4v2} LIBS+= ${LIBOSSAUDIO} -PYTHON_PATCH_SCRIPTS= \ +REPLACE_PYTHON= \ amarok/src/scripts/common/Publisher.py \ amarok/src/scripts/common/Zeroconf.py \ amarok/src/scripts/playlist2html/Playlist.py \ diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile index d91d2421b9f..8a048305273 100644 --- a/audio/aubio/Makefile +++ b/audio/aubio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2014/01/25 10:29:56 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2014/01/25 10:45:16 wiz Exp $ DISTNAME= aubio-0.3.2 PKGREVISION= 2 @@ -18,7 +18,7 @@ PKGCONFIG_OVERRIDE+= aubio.pc.in # Python related variables: PY_PATCHPLIST= yes -PYTHON_PATCH_SCRIPTS= python/aubiocut python/aubiopitch +REPLACE_PYTHON= python/aubiocut python/aubiopitch PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.2 .include "options.mk" diff --git a/audio/cplay/Makefile b/audio/cplay/Makefile index 67edf3325a1..48186b43cde 100644 --- a/audio/cplay/Makefile +++ b/audio/cplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/04/13 07:55:04 ghen Exp $ +# $NetBSD: Makefile,v 1.18 2014/01/25 10:45:16 wiz Exp $ DISTNAME= cplay-1.49 PKGREVISION= 4 @@ -12,7 +12,7 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses -PYTHON_PATCH_SCRIPTS= cplay +REPLACE_PYTHON= cplay USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile index 74c42b1ab7a..ed9703e4cb1 100644 --- a/audio/exaile/Makefile +++ b/audio/exaile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2014/01/25 10:29:56 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2014/01/25 10:45:16 wiz Exp $ DISTNAME= exaile_0.2.14 PKGNAME= ${DISTNAME:S/_/-/1} @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/exaile-0.2.14 USE_PKGLOCALEDIR= yes USE_TOOLS+= pkg-config gmake intltool msgfmt -PYTHON_PATCH_SCRIPTS= exaile.py +REPLACE_PYTHON= exaile.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mutagen, py-sqlite2, py-gtk2, py-gstreamer0.10 MAKE_ENV+= PYTHONBIN=${PYTHONBIN} diff --git a/audio/moss/Makefile b/audio/moss/Makefile index 111ec626675..ddbe44519e8 100644 --- a/audio/moss/Makefile +++ b/audio/moss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2014/01/25 10:29:56 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2014/01/25 10:45:16 wiz Exp $ DISTNAME= moss-0.1.13 PKGREVISION= 6 @@ -14,7 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-vorbis>=1.3:../../audio/py-vorbis PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ogg, py-vorbis -PYTHON_PATCH_SCRIPTS= ${WRKSRC}/*.py +REPLACE_PYTHON= ${WRKSRC}/*.py RCD_SCRIPTS= moss CONF_FILES= ${PREFIX}/share/moss/moss.conf.sample \ diff --git a/audio/quodlibet2/Makefile b/audio/quodlibet2/Makefile index 723be196b6a..c0013331165 100644 --- a/audio/quodlibet2/Makefile +++ b/audio/quodlibet2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/25 10:29:57 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:45:16 wiz Exp $ DISTNAME= quodlibet-2.6.3 CATEGORIES= audio @@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= yes PYDISTUTILSPKG= yes PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-mutagen, py-gtk2, py-gstreamer0.10 -PYTHON_PATCH_SCRIPTS= exfalso.py quodlibet.py operon.py +REPLACE_PYTHON= exfalso.py quodlibet.py operon.py .include "../../devel/py-gobject/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile index 16808c3cc77..689beef5405 100644 --- a/audio/solfege/Makefile +++ b/audio/solfege/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2014/01/25 10:29:57 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2014/01/25 10:45:16 wiz Exp $ DISTNAME= solfege-3.14.1 PKGREVISION= 22 @@ -25,7 +25,7 @@ USE_TOOLS+= gmake gm4 makeinfo pkg-config msgfmt bash:run REPLACE_BASH= lesson-files/bin/csound-play-harmonic-interval.sh -PYTHON_PATCH_SCRIPTS= *.py *.py.in */*.py */*.py.in +REPLACE_PYTHON= *.py *.py.in */*.py */*.py.in PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 SUBST_CLASSES+= sound diff --git a/databases/luma/Makefile b/databases/luma/Makefile index 2dec155d752..f8c1e1cb188 100644 --- a/databases/luma/Makefile +++ b/databases/luma/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2014/01/25 10:29:59 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2014/01/25 10:45:16 wiz Exp $ DISTNAME= luma-2.3 PKGREVISION= 14 @@ -16,7 +16,7 @@ SUBST_CLASSES+= luma SUBST_STAGE.luma= pre-configure SUBST_FILES.luma= bin/luma SUBST_SED.luma= -e "s|@PREFIX@|${PREFIX}|" -PYTHON_PATCH_SCRIPTS= bin/luma lib/luma/luma.py +REPLACE_PYTHON= bin/luma lib/luma/luma.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-qt3-base, py-ldap post-extract: diff --git a/databases/oraedit/Makefile b/databases/oraedit/Makefile index aa3555a7daa..8c820e9db40 100644 --- a/databases/oraedit/Makefile +++ b/databases/oraedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2012/10/02 21:25:24 asau Exp $ +# $NetBSD: Makefile,v 1.23 2014/01/25 10:45:16 wiz Exp $ DISTNAME= oraedit-0.1.4 PKGREVISION= 4 @@ -11,7 +11,7 @@ COMMENT= Editor of PL/SQL source stored in Oracle database NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= oraedit +REPLACE_PYTHON= oraedit INSTALLATION_DIRS= bin do-configure:; diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile index 65ba78b5b81..29823d44e5e 100644 --- a/devel/bzr-svn/Makefile +++ b/devel/bzr-svn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2014/01/25 10:45:16 wiz Exp $ DISTNAME= bzr-svn-${VER} CATEGORIES= devel scm @@ -11,7 +11,7 @@ HOMEPAGE= http://bazaar-vcs.org/BzrForeignBranches/Subversion COMMENT= Foreign Subversion repository support for Bazaar LICENSE= gnu-gpl-v2 -PYTHON_PATCH_SCRIPTS= info.py wiki.py +REPLACE_PYTHON= info.py wiki.py DEPENDS+= ${PYPKGPREFIX}-subvertpy>=0.8.8:../../devel/py-subvertpy DEPENDS= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile index 3263268e6a0..c6de93672c3 100644 --- a/devel/bzr/Makefile +++ b/devel/bzr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2014/01/25 10:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.62 2014/01/25 10:45:16 wiz Exp $ DISTNAME= bzr-2.5.1 CATEGORIES= devel scm @@ -20,10 +20,10 @@ PY_PATCHPLIST= yes PYDISTUTILSPKG= yes PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-pyrex, py-paramiko -PYTHON_PATCH_SCRIPTS= bzr bzrlib/weave.py -PYTHON_PATCH_SCRIPTS+= bzrlib/patiencediff.py bzrlib/_patiencediff_py.py -PYTHON_PATCH_SCRIPTS+= bzrlib/plugins/bash_completion/bashcomp.py -PYTHON_PATCH_SCRIPTS+= bzrlib/tests/ssl_certs/create_ssls.py +REPLACE_PYTHON= bzr bzrlib/weave.py +REPLACE_PYTHON+= bzrlib/patiencediff.py bzrlib/_patiencediff_py.py +REPLACE_PYTHON+= bzrlib/plugins/bash_completion/bashcomp.py +REPLACE_PYTHON+= bzrlib/tests/ssl_certs/create_ssls.py .include "../../mk/bsd.prefs.mk" diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile index 5b67e5080ab..66fc2807651 100644 --- a/devel/bzrtools/Makefile +++ b/devel/bzrtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:00 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/25 10:45:16 wiz Exp $ PKGNAME= bzrtools-${VER} DISTNAME= bzrtools-${VER:R} @@ -11,7 +11,7 @@ HOMEPAGE= http://bazaar-vcs.org/BzrTools COMMENT= Collection of plugins for Bazaar LICENSE= gnu-gpl-v2 -PYTHON_PATCH_SCRIPTS= check-release.py test.py +REPLACE_PYTHON= check-release.py test.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.5.0 WRKSRC= ${WRKDIR}/bzrtools diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile index af70d8a58c9..2b04fcce55b 100644 --- a/devel/cvs2svn/Makefile +++ b/devel/cvs2svn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:01 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/25 10:45:17 wiz Exp $ DISTNAME= cvs2svn-2.3.0 PKGREVISION= 2 @@ -14,7 +14,7 @@ DEPENDS+= subversion-base-[0-9]*:../../devel/subversion-base CONFLICTS+= py*-subversion<1.0.1 PYDISTUTILSPKG= yes -PYTHON_PATCH_SCRIPTS= run-tests.py cvs2svn_rcsparse/run-tests.py \ +REPLACE_PYTHON= run-tests.py cvs2svn_rcsparse/run-tests.py \ cvs2svn_rcsparse/parse_rcs_file.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.3.0 #USE_TOOLS+= gtar diff --git a/devel/meld/Makefile b/devel/meld/Makefile index 6810844ed34..f315d484952 100644 --- a/devel/meld/Makefile +++ b/devel/meld/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2014/01/25 10:30:02 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2014/01/25 10:45:17 wiz Exp $ DISTNAME= meld-1.8.3 CATEGORIES= devel @@ -17,7 +17,7 @@ USE_TOOLS+= gmake msgfmt intltool MAKE_FLAGS+= prefix=${PREFIX} MAKE_FLAGS+= localedir=${PREFIX}/${PKGLOCALEDIR}/locale MAKE_FLAGS+= PYTHON=${PYTHONBIN} -PYTHON_PATCH_SCRIPTS= bin/meld +REPLACE_PYTHON= bin/meld PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 # remove unnecessarily created empty dirs diff --git a/devel/ncc/Makefile b/devel/ncc/Makefile index b4550ebfaa8..6b8b14986b5 100644 --- a/devel/ncc/Makefile +++ b/devel/ncc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/31 11:17:31 asau Exp $ +# $NetBSD: Makefile,v 1.8 2014/01/25 10:45:17 wiz Exp $ # DISTNAME= ncc-2.8 @@ -21,7 +21,7 @@ SUBST_MESSAGE.prefix= Fixing hardcoded paths SUBST_FILES.prefix= config.h SUBST_SED.prefix= -e 's,@PREFIX@,${PREFIX},g' -PYTHON_PATCH_SCRIPTS+= scripts/nccstrip2.py +REPLACE_PYTHON+= scripts/nccstrip2.py INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 share/ncc share/doc/ncc diff --git a/devel/py-InlineEgg/Makefile b/devel/py-InlineEgg/Makefile index e24a4e35254..0ffc0b66606 100644 --- a/devel/py-InlineEgg/Makefile +++ b/devel/py-InlineEgg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:02 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:45:17 wiz Exp $ DISTNAME= InlineEgg-1.08 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +11,7 @@ HOMEPAGE= http://oss.corest.com/projects/inlineegg.html COMMENT= Python module for writing inline assembler programs LICENSE= inlineegg-license -PYTHON_PATCH_SCRIPTS= examples/example1.py examples/example2.py \ +REPLACE_PYTHON= examples/example1.py examples/example2.py \ examples/example3.py examples/example4.py \ examples/example5.py examples/example6.py \ xored_shell_client.py diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile index 2003dc0a49c..beeba6d3e37 100644 --- a/devel/py-idle/Makefile +++ b/devel/py-idle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2014/01/25 10:30:03 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2014/01/25 10:45:17 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-idle-0 PKGREVISION= 2 @@ -34,7 +34,7 @@ IDLE_NAME= idle .endif EXTRACT_ELEMENTS= ${PYSUBDIR}/Tools/scripts/${IDLE_NAME} -PYTHON_PATCH_SCRIPTS= Tools/scripts/${IDLE_NAME} +REPLACE_PYTHON= Tools/scripts/${IDLE_NAME} NO_BUILD= yes INSTALLATION_DIRS= bin diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile index 636a731a623..f40f2fd31aa 100644 --- a/devel/py-subversion/Makefile +++ b/devel/py-subversion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2013/11/02 09:19:17 adam Exp $ +# $NetBSD: Makefile,v 1.59 2014/01/25 10:45:17 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-subversion-${SVNVER} COMMENT= Python bindings and tools for Subversion @@ -10,7 +10,7 @@ SHLIBTOOL_OVERRIDE= # empty CONFIGURE_ENV+= PYTHON2=${PYTHONBIN:Q} PY_PATCHPLIST= YES -PYTHON_PATCH_SCRIPTS= tools/hook-scripts/mailer/mailer.py +REPLACE_PYTHON= tools/hook-scripts/mailer/mailer.py PYTHON_SELF_CONFLICT= YES BUILD_TARGET= swig-py diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile index 47b70618c99..9efb216ace1 100644 --- a/devel/roundup/Makefile +++ b/devel/roundup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2014/01/25 10:30:05 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2014/01/25 10:45:17 wiz Exp $ DISTNAME= roundup-1.4.19 PKGREVISION= 2 @@ -14,19 +14,19 @@ USE_LANGUAGES= # empty USE_TOOLS+= pax PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.4.19 -PYTHON_PATCH_SCRIPTS+= cgi-bin/roundup.cgi demo.py roundup/admin.py -PYTHON_PATCH_SCRIPTS+= frontends/roundup.cgi -PYTHON_PATCH_SCRIPTS+= roundup/backends/locking.py -PYTHON_PATCH_SCRIPTS+= roundup/cgi/TAL/talgettext.py -PYTHON_PATCH_SCRIPTS+= roundup/msgfmt.py -PYTHON_PATCH_SCRIPTS+= roundup/scripts/roundup_demo.py -PYTHON_PATCH_SCRIPTS+= roundup/scripts/roundup_gettext.py -PYTHON_PATCH_SCRIPTS+= roundup/scripts/roundup_xmlrpc_server.py -PYTHON_PATCH_SCRIPTS+= roundup/version_check.py run_tests.py -PYTHON_PATCH_SCRIPTS+= scripts/add-issue scripts/copy-user.py -PYTHON_PATCH_SCRIPTS+= scripts/imapServer.py scripts/roundup-reminder -PYTHON_PATCH_SCRIPTS+= scripts/schema_diagram.py tools/load_tracker.py -PYTHON_PATCH_SCRIPTS+= tools/migrate-queries.py tools/pygettext.py +REPLACE_PYTHON+= cgi-bin/roundup.cgi demo.py roundup/admin.py +REPLACE_PYTHON+= frontends/roundup.cgi +REPLACE_PYTHON+= roundup/backends/locking.py +REPLACE_PYTHON+= roundup/cgi/TAL/talgettext.py +REPLACE_PYTHON+= roundup/msgfmt.py +REPLACE_PYTHON+= roundup/scripts/roundup_demo.py +REPLACE_PYTHON+= roundup/scripts/roundup_gettext.py +REPLACE_PYTHON+= roundup/scripts/roundup_xmlrpc_server.py +REPLACE_PYTHON+= roundup/version_check.py run_tests.py +REPLACE_PYTHON+= scripts/add-issue scripts/copy-user.py +REPLACE_PYTHON+= scripts/imapServer.py scripts/roundup-reminder +REPLACE_PYTHON+= scripts/schema_diagram.py tools/load_tracker.py +REPLACE_PYTHON+= tools/migrate-queries.py tools/pygettext.py ROUNDUPDOCDIR= ${PREFIX}/share/doc/roundup diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile index 8ef89c910b0..f3940206ed9 100644 --- a/devel/rox-lib/Makefile +++ b/devel/rox-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:06 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2014/01/25 10:45:17 wiz Exp $ DISTNAME= rox-lib-2.0.2 PKGREVISION= 14 @@ -21,9 +21,9 @@ NO_BUILD= yes USE_TOOLS+= pax -PYTHON_PATCH_SCRIPTS= AppRun MakeDist -PYTHON_PATCH_SCRIPTS+= python/make_docs.py -PYTHON_PATCH_SCRIPTS+= tests/python/*.py +REPLACE_PYTHON= AppRun MakeDist +REPLACE_PYTHON+= python/make_docs.py +REPLACE_PYTHON+= tests/python/*.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 INSTALLATION_DIRS= share/rox/ROX-Lib2 diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile index 89cdd58246a..85fa09735fb 100644 --- a/devel/stgit/Makefile +++ b/devel/stgit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2014/01/25 10:30:06 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2014/01/25 10:45:17 wiz Exp $ DISTNAME= stgit-0.14.3 PKGREVISION= 7 @@ -21,7 +21,7 @@ USE_LANGUAGES= #none REPLACE_PERL= Documentation/build-docdep.perl REPLACE_BASH= contrib/stg-* -PYTHON_PATCH_SCRIPTS= *.py stgit/*.py stg +REPLACE_PYTHON= *.py stgit/*.py stg PYSETUPINSTALLARGS= --prefix=${PREFIX} PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.14.3 diff --git a/editors/TeXmacs-devel/Makefile b/editors/TeXmacs-devel/Makefile index c7259f388f8..41b0a221d11 100644 --- a/editors/TeXmacs-devel/Makefile +++ b/editors/TeXmacs-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/06/06 12:54:15 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:45:17 wiz Exp $ DISTNAME= TeXmacs-1.0.7.19-src PKGNAME= ${DISTNAME:S/-src//} @@ -21,9 +21,9 @@ CONFIGURE_ARGS+= --with-qt=${QTDIR}/bin MAKE_ENV+= QT_QTDIR=${QTDIR} TEX_ACCEPTED= teTeX3 -PYTHON_PATCH_SCRIPTS= plugins/python/bin/tm_python -PYTHON_PATCH_SCRIPTS+= plugins/mathematica/bin/realpath.py -PYTHON_PATCH_SCRIPTS+= plugins/sage/bin/tm_sage +REPLACE_PYTHON= plugins/python/bin/tm_python +REPLACE_PYTHON+= plugins/mathematica/bin/realpath.py +REPLACE_PYTHON+= plugins/sage/bin/tm_sage SUBST_CLASSES+= init SUBST_STAGE.init= post-patch diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile index d59aa5485ac..c8630d30001 100644 --- a/editors/TeXmacs/Makefile +++ b/editors/TeXmacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.100 2013/06/04 22:15:57 tron Exp $ +# $NetBSD: Makefile,v 1.101 2014/01/25 10:45:17 wiz Exp $ DISTNAME= TeXmacs-1.0.6.15-src PKGNAME= ${DISTNAME:S/-src//} @@ -20,9 +20,9 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datadir=${PREFIX}/share TEX_ACCEPTED= teTeX3 -PYTHON_PATCH_SCRIPTS= plugins/python/bin/tm_python -PYTHON_PATCH_SCRIPTS+= plugins/sage/bin/tm_sage -PYTHON_PATCH_SCRIPTS+= plugins/mathematica/bin/realpath.py +REPLACE_PYTHON= plugins/python/bin/tm_python +REPLACE_PYTHON+= plugins/sage/bin/tm_sage +REPLACE_PYTHON+= plugins/mathematica/bin/realpath.py SUBST_CLASSES+= init SUBST_STAGE.init= post-patch diff --git a/editors/lyx/Makefile b/editors/lyx/Makefile index 6fc122b61d7..47167d5429d 100644 --- a/editors/lyx/Makefile +++ b/editors/lyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:06 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2014/01/25 10:45:18 wiz Exp $ DISTNAME= lyx-2.0.6 CATEGORIES= editors @@ -90,7 +90,7 @@ PLIST_SUBST+= BIN_DIR=bin \ SHARE_DIR=share/lyx .endif -PYTHON_PATCH_SCRIPTS= development/cmake/doc/ReplaceValues.py \ +REPLACE_PYTHON= development/cmake/doc/ReplaceValues.py \ development/cmake/po/cat.py \ development/tools/convert_kmap.py \ development/tools/gen_lfuns.py \ diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile index 348d45ee9b6..341d77ac143 100644 --- a/editors/rox-edit/Makefile +++ b/editors/rox-edit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/03 11:43:42 asau Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:45:18 wiz Exp $ # DISTNAME= edit-2.0 @@ -21,7 +21,7 @@ DIST_SUBDIR= rox NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= AppRun tests/testreplace.py +REPLACE_PYTHON= AppRun tests/testreplace.py INSTALLATION_DIRS= share/rox/Edit diff --git a/filesystems/fuse-gmailfs/Makefile b/filesystems/fuse-gmailfs/Makefile index d650b5153de..84558e6dcb2 100644 --- a/filesystems/fuse-gmailfs/Makefile +++ b/filesystems/fuse-gmailfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:07 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:45:18 wiz Exp $ DISTNAME= gmailfs-0.7.2 PKGREVISION= 3 @@ -11,7 +11,7 @@ HOMEPAGE= http://richard.jones.name/google-hacks/gmail-filesystem/gmail-filesyst COMMENT= FUSE filesystem which uses Google mail for free space NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= gmailfs.py mount.gmailfs +REPLACE_PYTHON= gmailfs.py mount.gmailfs PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-fuse-bindings CONF_FILES= ${PREFIX}/share/examples/gmailfs/gmailfs.conf \ diff --git a/fonts/mkfontalias/Makefile b/fonts/mkfontalias/Makefile index 431d565bece..caaae8c5ac1 100644 --- a/fonts/mkfontalias/Makefile +++ b/fonts/mkfontalias/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/10/03 18:28:27 asau Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/25 10:45:18 wiz Exp $ # DISTNAME= mkfontalias.py @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR} EXTRACT_ONLY= # empty NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= ${DISTNAME} +REPLACE_PYTHON= ${DISTNAME} INSTALLATION_DIRS= bin do-extract: diff --git a/games/4stAttack/Makefile b/games/4stAttack/Makefile index 5d3b1bcffaf..31a6b4aef71 100644 --- a/games/4stAttack/Makefile +++ b/games/4stAttack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2014/01/25 10:30:08 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2014/01/25 10:45:18 wiz Exp $ DISTNAME= 4stAttack-2.1.4 PKGREVISION= 17 @@ -13,7 +13,7 @@ INSTALLATION_DIRS= bin share/${PKGBASE} USE_TOOLS+= pax -PYTHON_PATCH_SCRIPTS= 4stattack.py +REPLACE_PYTHON= 4stattack.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1.4 FIND_EXCLUDE= \( -name \*.orig -or -name \*.txt -or -name \*.pre -or -name GPL -or -name \*~ -or -name 4stattack \) diff --git a/games/freeciv-share/Makefile.common b/games/freeciv-share/Makefile.common index fbda937a970..468d6469ec2 100644 --- a/games/freeciv-share/Makefile.common +++ b/games/freeciv-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2014/01/25 10:30:08 wiz Exp $ +# $NetBSD: Makefile.common,v 1.41 2014/01/25 10:45:18 wiz Exp $ # used by games/freeciv-share/Makefile # used by games/freeciv-client/Makefile @@ -24,7 +24,7 @@ USE_PKGLOCALEDIR= yes DISTINFO_FILE= ${.CURDIR}/../../games/freeciv-share/distinfo PATCHDIR= ${.CURDIR}/../../games/freeciv-share/patches -PYTHON_PATCH_SCRIPTS= ${WRKSRC}/common/generate_packets.py +REPLACE_PYTHON= ${WRKSRC}/common/generate_packets.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.3.2 SUBST_CLASSES+= data diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 8671b9ddc7b..953d2fb2461 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.140 2014/01/25 10:30:08 wiz Exp $ +# $NetBSD: Makefile,v 1.141 2014/01/25 10:45:18 wiz Exp $ DISTNAME= gnome-games-2.32.1 PKGREVISION= 24 @@ -46,8 +46,8 @@ GCONF_SCHEMAS+= mahjongg.schemas GCONF_SCHEMAS+= swell-foop.schemas GCONF_SCHEMAS+= gnome-sudoku.schemas -PYTHON_PATCH_SCRIPTS+= glchess/src/glchess.in.in -PYTHON_PATCH_SCRIPTS+= gnome-sudoku/src/gnome-sudoku.in.in +REPLACE_PYTHON+= glchess/src/glchess.in.in +REPLACE_PYTHON+= gnome-sudoku/src/gnome-sudoku.in.in PY_PATCHPLIST= yes #!/usr/bin/env sh is pretty dumb and REPLACE_SH doesn't support fixing it diff --git a/games/monsterz/Makefile b/games/monsterz/Makefile index 0f33edf307d..5301966a609 100644 --- a/games/monsterz/Makefile +++ b/games/monsterz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:08 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/25 10:45:18 wiz Exp $ DISTNAME= monsterz-0.7.1 PKGREVISION= 4 @@ -12,7 +12,7 @@ COMMENT= Puzzle game similar to the famous Bejeweled or Zookeeper DEPENDS+= ${PYPKGPREFIX}-game-[0-9]*:../../devel/py-game DEPENDS+= ${PYPKGPREFIX}-Numeric-[0-9]*:../../math/py-Numeric -PYTHON_PATCH_SCRIPTS= monsterz.py +REPLACE_PYTHON= monsterz.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-Numeric MAKE_ENV+= GAMEOWN=${GAMEOWN:Q} diff --git a/graphics/dia-python/Makefile b/graphics/dia-python/Makefile index a46045e7002..b197787427f 100644 --- a/graphics/dia-python/Makefile +++ b/graphics/dia-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2014/01/25 10:30:09 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2014/01/25 10:45:18 wiz Exp $ DIA_SUBPKG= -python .include "../../graphics/dia/Makefile.common" @@ -10,9 +10,9 @@ COMMENT+= (Python plugin) CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/--without-python/--with-python/g} CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} -PYTHON_PATCH_SCRIPTS= po-checktrans.py -PYTHON_PATCH_SCRIPTS+= plug-ins/python/gtkcons.py -PYTHON_PATCH_SCRIPTS+= sheets/checktrans.py +REPLACE_PYTHON= po-checktrans.py +REPLACE_PYTHON+= plug-ins/python/gtkcons.py +REPLACE_PYTHON+= sheets/checktrans.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 BUILD_DIRS+= plug-ins/python diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile index a86d7dd5a47..b726de54876 100644 --- a/graphics/gif2png/Makefile +++ b/graphics/gif2png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2013/02/16 11:21:54 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2014/01/25 10:45:18 wiz Exp $ DISTNAME= gif2png-2.5.8 PKGREVISION= 1 @@ -12,7 +12,7 @@ LICENSE= zlib GNU_CONFIGURE= YES -PYTHON_PATCH_SCRIPTS+= web2png +REPLACE_PYTHON+= web2png .include "../../graphics/png/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile index 069d227f29b..36cf0a9ea92 100644 --- a/graphics/skencil/Makefile +++ b/graphics/skencil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2014/01/25 10:30:10 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2014/01/25 10:45:18 wiz Exp $ DISTNAME= skencil-0.6.17 PKGREVISION= 12 @@ -13,7 +13,7 @@ DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk USE_TOOLS+= pax -PYTHON_PATCH_SCRIPTS= sk2ppm.py sk2ps.py skconvert.py skencil.py skshow.py +REPLACE_PYTHON= sk2ppm.py sk2ps.py skconvert.py skencil.py skshow.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-imaging SK_CONF_ARGS= --imaging-include=${BUILDLINK_PREFIX.pyimaging}/${PYINC}/PIL diff --git a/ham/gnuradio-audio-jack/Makefile b/ham/gnuradio-audio-jack/Makefile index 73e07a680b6..01bfa008bbf 100644 --- a/ham/gnuradio-audio-jack/Makefile +++ b/ham/gnuradio-audio-jack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/11/20 20:04:38 adam Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:45:18 wiz Exp $ PKGNAME= gnuradio-audio-jack-${VERSION} PKGREVISION= 10 @@ -10,7 +10,7 @@ CONF_FILES+= ${EGDIR}/gr-audio-jack.conf ${PKG_SYSCONFDIR}/gr-audio-jack.conf CONFIGURE_ARGS+=--enable-gr-audio-jack CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel -PYTHON_PATCH_SCRIPTS+= gr-audio-jack/src/python/qa_jack.py +REPLACE_PYTHON+= gr-audio-jack/src/python/qa_jack.py .include "../../audio/jack/buildlink3.mk" .include "../../ham/gnuradio-core/buildlink3.mk" diff --git a/ham/gnuradio-audio-oss/Makefile b/ham/gnuradio-audio-oss/Makefile index 70af78c6325..3006fe143e1 100644 --- a/ham/gnuradio-audio-oss/Makefile +++ b/ham/gnuradio-audio-oss/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2013/11/20 20:04:38 adam Exp $ +# $NetBSD: Makefile,v 1.23 2014/01/25 10:45:18 wiz Exp $ PKGNAME= gnuradio-audio-oss-${VERSION} PKGREVISION= 9 @@ -10,7 +10,7 @@ CONF_FILES+= ${EGDIR}/gr-audio-oss.conf ${PKG_SYSCONFDIR}/gr-audio-oss.conf CONFIGURE_ARGS+=--enable-gr-audio-oss CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel -PYTHON_PATCH_SCRIPTS+= gr-audio-oss/src/qa_oss.py +REPLACE_PYTHON+= gr-audio-oss/src/qa_oss.py #LDFLAGS = -lgnuradio-core ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} .include "../../mk/oss.buildlink3.mk" diff --git a/ham/gnuradio-audio-portaudio/Makefile b/ham/gnuradio-audio-portaudio/Makefile index 03c3f50fee6..2fc2f9a0552 100644 --- a/ham/gnuradio-audio-portaudio/Makefile +++ b/ham/gnuradio-audio-portaudio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/11/20 20:04:38 adam Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/25 10:45:18 wiz Exp $ PKGNAME= gnuradio-audio-portaudio-${VERSION} PKGREVISION= 9 @@ -10,7 +10,7 @@ CONF_FILES+= ${EGDIR}/gr-audio-portaudio.conf ${PKG_SYSCONFDIR}/gr-audio-port CONFIGURE_ARGS+=--enable-gr-audio-portaudio CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel -PYTHON_PATCH_SCRIPTS+= gr-audio-portaudio/src/qa_portaudio.py +REPLACE_PYTHON+= gr-audio-portaudio/src/qa_portaudio.py .include "../../audio/portaudio-devel/buildlink3.mk" .include "../../ham/gnuradio-core/buildlink3.mk" diff --git a/ham/gnuradio-core/Makefile b/ham/gnuradio-core/Makefile index 4e5916b69e4..ff510a39216 100644 --- a/ham/gnuradio-core/Makefile +++ b/ham/gnuradio-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:10 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2014/01/25 10:45:18 wiz Exp $ PKGNAME= gnuradio-core-${VERSION} PKGREVISION= 10 @@ -15,68 +15,68 @@ CONFIGURE_ARGS+= --enable-gnuradio-core CONFIGURE_ARGS+= --enable-omnithread CONFIGURE_ARGS+= --enable-gruel -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/swig/gen-swig-bug-fix -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/bin/microtune.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/general/gen_sine_table.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/filter/generate_gr_fir_XXX.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/filter/generate_all.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/filter/generate_gr_interp_fir_filter_XXX.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/filter/generate_gr_fir_filter_XXX.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/filter/generate_gr_rational_resampler_base_XXX.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/filter/generate_gr_fir_sysconfig.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/filter/generate_gr_fir_sysconfig_generic.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/filter/generate_gr_fir_util.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/lib/filter/generate_gr_freq_xlating_fir_filter_XXX.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pnac.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/pfb_decimator.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/blks2impl/pfb_interpolator.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/benchmark_filters.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/pubsub.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_correlate_access_code.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_agc.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_cma_equalizer.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_complex_to_xxx.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_fft_filter.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_feval.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_constellation_decoder_cb.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_diff_encoder.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_diff_phasor_cc.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_frequency_modulator.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_filter_delay_fc.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_interp_fir_filter.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_fsk_stuff.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_goertzel.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_head.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_hilbert.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_iir.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_interleave.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_kludge_copy.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_message.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_kludged_imports.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_mute.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_nlog10.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_packed_to_unpacked.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_pipe_fittings.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_rational_resampler.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_sig_source.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_single_pole_iir.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_single_pole_iir_cc.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr/qa_unpack_k_bits.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gruimpl/freqz.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gruimpl/lmx2306.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/python/gnuradio/gr_unittest.py -PYTHON_PATCH_SCRIPTS+= gnuradio-core/src/tests/test_buffers.py +REPLACE_PYTHON+= gnuradio-core/src/lib/swig/gen-swig-bug-fix +REPLACE_PYTHON+= gnuradio-core/src/python/bin/microtune.py +REPLACE_PYTHON+= gnuradio-core/src/lib/general/gen_sine_table.py +REPLACE_PYTHON+= gnuradio-core/src/lib/filter/generate_gr_fir_XXX.py +REPLACE_PYTHON+= gnuradio-core/src/lib/filter/generate_all.py +REPLACE_PYTHON+= gnuradio-core/src/lib/filter/generate_gr_interp_fir_filter_XXX.py +REPLACE_PYTHON+= gnuradio-core/src/lib/filter/generate_gr_fir_filter_XXX.py +REPLACE_PYTHON+= gnuradio-core/src/lib/filter/generate_gr_rational_resampler_base_XXX.py +REPLACE_PYTHON+= gnuradio-core/src/lib/filter/generate_gr_fir_sysconfig.py +REPLACE_PYTHON+= gnuradio-core/src/lib/filter/generate_gr_fir_sysconfig_generic.py +REPLACE_PYTHON+= gnuradio-core/src/lib/filter/generate_gr_fir_util.py +REPLACE_PYTHON+= gnuradio-core/src/lib/filter/generate_gr_freq_xlating_fir_filter_XXX.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pnac.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/pfb_arb_resampler.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/pfb_channelizer.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/pfb_decimator.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/blks2impl/pfb_interpolator.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/benchmark_filters.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/pubsub.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_add_and_friends.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_correlate_access_code.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_agc.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_cma_equalizer.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_complex_to_xxx.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_fft_filter.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_feval.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_constellation_decoder_cb.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_diff_encoder.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_diff_phasor_cc.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_frequency_modulator.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_filter_delay_fc.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_interp_fir_filter.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_fsk_stuff.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_goertzel.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_head.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_hilbert.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_iir.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_interleave.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_kludge_copy.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_message.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_kludged_imports.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_mute.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_nlog10.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_packed_to_unpacked.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_pipe_fittings.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_rational_resampler.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_sig_source.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_single_pole_iir.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_single_pole_iir_cc.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr/qa_unpack_k_bits.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gruimpl/freqz.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gruimpl/lmx2306.py +REPLACE_PYTHON+= gnuradio-core/src/python/gnuradio/gr_unittest.py +REPLACE_PYTHON+= gnuradio-core/src/tests/test_buffers.py .include "../../devel/swig/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk" diff --git a/ham/gnuradio-examples/Makefile b/ham/gnuradio-examples/Makefile index 6890bbf7788..9d0fe6a12a9 100644 --- a/ham/gnuradio-examples/Makefile +++ b/ham/gnuradio-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2013/11/20 20:04:38 adam Exp $ +# $NetBSD: Makefile,v 1.44 2014/01/25 10:45:19 wiz Exp $ PKGNAME= gnuradio-examples-${VERSION} PKGREVISION= 25 @@ -12,33 +12,33 @@ CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel EXAMPLE_DIR= ${LOCALBASE}/share/examples/gnuradio/python -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/apps/hf_explorer/hfx2.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/apps/hf_radio/radio.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/apps/hf_radio/ui.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_copy.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_fft.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_play.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/audio_to_file.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/dial_tone.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/mono_tone.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/multi_tone.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/spectrum_inversion.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/audio/test_resampler.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/digital/benchmark_rx.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/digital/benchmark_tx.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/digital/gen_whitener.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/digital/pick_bitrate.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/digital/receive_path.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/digital/rx_voice.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/digital/transmit_path.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/digital/tunnel.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/digital/tx_voice.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/digital_voice/encdec.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/multi-antenna/multi_fft.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/multi-antenna/multi_file.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/multi-antenna/multi_scope.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/multi_usrp/multi_usrp_oscope.py -PYTHON_PATCH_SCRIPTS+= gnuradio-examples/python/multi_usrp/multi_usrp_rx_cfile.py +REPLACE_PYTHON+= gnuradio-examples/python/apps/hf_explorer/hfx2.py +REPLACE_PYTHON+= gnuradio-examples/python/apps/hf_radio/radio.py +REPLACE_PYTHON+= gnuradio-examples/python/apps/hf_radio/ui.py +REPLACE_PYTHON+= gnuradio-examples/python/audio/audio_copy.py +REPLACE_PYTHON+= gnuradio-examples/python/audio/audio_fft.py +REPLACE_PYTHON+= gnuradio-examples/python/audio/audio_play.py +REPLACE_PYTHON+= gnuradio-examples/python/audio/audio_to_file.py +REPLACE_PYTHON+= gnuradio-examples/python/audio/dial_tone.py +REPLACE_PYTHON+= gnuradio-examples/python/audio/mono_tone.py +REPLACE_PYTHON+= gnuradio-examples/python/audio/multi_tone.py +REPLACE_PYTHON+= gnuradio-examples/python/audio/spectrum_inversion.py +REPLACE_PYTHON+= gnuradio-examples/python/audio/test_resampler.py +REPLACE_PYTHON+= gnuradio-examples/python/digital/benchmark_rx.py +REPLACE_PYTHON+= gnuradio-examples/python/digital/benchmark_tx.py +REPLACE_PYTHON+= gnuradio-examples/python/digital/gen_whitener.py +REPLACE_PYTHON+= gnuradio-examples/python/digital/pick_bitrate.py +REPLACE_PYTHON+= gnuradio-examples/python/digital/receive_path.py +REPLACE_PYTHON+= gnuradio-examples/python/digital/rx_voice.py +REPLACE_PYTHON+= gnuradio-examples/python/digital/transmit_path.py +REPLACE_PYTHON+= gnuradio-examples/python/digital/tunnel.py +REPLACE_PYTHON+= gnuradio-examples/python/digital/tx_voice.py +REPLACE_PYTHON+= gnuradio-examples/python/digital_voice/encdec.py +REPLACE_PYTHON+= gnuradio-examples/python/multi-antenna/multi_fft.py +REPLACE_PYTHON+= gnuradio-examples/python/multi-antenna/multi_file.py +REPLACE_PYTHON+= gnuradio-examples/python/multi-antenna/multi_scope.py +REPLACE_PYTHON+= gnuradio-examples/python/multi_usrp/multi_usrp_oscope.py +REPLACE_PYTHON+= gnuradio-examples/python/multi_usrp/multi_usrp_rx_cfile.py do-install: set -e; \ diff --git a/ham/gnuradio-gsm/Makefile b/ham/gnuradio-gsm/Makefile index 6eb3f675cbf..8426e656572 100644 --- a/ham/gnuradio-gsm/Makefile +++ b/ham/gnuradio-gsm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/11/20 20:04:38 adam Exp $ +# $NetBSD: Makefile,v 1.19 2014/01/25 10:45:19 wiz Exp $ PKGNAME= gnuradio-gsm-${VERSION} PKGREVISION= 8 @@ -9,8 +9,8 @@ COMMENT= GNU Radio GSM 06.10 13kbit/sec voice encoder/decoder CONFIGURE_ARGS+=--enable-gr-gsm-fr-vocoder CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel -PYTHON_PATCH_SCRIPTS+= gr-gsm-fr-vocoder/src/python/encdec.py -PYTHON_PATCH_SCRIPTS+= gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py +REPLACE_PYTHON+= gr-gsm-fr-vocoder/src/python/encdec.py +REPLACE_PYTHON+= gr-gsm-fr-vocoder/src/python/qa_gsm_full_rate.py post-install: ${MKDIR} ${DESTDIR}${PREFIX}/${PYSITELIB}/gnuradio/vocoder diff --git a/ham/gnuradio-radio-astronomy/Makefile b/ham/gnuradio-radio-astronomy/Makefile index 18ddda569ff..717ed335ce4 100644 --- a/ham/gnuradio-radio-astronomy/Makefile +++ b/ham/gnuradio-radio-astronomy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2014/01/20 12:54:53 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2014/01/25 10:45:19 wiz Exp $ PKGNAME= gnuradio-radio-astronomy-${VERSION} PKGREVISION= 25 @@ -11,12 +11,12 @@ CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel PYTHON_VERSIONED_DEPENDENCIES= ephem -PYTHON_PATCH_SCRIPTS+= gr-radio-astronomy/src/python/local_calibrator.py -PYTHON_PATCH_SCRIPTS+= gr-radio-astronomy/src/python/qa_ra.py -PYTHON_PATCH_SCRIPTS+= gr-radio-astronomy/src/python/ra_fftsink.py -PYTHON_PATCH_SCRIPTS+= gr-radio-astronomy/src/python/ra_stripchartsink.py -PYTHON_PATCH_SCRIPTS+= gr-radio-astronomy/src/python/usrp_psr_receiver.py -PYTHON_PATCH_SCRIPTS+= gr-radio-astronomy/src/python/usrp_ra_receiver.py +REPLACE_PYTHON+= gr-radio-astronomy/src/python/local_calibrator.py +REPLACE_PYTHON+= gr-radio-astronomy/src/python/qa_ra.py +REPLACE_PYTHON+= gr-radio-astronomy/src/python/ra_fftsink.py +REPLACE_PYTHON+= gr-radio-astronomy/src/python/ra_stripchartsink.py +REPLACE_PYTHON+= gr-radio-astronomy/src/python/usrp_psr_receiver.py +REPLACE_PYTHON+= gr-radio-astronomy/src/python/usrp_ra_receiver.py .include "../../mk/oss.buildlink3.mk" .include "../../lang/python/versioned_dependencies.mk" diff --git a/ham/gnuradio-trellis/Makefile b/ham/gnuradio-trellis/Makefile index b64eeed2b8e..e3d5181e8b2 100644 --- a/ham/gnuradio-trellis/Makefile +++ b/ham/gnuradio-trellis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/11/20 20:04:38 adam Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:45:19 wiz Exp $ PKGNAME= gnuradio-trellis-${VERSION} PKGREVISION= 10 @@ -10,11 +10,11 @@ CONFIGURE_ARGS+=--enable-gr-trellis CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel CONFIGURE_ENV+=XMLTO=no -PYTHON_PATCH_SCRIPTS+= gr-trellis/doc/make_numbered_listing.py -PYTHON_PATCH_SCRIPTS+= gr-trellis/doc/test_tcm.py -PYTHON_PATCH_SCRIPTS+= gr-trellis/doc/test_viterbi_equalization1.py -PYTHON_PATCH_SCRIPTS+= gr-trellis/src/python/qa_trellis.py -PYTHON_PATCH_SCRIPTS+= gr-trellis/src/examples/*.py +REPLACE_PYTHON+= gr-trellis/doc/make_numbered_listing.py +REPLACE_PYTHON+= gr-trellis/doc/test_tcm.py +REPLACE_PYTHON+= gr-trellis/doc/test_viterbi_equalization1.py +REPLACE_PYTHON+= gr-trellis/src/python/qa_trellis.py +REPLACE_PYTHON+= gr-trellis/src/examples/*.py .include "../../ham/gnuradio-core/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/ham/gnuradio-usrp/Makefile b/ham/gnuradio-usrp/Makefile index e7f22c79729..729d4549803 100644 --- a/ham/gnuradio-usrp/Makefile +++ b/ham/gnuradio-usrp/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.21 2013/11/20 20:04:38 adam Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/25 10:45:19 wiz Exp $ PKGNAME= gnuradio-usrp-${VERSION} PKGREVISION= 8 COMMENT= USRP bindings for GNU Radio -PYTHON_PATCH_SCRIPTS+= gr-usrp/src/flexrf_debug_gui.py -PYTHON_PATCH_SCRIPTS+= gr-usrp/src/qa_usrp.py -PYTHON_PATCH_SCRIPTS+= gr-usrp/src/tx_debug_gui.py +REPLACE_PYTHON+= gr-usrp/src/flexrf_debug_gui.py +REPLACE_PYTHON+= gr-usrp/src/qa_usrp.py +REPLACE_PYTHON+= gr-usrp/src/tx_debug_gui.py .include "../../meta-pkgs/gnuradio/Makefile.common" diff --git a/ham/gnuradio-video-sdl/Makefile b/ham/gnuradio-video-sdl/Makefile index 9ac7542f98e..736512fca9c 100644 --- a/ham/gnuradio-video-sdl/Makefile +++ b/ham/gnuradio-video-sdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/11/20 20:04:38 adam Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/25 10:45:19 wiz Exp $ PKGNAME= gnuradio-video-sdl-${VERSION} PKGREVISION= 9 @@ -9,7 +9,7 @@ COMMENT= SDL bindings for GNU Radio CONFIGURE_ARGS+=--enable-gr-video-sdl CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel -PYTHON_PATCH_SCRIPTS+= gr-video-sdl/src/qa_video_sdl.py +REPLACE_PYTHON+= gr-video-sdl/src/qa_video_sdl.py .include "../../devel/SDL/buildlink3.mk" .include "../../ham/gnuradio-core/buildlink3.mk" diff --git a/ham/gnuradio-wxgui/Makefile b/ham/gnuradio-wxgui/Makefile index c07f111f2f0..500c0a14c53 100644 --- a/ham/gnuradio-wxgui/Makefile +++ b/ham/gnuradio-wxgui/Makefile @@ -1,12 +1,12 @@ -# $NetBSD: Makefile,v 1.48 2014/01/25 10:30:10 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2014/01/25 10:45:19 wiz Exp $ PKGNAME= gnuradio-wxgui-${VERSION} PKGREVISION= 27 COMMENT= GUI framework for GNU Radio based on wxPython -PYTHON_PATCH_SCRIPTS+= gr-wxgui/src/python/form.py -PYTHON_PATCH_SCRIPTS+= gr-wxgui/src/python/powermate.py -PYTHON_PATCH_SCRIPTS+= gr-wxgui/src/python/slider.py +REPLACE_PYTHON+= gr-wxgui/src/python/form.py +REPLACE_PYTHON+= gr-wxgui/src/python/powermate.py +REPLACE_PYTHON+= gr-wxgui/src/python/slider.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets diff --git a/ham/usrp/Makefile b/ham/usrp/Makefile index f72cc03dc19..2eef1dc3ca2 100644 --- a/ham/usrp/Makefile +++ b/ham/usrp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:11 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2014/01/25 10:45:19 wiz Exp $ PKGNAME= usrp-${VERSION} PKGREVISION= 10 @@ -13,14 +13,14 @@ CONFIGURE_ARGS+=--with-gnuradio-core --with-omnithread --with-gruel BUILD_DEPENDS+= sdcc>=2.4.0<3:../../devel/sdcc -PYTHON_PATCH_SCRIPTS+= usrp/firmware/include/generate_regs.py -PYTHON_PATCH_SCRIPTS+= usrp/firmware/src/common/edit-gpif -PYTHON_PATCH_SCRIPTS+= usrp/firmware/src/common/build_eeprom.py -PYTHON_PATCH_SCRIPTS+= usrp/firmware/src/usrp2/edit-gpif -PYTHON_PATCH_SCRIPTS+= usrp/host/lib/check_data.py -PYTHON_PATCH_SCRIPTS+= usrp/host/lib/dump_data.py -PYTHON_PATCH_SCRIPTS+= usrp/host/lib/gen_usrp_dbid.py -PYTHON_PATCH_SCRIPTS+= usrp/host/lib/usrp_dbid.py +REPLACE_PYTHON+= usrp/firmware/include/generate_regs.py +REPLACE_PYTHON+= usrp/firmware/src/common/edit-gpif +REPLACE_PYTHON+= usrp/firmware/src/common/build_eeprom.py +REPLACE_PYTHON+= usrp/firmware/src/usrp2/edit-gpif +REPLACE_PYTHON+= usrp/host/lib/check_data.py +REPLACE_PYTHON+= usrp/host/lib/dump_data.py +REPLACE_PYTHON+= usrp/host/lib/gen_usrp_dbid.py +REPLACE_PYTHON+= usrp/host/lib/usrp_dbid.py .include "../../ham/gnuradio-core/buildlink3.mk" .include "../../devel/libusb/buildlink3.mk" diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile index de4caf5f075..37158f01fff 100644 --- a/mail/evolution-data-server/Makefile +++ b/mail/evolution-data-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.141 2014/01/01 11:52:07 wiz Exp $ +# $NetBSD: Makefile,v 1.142 2014/01/25 10:45:19 wiz Exp $ DISTNAME= evolution-data-server-2.32.3 PKGREVISION= 27 @@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES PYTHON_FOR_BUILD_ONLY= YES -PYTHON_PATCH_SCRIPTS= addressbook/libebook/gen-western-table.py +REPLACE_PYTHON= addressbook/libebook/gen-western-table.py .include "options.mk" diff --git a/mail/fetchmailconf/Makefile b/mail/fetchmailconf/Makefile index c10da223485..4ec1fb9e33e 100644 --- a/mail/fetchmailconf/Makefile +++ b/mail/fetchmailconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.89 2014/01/25 10:30:12 wiz Exp $ +# $NetBSD: Makefile,v 1.90 2014/01/25 10:45:19 wiz Exp $ DISTNAME= fetchmail-6.3.22 PKGNAME= ${DISTNAME:S/fetchmail/fetchmailconf/} @@ -30,7 +30,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 INSTALL_TARGET= install-pythonPYTHON PLIST_SUBST+= PYSITELIB=${PYSITELIB} -PYTHON_PATCH_SCRIPTS= fetchmailconf.py +REPLACE_PYTHON= fetchmailconf.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 6.3.22 post-install: diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile index 8868a4bf788..3ffd11c5cdf 100644 --- a/mail/getmail/Makefile +++ b/mail/getmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.137 2014/01/25 10:30:12 wiz Exp $ +# $NetBSD: Makefile,v 1.138 2014/01/25 10:45:19 wiz Exp $ DISTNAME= getmail-4.43.0 CATEGORIES= mail @@ -11,7 +11,7 @@ LICENSE= gnu-gpl-v2 USE_LANGUAGES= # none -PYTHON_PATCH_SCRIPTS= *.py getmailcore/*.py +REPLACE_PYTHON= *.py getmailcore/*.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.43.0 .include "../../lang/python/application.mk" diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index ece9212fdc8..09071dc833b 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2014/01/25 10:30:12 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2014/01/25 10:45:19 wiz Exp $ DISTNAME= mailman-2.1.14-1 PKGNAME= mailman-2.1.14.1 @@ -70,9 +70,9 @@ INSTALL_TEMPLATES+= ${FILESDIR}/INSTALL DEINSTALL_TEMPLATES+= ${FILESDIR}/DEINSTALL PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.1.14.1 -PYTHON_PATCH_SCRIPTS+= Mailman/Archiver/pipermail.py -PYTHON_PATCH_SCRIPTS+= Mailman/Post.py -PYTHON_PATCH_SCRIPTS+= bin/msgfmt.py +REPLACE_PYTHON+= Mailman/Archiver/pipermail.py +REPLACE_PYTHON+= Mailman/Post.py +REPLACE_PYTHON+= bin/msgfmt.py CONFIGURE_ARGS+= --with-cgi-gid=${MAILMAN_CGIGROUP:Q} .if ${MAILMAN_CGIEXT} != "none" diff --git a/mail/newspipe/Makefile b/mail/newspipe/Makefile index d27f12867f3..39ffa603109 100644 --- a/mail/newspipe/Makefile +++ b/mail/newspipe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/08 12:19:18 asau Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/25 10:45:19 wiz Exp $ # DISTNAME= newspipe.1.1.9 @@ -19,7 +19,7 @@ DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text WRKSRC= ${WRKDIR} NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= *.py +REPLACE_PYTHON= *.py SUBST_CLASSES+= bin SUBST_STAGE.bin= do-configure diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile index 3f4548b6a7e..51db4643421 100644 --- a/mail/pymsgauth/Makefile +++ b/mail/pymsgauth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/08 12:19:28 asau Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/25 10:45:19 wiz Exp $ # DISTNAME= pymsgauth-2.1.0 @@ -21,14 +21,14 @@ HTMLDOCDIR= share/doc/html/pymsgauth EGDIR= share/examples/pymsgauth NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= ${PYMSGAUTH_PROGRAMS} *.py +REPLACE_PYTHON= ${PYMSGAUTH_PROGRAMS} *.py FILES_SUBST+= SHAREDIR=${SHAREDIR:Q} INSTALLATION_DIRS= ${SHAREDIR} ${DOCDIR} ${HTMLDOCDIR} ${EGDIR} bin do-install: - for f in ${PYTHON_PATCH_SCRIPTS}; do \ + for f in ${REPLACE_PYTHON}; do \ ${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${DESTDIR}${PREFIX}/${SHAREDIR}; \ done diff --git a/mail/queue-repair/Makefile b/mail/queue-repair/Makefile index 414e827ca21..8a8a2682c33 100644 --- a/mail/queue-repair/Makefile +++ b/mail/queue-repair/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/08 12:19:29 asau Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:45:19 wiz Exp $ # DISTNAME= queue-repair-0.9.0 @@ -12,7 +12,7 @@ COMMENT= Check or correct most corruptions of the queue in qmail NO_BUILD= YES -PYTHON_PATCH_SCRIPTS= queue_repair.py +REPLACE_PYTHON= queue_repair.py INSTALLATION_DIRS= bin do-install: diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile index 0c0deb72d50..3e76493e066 100644 --- a/mail/tmda/Makefile +++ b/mail/tmda/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2014/01/25 10:30:13 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2014/01/25 10:45:20 wiz Exp $ DISTNAME= tmda-1.1.12 PKGREVISION= 5 @@ -11,7 +11,7 @@ MAINTAINER= schmonz@NetBSD.org HOMEPAGE= http://tmda.net/ COMMENT= Python-based SPAM reduction system -PYTHON_PATCH_SCRIPTS= ${TMDA_PROGRAMS} +REPLACE_PYTHON= ${TMDA_PROGRAMS} PY_PATCHPLIST= yes PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1.12 diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile index e4f8d6770da..f088eaf02be 100644 --- a/misc/deskbar-applet/Makefile +++ b/misc/deskbar-applet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2014/01/25 10:30:14 wiz Exp $ +# $NetBSD: Makefile,v 1.83 2014/01/25 10:45:20 wiz Exp $ DISTNAME= deskbar-applet-2.32.0 PKGREVISION= 31 @@ -22,7 +22,7 @@ GCONF_SCHEMAS= deskbar-applet.schemas PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 -PYTHON_PATCH_SCRIPTS= deskbar/deskbar-applet.py +REPLACE_PYTHON= deskbar/deskbar-applet.py PY_PATCHPLIST= yes BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 diff --git a/misc/mtail/Makefile b/misc/mtail/Makefile index 584a5f21d6b..c2bad6b03f4 100644 --- a/misc/mtail/Makefile +++ b/misc/mtail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2012/10/08 09:57:31 asau Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:45:20 wiz Exp $ # DISTNAME= mtail-1.1.1 @@ -13,7 +13,7 @@ COMMENT= Small tail workalike that performs output coloring NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= mtail +REPLACE_PYTHON= mtail INSTALLATION_DIRS= bin share/doc share/examples do-install: diff --git a/misc/routeplanner-cli/Makefile b/misc/routeplanner-cli/Makefile index f1f591dc4c1..162873105d0 100644 --- a/misc/routeplanner-cli/Makefile +++ b/misc/routeplanner-cli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:14 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:45:20 wiz Exp $ # DISTNAME= routeplanner_0.11 @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/routeplanner-0.11 NO_BUILD= yes USE_TOOLS+= gzip -PYTHON_PATCH_SCRIPTS= rpcli +REPLACE_PYTHON= rpcli RPLIBDIR= ${PREFIX}/lib/routeplanner RPPY= rpcli.py rpcountry.py rpdbase.py rpunits.py rpcity.py rproute.py RPDB= Basic-USA.rpl3 NorthAmerica.rpl3 diff --git a/misc/rox-memo/Makefile b/misc/rox-memo/Makefile index 47e95191e7f..ec25c75f7d2 100644 --- a/misc/rox-memo/Makefile +++ b/misc/rox-memo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/08 09:57:36 asau Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:45:20 wiz Exp $ # DISTNAME= Memo-1.9.5 @@ -21,7 +21,7 @@ DIST_SUBDIR= rox NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= AppRun +REPLACE_PYTHON= AppRun INSTALLATION_DIRS= share/rox/Memo diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile index 23985ad5c1b..3dbfedf1e3d 100644 --- a/multimedia/pitivi/Makefile +++ b/multimedia/pitivi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:15 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/25 10:45:20 wiz Exp $ DISTNAME= pitivi-0.15.2 PKGREVISION= 5 @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= pkg-config intltool gmake msgfmt CONFIGURE_ENV+= ac_cv_path_PYTHON=${PYTHONBIN} -PYTHON_PATCH_SCRIPTS= bin/pitivi.in +REPLACE_PYTHON= bin/pitivi.in PYTHON_VERSIONED_DEPENDENCIES= cairo PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2, py-gstreamer0.10 diff --git a/net/bittornado-gui/Makefile b/net/bittornado-gui/Makefile index a40a01403ba..6ba977b60d8 100644 --- a/net/bittornado-gui/Makefile +++ b/net/bittornado-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:15 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/25 10:45:20 wiz Exp $ .include "../../net/bittornado/Makefile.common" @@ -14,8 +14,8 @@ DEPENDS+= ${PYPKGPREFIX}-wxWidgets-[0-9]*:../../x11/py-wxWidgets NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= btcompletedirgui.py btdownloadgui.py -PYTHON_PATCH_SCRIPTS+= btmaketorrentgui.py +REPLACE_PYTHON= btcompletedirgui.py btdownloadgui.py +REPLACE_PYTHON+= btmaketorrentgui.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets INSTALLATION_DIRS= bin diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile index 1aedd13a5f6..900f19aa8c8 100644 --- a/net/bittorrent-gui/Makefile +++ b/net/bittorrent-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2014/01/25 10:30:15 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2014/01/25 10:45:20 wiz Exp $ .include "../../net/bittorrent/Makefile.common" @@ -10,7 +10,7 @@ COMMENT+= (GTK+ GUI) DEPENDS+= bittorrent>=${PKGVERSION_NOREV}:../../net/bittorrent DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.6:../../x11/py-gtk2 -PYTHON_PATCH_SCRIPTS= bittorrent maketorrent +REPLACE_PYTHON= bittorrent maketorrent PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 CONFLICTS+= bittornado-gui-[0-9]* diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index 0f6b27bb6c3..b12fb3cc39d 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2013/10/13 21:52:44 sbd Exp $ +# $NetBSD: Makefile,v 1.33 2014/01/25 10:45:20 wiz Exp $ DISTNAME= flow-tools-0.68 PKGREVISION= 6 @@ -49,7 +49,7 @@ PLIST_VARS+= python .if !empty(PKG_OPTIONS:Mpython) . include "../../lang/python/application.mk" -PYTHON_PATCH_SCRIPTS= bin/flow-rpt2rrd bin/flow-log2rrd bin/flow-rptfmt +REPLACE_PYTHON= bin/flow-rpt2rrd bin/flow-log2rrd bin/flow-rptfmt PLIST.python= yes post-install: diff --git a/net/ipcheck/Makefile b/net/ipcheck/Makefile index 1d3d1f7f543..a09488ae226 100644 --- a/net/ipcheck/Makefile +++ b/net/ipcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/10/23 17:18:28 asau Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/25 10:45:20 wiz Exp $ # DISTNAME= ipcheck.233 @@ -17,7 +17,7 @@ EXTRACT_SUFX= #none EXTRACT_CMD= ${CP} "$${extract_file}" ipcheck.py NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= ipcheck.py +REPLACE_PYTHON= ipcheck.py INSTALLATION_DIRS= bin do-install: diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile index fc45c3e7bd6..0ae8f20cc1b 100644 --- a/net/pygopherd/Makefile +++ b/net/pygopherd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2014/01/25 10:30:18 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:45:20 wiz Exp $ DISTNAME= pygopherd_2.0.16 PKGREVISION= 4 @@ -34,12 +34,12 @@ FILES_SUBST+= RUNTIMEDIR=${RUNTIMEDIR:Q} FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q} PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.0.16 -PYTHON_PATCH_SCRIPTS= bin/pygopherd -PYTHON_PATCH_SCRIPTS+= pygopherd/GopherExceptionsTest.py -PYTHON_PATCH_SCRIPTS+= pygopherd/fileextTest.py -PYTHON_PATCH_SCRIPTS+= pygopherd/gopherentryTest.py -PYTHON_PATCH_SCRIPTS+= pygopherd/initializationTest.py -PYTHON_PATCH_SCRIPTS+= pygopherd/testutil.py +REPLACE_PYTHON= bin/pygopherd +REPLACE_PYTHON+= pygopherd/GopherExceptionsTest.py +REPLACE_PYTHON+= pygopherd/fileextTest.py +REPLACE_PYTHON+= pygopherd/gopherentryTest.py +REPLACE_PYTHON+= pygopherd/initializationTest.py +REPLACE_PYTHON+= pygopherd/testutil.py SUBST_CLASSES+= man SUBST_STAGE.man= post-patch diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index 51f22bd9cff..420350f0ada 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.239 2014/01/12 09:01:50 wiz Exp $ +# $NetBSD: makevars.map,v 1.240 2014/01/25 10:45:20 wiz Exp $ # # This file contains the guessed type of some variables, according to @@ -640,7 +640,7 @@ PTHREAD_TYPE Identifier [$system] PY_PATCHPLIST Yes [$package] PYPKGPREFIX { py26 py27 py33 } [*:pu, pyversion.mk:s, *:] PYTHON_FOR_BUILD_ONLY Yes [$package] -PYTHON_PATCH_SCRIPTS List of Pathmask [$package_list] +REPLACE_PYTHON List of Pathmask [$package_list] PYTHON_VERSIONS_ACCEPTED List of Version [$package] PYTHON_VERSIONS_INCOMPATIBLE List of Version [$package] PYTHON_VERSION_DEFAULT Version [$user] diff --git a/print/bg5pdf/Makefile b/print/bg5pdf/Makefile index 45679ee3c08..13e13a46af5 100644 --- a/print/bg5pdf/Makefile +++ b/print/bg5pdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2013/02/16 11:24:06 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2014/01/25 10:45:20 wiz Exp $ DISTNAME= bg5pdf-1.0.0 PKGREVISION= 15 @@ -20,7 +20,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} WRKSRC= ${WRKDIR}/bg5pdf PY_PATCHPLIST= yes -PYTHON_PATCH_SCRIPTS= bg5pdf +REPLACE_PYTHON= bg5pdf INSTALLATION_DIRS= bin ${PYSITELIB} diff --git a/security/flawfinder/Makefile b/security/flawfinder/Makefile index 7ee705bc515..76b6f1bf4df 100644 --- a/security/flawfinder/Makefile +++ b/security/flawfinder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2012/10/23 18:16:27 asau Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/25 10:45:20 wiz Exp $ DISTNAME= flawfinder-1.27 PKGREVISION= 3 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.dwheeler.com/flawfinder/ COMMENT= Python program to find flaws in C/C++ programs NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= flawfinder +REPLACE_PYTHON= flawfinder INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile index 8f904a76f36..f73f93df1ee 100644 --- a/security/py-prewikka/Makefile +++ b/security/py-prewikka/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:20 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2014/01/25 10:45:20 wiz Exp $ DISTNAME= prewikka-${VERSION} PKGNAME= ${PYPKGPREFIX}-prewikka-${VERSION} @@ -23,7 +23,7 @@ USE_TOOLS+= msgfmt PYDISTUTILSPKG= yes PYSETUP= setup.py -PYTHON_PATCH_SCRIPTS= scripts/prewikka-httpd +REPLACE_PYTHON= scripts/prewikka-httpd PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-cheetah PREWIKKA_USER?= prewikka diff --git a/security/pyca/Makefile b/security/pyca/Makefile index 0d059509b8c..ed5139d4895 100644 --- a/security/pyca/Makefile +++ b/security/pyca/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2012/10/23 18:16:55 asau Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/25 10:45:20 wiz Exp $ # Date-based distfile name for pre-releases leading to 0.6.6. DISTNAME= pyca-20031118 @@ -23,7 +23,7 @@ PKG_SYSCONFSUBDIR= openssl PKG_SYSCONFDIR.openssl?= /etc/openssl .endif -PYTHON_PATCH_SCRIPTS= bin/*.py cgi-bin/*.py sbin/*.py +REPLACE_PYTHON= bin/*.py cgi-bin/*.py sbin/*.py PYCA_SCRIPT_FIXUP_SED= \ -e "s|/usr/local/pyca/pylib|${PREFIX}/lib/pyca|g" \ @@ -36,7 +36,7 @@ INSTALLATION_DIRS= bin lib/pyca/openssl libexec/cgi-bin sbin \ share/examples/pyca pyca-script-fixup: - cd ${WRKSRC}; for file in ${PYTHON_PATCH_SCRIPTS}; do \ + cd ${WRKSRC}; for file in ${REPLACE_PYTHON}; do \ ${SED} ${PYCA_SCRIPT_FIXUP_SED} \ <$${file} >$${file}.fixed; \ ${MV} $${file}.fixed $${file}; \ diff --git a/security/sshfp/Makefile b/security/sshfp/Makefile index 678f8ae7020..5339727d4da 100644 --- a/security/sshfp/Makefile +++ b/security/sshfp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/01/17 23:11:28 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:45:21 wiz Exp $ DISTNAME= sshfp-1.1.3 PKGREVISION= 3 @@ -14,7 +14,7 @@ PYTHON_VERSIONED_DEPENDENCIES= dns MANCOMPRESSED= yes NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= sshfp +REPLACE_PYTHON= sshfp .include "../../lang/python/application.mk" .include "../../lang/python/versioned_dependencies.mk" diff --git a/sysutils/libvirt/Makefile b/sysutils/libvirt/Makefile index 30a495b7191..25451c90a8b 100644 --- a/sysutils/libvirt/Makefile +++ b/sysutils/libvirt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:21 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/25 10:45:21 wiz Exp $ DISTNAME= libvirt-1.2.1 CATEGORIES= sysutils @@ -18,24 +18,24 @@ USE_LIBTOOL= yes PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml PY_PATCHPLIST= yes -PYTHON_PATCH_SCRIPTS+= examples/python/domstart.py -PYTHON_PATCH_SCRIPTS+= examples/python/domrestore.py -PYTHON_PATCH_SCRIPTS+= examples/python/dominfo.py -PYTHON_PATCH_SCRIPTS+= examples/python/domsave.py -PYTHON_PATCH_SCRIPTS+= examples/python/esxlist.py -PYTHON_PATCH_SCRIPTS+= examples/domain-events/events-python/event-test.py -PYTHON_PATCH_SCRIPTS+= python/tests/create.py -PYTHON_PATCH_SCRIPTS+= python/tests/error.py -PYTHON_PATCH_SCRIPTS+= python/tests/uuid.py -PYTHON_PATCH_SCRIPTS+= python/tests/basic.py -PYTHON_PATCH_SCRIPTS+= python/tests/node.py -PYTHON_PATCH_SCRIPTS+= python/libvirt-override.py -PYTHON_PATCH_SCRIPTS+= python/libvirt-override-virStream.py -PYTHON_PATCH_SCRIPTS+= python/libvirt-override-virConnect.py -PYTHON_PATCH_SCRIPTS+= python/generator.py -PYTHON_PATCH_SCRIPTS+= python/libvirt.py -PYTHON_PATCH_SCRIPTS+= src/esx/esx_vi_generator.py -PYTHON_PATCH_SCRIPTS+= docs/apibuild.py +REPLACE_PYTHON+= examples/python/domstart.py +REPLACE_PYTHON+= examples/python/domrestore.py +REPLACE_PYTHON+= examples/python/dominfo.py +REPLACE_PYTHON+= examples/python/domsave.py +REPLACE_PYTHON+= examples/python/esxlist.py +REPLACE_PYTHON+= examples/domain-events/events-python/event-test.py +REPLACE_PYTHON+= python/tests/create.py +REPLACE_PYTHON+= python/tests/error.py +REPLACE_PYTHON+= python/tests/uuid.py +REPLACE_PYTHON+= python/tests/basic.py +REPLACE_PYTHON+= python/tests/node.py +REPLACE_PYTHON+= python/libvirt-override.py +REPLACE_PYTHON+= python/libvirt-override-virStream.py +REPLACE_PYTHON+= python/libvirt-override-virConnect.py +REPLACE_PYTHON+= python/generator.py +REPLACE_PYTHON+= python/libvirt.py +REPLACE_PYTHON+= src/esx/esx_vi_generator.py +REPLACE_PYTHON+= docs/apibuild.py EGDIR= ${PREFIX}/share/examples CONF_FILES+= ${EGDIR}/libvirt/libvirtd.conf ${PKG_SYSCONFDIR}/libvirt/libvirtd.conf diff --git a/sysutils/logfinder/Makefile b/sysutils/logfinder/Makefile index b4ef1567df5..dc22bb49f52 100644 --- a/sysutils/logfinder/Makefile +++ b/sysutils/logfinder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/23 19:51:11 asau Exp $ +# $NetBSD: Makefile,v 1.11 2014/01/25 10:45:21 wiz Exp $ # DISTNAME= logfinder-0.1 @@ -14,7 +14,7 @@ DEPENDS+= lsof>=4.72:../../sysutils/lsof NO_BUILD= YES -PYTHON_PATCH_SCRIPTS+= ${WRKSRC}/logfinder.py +REPLACE_PYTHON+= ${WRKSRC}/logfinder.py INSTALLATION_DIRS= sbin do-install: diff --git a/sysutils/tdir/Makefile b/sysutils/tdir/Makefile index ce78805f37c..810d0016979 100644 --- a/sysutils/tdir/Makefile +++ b/sysutils/tdir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/10/17 16:47:41 shattered Exp $ +# $NetBSD: Makefile,v 1.22 2014/01/25 10:45:21 wiz Exp $ # DISTNAME= tdir-1.69 @@ -12,7 +12,7 @@ LICENSE= tdir-license NOT_FOR_BULK_PLATFORM= HPUX-*-* USE_TOOLS+= gunzip -PYTHON_PATCH_SCRIPTS= tdir +REPLACE_PYTHON= tdir INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/tdir do-install: diff --git a/sysutils/vxargs/Makefile b/sysutils/vxargs/Makefile index b4d6c81b802..e488807f48b 100644 --- a/sysutils/vxargs/Makefile +++ b/sysutils/vxargs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/06/04 07:38:49 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2014/01/25 10:45:21 wiz Exp $ DISTNAME= vxargs-0.3.3 PKGREVISION= 2 @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR} INSTALLATION_DIRS= bin -PYTHON_PATCH_SCRIPTS= vxargs.py +REPLACE_PYTHON= vxargs.py .include "../../lang/python/application.mk" diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile index 7805297a3d8..331a26d5284 100644 --- a/sysutils/xentools20/Makefile +++ b/sysutils/xentools20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2014/01/25 10:30:22 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2014/01/25 10:45:21 wiz Exp $ DISTNAME= xen-2.0.7-src PKGNAME= xentools20-2.0.7 @@ -33,18 +33,18 @@ MAKE_ENV+= EGDIR=${EGDIR:Q} MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} PY_PATCHPLIST= yes -PYTHON_PATCH_SCRIPTS= python/xen/util/console_client.py -PYTHON_PATCH_SCRIPTS+= python/xen/xend/server/SrvServer.py -PYTHON_PATCH_SCRIPTS+= python/xen/xend/XendClient.py -PYTHON_PATCH_SCRIPTS+= python/xen/xend/sxp.py -PYTHON_PATCH_SCRIPTS+= xfrd/xfrdClient.py -PYTHON_PATCH_SCRIPTS+= misc/xensymoops -PYTHON_PATCH_SCRIPTS+= misc/xencons -PYTHON_PATCH_SCRIPTS+= misc/xm -PYTHON_PATCH_SCRIPTS+= misc/xensv -PYTHON_PATCH_SCRIPTS+= misc/netfix -PYTHON_PATCH_SCRIPTS+= misc/xend -PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format +REPLACE_PYTHON= python/xen/util/console_client.py +REPLACE_PYTHON+= python/xen/xend/server/SrvServer.py +REPLACE_PYTHON+= python/xen/xend/XendClient.py +REPLACE_PYTHON+= python/xen/xend/sxp.py +REPLACE_PYTHON+= xfrd/xfrdClient.py +REPLACE_PYTHON+= misc/xensymoops +REPLACE_PYTHON+= misc/xencons +REPLACE_PYTHON+= misc/xm +REPLACE_PYTHON+= misc/xensv +REPLACE_PYTHON+= misc/netfix +REPLACE_PYTHON+= misc/xend +REPLACE_PYTHON+= xentrace/xentrace_format SUBST_CLASSES+= paths py conf SUBST_STAGE.paths= pre-configure diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile index 3999aa0a280..3e492db43e1 100644 --- a/sysutils/xentools3/Makefile +++ b/sysutils/xentools3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2014/01/25 10:30:22 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2014/01/25 10:45:21 wiz Exp $ VERSION= 3.1.4 DISTNAME= xen-${VERSION} @@ -49,25 +49,25 @@ MAKE_ENV+= XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64" MAKE_ENV+= XEN_TARGET_ARCH="unsupported" .endif PY_PATCHPLIST= yes -PYTHON_PATCH_SCRIPTS+= misc/xm -PYTHON_PATCH_SCRIPTS+= misc/netfix -PYTHON_PATCH_SCRIPTS+= misc/xen-bugtool -PYTHON_PATCH_SCRIPTS+= misc/xencons -PYTHON_PATCH_SCRIPTS+= misc/xend -PYTHON_PATCH_SCRIPTS+= misc/xensymoops -PYTHON_PATCH_SCRIPTS+= misc/xen-python-path -PYTHON_PATCH_SCRIPTS+= pygrub/src/pygrub -PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py -PYTHON_PATCH_SCRIPTS+= python/xen/xend/*.py -PYTHON_PATCH_SCRIPTS+= python/xen/xm/*.py -PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py -PYTHON_PATCH_SCRIPTS+= python/*.py -PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/cgi-bin/policy.cgi -PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/*.py -PYTHON_PATCH_SCRIPTS+= security/python/*.py -PYTHON_PATCH_SCRIPTS+= security/*.py -PYTHON_PATCH_SCRIPTS+= xenmon/*.py -PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format +REPLACE_PYTHON+= misc/xm +REPLACE_PYTHON+= misc/netfix +REPLACE_PYTHON+= misc/xen-bugtool +REPLACE_PYTHON+= misc/xencons +REPLACE_PYTHON+= misc/xend +REPLACE_PYTHON+= misc/xensymoops +REPLACE_PYTHON+= misc/xen-python-path +REPLACE_PYTHON+= pygrub/src/pygrub +REPLACE_PYTHON+= python/xen/util/*.py +REPLACE_PYTHON+= python/xen/xend/*.py +REPLACE_PYTHON+= python/xen/xm/*.py +REPLACE_PYTHON+= python/xen/util/*.py +REPLACE_PYTHON+= python/*.py +REPLACE_PYTHON+= security/python/xensec_gen/cgi-bin/policy.cgi +REPLACE_PYTHON+= security/python/xensec_gen/*.py +REPLACE_PYTHON+= security/python/*.py +REPLACE_PYTHON+= security/*.py +REPLACE_PYTHON+= xenmon/*.py +REPLACE_PYTHON+= xentrace/xentrace_format SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile index 0ec7f283685..f204670eb9b 100644 --- a/sysutils/xentools33/Makefile +++ b/sysutils/xentools33/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2014/01/25 10:30:22 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2014/01/25 10:45:21 wiz Exp $ VERSION= 3.3.2 DISTNAME= xen-${VERSION} @@ -50,25 +50,25 @@ MAKE_ENV+= XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64" MAKE_ENV+= XEN_TARGET_ARCH="unsupported" .endif PY_PATCHPLIST= yes -PYTHON_PATCH_SCRIPTS+= misc/xm -PYTHON_PATCH_SCRIPTS+= misc/netfix -PYTHON_PATCH_SCRIPTS+= misc/xen-bugtool -PYTHON_PATCH_SCRIPTS+= misc/xencons -PYTHON_PATCH_SCRIPTS+= misc/xend -PYTHON_PATCH_SCRIPTS+= misc/xensymoops -PYTHON_PATCH_SCRIPTS+= misc/xen-python-path -PYTHON_PATCH_SCRIPTS+= pygrub/src/pygrub -PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py -PYTHON_PATCH_SCRIPTS+= python/xen/xend/*.py -PYTHON_PATCH_SCRIPTS+= python/xen/xm/*.py -PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py -PYTHON_PATCH_SCRIPTS+= python/*.py -PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/cgi-bin/policy.cgi -PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/*.py -PYTHON_PATCH_SCRIPTS+= security/python/*.py -PYTHON_PATCH_SCRIPTS+= security/*.py -PYTHON_PATCH_SCRIPTS+= xenmon/*.py -PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format +REPLACE_PYTHON+= misc/xm +REPLACE_PYTHON+= misc/netfix +REPLACE_PYTHON+= misc/xen-bugtool +REPLACE_PYTHON+= misc/xencons +REPLACE_PYTHON+= misc/xend +REPLACE_PYTHON+= misc/xensymoops +REPLACE_PYTHON+= misc/xen-python-path +REPLACE_PYTHON+= pygrub/src/pygrub +REPLACE_PYTHON+= python/xen/util/*.py +REPLACE_PYTHON+= python/xen/xend/*.py +REPLACE_PYTHON+= python/xen/xm/*.py +REPLACE_PYTHON+= python/xen/util/*.py +REPLACE_PYTHON+= python/*.py +REPLACE_PYTHON+= security/python/xensec_gen/cgi-bin/policy.cgi +REPLACE_PYTHON+= security/python/xensec_gen/*.py +REPLACE_PYTHON+= security/python/*.py +REPLACE_PYTHON+= security/*.py +REPLACE_PYTHON+= xenmon/*.py +REPLACE_PYTHON+= xentrace/xentrace_format SUBST_CLASSES+= pathsvar SUBST_STAGE.pathsvar= pre-configure diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile index 3d321fead3a..79998b0d304 100644 --- a/sysutils/xentools41/Makefile +++ b/sysutils/xentools41/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:22 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2014/01/25 10:45:21 wiz Exp $ # # VERSION is set in version.mk as it is shared with other packages .include "version.mk" @@ -62,25 +62,25 @@ MAKE_ENV+= V=YES #MAKE_ENV+= INSTALL_PROG=${BSD_INSTALL_PROGRAM} PY_PATCHPLIST= yes -#PYTHON_PATCH_SCRIPTS+= misc/xm -#PYTHON_PATCH_SCRIPTS+= misc/netfix -#PYTHON_PATCH_SCRIPTS+= misc/xen-bugtool -#PYTHON_PATCH_SCRIPTS+= misc/xencons -#PYTHON_PATCH_SCRIPTS+= misc/xend -#PYTHON_PATCH_SCRIPTS+= misc/xensymoops -#PYTHON_PATCH_SCRIPTS+= misc/xen-python-path -#PYTHON_PATCH_SCRIPTS+= pygrub/src/pygrub -#PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py -#PYTHON_PATCH_SCRIPTS+= python/xen/xend/*.py -#PYTHON_PATCH_SCRIPTS+= python/xen/xm/*.py -#PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py -#PYTHON_PATCH_SCRIPTS+= python/*.py -#PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/cgi-bin/policy.cgi -#PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/*.py -#PYTHON_PATCH_SCRIPTS+= security/python/*.py -#PYTHON_PATCH_SCRIPTS+= security/*.py -#PYTHON_PATCH_SCRIPTS+= xenmon/*.py -#PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format +#REPLACE_PYTHON+= misc/xm +#REPLACE_PYTHON+= misc/netfix +#REPLACE_PYTHON+= misc/xen-bugtool +#REPLACE_PYTHON+= misc/xencons +#REPLACE_PYTHON+= misc/xend +#REPLACE_PYTHON+= misc/xensymoops +#REPLACE_PYTHON+= misc/xen-python-path +#REPLACE_PYTHON+= pygrub/src/pygrub +#REPLACE_PYTHON+= python/xen/util/*.py +#REPLACE_PYTHON+= python/xen/xend/*.py +#REPLACE_PYTHON+= python/xen/xm/*.py +#REPLACE_PYTHON+= python/xen/util/*.py +#REPLACE_PYTHON+= python/*.py +#REPLACE_PYTHON+= security/python/xensec_gen/cgi-bin/policy.cgi +#REPLACE_PYTHON+= security/python/xensec_gen/*.py +#REPLACE_PYTHON+= security/python/*.py +#REPLACE_PYTHON+= security/*.py +#REPLACE_PYTHON+= xenmon/*.py +#REPLACE_PYTHON+= xentrace/xentrace_format REPLACE_PYTHON+= python/xen/remus/*.py REPLACE_PYTHON+= python/xen/util/*.py diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile index f371edeacad..ee7b6e70e96 100644 --- a/sysutils/xentools42/Makefile +++ b/sysutils/xentools42/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:23 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2014/01/25 10:45:21 wiz Exp $ VERSION= 4.2.3 VERSION_IPXE= 1.0.0 @@ -63,25 +63,25 @@ MAKE_ENV+= V=YES #MAKE_ENV+= INSTALL_PROG=${BSD_INSTALL_PROGRAM} PY_PATCHPLIST= yes -#PYTHON_PATCH_SCRIPTS+= misc/xm -#PYTHON_PATCH_SCRIPTS+= misc/netfix -#PYTHON_PATCH_SCRIPTS+= misc/xen-bugtool -#PYTHON_PATCH_SCRIPTS+= misc/xencons -#PYTHON_PATCH_SCRIPTS+= misc/xend -#PYTHON_PATCH_SCRIPTS+= misc/xensymoops -#PYTHON_PATCH_SCRIPTS+= misc/xen-python-path -#PYTHON_PATCH_SCRIPTS+= pygrub/src/pygrub -#PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py -#PYTHON_PATCH_SCRIPTS+= python/xen/xend/*.py -#PYTHON_PATCH_SCRIPTS+= python/xen/xm/*.py -#PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py -#PYTHON_PATCH_SCRIPTS+= python/*.py -#PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/cgi-bin/policy.cgi -#PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/*.py -#PYTHON_PATCH_SCRIPTS+= security/python/*.py -#PYTHON_PATCH_SCRIPTS+= security/*.py -#PYTHON_PATCH_SCRIPTS+= xenmon/*.py -#PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format +#REPLACE_PYTHON+= misc/xm +#REPLACE_PYTHON+= misc/netfix +#REPLACE_PYTHON+= misc/xen-bugtool +#REPLACE_PYTHON+= misc/xencons +#REPLACE_PYTHON+= misc/xend +#REPLACE_PYTHON+= misc/xensymoops +#REPLACE_PYTHON+= misc/xen-python-path +#REPLACE_PYTHON+= pygrub/src/pygrub +#REPLACE_PYTHON+= python/xen/util/*.py +#REPLACE_PYTHON+= python/xen/xend/*.py +#REPLACE_PYTHON+= python/xen/xm/*.py +#REPLACE_PYTHON+= python/xen/util/*.py +#REPLACE_PYTHON+= python/*.py +#REPLACE_PYTHON+= security/python/xensec_gen/cgi-bin/policy.cgi +#REPLACE_PYTHON+= security/python/xensec_gen/*.py +#REPLACE_PYTHON+= security/python/*.py +#REPLACE_PYTHON+= security/*.py +#REPLACE_PYTHON+= xenmon/*.py +#REPLACE_PYTHON+= xentrace/xentrace_format REPLACE_PYTHON+= misc/sbdf2devicepath misc/sxp-pretty misc/xen-bugtool REPLACE_PYTHON+= misc/xen-python-path misc/xen-ringwatch misc/xencons diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile index a06621faf6d..9396ad737e1 100644 --- a/textproc/asciidoc/Makefile +++ b/textproc/asciidoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2014/01/25 10:30:23 wiz Exp $ +# $NetBSD: Makefile,v 1.39 2014/01/25 10:45:21 wiz Exp $ DISTNAME= asciidoc-8.6.9 PKGREVISION= 1 @@ -14,12 +14,12 @@ DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl DEPENDS+= getopt-[0-9]*:../../misc/getopt USE_TOOLS+= pax -PYTHON_PATCH_SCRIPTS= a2x.py asciidoc.py asciidocapi.py -PYTHON_PATCH_SCRIPTS+= filters/code/code-filter.py -PYTHON_PATCH_SCRIPTS+= filters/latex/latex2png.py -PYTHON_PATCH_SCRIPTS+= filters/music/music2png.py -PYTHON_PATCH_SCRIPTS+= filters/graphviz/graphviz2png.py -PYTHON_PATCH_SCRIPTS+= tests/testasciidoc.py tests/asciidocapi.py +REPLACE_PYTHON= a2x.py asciidoc.py asciidocapi.py +REPLACE_PYTHON+= filters/code/code-filter.py +REPLACE_PYTHON+= filters/latex/latex2png.py +REPLACE_PYTHON+= filters/music/music2png.py +REPLACE_PYTHON+= filters/graphviz/graphviz2png.py +REPLACE_PYTHON+= tests/testasciidoc.py tests/asciidocapi.py NO_BUILD= yes diff --git a/textproc/doclifter/Makefile b/textproc/doclifter/Makefile index de51eb1ec8c..1f2113c3249 100644 --- a/textproc/doclifter/Makefile +++ b/textproc/doclifter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/25 06:55:47 asau Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:45:21 wiz Exp $ # DISTNAME= doclifter-2.3 @@ -12,7 +12,7 @@ COMMENT= Translates documents written in troff macros to DocBook NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= doclifter manlifter +REPLACE_PYTHON= doclifter manlifter SUBST_CLASSES+= bin-path SUBST_STAGE.bin-path= pre-configure diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile index 88694c76a13..f8a94942d3f 100644 --- a/textproc/py-xml/Makefile +++ b/textproc/py-xml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2014/01/25 10:30:25 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2014/01/25 10:45:21 wiz Exp $ DISTNAME= PyXML-0.8.4 PKGNAME= ${PYPKGPREFIX}-xml-0.8.4 @@ -31,7 +31,7 @@ post-extract: ${MV} ${WRKSRC}/${s} ${WRKSRC}/${s}${PYVERSSUFFIX} .endfor -PYTHON_PATCH_SCRIPTS= ${PYXML_SCRIPTS:S/$/${PYVERSSUFFIX}/g} +REPLACE_PYTHON= ${PYXML_SCRIPTS:S/$/${PYVERSSUFFIX}/g} PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} .include "../../textproc/expat/buildlink3.mk" diff --git a/time/gdeskcal/Makefile b/time/gdeskcal/Makefile index ffcb1bffcfd..c7264902581 100644 --- a/time/gdeskcal/Makefile +++ b/time/gdeskcal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2014/01/25 10:30:25 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2014/01/25 10:45:21 wiz Exp $ DISTNAME= gDeskCal-0_57_1 PKGNAME= gdeskcal-0.57.1 @@ -13,7 +13,7 @@ COMMENT= Desktop calendar WRKSRC= ${WRKDIR}/gDeskCal-0.57.1 NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= gdeskcal +REPLACE_PYTHON= gdeskcal PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml, py-gtk2 diff --git a/wm/icecc/Makefile b/wm/icecc/Makefile index 433c1ed1c79..d194f854572 100644 --- a/wm/icecc/Makefile +++ b/wm/icecc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:26 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2014/01/25 10:45:21 wiz Exp $ # Package version reflects icecc version, with PKGREVISION incremented # for any tool updates, according to the authors scheme. @@ -35,9 +35,9 @@ WRKSRC= ${WRKDIR} CONFIGURE_DIRS= icecc-2.9 icebgset-1.3 iceked-1.5 icemc-2.1 CONFIGURE_DIRS+= icesndcfg-1.3 icets-1.4 icewoed-1.8 -PYTHON_PATCH_SCRIPTS= icecursorscfg-0.6/icecurcfg.py iceiconcvt-1.0/iceiconcvt.py -PYTHON_PATCH_SCRIPTS+= icemergeprefs-0.5/icemergeprefs.py icerrun-0.5/icerrrun.py -PYTHON_PATCH_SCRIPTS+= icerrun-0.5/icerrun.py +REPLACE_PYTHON= icecursorscfg-0.6/icecurcfg.py iceiconcvt-1.0/iceiconcvt.py +REPLACE_PYTHON+= icemergeprefs-0.5/icemergeprefs.py icerrun-0.5/icerrrun.py +REPLACE_PYTHON+= icerrun-0.5/icerrun.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-qt3-base @@ -67,7 +67,7 @@ post-build: cd ${WRKSRC}/icewm4vim && ${SETENV} ${MAKE_ENV} ${GMAKE} QTDIR=${QTDIR:Q} post-install: -. for script in ${PYTHON_PATCH_SCRIPTS} +. for script in ${REPLACE_PYTHON} ${INSTALL_SCRIPT} ${WRKSRC}/${script:Q} ${DESTDIR}${PREFIX}/bin . endfor ${INSTALL_PROGRAM} ${WRKSRC}/icewm4vim/icecolsel ${DESTDIR}${PREFIX}/bin diff --git a/wm/oroborox/Makefile b/wm/oroborox/Makefile index 4c58f0acf0c..d5b1ac24ac5 100644 --- a/wm/oroborox/Makefile +++ b/wm/oroborox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2013/10/10 14:42:34 ryoon Exp $ +# $NetBSD: Makefile,v 1.43 2014/01/25 10:45:22 wiz Exp $ # DISTNAME= OroboROX-0.9.8 @@ -23,11 +23,11 @@ USE_TOOLS+= autoconf pax pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-xft --with-platform=${PLATFORM:Q} -PYTHON_PATCH_SCRIPTS= Configure/OroboScheme/AppRun -PYTHON_PATCH_SCRIPTS+= Configure/OroboScheme/AppInfo.py -PYTHON_PATCH_SCRIPTS+= Configure/OroboScheme/Schemer.py -PYTHON_PATCH_SCRIPTS+= Configure/Windows/AppRun -PYTHON_PATCH_SCRIPTS+= Configure/Workspaces/AppRun +REPLACE_PYTHON= Configure/OroboScheme/AppRun +REPLACE_PYTHON+= Configure/OroboScheme/AppInfo.py +REPLACE_PYTHON+= Configure/OroboScheme/Schemer.py +REPLACE_PYTHON+= Configure/Windows/AppRun +REPLACE_PYTHON+= Configure/Workspaces/AppRun INSTALLATION_DIRS= share/rox/OroboROX diff --git a/www/browser-bookmarks-menu/Makefile b/www/browser-bookmarks-menu/Makefile index 7dbd79176df..bfa4bab6e8b 100644 --- a/www/browser-bookmarks-menu/Makefile +++ b/www/browser-bookmarks-menu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2014/01/25 10:30:26 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2014/01/25 10:45:22 wiz Exp $ DISTNAME= browser-bookmarks-menu-0.6 PKGREVISION= 28 @@ -10,7 +10,7 @@ HOMEPAGE= http://browserbookapp.sourceforge.net/ COMMENT= Easy access to web bookmarks through a GNOME Panel Applet NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= browser-bookmarks-menu.py +REPLACE_PYTHON= browser-bookmarks-menu.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 SUBST_CLASSES+= paths diff --git a/www/trac/Makefile b/www/trac/Makefile index c5e9100e3b9..69eaa57dc60 100644 --- a/www/trac/Makefile +++ b/www/trac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2014/01/25 10:30:30 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2014/01/25 10:45:22 wiz Exp $ DISTNAME= Trac-1.0.1 PKGNAME= ${DISTNAME:tl} @@ -44,8 +44,8 @@ PKG_SUGGESTED_OPTIONS= sqlite PYDISTUTILSPKG= YES PY_PATCHPLIST= YES -PYTHON_PATCH_SCRIPTS= contrib/cgi-bin/trac.* contrib/*.py contrib/*-hook -PYTHON_PATCH_SCRIPTS+= trac/tests/functional/*.py +REPLACE_PYTHON= contrib/cgi-bin/trac.* contrib/*.py contrib/*-hook +REPLACE_PYTHON+= trac/tests/functional/*.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0 .include "../../lang/python/application.mk" diff --git a/www/viewvc/Makefile b/www/viewvc/Makefile index ee5cf296c55..bf809a80ab8 100644 --- a/www/viewvc/Makefile +++ b/www/viewvc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:30 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/25 10:45:22 wiz Exp $ DISTNAME= viewvc-1.1.20 CATEGORIES= devel www @@ -9,7 +9,7 @@ HOMEPAGE= http://www.viewvc.org/ COMMENT= Viewing the content of CVS/SVN repositories with a Webbrowser LICENSE= 2-clause-bsd -PYTHON_PATCH_SCRIPTS= viewvc-install bin/* bin/cgi/*.cgi lib/*.py +REPLACE_PYTHON= viewvc-install bin/* bin/cgi/*.cgi lib/*.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.1.20 .if !exists(/usr/bin/rlog) diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 8dca5e5f34e..23191d64845 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.124 2014/01/25 10:30:30 wiz Exp $ +# $NetBSD: Makefile,v 1.125 2014/01/25 10:45:22 wiz Exp $ DISTNAME= gnome-applets-2.32.1.1 PKGREVISION= 35 @@ -54,8 +54,8 @@ PRINT_PLIST_AWK+= /examples/ { print "$${PLIST.battstat}"$$0; next; } .include "../../devel/GConf/schemas.mk" PY_PATCHPLIST= yes -PYTHON_PATCH_SCRIPTS+= invest-applet/invest/invest-applet.py -PYTHON_PATCH_SCRIPTS+= invest-applet/invest/invest-chart +REPLACE_PYTHON+= invest-applet/invest/invest-applet.py +REPLACE_PYTHON+= invest-applet/invest/invest-chart .include "../../devel/gettext-lib/buildlink3.mk" BUILDLINK_API_DEPENDS.glib2+= glib2>=2.18.0 diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index e60ad75ca7f..ee7256494b3 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.257 2013/12/08 14:04:39 prlw1 Exp $ +# $NetBSD: Makefile,v 1.258 2014/01/25 10:45:22 wiz Exp $ DISTNAME= gtk+-2.24.22 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -75,7 +75,7 @@ CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" #SUBST_SED.pthread= -e 's,__PTHREAD_FLAGS__,${BUILDLINK_LDFLAGS.pthread},g' #SUBST_FILES.pthread= gdk-pixbuf/Makefile.in -PYTHON_PATCH_SCRIPTS= gtk/gtk-builder-convert +REPLACE_PYTHON= gtk/gtk-builder-convert # We remove the module databases during post-install since we create them # anew in the +INSTALL script as part of the POST-INSTALL action. diff --git a/x11/rox-session/Makefile b/x11/rox-session/Makefile index e5dc22db0c4..525f257a25c 100644 --- a/x11/rox-session/Makefile +++ b/x11/rox-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2014/01/25 10:30:32 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2014/01/25 10:45:22 wiz Exp $ DISTNAME= rox-session-0.28 PKGREVISION= 26 @@ -17,7 +17,7 @@ DIST_SUBDIR= rox NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= AppRun tests/testutils.py +REPLACE_PYTHON= AppRun tests/testutils.py PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 INSTALLATION_DIRS= share/rox/ROX-Session diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile index 2d00d8ecf75..d4906e47236 100644 --- a/x11/rox-wallpaper/Makefile +++ b/x11/rox-wallpaper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/29 05:06:50 asau Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:45:22 wiz Exp $ # DISTNAME= wallpaper-2.0 @@ -19,7 +19,7 @@ DIST_SUBDIR= rox NO_BUILD= yes -PYTHON_PATCH_SCRIPTS= AppRun +REPLACE_PYTHON= AppRun INSTALLATION_DIRS= share/rox/Wallpaper |