Remove py-qt3-sip, replaced by py-sip.

8 files changed, 1 insertions, 162 deletions

diff --git a/x11/Makefile b/x11/Makefile
index df9bfbeb54c..4602919c4bc 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.567 2008/10/08 14:11:24 wiz Exp $
+# $NetBSD: Makefile,v 1.568 2008/10/08 14:28:21 wiz Exp $
 #
 
 COMMENT=	Packages to support the X window system
@@ -262,7 +262,6 @@ SUBDIR+=	py-sip
 SUBDIR+=	py-qt3-base
 SUBDIR+=	py-qt3-modules
 SUBDIR+=	py-qt3-qscintilla
-SUBDIR+=	py-qt3-sip
 SUBDIR+=	py-wxWidgets
 SUBDIR+=	qt3
 SUBDIR+=	qt3-docs
diff --git a/x11/py-qt3-sip/DESCR b/x11/py-qt3-sip/DESCR
deleted file mode 100644
index 066f40f3895..00000000000
--- a/x11/py-qt3-sip/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-SIP is a tool that makes it very easy to create Python bindings for
-C++ libraries. It was originally developed to create PyQt, the Python
-bindings for the Qt toolkit, but can be used to create bindings for any
-C++ library.
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
deleted file mode 100644
index 97a33488686..00000000000
--- a/x11/py-qt3-sip/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-# $NetBSD: Makefile,v 1.35 2008/07/14 16:30:26 joerg Exp $
-#
-
-DISTNAME=	sip-4.3.2
-PKGNAME=	${PYPKGPREFIX}-qt3-${DISTNAME}
-PKGREVISION=	3
-CATEGORIES=	x11 devel python
-MASTER_SITES=	http://www.river-bank.demon.co.uk/download/sip/
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.riverbankcomputing.co.uk/sip/index.php
-COMMENT=	Tool to create Python bindings for C++ libraries
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-CONFLICTS+=	${PYPKGPREFIX}-qt2-sip-*
-
-PYTHON_VERSIONS_ACCEPTED=	24
-
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake
-USE_LANGUAGES=	c c++
-
-CONFIGURE_ARGS+=	-b ${PREFIX}/bin
-CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
-CONFIGURE_ARGS+=	-e ${PREFIX}/${PYINC}
-CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
-
-PY_PATCHPLIST=	yes
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
-.include "../../mk/bsd.prefs.mk"
-.include "../../mk/compiler.mk"
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	CFLAGS_SHLIB=-fno-common
-CONFIGURE_ARGS+=	LFLAGS_PLUGIN="-bundle -flat_namespace -undefined suppress"
-.else
-CONFIGURE_ARGS+=	CFLAGS_SHLIB=-fPIC
-CONFIGURE_ARGS+=	CXXFLAGS_SHLIB=-fPIC
-.if ${OPSYS} == "SunOS" && !empty(CC_VERSION:Mgcc*)
-# gcc3 uses -mimpure-text to not pass -assert pure-text to the linker
-CONFIGURE_ARGS+=	LFLAGS_SHLIB="-shared -mimpure-text"
-.else
-CONFIGURE_ARGS+=       LFLAGS_SHLIB="-shared"
-.endif
-.endif
-
-SUBST_CLASSES+=		pyversfx
-SUBST_STAGE.pyversfx=	pre-configure
-SUBST_FILES.pyversfx=	sipgen/sipgen.sbf
-SUBST_SED.pyversfx=	-e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
-
-do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
-
-.include "../../lang/python/extension.mk"
-.include "../../lang/python/application.mk"
-.include "../../x11/qt3-libs/buildlink3.mk"
-.include "../../x11/qt3-tools/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-sip/PLIST b/x11/py-qt3-sip/PLIST
deleted file mode 100644
index 4988254c286..00000000000
--- a/x11/py-qt3-sip/PLIST
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2005/11/22 18:50:30 drochner Exp $
-bin/sip${PYVERSSUFFIX}
-${PYINC}/sip.h
-${PYSITELIB}/sip.so
-${PYSITELIB}/sipconfig.py
-${PYSITELIB}/sipconfig.pyc
-${PYSITELIB}/sipdistutils.py
diff --git a/x11/py-qt3-sip/buildlink3.mk b/x11/py-qt3-sip/buildlink3.mk
deleted file mode 100644
index cbd43f0af27..00000000000
--- a/x11/py-qt3-sip/buildlink3.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/26 17:56:25 wiz Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-PYQT3_SIP_BUILDLINK3_MK:=	${PYQT3_SIP_BUILDLINK3_MK}+
-
-.include "../../lang/python/pyversion.mk"
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pyqt3-sip
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npyqt3-sip}
-BUILDLINK_PACKAGES+=	pyqt3-sip
-BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}pyqt3-sip
-
-.if !empty(PYQT3_SIP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.pyqt3-sip+=	${PYPKGPREFIX}-qt3-sip>=4.0rc3
-BUILDLINK_ABI_DEPENDS.pyqt3-sip?=	${PYPKGPREFIX}-qt3-sip>=4.3.2nb3
-BUILDLINK_PKGSRCDIR.pyqt3-sip?=	../../x11/py-qt3-sip
-
-BUILDLINK_LIBDIRS.pyqt3-sip+=	${PYSITELIB}
-.endif	# PYQT3_SIP_BUILDLINK3_MK
-
-SIPBIN=	${BUILDLINK_PREFIX.pyqt3-sip}/bin/sip${PYVERSSUFFIX}
-
-.include "../../x11/qt3-libs/buildlink3.mk"
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/py-qt3-sip/distinfo b/x11/py-qt3-sip/distinfo
deleted file mode 100644
index 4b3576268b5..00000000000
--- a/x11/py-qt3-sip/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.8 2005/11/22 18:50:30 drochner Exp $
-
-SHA1 (sip-4.3.2.tar.gz) = 5eac6ddf8e4b7e0fdb03b069aa5336a535ef41ce
-RMD160 (sip-4.3.2.tar.gz) = 3910cb93f6b62bc1f6d540f8c06d56054cd2aa12
-Size (sip-4.3.2.tar.gz) = 334659 bytes
-SHA1 (patch-aa) = ec85155775d4f8bad2cf1895e6bed2935677ad1d
-SHA1 (patch-ab) = b16d9cb57c46bab01052896195be35a9b7b88246
diff --git a/x11/py-qt3-sip/patches/patch-aa b/x11/py-qt3-sip/patches/patch-aa
deleted file mode 100644
index 7abfac70c30..00000000000
--- a/x11/py-qt3-sip/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2005/11/22 18:50:30 drochner Exp $
-
---- configure.py.orig	2005-11-14 18:31:01.000000000 +0100
-+++ configure.py
-@@ -243,7 +243,7 @@ def set_platform_directories():
-         plat_bin_dir = sys.exec_prefix
-         plat_sip_dir = sys.prefix + "\\sip"
-     else:
--        vers = "%d.%d" % ((py_version >> 16) & 0xff, (py_version >> 8) & 0xff)
-+        vers = sys.version[0:3]
- 
-         plat_py_site_dir = sys.prefix + "/lib/python" + vers
-         if py_version >= 0x020000:
-@@ -252,7 +252,7 @@ def set_platform_directories():
-         plat_py_inc_dir = sys.prefix + "/include/python" + vers
-         plat_py_lib_dir = sys.prefix + "/lib/python" + vers + "/config"
-         plat_bin_dir = sys.exec_prefix + "/bin"
--        plat_sip_dir = sys.prefix + "/share/sip"
-+        plat_sip_dir = sys.prefix + "/share/sip%s" % vers
- 
- 
- def create_config(module, template, macros):
-@@ -268,7 +268,7 @@ def create_config(module, template, macr
-     content = {
-         "sip_version":      sip_version,
-         "sip_version_str":  sip_version_str,
--        "sip_bin":          os.path.join(opt_sipbindir, "sip"),
-+        "sip_bin":          os.path.join(opt_sipbindir, "sip%s" % sys.version[0:3]),
-         "sip_inc_dir":      opt_sipincdir,
-         "sip_mod_dir":      opt_sipmoddir,
-         "default_bin_dir":  plat_bin_dir,
-@@ -715,7 +715,7 @@ def create_makefiles():
-     sipconfig.ParentMakefile(
-         configuration=cfg,
-         subdirs=["sipgen", "siplib"],
--        installs=(["sipconfig.py", "sipdistutils.py"], cfg.sip_mod_dir)
-+        installs=(["sipconfig.py", "sipconfig.pyc", "sipdistutils.py"], cfg.sip_mod_dir)
-     ).generate()
- 
-     sipconfig.inform("Creating sip code generator Makefile...")
diff --git a/x11/py-qt3-sip/patches/patch-ab b/x11/py-qt3-sip/patches/patch-ab
deleted file mode 100644
index fad100fccad..00000000000
--- a/x11/py-qt3-sip/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/05/09 17:04:22 recht Exp $
-
---- sipgen/sipgen.sbf.orig	2004-05-09 01:53:12.000000000 +0200
-+++ sipgen/sipgen.sbf	2004-05-09 01:54:02.000000000 +0200
-@@ -11,6 +11,6 @@
- # SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- 
--target = sip
-+target = sip@PYVERSSUFFIX@
- sources = main.c transform.c gencode.c heap.c parser.c lexer.c 
- headers = sip.h parser.h