diff options
| author | wiz <wiz> | 2014-01-25 10:29:56 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-01-25 10:29:56 +0000 |
| commit | f86d461178033174903bd0d6031d959e38e12ac0 (patch) | |
| tree | 3bbaa4e1a32886abb417eed9e3a6c4c742388c9a /net | |
| parent | f64235a49f032dacf7612c1aa33f6ac70a2eb44d (diff) | |
| download | pkgsrc-f86d461178033174903bd0d6031d959e38e12ac0.tar.gz | |
Mark packages as not ready for python-3.x where applicable;
either because they themselves are not ready or because a
dependency isn't. This is annotated by
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of x.y.z
or
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-foo, py-bar
respectively, please use the same style for other packages,
and check during updates.
Use versioned_dependencies.mk where applicable.
Use REPLACE_PYTHON instead of handcoded alternatives, where applicable.
Reorder Makefile sections into standard order, where applicable.
Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default
with the next commit.
Whitespace cleanups and other nits corrected, where necessary.
Diffstat (limited to 'net')
45 files changed, 111 insertions, 84 deletions
diff --git a/net/Radicale/Makefile b/net/Radicale/Makefile index 08b3dc3f1f8..7a44f2bdd33 100644 --- a/net/Radicale/Makefile +++ b/net/Radicale/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/10/11 09:59:54 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:15 wiz Exp $ DISTNAME= Radicale-0.8 PKGREVISION= 1 @@ -13,7 +13,6 @@ LICENSE= gnu-gpl-v3 PYDISTUTILSPKG= yes EGDIR= share/examples/radicale -PYTHON_VERSIONS_INCLUDE_3X= yes INSTALLATION_DIRS= ${EGDIR} OWN_DIRS= ${PKG_SYSCONFDIR}/radicale CONF_FILES+= ${EGDIR}/config ${PKG_SYSCONFDIR}/radicale/config diff --git a/net/avahi/options.mk b/net/avahi/options.mk index bbf8980891b..bd429b19774 100644 --- a/net/avahi/options.mk +++ b/net/avahi/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2013/06/17 12:44:54 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2014/01/25 10:30:15 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.avahi PKG_SUPPORTED_OPTIONS= avahi-howl gdbm introspection gtk2 gtk3 mono python qt3 @@ -77,8 +77,9 @@ CONFIGURE_ARGS+= --disable-qt4 ### Enable python support ### .if !empty(PKG_OPTIONS:Mpython) -. include "../../lang/python/application.mk" PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 +. include "../../lang/python/application.mk" REPLACE_PYTHON+= avahi-python/avahi-discover/__init__.py . include "../../lang/python/extension.mk" . include "../../sysutils/py-dbus/buildlink3.mk" diff --git a/net/bittornado-gui/Makefile b/net/bittornado-gui/Makefile index a6de769696f..a40a01403ba 100644 --- a/net/bittornado-gui/Makefile +++ b/net/bittornado-gui/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2012/10/23 17:18:12 asau Exp $ -# +# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:15 wiz Exp $ .include "../../net/bittornado/Makefile.common" @@ -17,6 +16,7 @@ NO_BUILD= yes PYTHON_PATCH_SCRIPTS= btcompletedirgui.py btdownloadgui.py PYTHON_PATCH_SCRIPTS+= btmaketorrentgui.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets INSTALLATION_DIRS= bin diff --git a/net/bittornado/Makefile b/net/bittornado/Makefile index f86ea3a644e..63560a04b3f 100644 --- a/net/bittornado/Makefile +++ b/net/bittornado/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/23 17:18:12 asau Exp $ -# +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:15 wiz Exp $ .include "Makefile.common" @@ -10,6 +9,8 @@ CONFLICTS= bittorrent-[0-9]* DEPENDS+= ${PYPKGPREFIX}-cursespanel-[0-9]*:../../devel/py-cursespanel DEPENDS+= ${PYPKGPREFIX}-crypto>=2.0:../../security/py-crypto +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.18 + EGG_NAME= BitTornado-T_${PKGVERSION_NOREV}._BitTornado_ .include "../../lang/python/application.mk" diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile index 4283b98843f..1aedd13a5f6 100644 --- a/net/bittorrent-gui/Makefile +++ b/net/bittorrent-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2012/10/23 17:18:12 asau Exp $ +# $NetBSD: Makefile,v 1.33 2014/01/25 10:30:15 wiz Exp $ .include "../../net/bittorrent/Makefile.common" @@ -11,6 +11,7 @@ DEPENDS+= bittorrent>=${PKGVERSION_NOREV}:../../net/bittorrent DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.6:../../x11/py-gtk2 PYTHON_PATCH_SCRIPTS= bittorrent maketorrent +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 CONFLICTS+= bittornado-gui-[0-9]* diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile index 5f4a9928668..b77830d6b0a 100644 --- a/net/bittorrent/Makefile +++ b/net/bittorrent/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2012/10/23 17:18:12 asau Exp $ +# $NetBSD: Makefile,v 1.46 2014/01/25 10:30:15 wiz Exp $ .include "Makefile.common" @@ -28,6 +28,8 @@ SUBST_FILES.sha+= khashmir/utkhashmir.py SUBST_FILES.sha+= torrentinfo-console.py SUBST_SED.sha= -e "s/^from sha import .*/from hashlib import sha1 as sha/" +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.4.0 + .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/calypso/Makefile b/net/calypso/Makefile index d26e985af88..eebc3b207a6 100644 --- a/net/calypso/Makefile +++ b/net/calypso/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/11/29 16:58:33 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:15 wiz Exp $ DISTNAME= calypso-1.3 CATEGORIES= net time @@ -14,6 +14,8 @@ DEPENDS+= git-base-[0-9]*:../../devel/git-base INSTALLATION_DIRS= share/examples/calypso +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-vobject + REPLACE_PYTHON= calypso.py post-install: diff --git a/net/coherence/Makefile b/net/coherence/Makefile index 53ac8dd7ca2..716ed5772c0 100644 --- a/net/coherence/Makefile +++ b/net/coherence/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:15 asau Exp $ -# +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:15 wiz Exp $ DISTNAME= Coherence-0.6.6.2 PKGNAME= coherence-0.6.6.2 @@ -15,5 +14,7 @@ USE_LANGUAGES= # none DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/gitso/Makefile b/net/gitso/Makefile index c40fb0a6b02..92c9033f2a6 100644 --- a/net/gitso/Makefile +++ b/net/gitso/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/10/10 14:42:27 ryoon Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:16 wiz Exp $ DISTNAME= gitso-0.6 PKGREVISION= 11 @@ -17,6 +17,8 @@ DEPENDS+= x11vnc-[0-9]*:../../x11/x11vnc WRKSRC= ${WRKDIR}/Gitso PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-wxWidgets + USE_TOOLS+= bash:run REPLACE_BASH+= run-gitso.sh.local diff --git a/net/gtk-vnc/options.mk b/net/gtk-vnc/options.mk index 9ec9cd8c89c..9e65d7e06c4 100644 --- a/net/gtk-vnc/options.mk +++ b/net/gtk-vnc/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2013/06/13 07:02:34 obache Exp $ +# $NetBSD: options.mk,v 1.6 2014/01/25 10:30:16 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gtk-vnc PKG_SUPPORTED_OPTIONS= python vnc-sasl pulseaudio @@ -8,6 +8,7 @@ PKG_SUGGESTED_OPTIONS= python vnc-sasl PLIST_VARS= python .if !empty(PKG_OPTIONS:Mpython) +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/extension.mk" .include "../../x11/py-gtk2/buildlink3.mk" PLIST.python= yes diff --git a/net/gupnp-igd/Makefile b/net/gupnp-igd/Makefile index 81d2e8c33b6..064c54a71d9 100644 --- a/net/gupnp-igd/Makefile +++ b/net/gupnp-igd/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2014/01/01 11:52:07 wiz Exp $ -# +# $NetBSD: Makefile,v 1.25 2014/01/25 10:30:16 wiz Exp $ DISTNAME= gupnp-igd-0.2.2 PKGREVISION= 5 @@ -18,6 +17,7 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= gupnp-igd-1.0.pc.in PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.2 CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/net/mimms/Makefile b/net/mimms/Makefile index 4911a3c0e9c..f5c455e5135 100644 --- a/net/mimms/Makefile +++ b/net/mimms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/06/16 21:21:15 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:16 wiz Exp $ DISTNAME= mimms-3.2 CATEGORIES= net multimedia @@ -11,6 +11,7 @@ COMMENT= MMS (e.g. mms://) stream downloader LICENSE= gnu-gpl-v3 USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.2 SUBST_CLASSES+= man SUBST_FILES.man+= setup.py diff --git a/net/mitmproxy/Makefile b/net/mitmproxy/Makefile index 4011ddc5918..73ebf77fa10 100644 --- a/net/mitmproxy/Makefile +++ b/net/mitmproxy/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/05/15 22:39:26 wiz Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:16 wiz Exp $ DISTNAME= mitmproxy-0.9 CATEGORIES= net @@ -19,6 +18,7 @@ DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.13:../../security/py-OpenSSL DEPENDS+= ${PYPKGPREFIX}-urwid>=1.1:../../devel/py-urwid USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-imaging, py-netlib .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/nagstamon/Makefile b/net/nagstamon/Makefile index 481b7d6207e..43965651d37 100644 --- a/net/nagstamon/Makefile +++ b/net/nagstamon/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2013/10/10 14:42:28 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.31 2014/01/25 10:30:16 wiz Exp $ VERSION= 0.9.9 DISTNAME= nagstamon_${VERSION} @@ -13,6 +12,10 @@ HOMEPAGE= http://nagstamon.ifw-dresden.de/ COMMENT= Nagios status monitor which takes place in systray or on desktop LICENSE= gnu-gpl-v2 +DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.4:../../textproc/py-lxml +DEPENDS+= ${PYPKGPREFIX}-libxslt>=1.1.24:../../textproc/py-libxslt +DEPENDS+= sox>=14.0.1:../../audio/sox + USE_LANGUAGES= # none PYDISTUTILSPKG= yes @@ -22,9 +25,7 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1 REPLACE_PYTHON= ${WRKSRC}/*.py REPLACE_PYTHON+= ${WRKSRC}/Nagstamon/Server/Multisite.py -DEPENDS+= ${PYPKGPREFIX}-lxml>=2.2.4:../../textproc/py-lxml -DEPENDS+= ${PYPKGPREFIX}-libxslt>=1.1.24:../../textproc/py-libxslt -DEPENDS+= sox>=14.0.1:../../audio/sox +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-libxslt, py-ORBit via py-gnome2, py-gtk2 SUBST_CLASSES+= mandir SUBST_STAGE.mandir= pre-configure diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile index c79b7e92f00..8e6a8a26ca6 100644 --- a/net/nicotine/Makefile +++ b/net/nicotine/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2012/10/23 17:18:42 asau Exp $ -# +# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:16 wiz Exp $ DISTNAME= nicotine-1.0.8 PKGREVISION= 16 @@ -16,6 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2>=1.99.16:../../x11/py-gtk2 USE_PKGLOCALEDIR= yes USE_LANGUAGES= # empty +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/nmap/options.mk b/net/nmap/options.mk index 0d3c83761a0..23f8dd5410e 100644 --- a/net/nmap/options.mk +++ b/net/nmap/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2013/09/14 14:11:25 drochner Exp $ +# $NetBSD: options.mk,v 1.11 2014/01/25 10:30:16 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nmap @@ -37,6 +37,7 @@ PY_PATCHPLIST= yes REPLACE_PYTHON+= zenmap/zenmapCore/*.py REPLACE_PYTHON+= zenmap/zenmapGUI/*.py REPLACE_PYTHON+= zenmap/zenmapGUI/higwidgets/*.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml, py-sqlite2, py-gtk2 .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/net/omniORB/Makefile b/net/omniORB/Makefile index b1afc282e60..219a4296848 100644 --- a/net/omniORB/Makefile +++ b/net/omniORB/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2014/01/19 11:28:59 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:16 wiz Exp $ DISTNAME= omniORB-4.1.7 CATEGORIES= devel @@ -44,6 +44,7 @@ CONFIGURE_ARGS+=--disable-ipv6 PY_PATCHPLIST= yes REPLACE_PYTHON+= src/tool/omniidl/python/scripts/omniidlrun.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.1.7 post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/omniORB/ diff --git a/net/py-IP/Makefile b/net/py-IP/Makefile index 1017be72756..178f4ec4f82 100644 --- a/net/py-IP/Makefile +++ b/net/py-IP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 17:19:01 asau Exp $ +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:16 wiz Exp $ DISTNAME= IPy-0.75 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/IPy/IP/} @@ -10,8 +10,6 @@ HOMEPAGE= https://github.com/haypo/python-ipy/ COMMENT= Python module to handle IPv4 and IPv6 address LICENSE= modified-bsd -PYTHON_VERSIONS_INCLUDE_3X= yes - do-test: ${RUN}cd ${WRKSRC}/test; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test_IPy.py diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile index d16e45b9ff9..96f389771df 100644 --- a/net/py-ORBit/Makefile +++ b/net/py-ORBit/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2013/01/21 11:49:19 wiz Exp $ -# +# $NetBSD: Makefile,v 1.47 2014/01/25 10:30:16 wiz Exp $ DISTNAME= pyorbit-2.24.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pyorbit/ORBit/} @@ -24,6 +23,8 @@ PYTHON_SELF_CONFLICT= YES BUILDLINK_API_DEPENDS.python26+= python26>=2.6.2nb4 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # dead upstream, no plans to port + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" BUILDLINK_TRANSFORM+= rm:-std=c9x diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile index f94e0f669ec..fac58018860 100644 --- a/net/py-boto/Makefile +++ b/net/py-boto/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/11/11 21:31:08 jakllsch Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:16 wiz Exp $ DISTNAME= boto-2.6.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,6 +17,8 @@ REPLACE_PYTHON+= *.py REPLACE_PYTHON+= boto/*/*.py REPLACE_PYTHON+= bin/* +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-filechunkio + .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-dns3/Makefile b/net/py-dns3/Makefile index c8810b76e12..1f471d91d68 100644 --- a/net/py-dns3/Makefile +++ b/net/py-dns3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2014/01/20 11:10:04 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:16 wiz Exp $ DISTNAME= dnspython3-1.11.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python3-/-/} @@ -12,7 +12,6 @@ LICENSE= modified-bsd USE_LANGUAGES= # none PYTHON_VERSIONS_INCOMPATIBLE= 26 27 -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-foolscap/Makefile b/net/py-foolscap/Makefile index a66277d51a2..9a4c867ddce 100644 --- a/net/py-foolscap/Makefile +++ b/net/py-foolscap/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2012/10/23 17:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:16 wiz Exp $ DISTNAME= foolscap-0.6.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/.tar//} @@ -16,6 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-ZopeInterface>=3.6.1:../../devel/py-ZopeInterface DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.6:../../security/py-OpenSSL +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + TEST_TARGET= test USE_LANGUAGES= # none diff --git a/net/py-google/Makefile b/net/py-google/Makefile index 34e3a20c7ea..a0558c731c6 100644 --- a/net/py-google/Makefile +++ b/net/py-google/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2012/10/23 17:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:17 wiz Exp $ DISTNAME= pygoogle-0.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -15,5 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-SOAPpy-[0-9]*:../../net/py-soappy EGG_NAME= pygoogle-0.5 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml via py-soappy + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-kenosis/Makefile b/net/py-kenosis/Makefile index 7b4b3fbd91d..3fd38c7ee64 100644 --- a/net/py-kenosis/Makefile +++ b/net/py-kenosis/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/10/23 17:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:17 wiz Exp $ DISTNAME= kenosis-0.96 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,6 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat USE_LANGUAGES= # empty PYSETUP= kenosis_setup.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.96 .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-libdnet/Makefile b/net/py-libdnet/Makefile index c0b702ee843..d1f2959e9ff 100644 --- a/net/py-libdnet/Makefile +++ b/net/py-libdnet/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/23 17:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:17 wiz Exp $ DISTNAME= libdnet-1.12 PKGNAME= ${PYPKGPREFIX}-libdnet-1.12 @@ -15,6 +14,7 @@ LICENSE= modified-bsd GNU_CONFIGURE= yes PYSETUPSUBDIR= python +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.12 EGG_NAME= ${DISTNAME:S/^lib//} diff --git a/net/py-libpcap/Makefile b/net/py-libpcap/Makefile index 8e4b1e267e2..c7155bf78be 100644 --- a/net/py-libpcap/Makefile +++ b/net/py-libpcap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2013/06/15 20:18:14 adam Exp $ +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:17 wiz Exp $ DISTNAME= pylibpcap-0.6.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} @@ -12,6 +12,8 @@ LICENSE= modified-bsd BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.9.3nb1 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.6.4 + pre-build: (cd ${WRKSRC} && ${PYTHONBIN} mk-constants.py) diff --git a/net/py-medusa/Makefile b/net/py-medusa/Makefile index 6e5cb708bba..4c47da11096 100644 --- a/net/py-medusa/Makefile +++ b/net/py-medusa/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/10/23 17:19:02 asau Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:17 wiz Exp $ DISTNAME= medusa-0.5.4 PKGREVISION= 1 @@ -13,5 +12,7 @@ COMMENT= Framework for writing asynchronous socket-based servers USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-netifaces/Makefile b/net/py-netifaces/Makefile index 22882f3b094..88c8990a7fc 100644 --- a/net/py-netifaces/Makefile +++ b/net/py-netifaces/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2012/11/26 13:55:00 ryoon Exp $ -# +#y$NetBSD: Makefile,v 1.2 2014/01/25 10:30:17 wiz Exp $ DISTNAME= netifaces-0.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,7 +10,7 @@ HOMEPAGE= http://alastairs-place.net/projects/netifaces/ COMMENT= Portable access to network interfaces from Python LICENSE= mit -PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.8 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-omniORBpy/Makefile b/net/py-omniORBpy/Makefile index 6a92a84ac5e..0a846e177dd 100644 --- a/net/py-omniORBpy/Makefile +++ b/net/py-omniORBpy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2012/10/23 17:19:03 asau Exp $ +# $NetBSD: Makefile,v 1.8 2014/01/25 10:30:17 wiz Exp $ DISTNAME= omniORBpy-3.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,6 +18,7 @@ USE_LANGUAGES+= c c++ MAKE_FILE= GNUmakefile PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # omniORB .include "../../lang/python/application.mk" .include "../../net/omniORB/buildlink3.mk" diff --git a/net/py-pcap/Makefile b/net/py-pcap/Makefile index 3ded00fc7eb..3f4baf6cae9 100644 --- a/net/py-pcap/Makefile +++ b/net/py-pcap/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/02/06 19:31:00 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:17 wiz Exp $ DISTNAME= pypcap-1.1 PKGNAME= ${PYPKGPREFIX}-pcap-1.1 @@ -24,6 +23,7 @@ SUBST_SED.prefix= -e "s|@PREFIX@|${PREFIX}|g" SUBST_STAGE.prefix= post-patch PYDISTUTILSPKG= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-pyrex FILES_SUBST+= PYTHONBIN=${PYTHONBIN:Q} diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile index 71fed0f2357..d6c6f2373ed 100644 --- a/net/py-s3cmd/Makefile +++ b/net/py-s3cmd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/23 17:19:03 asau Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:17 wiz Exp $ DISTNAME= s3cmd-1.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,6 +15,7 @@ PYDISTUTILSPKG= yes MAKE_ENV+= S3CMD_INSTPATH_MAN=${PKGMANDIR} PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.0.1 .include "../../lang/python/pyversion.mk" diff --git a/net/py-soaplib/Makefile b/net/py-soaplib/Makefile index cf6efd8231f..60a52e10510 100644 --- a/net/py-soaplib/Makefile +++ b/net/py-soaplib/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2012/10/23 17:19:03 asau Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:17 wiz Exp $ DISTNAME= soaplib-0.8-20000621 PKGNAME= ${PYPKGPREFIX}-soaplib-0.8 @@ -12,8 +11,6 @@ MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://www.pythonware.com/products/soap/index.htm COMMENT= Implementation of the SOAP 1.1 protocol -PYTHON_VERSIONS_INCLUDE_3X= yes - WRKSRC= ${WRKDIR} NO_BUILD= yes diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile index 424eb3895b1..bd1bdb74e01 100644 --- a/net/py-soappy/Makefile +++ b/net/py-soappy/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2012/10/23 17:19:03 asau Exp $ -# +# $NetBSD: Makefile,v 1.30 2014/01/25 10:30:17 wiz Exp $ DISTNAME= SOAPpy-0.11.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,5 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-xml>=0.8.3:../../textproc/py-xml USE_LANGUAGES= # empty +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-socketpool/Makefile b/net/py-socketpool/Makefile index 5431c500a6a..75562e540af 100644 --- a/net/py-socketpool/Makefile +++ b/net/py-socketpool/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2013/12/31 20:02:38 rodent Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:17 wiz Exp $ DISTNAME= socketpool-0.5.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= net MASTER_SITES= https://pypi.python.org/packages/source/s/socketpool/ -FETCH_USING= curl MAINTAINER= rodent@NetBSD.org HOMEPAGE= https://github.com/benoitc/socketpool @@ -16,6 +15,8 @@ USE_LANGUAGES= # none DOCDIR= share/doc/${PKGBASE:S/${PYPKGPREFIX}/py/1} INSTALLATION_DIRS+= ${DOCDIR} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.5.3 + post-install: ${INSTALL_DATA} ${DESTDIR}${PREFIX}/socketpool/README.rst \ ${DESTDIR}${PREFIX}/${DOCDIR} diff --git a/net/py-spreadmodule/Makefile b/net/py-spreadmodule/Makefile index 6b5e0c5927a..b1f7fab1289 100644 --- a/net/py-spreadmodule/Makefile +++ b/net/py-spreadmodule/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2012/10/23 17:19:03 asau Exp $ -# +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:17 wiz Exp $ DISTNAME= SpreadModule-1.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/SpreadModule/spreadmodule/} @@ -18,6 +17,8 @@ SUBST_STAGE.setup= post-patch SUBST_FILES.setup= setup.py SUBST_SED.setup= -e 's,/usr/local,${BUILDLINK_PREFIX.spread},g' +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.4 + .include "../../net/spread/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-suds/Makefile b/net/py-suds/Makefile index c02e727975f..4520c1cf8a1 100644 --- a/net/py-suds/Makefile +++ b/net/py-suds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/10/23 17:19:03 asau Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:17 wiz Exp $ DISTNAME= suds-0.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,6 +12,7 @@ LICENSE= gnu-lgpl-v3 EGG_NAME= ${DISTNAME} USE_LANGUAGES= # empty +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.4 .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-twisted/Makefile.common b/net/py-twisted/Makefile.common index 0b47c29e725..15d1241b1fb 100644 --- a/net/py-twisted/Makefile.common +++ b/net/py-twisted/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2013/11/13 07:06:58 adam Exp $ +# $NetBSD: Makefile.common,v 1.14 2014/01/25 10:30:17 wiz Exp $ # used by net/py-twisted/Makefile # used by net/py-twisted-docs/Makefile @@ -13,3 +13,5 @@ LICENSE= mit DISTINFO_FILE?= ${.CURDIR}/../py-twisted/distinfo PATCHDIR?= ${.CURDIR}/../py-twisted/patches + +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 13.2.0 diff --git a/net/py-zmq/Makefile b/net/py-zmq/Makefile index 5bcec971a1e..f690759256a 100644 --- a/net/py-zmq/Makefile +++ b/net/py-zmq/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/07/31 12:16:57 drochner Exp $ -# +# $NetBSD: Makefile,v 1.12 2014/01/25 10:30:17 wiz Exp $ DISTNAME= pyzmq-13.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -19,8 +18,6 @@ REPLACE_PYTHON+= zmq/eventloop/minitornado/platform/interface.py REPLACE_PYTHON+= zmq/eventloop/minitornado/platform/posix.py REPLACE_PYTHON+= zmq/eventloop/minitornado/stack_context.py -PYTHON_VERSIONS_INCLUDE_3X= yes - .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" .include "../../net/zeromq/buildlink3.mk" diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile index 07d94d3d118..e95fb5f55cf 100644 --- a/net/py-zsi/Makefile +++ b/net/py-zsi/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2012/10/23 17:19:04 asau Exp $ -# +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:18 wiz Exp $ DISTNAME= ZSI-2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,6 +14,8 @@ DEPENDS+= ${PYPKGPREFIX}-xml>=0.8.3:../../textproc/py-xml USE_LANGUAGES= # none +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} post-extract: diff --git a/net/pygopherd/Makefile b/net/pygopherd/Makefile index c802d6501e1..fc45c3e7bd6 100644 --- a/net/pygopherd/Makefile +++ b/net/pygopherd/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2013/07/12 10:45:00 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.25 2014/01/25 10:30:18 wiz Exp $ DISTNAME= pygopherd_2.0.16 PKGREVISION= 4 @@ -34,6 +33,7 @@ RCD_SCRIPTS= pygopherd 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 diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index b37b2df595e..ca8b252fb07 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2014/01/13 12:10:23 fhajny Exp $ -# +# $NetBSD: Makefile,v 1.15 2014/01/25 10:30:18 wiz Exp $ PKGNAME= rabbitmq-${RMQ_VERSION} PKGREVISION= 2 @@ -22,6 +21,8 @@ BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto DEPENDS+= coreutils-[0-9]*:../../sysutils/coreutils DEPENDS+= ${PYPKGPREFIX}-simplejson>=2:../../converters/py-simplejson +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.2.2 + .include "version.mk" .include "../../lang/python/pyversion.mk" diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 8fba3c7d117..0e7df887531 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/06/15 20:24:19 adam Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:18 wiz Exp $ DISTNAME= scapy-2.2.0 CATEGORIES= net @@ -15,6 +15,8 @@ DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline NO_BUILD= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-libpcap, py-libdnet + INSTALLATION_DIRS+= share/examples/scapy .include "options.mk" diff --git a/net/scapy/options.mk b/net/scapy/options.mk index 87eb1052a42..44cfccdea6d 100644 --- a/net/scapy/options.mk +++ b/net/scapy/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2011/10/16 04:16:49 obache Exp $ +# $NetBSD: options.mk,v 1.3 2014/01/25 10:30:18 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.scapy @@ -18,11 +18,13 @@ DEPENDS+= ${PYPKGPREFIX}-amkCrypto-[0-9]*:../../security/py-amkCrypto ### .if !empty(PKG_OPTIONS:Mgnuplot) DEPENDS+= ${PYPKGPREFIX}-gnuplot-[0-9]*:../../graphics/py-gnuplot +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gnuplot .endif ### ### Add in TeX support for psdump() and/or pdfdump() ### .if !empty(PKG_OPTIONS:Mscapy-pyx) -DEPENDS+= ${PYPKGPREFIX}-X-[0-9]*:../../textproc/py-X +PYTHON_VERSIONED_DEPENDENCIES= X +.include "../../lang/python/versioned_dependencies.mk" .endif diff --git a/net/upnpinspector/Makefile b/net/upnpinspector/Makefile index 2069dda9f6d..089280a356a 100644 --- a/net/upnpinspector/Makefile +++ b/net/upnpinspector/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2013/09/01 09:19:16 obache Exp $ -# +# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:18 wiz Exp $ DISTNAME= UPnP-Inspector-0.2.2 PKGREVISION= 3 @@ -17,5 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2 USE_LANGUAGES= # none EGG_NAME= UPnP_Inspector-0.2.2 +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 + .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index fde6ccd4b8e..88ba6078c37 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.114 2014/01/01 11:52:31 wiz Exp $ +# $NetBSD: Makefile,v 1.115 2014/01/25 10:30:18 wiz Exp $ DISTNAME= wireshark-1.10.5 PKGREVISION= 1 @@ -34,6 +34,7 @@ CONFIGURE_ENV+= ac_cv_path_LEXDUMMY=${TOOLS_PATH.lex} PTHREAD_OPTS+= require PYTHON_FOR_BUILD_ONLY= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.10.5 REPLACE_PYTHON+= help/faq.py REPLACE_PYTHON+= tools/asn2deb REPLACE_PYTHON+= tools/asn2wrs.py |