diff options
| author | wiz <wiz@pkgsrc.org> | 2014-01-25 10:29:56 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2014-01-25 10:29:56 +0000 |
| commit | 26edaca7bb13575eca053bdeadc74df68dbe5b03 (patch) | |
| tree | 3bbaa4e1a32886abb417eed9e3a6c4c742388c9a /sysutils | |
| parent | 064b605d8ade40e0dc1d43f538b1bdc8a0e5233b (diff) | |
| download | pkgsrc-26edaca7bb13575eca053bdeadc74df68dbe5b03.tar.gz | |
Mark packages as not ready for python-3.x where applicable;
either because they themselves are not ready or because a
dependency isn't. This is annotated by
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of x.y.z
or
PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-foo, py-bar
respectively, please use the same style for other packages,
and check during updates.
Use versioned_dependencies.mk where applicable.
Use REPLACE_PYTHON instead of handcoded alternatives, where applicable.
Reorder Makefile sections into standard order, where applicable.
Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default
with the next commit.
Whitespace cleanups and other nits corrected, where necessary.
Diffstat (limited to 'sysutils')
30 files changed, 94 insertions, 71 deletions
diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index ba9b19901ab..65d458449a4 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/12/02 22:54:46 hubertf Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:20 wiz Exp $ DISTNAME= ansible-1.4.1 CATEGORIES= sysutils @@ -35,6 +34,8 @@ SUBST_STAGE.pythonbin= pre-configure SUBST_FILES.pythonbin= Makefile SUBST_FILES.pythonbin= -e "s,@PYTHONBIN@,${PYTHONBIN}," +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-paramiko + MANPAGES= ansible-doc.1 ansible-pull.1 ansible-playbook.1 ansible.1 DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile index ba620d8a7ed..6bafee6a1d4 100644 --- a/sysutils/bup/Makefile +++ b/sysutils/bup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/12/31 11:03:12 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2014/01/25 10:30:21 wiz Exp $ DISTNAME= bup-0.25 CATEGORIES= sysutils @@ -17,6 +17,8 @@ DEPENDS+= par2-[0-9]*:../../archivers/par2 DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline DEPENDS+= git-base-[0-9]*:../../devel/git-base +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-fuse-bindings + DOCDIR= ${WRKDIR}/bup-man TEST_TARGET= test diff --git a/sysutils/cuisine/Makefile b/sysutils/cuisine/Makefile index 59f7a9e976d..0123d7d4606 100644 --- a/sysutils/cuisine/Makefile +++ b/sysutils/cuisine/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2013/08/06 18:47:23 gls Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:21 wiz Exp $ VERSION= b79718f8f69d17a075b7a626e32c1ed1200445f8 DISTNAME= ${VERSION} PKGNAME= cuisine-0.6.4 CATEGORIES= sysutils MASTER_SITES= https://github.com/sebastien/cuisine/archive/ -FETCH_USING= curl MAINTAINER= imil@NetBSD.org HOMEPAGE= https://github.com/sebastien/cuisine @@ -15,6 +13,8 @@ LICENSE= modified-bsd DEPENDS+= fabric>=1.6.0:../../sysutils/fabric +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.6.4 + WRKSRC= ${WRKDIR}/cuisine-${VERSION} DOCDIR= ${PREFIX}/share/doc/cuisine diff --git a/sysutils/dbus-python-common/Makefile b/sysutils/dbus-python-common/Makefile index a24a6537fd9..00cc848bd6d 100644 --- a/sysutils/dbus-python-common/Makefile +++ b/sysutils/dbus-python-common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/05/29 22:59:32 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:21 wiz Exp $ DISTNAME= dbus-python-1.2.0 PKGNAME= dbus-python-common-1.2.0 @@ -7,6 +7,7 @@ MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/ #BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0:../../textproc/py-docutils #DEPENDS+= ${PYPKGPREFIX}-pyrex>=0.9.3:../../lang/py-pyrex +#PYTHON_VERSIONS_INCOMPATIBLE=33 # py-pyrex MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.freedesktop.org/Software/dbus @@ -16,7 +17,6 @@ LICENSE= mit CONFLICTS+= py[0-9]*-dbus<1.1.1 PYTHON_FOR_BUILD_ONLY= yes -PYTHON_VERSIONS_INCLUDE_3X= yes USE_TOOLS+= pkg-config gmake GNU_CONFIGURE= yes diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index e1c9d06daad..3e09ebcc3d3 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/11/26 20:36:22 drochner Exp $ +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:21 wiz Exp $ DISTNAME= duplicity-0.6.22 CATEGORIES= sysutils net @@ -23,6 +23,7 @@ GPGPATH= ${LOCALBASE}/bin/gpg .endif REPLACE_PYTHON+= bin/* +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.6.22 SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= pre-configure diff --git a/sysutils/euca2ools/Makefile b/sysutils/euca2ools/Makefile index aab675b1a8d..58b7e785b3d 100644 --- a/sysutils/euca2ools/Makefile +++ b/sysutils/euca2ools/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/02/26 10:17:55 joerg Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:21 wiz Exp $ DISTNAME= euca2ools-2.1.2 CATEGORIES= sysutils @@ -15,6 +14,8 @@ DEPENDS+= ${PYPKGPREFIX}-m2crypto>=0.20.2:../../security/py-m2crypto DEPENDS+= ${PYPKGPREFIX}-xml-[0-9]*:../../textproc/py-xml DEPENDS+= help2man-[0-9]*:../../converters/help2man +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml, py-m2crypto + #USE_LANGUAGES= # none post-build: diff --git a/sysutils/fabric/Makefile b/sysutils/fabric/Makefile index 674c49b7b6d..4a186181034 100644 --- a/sysutils/fabric/Makefile +++ b/sysutils/fabric/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2013/10/21 18:09:30 gls Exp $ +# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:21 wiz Exp $ VERSION= 1.8.0 DISTNAME= Fabric-${VERSION} @@ -14,6 +14,8 @@ LICENSE= 2-clause-bsd DEPENDS+= ${PYPKGPREFIX}-paramiko>=1.10.0:../../security/py-paramiko +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-paramiko + USE_TOOLS+= pax INSTALLATION_DIRS+= ${PKGMANDIR}/man1 diff --git a/sysutils/gnome-commander/Makefile b/sysutils/gnome-commander/Makefile index cb4ab3853f5..d407447ef45 100644 --- a/sysutils/gnome-commander/Makefile +++ b/sysutils/gnome-commander/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2014/01/01 11:52:34 wiz Exp $ -# +# $NetBSD: Makefile,v 1.56 2014/01/25 10:30:21 wiz Exp $ DISTNAME= gnome-commander-1.2.8.15 PKGREVISION= 27 @@ -17,6 +16,8 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake intltool msgfmt pkg-config perl +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.2.8.15 + #Problem with heimdal, on which this package depends via another packages. #Simple solution is delete link to fnmatch.h from work directory of package #after make configure like this: diff --git a/sysutils/libvirt/Makefile b/sysutils/libvirt/Makefile index d7fc2ec89ba..30a495b7191 100644 --- a/sysutils/libvirt/Makefile +++ b/sysutils/libvirt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2014/01/25 02:54:27 agc Exp $ +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:21 wiz Exp $ DISTNAME= libvirt-1.2.1 CATEGORIES= sysutils @@ -15,6 +15,8 @@ CONFIGURE_ARGS+= --without-macvtap USE_TOOLS+= gmake pkg-config perl 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 diff --git a/sysutils/monitoring/Makefile b/sysutils/monitoring/Makefile index 696c61376d7..a441fef387d 100644 --- a/sysutils/monitoring/Makefile +++ b/sysutils/monitoring/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.1 2013/04/22 09:39:21 imil Exp $ -# +# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:21 wiz Exp $ VERSION= e518a90eade4ca538468b6640dccb651e6034b9e DISTNAME= ${VERSION} PKGNAME= monitoring-0.9.5 CATEGORIES= sysutils MASTER_SITES= https://github.com/sebastien/monitoring/archive/ -FETCH_USING= curl MAINTAINER= imil@NetBSD.org HOMEPAGE= https://github.com/sebastien/monitoring @@ -16,6 +14,7 @@ LICENSE= modified-bsd WRKSRC= ${WRKDIR}/monitoring-${VERSION} REPLACE_PYTHON+= Sources/monitoring.py Scripts/monitoring +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.9.5 DOCDIR= ${PREFIX}/share/doc/monitoring EXPDIR= ${PREFIX}/share/examples/monitoring diff --git a/sysutils/openxenmanager/Makefile b/sysutils/openxenmanager/Makefile index 65491694060..ea727578261 100644 --- a/sysutils/openxenmanager/Makefile +++ b/sysutils/openxenmanager/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2013/10/10 14:42:33 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.10 2014/01/25 10:30:21 wiz Exp $ DISTNAME= openxenmanager_0.r80+dfsg.orig PKGNAME= openxenmanager-0.0.80 @@ -22,6 +21,7 @@ DEPENDS+= ${PYPKGPREFIX}-httplib2>=0.7.7:../../www/py-httplib2 INSTALLATION_DIRS= bin share REPLACE_PYTHON= openxenmanager/*py openxenmanager/pygtk_chart/*py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 OXMDIR= ${PREFIX} diff --git a/sysutils/py-dbus/Makefile b/sysutils/py-dbus/Makefile index c80513e48e6..3c5876f7537 100644 --- a/sysutils/py-dbus/Makefile +++ b/sysutils/py-dbus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2013/05/26 19:51:25 wiz Exp $ +# $NetBSD: Makefile,v 1.29 2014/01/25 10:30:21 wiz Exp $ DISTNAME= dbus-python-1.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python//} @@ -10,8 +10,6 @@ HOMEPAGE= http://www.freedesktop.org/Software/dbus COMMENT= Python bindings for the D-BUS message bus system LICENSE= mit -PYTHON_VERSIONS_INCLUDE_3X= yes - USE_TOOLS+= pkg-config gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-html-docs --disable-api-docs diff --git a/sysutils/py-gnome-menus/Makefile b/sysutils/py-gnome-menus/Makefile index 8f360ddbe20..de6829f08fa 100644 --- a/sysutils/py-gnome-menus/Makefile +++ b/sysutils/py-gnome-menus/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/10/23 19:51:21 asau Exp $ -# +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:21 wiz Exp $ DISTNAME= gnome-menus-2.30.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,6 +22,7 @@ CONFIGURE_ARGS+= --enable-python BUILD_DIRS= python INSTALL_DIRS= python PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.30.5 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 diff --git a/sysutils/py-notify-python/Makefile b/sysutils/py-notify-python/Makefile index 9b69a079c7f..389c9a02adc 100644 --- a/sysutils/py-notify-python/Makefile +++ b/sysutils/py-notify-python/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2013/10/10 14:41:54 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.9 2014/01/25 10:30:21 wiz Exp $ DISTNAME= notify-python-0.1.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,6 +22,7 @@ USE_TOOLS+= gmake pkg-config PKGCONFIG_OVERRIDE+= notify-python.pc.in PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 # Missing function attach_status_icon # http://trac.galago-project.org/ticket/121 diff --git a/sysutils/py-notify/Makefile b/sysutils/py-notify/Makefile index 7a669f7989b..e98178ba908 100644 --- a/sysutils/py-notify/Makefile +++ b/sysutils/py-notify/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/08/13 09:18:46 obache Exp $ -# +# $NetBSD: Makefile,v 1.35 2014/01/25 10:30:21 wiz Exp $ DISTNAME= py-notify-0.2.1 PKGNAME= ${DISTNAME:S/py/${PYPKGPREFIX}/1} @@ -14,5 +13,7 @@ LICENSE= gnu-lgpl-v2.1 EGG_NAME= ${DISTNAME:S/-/_/} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.2.1 + .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile index a720bbde8ec..000dc6b824b 100644 --- a/sysutils/py-psutil/Makefile +++ b/sysutils/py-psutil/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2013/12/07 21:25:23 richard Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/25 10:30:22 wiz Exp $ DISTNAME= psutil-1.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -11,6 +11,7 @@ COMMENT= Cross-platform process and system utilities module for Python LICENSE= modified-bsd REPLACE_PYTHON= psutil/*py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 1.2.1 .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/py-xattr/Makefile b/sysutils/py-xattr/Makefile index 3f4c9819987..4cfc76632e3 100644 --- a/sysutils/py-xattr/Makefile +++ b/sysutils/py-xattr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/11/26 20:25:42 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:22 wiz Exp $ DISTNAME= v0.7.2 PROPERNAME= ${DISTNAME:S/v/xattr-/} @@ -22,6 +22,8 @@ EGG_NAME= ${PROPERNAME} USE_LANGUAGES= c REPLACE_PYTHON= xattr/tool.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 + .include "../../lang/python/pyversion.mk" .if ${PYPKGPREFIX} == "py27" diff --git a/sysutils/salt-docs/Makefile b/sysutils/salt-docs/Makefile index 64e76403f1f..52542b8b440 100644 --- a/sysutils/salt-docs/Makefile +++ b/sysutils/salt-docs/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/04/06 03:45:25 rodent Exp $ -# +# $NetBSD: Makefile,v 1.3 2014/01/25 10:30:22 wiz Exp $ DISTNAME= salt-0.10.5 PKGNAME= ${DISTNAME:S/-/-docs-/} @@ -26,6 +25,9 @@ do-install: ( cd ${DESTDIR}${PREFIX} \ && ${FIND} ${HTMLDIR} -type f -print ) >>${PLIST_SRC} +# problem in sphinx config file? +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.10.5 + # The upstream salt project does not say what version of sphinx is required. .include "../../lang/python/pyversion.mk" BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index ba3adee9b19..b80d11ecfe4 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/08/17 18:30:02 imil Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:22 wiz Exp $ DISTNAME= salt-0.16.3 CATEGORIES= sysutils @@ -11,6 +10,16 @@ HOMEPAGE= http://saltstack.org/ COMMENT= Remote execution and configuration management system LICENSE= apache-2.0 +DEPENDS+= zeromq>=2.1.9:../../net/zeromq +DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq +DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto +DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto +DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack +DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml +DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 + +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-m2crypto + SUBST_CLASSES+= fix-paths SUBST_STAGE.fix-paths= post-patch SUBST_MESSAGE.fix-paths=Fixing directory paths. @@ -52,12 +61,4 @@ post-install: # .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" -DEPENDS+= zeromq>=2.1.9:../../net/zeromq -DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq -DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto -DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto -DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack -DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml -DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 - .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/virt-manager/Makefile b/sysutils/virt-manager/Makefile index b10966abd64..dc916e459b4 100644 --- a/sysutils/virt-manager/Makefile +++ b/sysutils/virt-manager/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2013/10/10 14:42:33 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.16 2014/01/25 10:30:22 wiz Exp $ DISTNAME= virt-manager-0.9.4 PKGREVISION= 12 @@ -11,6 +10,14 @@ HOMEPAGE= http://virt-manager.org/ COMMENT= GUI to manage virtual machines LICENSE= gnu-gpl-v2 +DEPENDS= libvirt>=0.9.3:../../sysutils/libvirt +DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.24:../../x11/py-gtk2 +DEPENDS+= virtinst>=0.600.3:../../sysutils/virtinst +DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.8.0:../../textproc/py-libxml2 +DEPENDS+= urlgrabber>=3.1.0:../../www/urlgrabber +DEPENDS+= ${PYPKGPREFIX}-dbus>=1.1.1:../../sysutils/py-dbus +DEPENDS+= gtk-vnc>=0.5.1:../../net/gtk-vnc + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-libvirt-package-names=libvirt @@ -19,13 +26,7 @@ USE_PKGLOCALEDIR= yes GCONF_SCHEMAS+= virt-manager.schemas -DEPENDS= libvirt>=0.9.3:../../sysutils/libvirt -DEPENDS+= ${PYPKGPREFIX}-gtk2>=2.24:../../x11/py-gtk2 -DEPENDS+= virtinst>=0.600.3:../../sysutils/virtinst -DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.8.0:../../textproc/py-libxml2 -DEPENDS+= urlgrabber>=3.1.0:../../www/urlgrabber -DEPENDS+= ${PYPKGPREFIX}-dbus>=1.1.1:../../sysutils/py-dbus -DEPENDS+= gtk-vnc>=0.5.1:../../net/gtk-vnc +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 SUBST_CLASSES+= python SUBST_STAGE.python= pre-configure diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile index faf04dec76a..64006109b31 100644 --- a/sysutils/xenkernel3/Makefile +++ b/sysutils/xenkernel3/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2013/11/07 00:47:39 joerg Exp $ -# +# $NetBSD: Makefile,v 1.28 2014/01/25 10:30:22 wiz Exp $ VERSION= 3.1.4 DISTNAME= xen-${VERSION} @@ -24,6 +23,7 @@ USE_TOOLS+= gmake PYTHON_FOR_BUILD_ONLY= YES PY_PATCHPLIST= NO +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.1.4 SUBST_CLASSES+= py SUBST_STAGE.py= pre-build @@ -38,7 +38,7 @@ SUBST_FILES.py2= xen/tools/compat-build-source.py SUBST_FILES.py2+= xen/tools/compat-build-header.py SUBST_SED.py2= -e "s,/usr/bin/python,${PYTHONBIN},g" -.if ${MACHINE_ARCH} == "x86_64" +.if ${MACHINE_ARCH} == "x86_64" USE_TOOLS+= bash SUBST_CLASSES+= bash SUBST_STAGE.bash= pre-build @@ -46,7 +46,7 @@ SUBST_FILES.bash= xen/include/Makefile SUBST_SED.bash= -e "s,/bin/bash,${PREFIX}/bin/bash,g" .endif -.if ${MACHINE_ARCH} == "i386" +.if ${MACHINE_ARCH} == "i386" PLIST_SRC= PLIST.i386 PLIST .else PLIST_SRC= PLIST diff --git a/sysutils/xenkernel33/Makefile b/sysutils/xenkernel33/Makefile index b9b72c0df4c..c259eff6f83 100644 --- a/sysutils/xenkernel33/Makefile +++ b/sysutils/xenkernel33/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2013/11/07 00:47:39 joerg Exp $ -# +# $NetBSD: Makefile,v 1.26 2014/01/25 10:30:22 wiz Exp $ VERSION= 3.3.2 DISTNAME= xen-${VERSION} @@ -28,6 +27,7 @@ USE_TOOLS+= gmake PYTHON_FOR_BUILD_ONLY= yes PY_PATCHPLIST= NO +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.3.2 SUBST_CLASSES+= py SUBST_STAGE.py= pre-build diff --git a/sysutils/xenkernel41/Makefile b/sysutils/xenkernel41/Makefile index 848ea1660b8..783721da9b5 100644 --- a/sysutils/xenkernel41/Makefile +++ b/sysutils/xenkernel41/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2014/01/24 17:07:35 drochner Exp $ -# +# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:22 wiz Exp $ VERSION= 4.1.6.1 DISTNAME= xen-${VERSION} @@ -22,6 +21,7 @@ USE_TOOLS+= gmake PYTHON_FOR_BUILD_ONLY= yes PY_PATCHPLIST= NO +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.1.6.1 # XXX Why does this not work? # See work/xen-4.1.2/Config.mk:41 why PYTHON must be set and what for diff --git a/sysutils/xenkernel42/Makefile b/sysutils/xenkernel42/Makefile index 3571374d855..29e4200e815 100644 --- a/sysutils/xenkernel42/Makefile +++ b/sysutils/xenkernel42/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/11/07 00:47:39 joerg Exp $ -# +# $NetBSD: Makefile,v 1.5 2014/01/25 10:30:22 wiz Exp $ VERSION= 4.2.3 DISTNAME= xen-${VERSION} @@ -20,6 +19,7 @@ NO_CONFIGURE= yes USE_TOOLS+= gmake PYTHON_FOR_BUILD_ONLY= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.2.3 MAKE_ENV+= OCAML_TOOLS=no diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile index fd85b20d4aa..7805297a3d8 100644 --- a/sysutils/xentools20/Makefile +++ b/sysutils/xentools20/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2013/02/06 23:23:54 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.43 2014/01/25 10:30:22 wiz Exp $ DISTNAME= xen-2.0.7-src PKGNAME= xentools20-2.0.7 @@ -16,6 +15,8 @@ LICENSE= gnu-gpl-v2 DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-twisted + PKG_SYSCONFSUBDIR= xen ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 NetBSD-*-i386 diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile index 0f35b2aa100..fb1e58b5f69 100644 --- a/sysutils/xentools3-hvm/Makefile +++ b/sysutils/xentools3-hvm/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2013/05/31 12:42:05 wiz Exp $ -# +# $NetBSD: Makefile,v 1.21 2014/01/25 10:30:22 wiz Exp $ VERSION= 3.1.4 DISTNAME= xen-${VERSION} @@ -22,6 +21,8 @@ ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64 CONFLICTS= xentools30-* xentools33-* CONFLICTS+= xenstoretools-* +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.1.4 + WRKSRC= ${WRKDIR}/xen-${VERSION}/tools CHECK_PORTABILITY_SKIP+= examples/* xm-test/ramdisk/make-release.sh diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile index 9fa87417b48..3999aa0a280 100644 --- a/sysutils/xentools3/Makefile +++ b/sysutils/xentools3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2013/09/27 11:35:07 joerg Exp $ +# $NetBSD: Makefile,v 1.37 2014/01/25 10:30:22 wiz Exp $ VERSION= 3.1.4 DISTNAME= xen-${VERSION} @@ -15,6 +15,8 @@ COMMENT= Userland Tools for Xen DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + MAKE_JOBS_SAFE= no PKG_SYSCONFSUBDIR= xen diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile index f9b938650a2..0ec7f283685 100644 --- a/sysutils/xentools33/Makefile +++ b/sysutils/xentools33/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2013/09/27 11:35:07 joerg Exp $ +# $NetBSD: Makefile,v 1.41 2014/01/25 10:30:22 wiz Exp $ VERSION= 3.3.2 DISTNAME= xen-${VERSION} @@ -20,6 +20,7 @@ DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware PKG_SYSCONFSUBDIR= xen +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile index 4ea4ac48eac..3d321fead3a 100644 --- a/sysutils/xentools41/Makefile +++ b/sysutils/xentools41/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2014/01/06 22:15:31 joerg Exp $ +# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:22 wiz Exp $ # # VERSION is set in version.mk as it is shared with other packages .include "version.mk" @@ -28,6 +28,8 @@ BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils .endif +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + PKG_SYSCONFSUBDIR= xen ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile index af4df726e00..f371edeacad 100644 --- a/sysutils/xentools42/Makefile +++ b/sysutils/xentools42/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2014/01/07 12:59:35 prlw1 Exp $ -# +# $NetBSD: Makefile,v 1.14 2014/01/25 10:30:23 wiz Exp $ VERSION= 4.2.3 VERSION_IPXE= 1.0.0 @@ -26,6 +25,8 @@ BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils .endif DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-xml + PKG_SYSCONFSUBDIR= xen ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 |