diff options
author | wiz <wiz@pkgsrc.org> | 2012-04-08 19:08:44 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2012-04-08 19:08:44 +0000 |
commit | 4faa20286079b6833043b7bbd12c0e72039551f6 (patch) | |
tree | b2d16eef0342bf56f8fbe64706fa44b26684cdf8 /x11 | |
parent | 67a514f3391a0157a52f46664e69c897eb4b904e (diff) | |
download | pkgsrc-4faa20286079b6833043b7bbd12c0e72039551f6.tar.gz |
Remove python24 and all traces of it from pkgsrc.
Remove devel/py-ctypes (only needed by and supporting python24).
Remove PYTHON_VERSIONS_ACCEPTED and PYTHON_VERSIONS_INCOMPATIBLE
lines that just mirror defaults now.
Miscellaneous cleanup while editing all these files.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/driconf/Makefile | 3 | ||||
-rw-r--r-- | x11/kde-workspace4/Makefile | 3 | ||||
-rw-r--r-- | x11/libxcb/Makefile | 4 | ||||
-rw-r--r-- | x11/py-Xlib/Makefile | 4 | ||||
-rw-r--r-- | x11/py-gnome2-extras/Makefile | 4 | ||||
-rw-r--r-- | x11/py-gnome2/Makefile | 4 | ||||
-rw-r--r-- | x11/py-gtk2/Makefile | 4 | ||||
-rw-r--r-- | x11/py-gtksourceview/Makefile | 4 | ||||
-rw-r--r-- | x11/py-kde4/Makefile | 3 | ||||
-rw-r--r-- | x11/py-kiwi/Makefile | 4 | ||||
-rw-r--r-- | x11/py-qt4/Makefile | 5 | ||||
-rw-r--r-- | x11/py-qt4/PLIST.elementtree | 4 | ||||
-rw-r--r-- | x11/py-vte/Makefile | 4 | ||||
-rw-r--r-- | x11/py-xcbgen/Makefile | 4 |
14 files changed, 14 insertions, 40 deletions
diff --git a/x11/driconf/Makefile b/x11/driconf/Makefile index 0799547daf3..42bf6f233d7 100644 --- a/x11/driconf/Makefile +++ b/x11/driconf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2012/03/15 11:53:44 obache Exp $ +# $NetBSD: Makefile,v 1.18 2012/04/08 19:09:17 wiz Exp $ # DISTNAME= driconf-0.9.1 @@ -23,7 +23,6 @@ USE_TOOLS+= msgfmt msgmerge xgettext CONFIGURE_ARGS+= --prefix=${PREFIX:Q} PYDISTUTILSPKG= yes REPLACE_PYTHON= *.py -PYTHON_VERSIONS_ACCEPTED= 27 26 25 SUBST_CLASSES+= fix-paths SUBST_FILES.fix-paths= driconf driconf.desktop diff --git a/x11/kde-workspace4/Makefile b/x11/kde-workspace4/Makefile index b1edd785b40..d4db3169060 100644 --- a/x11/kde-workspace4/Makefile +++ b/x11/kde-workspace4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2012/03/19 19:44:03 markd Exp $ +# $NetBSD: Makefile,v 1.2 2012/04/08 19:09:17 wiz Exp $ DISTNAME= kde-workspace-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} @@ -112,7 +112,6 @@ post-install: BUILDLINK_DEPMETHOD.qt4-tools= full .include "../../meta-pkgs/kde4/kde4.mk" -PYTHON_VERSIONS_ACCEPTED= 27 26 25 # because kdebindings4-python .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../devel/libusb/buildlink3.mk" diff --git a/x11/libxcb/Makefile b/x11/libxcb/Makefile index 446a9a975af..02193c547e3 100644 --- a/x11/libxcb/Makefile +++ b/x11/libxcb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2011/06/15 11:15:35 obache Exp $ +# $NetBSD: Makefile,v 1.15 2012/04/08 19:09:18 wiz Exp $ # DISTNAME= libxcb-1.7 @@ -72,8 +72,6 @@ SUBST_MESSAGE.pc= Configuring threading in xcb.pc.in. SUBST_STAGE.pc= pre-configure SUBST_VARS.pc= XTHREADLIB XTHREAD_CPPFLAGS -PYTHON_VERSIONS_ACCEPTED= 27 26 25 - post-extract: ${CHMOD} -R go-w ${WRKSRC} diff --git a/x11/py-Xlib/Makefile b/x11/py-Xlib/Makefile index c100b7e15fa..a84178cd9e3 100644 --- a/x11/py-Xlib/Makefile +++ b/x11/py-Xlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2011/12/03 00:02:17 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2012/04/08 19:09:18 wiz Exp $ DISTNAME= python-xlib-0.14 PKGNAME= ${PYPKGPREFIX}-Xlib-0.14 @@ -14,7 +14,7 @@ PKG_DESTDIR_SUPPORT= user-destdir PYTHON_VERSIONS_INCLUDE_3X= yes -PYTHON_VERSIONS_INCOMPATIBLE= 24 25 +PYTHON_VERSIONS_INCOMPATIBLE= 25 EGG_NAME= python_xlib-0.12 diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile index fb8c97d75c0..a99a99e0576 100644 --- a/x11/py-gnome2-extras/Makefile +++ b/x11/py-gnome2-extras/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2012/03/03 00:12:18 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2012/04/08 19:09:18 wiz Exp $ # DISTNAME= gnome-python-extras-2.25.3 @@ -27,8 +27,6 @@ USE_TOOLS+= pkg-config gmake USE_LANGUAGES= c c++ CONFIGURE_ARGS+= --enable-docs -PYTHON_VERSIONS_ACCEPTED= 27 26 25 - .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile index b85f3a2bb9f..8090920d193 100644 --- a/x11/py-gnome2/Makefile +++ b/x11/py-gnome2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.81 2012/03/03 00:12:18 wiz Exp $ +# $NetBSD: Makefile,v 1.82 2012/04/08 19:09:18 wiz Exp $ # DISTNAME= gnome-python-2.28.1 @@ -26,8 +26,6 @@ USE_TOOLS+= pkg-config gmake BUILDLINK_TRANSFORM+= rm:-std=c9x .endif -PYTHON_VERSIONS_ACCEPTED= 27 26 25 - .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile index f113ed87ae8..49697a6add4 100644 --- a/x11/py-gtk2/Makefile +++ b/x11/py-gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.82 2012/03/03 00:12:29 wiz Exp $ +# $NetBSD: Makefile,v 1.83 2012/04/08 19:09:19 wiz Exp $ # DISTNAME= pygtk-2.24.0 @@ -24,8 +24,6 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} USE_TOOLS+= gmake pkg-config -PYTHON_VERSIONS_ACCEPTED= 27 26 25 - .include "../../lang/python/extension.mk" .include "../../lang/python/application.mk" diff --git a/x11/py-gtksourceview/Makefile b/x11/py-gtksourceview/Makefile index 81cd52b32fd..9a511600256 100644 --- a/x11/py-gtksourceview/Makefile +++ b/x11/py-gtksourceview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2012/03/03 00:11:56 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2012/04/08 19:09:19 wiz Exp $ DISTNAME= pygtksourceview-2.10.1 PKGNAME= ${DISTNAME:S/py/${PYPKGPREFIX}-/} @@ -22,8 +22,6 @@ GNU_CONFIGURE= YES USE_TOOLS+= pkg-config PY_PATCHPLIST= YES -PYTHON_VERSIONS_ACCEPTED= 27 26 25 - .include "../../lang/python/extension.mk" BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.15.2 diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile index cfd2e607fa6..e9d41a67da0 100644 --- a/x11/py-kde4/Makefile +++ b/x11/py-kde4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/03/20 11:21:15 markd Exp $ +# $NetBSD: Makefile,v 1.3 2012/04/08 19:09:19 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION} DISTNAME= pykde4-${_KDE_VERSION} @@ -11,7 +11,6 @@ COMMENT= Python bindings for the KDE integrated X11 desktop CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN} -PYTHON_VERSIONS_ACCEPTED= 27 26 25 PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} diff --git a/x11/py-kiwi/Makefile b/x11/py-kiwi/Makefile index 3cfe0b56792..7663324706d 100644 --- a/x11/py-kiwi/Makefile +++ b/x11/py-kiwi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2012/03/03 00:14:19 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2012/04/08 19:09:19 wiz Exp $ # DISTNAME= kiwi-1.9.29 @@ -19,8 +19,6 @@ USE_LANGUAGES= #none USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt -PYTHON_VERSIONS_ACCEPTED= 27 26 25 - SUBST_CLASSES+= localedir SUBST_STAGE.localedir= pre-configure SUBST_FILES.localedir= setup.py diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile index baa3481f2c9..3b11747a794 100644 --- a/x11/py-qt4/Makefile +++ b/x11/py-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2012/03/03 00:14:19 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2012/04/08 19:09:19 wiz Exp $ PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION} PYQT_VERSION= 4.9.1 @@ -52,9 +52,6 @@ DISTNAME= PyQt-x11-gpl-${PYQT_VERSION} PLIST_SRC+= ${PKGDIR}/PLIST.X11 .endif .include "../../lang/python/extension.mk" -.if ${PYPKGPREFIX} == "py24" -PLIST_SRC+= ${PKGDIR}/PLIST.elementtree -.endif CONFIGURE_ARGS+= --verbose do-configure: diff --git a/x11/py-qt4/PLIST.elementtree b/x11/py-qt4/PLIST.elementtree deleted file mode 100644 index b9969f4e943..00000000000 --- a/x11/py-qt4/PLIST.elementtree +++ /dev/null @@ -1,4 +0,0 @@ -@comment $NetBSD: PLIST.elementtree,v 1.2 2009/06/14 18:25:04 joerg Exp $ -${PYSITELIB}/PyQt4/elementtree/ElementPath.py -${PYSITELIB}/PyQt4/elementtree/ElementTree.py -${PYSITELIB}/PyQt4/elementtree/__init__.py diff --git a/x11/py-vte/Makefile b/x11/py-vte/Makefile index 674fa592078..a43b5614d10 100644 --- a/x11/py-vte/Makefile +++ b/x11/py-vte/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/03/03 00:12:20 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2012/04/08 19:09:20 wiz Exp $ # .include "../../x11/vte/Makefile.common" @@ -23,8 +23,6 @@ CONFIGURE_ARGS+= --enable-python CONFIGURE_ARGS+= --disable-freetype-test CONFIGURE_ARGS+= --enable-Bsymbolic=auto -PYTHON_VERSIONS_ACCEPTED= 27 26 25 - BUILD_DIRS= python pre-build: diff --git a/x11/py-xcbgen/Makefile b/x11/py-xcbgen/Makefile index ccf98d4fad4..a9630a7f4cc 100644 --- a/x11/py-xcbgen/Makefile +++ b/x11/py-xcbgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2011/06/15 11:13:17 obache Exp $ +# $NetBSD: Makefile,v 1.9 2012/04/08 19:09:20 wiz Exp $ # DISTNAME= xcb-proto-1.6 @@ -18,8 +18,6 @@ DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree CONFLICTS+= xcb-proto<1.4nb1 PKG_DESTDIR_SUPPORT= user-destdir -PYTHON_VERSIONS_ACCEPTED= 27 26 25 - GNU_CONFIGURE= yes USE_TOOLS+= pkg-config USE_LANGUAGES= # none |