Remove unnecessary PLIST_SUBST and FILES_SUBST that are now provided

by the infrastructure.

Mark a couple more packages as not ready for python-3.x.

6 files changed, 6 insertions, 12 deletions

diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile
index e9b583513bf..244ede61f79 100644
--- a/x11/py-kde4/Makefile
+++ b/x11/py-kde4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2016/03/05 11:29:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2016/08/28 15:48:37 wiz Exp $
 
 PKGNAME=	${PYPKGPREFIX}-kde4-${_KDE_VERSION}
 PKGREVISION=	3
@@ -15,7 +15,6 @@ CMAKE_ARGS+=	-DWITH_Soprano:BOOL=OFF
 CMAKE_ARGS+=	-DWITH_Nepomuk:BOOL=OFF
 
 PY_PATCHPLIST=			yes
-PLIST_SUBST+=			PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 REPLACE_PYTHON+= \
 	tools/pykdeuic4/*.py \
diff --git a/x11/py-qt4-qscintilla/Makefile b/x11/py-qt4-qscintilla/Makefile
index afab18455c7..79514bc5556 100644
--- a/x11/py-qt4-qscintilla/Makefile
+++ b/x11/py-qt4-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2016/03/05 11:27:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.44 2016/08/28 15:48:37 wiz Exp $
 
 PKGREVISION= 1
 .include "../../x11/qt4-qscintilla/Makefile.common"
@@ -9,7 +9,6 @@ COMMENT=	QScintilla -- Python bindings
 WRKSRC=		${WRKDIR}/${DISTNAME}/Python
 
 PY_PATCHPLIST=		yes
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX}
 
 MAKE_FLAGS+=		TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index ac397318c4f..2e8069068a1 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2016/04/11 04:05:05 dbj Exp $
+# $NetBSD: Makefile,v 1.82 2016/08/28 15:48:37 wiz Exp $
 
 PKGNAME=	${PYPKGPREFIX}-qt4-${PYQT_VERSION}
 PYQT_VERSION=	4.11.4
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+=	--qsci-api
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
 PY_PATCHPLIST=		yes
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 BUILDLINK_TRANSFORM+=	rm:-Wl,-R${WRKSRC}/qpy/QtCore
 BUILDLINK_TRANSFORM+=	rm:-Wl,-R${WRKSRC}/qpy/QtDeclarative
diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile
index 6f80965ab2f..a92729cbc62 100644
--- a/x11/py-qt5/Makefile
+++ b/x11/py-qt5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/04 17:03:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:37 wiz Exp $
 
 DISTNAME=	PyQt-gpl-${PYQT_VERSION}
 PKGNAME=	${PYPKGPREFIX}-qt5-${PYQT_VERSION}
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+=	--verbose
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
 PY_PATCHPLIST=		yes
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 SUBST_CLASSES+=		install x11lib
 SUBST_STAGE.install=	post-configure
diff --git a/x11/py-qwt-qt4/Makefile b/x11/py-qwt-qt4/Makefile
index 229471868f3..dc5067207dc 100644
--- a/x11/py-qwt-qt4/Makefile
+++ b/x11/py-qwt-qt4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/07/09 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/28 15:48:37 wiz Exp $
 
 DISTNAME=	PyQwt-5.2.0
 PKGNAME=	${PYPKGPREFIX}-qwt-qt4-${DISTNAME:S/PyQwt-//}
@@ -20,7 +20,6 @@ BUILD_DIRS=	configure
 PLIST_SUBST+=	PYSITELIB=${PYSITELIB}
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
 
-# Following line rescues from 'Unresolved dependency with pbulk'
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-Numeric
 
 REPLACE_PYTHON+=qt4lib/PyQt4/Qwt5/grace.py
diff --git a/x11/py-sip/Makefile b/x11/py-sip/Makefile
index 12ec902ec36..5855553b097 100644
--- a/x11/py-sip/Makefile
+++ b/x11/py-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2016/02/26 11:27:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.47 2016/08/28 15:48:37 wiz Exp $
 
 DISTNAME=	sip-4.17
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+=	LIBDIR=${PREFIX}/lib
 CONFIGURE_ARGS.DragonFly+=	-p freebsd-g++
 
 PY_PATCHPLIST=		yes
-PLIST_SUBST+=		PYVERSSUFFIX=${PYVERSSUFFIX:Q}
 
 .include "../../mk/compiler.mk"