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 | 4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8 (patch) | |
tree | 3bbaa4e1a32886abb417eed9e3a6c4c742388c9a /x11 | |
parent | da96a0b73ccce3895e3b718798083bf1740293d8 (diff) | |
download | pkgsrc-4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8.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 'x11')
-rw-r--r-- | x11/alacarte/Makefile | 4 | ||||
-rw-r--r-- | x11/avant-window-navigator/Makefile | 14 | ||||
-rw-r--r-- | x11/gnome-applets/Makefile | 5 | ||||
-rw-r--r-- | x11/gnome-mag/Makefile | 4 | ||||
-rw-r--r-- | x11/gnome-panel/Makefile | 4 | ||||
-rw-r--r-- | x11/gnome-terminal/Makefile | 4 | ||||
-rw-r--r-- | x11/kde-workspace4/Makefile | 4 | ||||
-rw-r--r-- | x11/libdesktop-agnostic/Makefile | 7 | ||||
-rw-r--r-- | x11/py-Pmw2/Makefile | 3 | ||||
-rw-r--r-- | x11/py-Tk/Makefile | 4 | ||||
-rw-r--r-- | x11/py-Xlib/Makefile | 4 | ||||
-rw-r--r-- | x11/py-gnome2-desktop/Makefile | 8 | ||||
-rw-r--r-- | x11/py-gnome2-extras/Makefile | 4 | ||||
-rw-r--r-- | x11/py-gnome2/Makefile | 5 | ||||
-rw-r--r-- | x11/py-gtksourceview/Makefile | 3 | ||||
-rw-r--r-- | x11/py-kiwi/Makefile | 4 | ||||
-rw-r--r-- | x11/py-qt3-base/Makefile.common | 3 | ||||
-rw-r--r-- | x11/py-qt4/Makefile | 3 | ||||
-rw-r--r-- | x11/py-sip/Makefile | 4 | ||||
-rw-r--r-- | x11/py-vte/Makefile | 5 | ||||
-rw-r--r-- | x11/py-wxWidgets/Makefile | 4 | ||||
-rw-r--r-- | x11/rox-session/Makefile | 4 | ||||
-rw-r--r-- | x11/tint2/Makefile | 5 |
23 files changed, 53 insertions, 56 deletions
diff --git a/x11/alacarte/Makefile b/x11/alacarte/Makefile index efc696aa2c3..7e28b78bacc 100644 --- a/x11/alacarte/Makefile +++ b/x11/alacarte/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2013/10/10 14:42:36 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.54 2014/01/25 10:30:30 wiz Exp $ DISTNAME= alacarte-0.13.1 PKGREVISION= 25 @@ -16,6 +15,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= intltool perl pkg-config gmake msgfmt PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile index ae20dcef4f4..afaf3653144 100644 --- a/x11/avant-window-navigator/Makefile +++ b/x11/avant-window-navigator/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/10/10 14:42:36 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:30 wiz Exp $ DISTNAME= avant-window-navigator-0.4.0 PKGREVISION= 15 @@ -11,8 +10,8 @@ HOMEPAGE= https://launchpad.net/awn COMMENT= Dock-like navigation bar LICENSE= gnu-lgpl-v2 -# Needed for launchpad -FETCH_USING= curl +DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg +DEPENDS+= bzr>=2.4.2:../../devel/bzr GNU_CONFIGURE= yes USE_LIBTOOL= yes @@ -43,9 +42,8 @@ SUBST_SED.pathfix= -e "s,/usr/share,${PREFIX}/share," PY_PATCHPLIST= yes REPLACE_PYTHON+= awn-settings/awnSettings.py.in REPLACE_PYTHON+= awn-settings/awnSettingsHelper.py - -DEPENDS+= ${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg -DEPENDS+= bzr>=2.4.2:../../devel/bzr +PYTHON_VERSIONED_DEPENDENCIES= cairo:link +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../devel/GConf/schemas.mk" .include "../../lang/vala014/buildlink3.mk" @@ -53,7 +51,7 @@ DEPENDS+= bzr>=2.4.2:../../devel/bzr .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../sysutils/py-dbus/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" -.include "../../graphics/py-cairo/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../x11/libdesktop-agnostic/buildlink3.mk" .include "../../sysutils/libgtop/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 3a777c37570..8dca5e5f34e 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.123 2014/01/01 11:52:38 wiz Exp $ -# +# $NetBSD: Makefile,v 1.124 2014/01/25 10:30:30 wiz Exp $ DISTNAME= gnome-applets-2.32.1.1 PKGREVISION= 35 @@ -16,6 +15,8 @@ USE_TOOLS+= gmake intltool msgfmt pkg-config USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 + .include "options.mk" CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile index ced695ed81a..a4f94a73ad4 100644 --- a/x11/gnome-mag/Makefile +++ b/x11/gnome-mag/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2013/10/10 14:41:51 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.84 2014/01/25 10:30:30 wiz Exp $ DISTNAME= gnome-mag-0.16.3 PKGREVISION= 17 @@ -29,6 +28,7 @@ SUBST_SED.doxy= -e 's,SUBDIRS = reference,SUBDIRS =,' DEPENDS+= ${PYPKGPREFIX}-gnome2-desktop-[0-9]*:../../x11/py-gnome2-desktop REPLACE_PYTHON= colorblind/colorblind-applet.py PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 .include "../../misc/colorblind/buildlink3.mk" .include "../../devel/py-gobject/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index 8d0975134c6..b95559b17f5 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.166 2014/01/01 11:52:08 wiz Exp $ -# +# $NetBSD: Makefile,v 1.167 2014/01/25 10:30:31 wiz Exp $ DISTNAME= gnome-panel-2.32.1 PKGREVISION= 35 @@ -23,6 +22,7 @@ USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= bonobo/libpanel-applet/libpanelapplet-2.0.pc.in PKGCONFIG_OVERRIDE+= libpanel-applet/libpanelapplet-3.0.pc.in CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 # XXX this pkg installs a gio module to ${PREFIX}/lib/gnome-panel/modules # but there are two problems with this: diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index cb3ba3ede7f..604f805c4d1 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2013/10/10 14:42:37 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.59 2014/01/25 10:30:31 wiz Exp $ DISTNAME= gnome-terminal-2.32.1 PKGREVISION= 20 @@ -25,6 +24,7 @@ CONFIGURE_ENV+= ac_cv_path_GTK_BUILDER_CONVERT="${PYTHONBIN} ${BUILDLINK_PREFIX GCONF_SCHEMAS= gnome-terminal.schemas PYTHON_FOR_BUILD_ONLY= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.32.1 .include "../../sysutils/desktop-file-utils/desktopdb.mk" BUILDLINK_API_DEPENDS.GConf+= GConf>=2.14.0 diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile index c4ae4a74726..83dc71f2156 100644 --- a/x11/kde-workspace4/Makefile +++ b/x11/kde-workspace4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2014/01/01 11:52:04 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2014/01/25 10:30:31 wiz Exp $ DISTNAME= kde-workspace-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} @@ -6,6 +6,8 @@ PKGREVISION= 3 CATEGORIES= x11 COMMENT= Base workspace for the KDE 4 integrated X11 desktop +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.11.3 + .include "../../meta-pkgs/kde4/Makefile.kde4" DISTFILES= ${DEFAULT_DISTFILES} Daemon.png Daemon.README diff --git a/x11/libdesktop-agnostic/Makefile b/x11/libdesktop-agnostic/Makefile index e3dafb2546a..79b5a15bc99 100644 --- a/x11/libdesktop-agnostic/Makefile +++ b/x11/libdesktop-agnostic/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2013/10/10 14:41:48 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.19 2014/01/25 10:30:31 wiz Exp $ DISTNAME= libdesktop-agnostic-0.3.92 PKGREVISION= 13 @@ -11,9 +10,6 @@ HOMEPAGE= https://launchpad.net/libdesktop-agnostic COMMENT= Desktop-agnostic library, apis and tools LICENSE= gnu-lgpl-v2 -# Needed for launchpad -FETCH_USING= curl - USE_TOOLS+= intltool pkg-config msgfmt PKGCONFIG_OVERRIDE+= data/desktop-agnostic.pc.in @@ -23,6 +19,7 @@ CONFIGURE_ARGS= --config-backends=keyfile,gconf \ --desktop-entry-backends=glib PY_PATCHPLIST= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.3.92 EGDIR= ${PREFIX}/share/examples/libdesktop-agnostic PKG_SYSCONFSUBDIR= xdg diff --git a/x11/py-Pmw2/Makefile b/x11/py-Pmw2/Makefile index 54d32ddb2fe..1572d063748 100644 --- a/x11/py-Pmw2/Makefile +++ b/x11/py-Pmw2/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:31 wiz Exp $ DISTNAME= Pmw_2_0_0-rc1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/_/-/:S/_/./g:S/-rc/rc/} @@ -22,7 +22,6 @@ REPLACE_PYTHON+= Pmw/Pmw_2_0_0/demos/All.py REPLACE_PYTHON+= Pmw/Pmw_2_0_0/tests/All.py PYTHON_VERSIONS_INCOMPATIBLE= 26 27 -PYTHON_VERSIONS_INCLUDE_3X= yes .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index f41780eb515..fcb1cbf54f4 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2014/01/11 14:42:06 adam Exp $ +# $NetBSD: Makefile,v 1.59 2014/01/25 10:30:31 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-Tk-${PY_DISTVERSION} PKGREVISION= 4 @@ -9,8 +9,6 @@ HOMEPAGE= http://wiki.python.org/moin/TkInter COMMENT= Tkinter -- Python interface to Tcl/Tk LICENSE= python-software-foundation -PYTHON_VERSIONS_INCLUDE_3X= yes - EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_tkinter.c \ ${PYSUBDIR}/Modules/tkappinit.c PYDISTUTILSPKG= yes diff --git a/x11/py-Xlib/Makefile b/x11/py-Xlib/Makefile index 327a52dd107..43e2234495b 100644 --- a/x11/py-Xlib/Makefile +++ b/x11/py-Xlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/10/29 05:06:44 asau Exp $ +# $NetBSD: Makefile,v 1.11 2014/01/25 10:30:31 wiz Exp $ DISTNAME= python-xlib-0.14 PKGNAME= ${PYPKGPREFIX}-Xlib-0.14 @@ -10,8 +10,6 @@ HOMEPAGE= http://python-xlib.sourceforge.net/ COMMENT= Functional X client library for Python LICENSE= gnu-gpl-v2 -PYTHON_VERSIONS_INCLUDE_3X= yes - EGG_NAME= python_xlib-0.12 .include "../../lang/python/distutils.mk" diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile index ab311446cef..97d98f04dd6 100644 --- a/x11/py-gnome2-desktop/Makefile +++ b/x11/py-gnome2-desktop/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2014/01/01 11:52:43 wiz Exp $ -# +# $NetBSD: Makefile,v 1.86 2014/01/25 10:30:31 wiz Exp $ DISTNAME= gnome-python-desktop-2.32.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/-python/2/} @@ -21,6 +20,9 @@ USE_TOOLS+= pkg-config gmake PKGCONFIG_OVERRIDE+= gnome-python-desktop-2.0.pc.in +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2, py-gtk2 +PYTHON_VERSIONED_DEPENDENCIES= cairo:link + .include "../../lang/python/pyversion.mk" # The "real" value here is: 27 26 @@ -35,7 +37,7 @@ PYTHON_VERSIONS_ACCEPTED+= ${PYTHON_VERSION_DEFAULT:M26} .include "../../lang/python/extension.mk" .include "../../devel/libwnck/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" -.include "../../graphics/py-cairo/buildlink3.mk" +.include "../../lang/python/versioned_dependencies.mk" .include "../../multimedia/gnome-media/buildlink3.mk" .include "../../multimedia/totem-pl-parser/buildlink3.mk" # works, but should better be in its own pkg to limit dependencies diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile index 704176012cd..5d62efa862c 100644 --- a/x11/py-gnome2-extras/Makefile +++ b/x11/py-gnome2-extras/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.69 2014/01/01 11:52:43 wiz Exp $ -# +# $NetBSD: Makefile,v 1.70 2014/01/25 10:30:31 wiz Exp $ DISTNAME= gnome-python-extras-2.25.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/} @@ -17,6 +16,7 @@ BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl PY_PATCHPLIST= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2 USE_LIBTOOL= YES PKGCONFIG_OVERRIDE+= gnome-python-extras-2.0.pc.in GNU_CONFIGURE= YES diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile index 7c820c9bda5..433ffe670b0 100644 --- a/x11/py-gnome2/Makefile +++ b/x11/py-gnome2/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.98 2014/01/01 11:52:43 wiz Exp $ -# +# $NetBSD: Makefile,v 1.99 2014/01/25 10:30:31 wiz Exp $ DISTNAME= gnome-python-2.28.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/gnome-python/gnome2/} @@ -19,6 +18,8 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_TOOLS+= pkg-config gmake +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit, py-gtk2 + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" BUILDLINK_TRANSFORM+= rm:-std=c9x diff --git a/x11/py-gtksourceview/Makefile b/x11/py-gtksourceview/Makefile index f0ae9ee123b..ba43e43ca72 100644 --- a/x11/py-gtksourceview/Makefile +++ b/x11/py-gtksourceview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2013/10/10 14:42:38 ryoon Exp $ +# $NetBSD: Makefile,v 1.33 2014/01/25 10:30:31 wiz Exp $ DISTNAME= pygtksourceview-2.10.1 PKGNAME= ${DISTNAME:S/py/${PYPKGPREFIX}-/} @@ -19,6 +19,7 @@ PKGCONFIG_OVERRIDE+= pygtksourceview-2.0.pc.in GNU_CONFIGURE= YES USE_TOOLS+= pkg-config PY_PATCHPLIST= YES +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 .include "../../lang/python/extension.mk" diff --git a/x11/py-kiwi/Makefile b/x11/py-kiwi/Makefile index 445b3f78dc1..ffffca76a13 100644 --- a/x11/py-kiwi/Makefile +++ b/x11/py-kiwi/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2014/01/10 14:43:36 jperkin Exp $ -# +# $NetBSD: Makefile,v 1.33 2014/01/25 10:30:31 wiz Exp $ DISTNAME= kiwi-1.9.29 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,6 +15,7 @@ LICENSE= gnu-lgpl-v2.1 # or later USE_LANGUAGES= #none USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 SUBST_CLASSES+= localedir SUBST_STAGE.localedir= pre-configure diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common index b7000e49156..0c1b5e9b112 100644 --- a/x11/py-qt3-base/Makefile.common +++ b/x11/py-qt3-base/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2009/07/22 09:19:37 wiz Exp $ +# $NetBSD: Makefile.common,v 1.14 2014/01/25 10:30:31 wiz Exp $ # # used by x11/py-qt3-base/Makefile # used by x11/py-qt3-modules/Makefile @@ -33,6 +33,7 @@ CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX} PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 3.18.1 do-configure: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile index ae7afa71961..af108f8e4cd 100644 --- a/x11/py-qt4/Makefile +++ b/x11/py-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2014/01/09 19:03:08 jperkin Exp $ +# $NetBSD: Makefile,v 1.72 2014/01/25 10:30:31 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION} PYQT_VERSION= 4.10.2 @@ -25,7 +25,6 @@ INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} -PYTHON_VERSIONS_INCLUDE_3X= yes BUILDLINK_TRANSFORM+= rm:-Wl,-R${WRKSRC}/qpy/QtCore BUILDLINK_TRANSFORM+= rm:-Wl,-R${WRKSRC}/qpy/QtDeclarative diff --git a/x11/py-sip/Makefile b/x11/py-sip/Makefile index f054dbaf127..d169a016349 100644 --- a/x11/py-sip/Makefile +++ b/x11/py-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2013/09/05 15:27:42 drochner Exp $ +# $NetBSD: Makefile,v 1.42 2014/01/25 10:30:32 wiz Exp $ DISTNAME= sip-4.14.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -10,8 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.riverbankcomputing.com/software/sip/intro COMMENT= Tool to create Python bindings for C++ libraries -PYTHON_VERSIONS_INCLUDE_3X= yes - CONFLICTS+= ${PYPKGPREFIX}-qt2-sip-* ${PYPKGPREFIX}-qt3-sip-* USE_LIBTOOL= yes diff --git a/x11/py-vte/Makefile b/x11/py-vte/Makefile index d0200e4befd..8c9215819d9 100644 --- a/x11/py-vte/Makefile +++ b/x11/py-vte/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/10/10 14:41:48 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.20 2014/01/25 10:30:32 wiz Exp $ .include "../../x11/vte/Makefile.common" @@ -21,6 +20,8 @@ CONFIGURE_ARGS+= --enable-python CONFIGURE_ARGS+= --disable-freetype-test CONFIGURE_ARGS+= --enable-Bsymbolic=auto +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 + BUILD_DIRS= python pre-build: diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile index 72cd37436cf..d8193c83b6a 100644 --- a/x11/py-wxWidgets/Makefile +++ b/x11/py-wxWidgets/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2013/10/10 14:41:54 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.53 2014/01/25 10:30:32 wiz Exp $ VERSION= 2.8.10.1 DISTNAME= wxPython-src-${VERSION} @@ -20,6 +19,7 @@ USE_TOOLS+= gmake pkg-config # previous name of the package CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]* PYTHON_SELF_CONFLICT= yes +PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 2.8.10.1 WXARG= WXPORT=gtk2 UNICODE=1 diff --git a/x11/rox-session/Makefile b/x11/rox-session/Makefile index 6840a24aeb4..e5dc22db0c4 100644 --- a/x11/rox-session/Makefile +++ b/x11/rox-session/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2013/10/10 14:42:39 ryoon Exp $ -# +# $NetBSD: Makefile,v 1.40 2014/01/25 10:30:32 wiz Exp $ DISTNAME= rox-session-0.28 PKGREVISION= 26 @@ -19,6 +18,7 @@ DIST_SUBDIR= rox NO_BUILD= yes PYTHON_PATCH_SCRIPTS= AppRun tests/testutils.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 INSTALLATION_DIRS= share/rox/ROX-Session diff --git a/x11/tint2/Makefile b/x11/tint2/Makefile index 43831bcd557..7b8455f47e8 100644 --- a/x11/tint2/Makefile +++ b/x11/tint2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/10/10 14:42:39 ryoon Exp $ +# $NetBSD: Makefile,v 1.30 2014/01/25 10:30:32 wiz Exp $ DISTNAME= tint2-0.11 PKGREVISION= 21 @@ -18,9 +18,10 @@ USE_TOOLS+= gmake pkg-config INSTALLATION_DIRS= share/examples/tint2 OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/tint2 CONF_FILES= ${PREFIX}/share/examples/tint2/tint2rc \ - ${PKG_SYSCONFDIR}/xdg/tint2/tint2rc + ${PKG_SYSCONFDIR}/xdg/tint2/tint2rc REPLACE_PYTHON+= src/tint2conf/tintwizard.py +PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-gtk2 CMAKE_OPTS+= -DCMAKE_INSTALL_PREFIX=${PREFIX} CMAKE_OPTS+= -DSYSCONFDIR=${PKG_SYSCONFDIR} |