pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc No need to have two variables for the same logic.
details: https://anonhg.NetBSD.org/pkgsrc/rev/cf929ae0e1ee
branches: trunk
changeset: 629659:cf929ae0e1ee
user: wiz <wiz%pkgsrc.org@localhost>
date: Sat Jan 25 10:45:15 2014 +0000
description:
No need to have two variables for the same logic.
Replace PYTHON_PATCH_SCRIPTS with REPLACE_PYTHON.
diffstat:
archivers/rox-archive/Makefile | 4 +-
audio/amaroc/Makefile | 4 +-
audio/amarok-kde3/Makefile | 4 +-
audio/aubio/Makefile | 4 +-
audio/cplay/Makefile | 4 +-
audio/exaile/Makefile | 4 +-
audio/moss/Makefile | 4 +-
audio/quodlibet2/Makefile | 4 +-
audio/solfege/Makefile | 4 +-
databases/luma/Makefile | 4 +-
databases/oraedit/Makefile | 4 +-
devel/bzr-svn/Makefile | 4 +-
devel/bzr/Makefile | 10 +-
devel/bzrtools/Makefile | 4 +-
devel/cvs2svn/Makefile | 4 +-
devel/meld/Makefile | 4 +-
devel/ncc/Makefile | 4 +-
devel/py-InlineEgg/Makefile | 4 +-
devel/py-idle/Makefile | 4 +-
devel/py-subversion/Makefile | 4 +-
devel/roundup/Makefile | 28 +++---
devel/rox-lib/Makefile | 8 +-
devel/stgit/Makefile | 4 +-
editors/TeXmacs-devel/Makefile | 8 +-
editors/TeXmacs/Makefile | 8 +-
editors/lyx/Makefile | 4 +-
editors/rox-edit/Makefile | 4 +-
filesystems/fuse-gmailfs/Makefile | 4 +-
fonts/mkfontalias/Makefile | 4 +-
games/4stAttack/Makefile | 4 +-
games/freeciv-share/Makefile.common | 4 +-
games/gnome-games/Makefile | 6 +-
games/monsterz/Makefile | 4 +-
graphics/dia-python/Makefile | 8 +-
graphics/gif2png/Makefile | 4 +-
graphics/skencil/Makefile | 4 +-
ham/gnuradio-audio-jack/Makefile | 4 +-
ham/gnuradio-audio-oss/Makefile | 4 +-
ham/gnuradio-audio-portaudio/Makefile | 4 +-
ham/gnuradio-core/Makefile | 126 +++++++++++++++++-----------------
ham/gnuradio-examples/Makefile | 56 +++++++-------
ham/gnuradio-gsm/Makefile | 6 +-
ham/gnuradio-radio-astronomy/Makefile | 14 +-
ham/gnuradio-trellis/Makefile | 12 +-
ham/gnuradio-usrp/Makefile | 8 +-
ham/gnuradio-video-sdl/Makefile | 4 +-
ham/gnuradio-wxgui/Makefile | 8 +-
ham/usrp/Makefile | 18 ++--
mail/evolution-data-server/Makefile | 4 +-
mail/fetchmailconf/Makefile | 4 +-
mail/getmail/Makefile | 4 +-
mail/mailman/Makefile | 8 +-
mail/newspipe/Makefile | 4 +-
mail/pymsgauth/Makefile | 6 +-
mail/queue-repair/Makefile | 4 +-
mail/tmda/Makefile | 4 +-
misc/deskbar-applet/Makefile | 4 +-
misc/mtail/Makefile | 4 +-
misc/routeplanner-cli/Makefile | 4 +-
misc/rox-memo/Makefile | 4 +-
multimedia/pitivi/Makefile | 4 +-
net/bittornado-gui/Makefile | 6 +-
net/bittorrent-gui/Makefile | 4 +-
net/flow-tools/Makefile | 4 +-
net/ipcheck/Makefile | 4 +-
net/pygopherd/Makefile | 14 +-
pkgtools/pkglint/files/makevars.map | 4 +-
print/bg5pdf/Makefile | 4 +-
security/flawfinder/Makefile | 4 +-
security/py-prewikka/Makefile | 4 +-
security/pyca/Makefile | 6 +-
security/sshfp/Makefile | 4 +-
sysutils/libvirt/Makefile | 38 +++++-----
sysutils/logfinder/Makefile | 4 +-
sysutils/tdir/Makefile | 4 +-
sysutils/vxargs/Makefile | 4 +-
sysutils/xentools20/Makefile | 26 +++---
sysutils/xentools3/Makefile | 40 +++++-----
sysutils/xentools33/Makefile | 40 +++++-----
sysutils/xentools41/Makefile | 40 +++++-----
sysutils/xentools42/Makefile | 40 +++++-----
textproc/asciidoc/Makefile | 14 +-
textproc/doclifter/Makefile | 4 +-
textproc/py-xml/Makefile | 4 +-
time/gdeskcal/Makefile | 4 +-
wm/icecc/Makefile | 10 +-
wm/oroborox/Makefile | 12 +-
www/browser-bookmarks-menu/Makefile | 4 +-
www/trac/Makefile | 6 +-
www/viewvc/Makefile | 4 +-
x11/gnome-applets/Makefile | 6 +-
x11/gtk2/Makefile | 4 +-
x11/rox-session/Makefile | 4 +-
x11/rox-wallpaper/Makefile | 4 +-
94 files changed, 444 insertions(+), 444 deletions(-)
diffs (truncated from 2220 to 300 lines):
diff -r 47b636198ea4 -r cf929ae0e1ee archivers/rox-archive/Makefile
--- a/archivers/rox-archive/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/archivers/rox-archive/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee audio/amaroc/Makefile
--- a/audio/amaroc/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/audio/amaroc/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee audio/amarok-kde3/Makefile
--- a/audio/amarok-kde3/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/audio/amarok-kde3/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee audio/aubio/Makefile
--- a/audio/aubio/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/audio/aubio/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
# 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 -r 47b636198ea4 -r cf929ae0e1ee audio/cplay/Makefile
--- a/audio/cplay/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/audio/cplay/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
-PYTHON_PATCH_SCRIPTS= cplay
+REPLACE_PYTHON= cplay
USE_PKGLOCALEDIR= yes
USE_TOOLS+= msgfmt
diff -r 47b636198ea4 -r cf929ae0e1ee audio/exaile/Makefile
--- a/audio/exaile/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/audio/exaile/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee audio/moss/Makefile
--- a/audio/moss/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/audio/moss/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee audio/quodlibet2/Makefile
--- a/audio/quodlibet2/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/audio/quodlibet2/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee audio/solfege/Makefile
--- a/audio/solfege/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/audio/solfege/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee databases/luma/Makefile
--- a/databases/luma/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/databases/luma/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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_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 -r 47b636198ea4 -r cf929ae0e1ee databases/oraedit/Makefile
--- a/databases/oraedit/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/databases/oraedit/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
NO_BUILD= yes
-PYTHON_PATCH_SCRIPTS= oraedit
+REPLACE_PYTHON= oraedit
INSTALLATION_DIRS= bin
do-configure:;
diff -r 47b636198ea4 -r cf929ae0e1ee devel/bzr-svn/Makefile
--- a/devel/bzr-svn/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/devel/bzr-svn/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee devel/bzr/Makefile
--- a/devel/bzr/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/devel/bzr/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee devel/bzrtools/Makefile
--- a/devel/bzrtools/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/devel/bzrtools/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee devel/cvs2svn/Makefile
--- a/devel/cvs2svn/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/devel/cvs2svn/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee devel/meld/Makefile
--- a/devel/meld/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/devel/meld/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 @@
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 -r 47b636198ea4 -r cf929ae0e1ee devel/ncc/Makefile
--- a/devel/ncc/Makefile Sat Jan 25 10:31:01 2014 +0000
+++ b/devel/ncc/Makefile Sat Jan 25 10:45:15 2014 +0000
@@ -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 $
Home |
Main Index |
Thread Index |
Old Index