summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/py-qt3-sip/Makefile54
-rw-r--r--x11/py-qt3-sip/PLIST16
-rw-r--r--x11/py-qt3-sip/buildlink2.mk29
-rw-r--r--x11/py-qt3-sip/buildlink3.mk26
-rw-r--r--x11/py-qt3-sip/distinfo9
-rw-r--r--x11/py-qt3-sip/patches/patch-aa63
-rw-r--r--x11/py-qt3-sip/patches/patch-ab12
7 files changed, 106 insertions, 103 deletions
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 55d9ba6aac0..79a324918ea 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/05/09 17:04:22 recht Exp $
#
-DISTNAME= sip-x11-gpl-3.8
-PKGNAME= ${PYPKGPREFIX}-qt3-sip-3.8
+DISTNAME= sip-4.0rc3
+PKGNAME= ${PYPKGPREFIX}-qt3-${DISTNAME}
CATEGORIES= x11 devel
MASTER_SITES= http://www.river-bank.demon.co.uk/download/sip/
@@ -15,41 +15,35 @@ CONFLICTS+= ${PYPKGPREFIX}-qt2-sip-*
# needs qmake
BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools
-USE_BUILDLINK2= # defined
-USE_X11= # defined
-USE_LIBTOOL= # defined
-USE_GNU_TOOLS+= make
+USE_BUILDLINK3= yes
+USE_X11= yes
+USE_LIBTOOL= yes
+USE_GNU_TOOLS+= make
+USE_LANGUAGES= c c++
-CONFIGURE_ARGS= -q ${QTDIR} -m ${GMAKE}
+CONFIGURE_ARGS= -b ${PREFIX}/bin
+CONFIGURE_ARGS+= -d ${PREFIX}/${PYSITELIB}
+CONFIGURE_ARGS+= -e ${PREFIX}/${PYINC}
+CONFIGURE_ARGS+= -v ${PREFIX}/share/sip${PYVERSSUFFIX}
-PYQT_TMPDIR= ${WRKDIR}/pyqt_tmp
-CONFIGURE_ARGS+= -d ${PYQT_TMPDIR}
-CONFIGURE_ARGS+= -b ${PYQT_TMPDIR}
-
-PYTHON_VERSIONS_ACCEPTED= 22pth 23pth 21pth
+PYTHON_VERSIONS_ACCEPTED= 23pth
PY_PATCHPLIST= yes
-QTLIBDIR= ${QTDIR:S/${BUILDLINK_PREFIX.qt3-libs}\///}/lib
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} QTLIBDIR=${QTLIBDIR}
+PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+
+CONFIGURE_ARGS+= CFLAGS_SHLIB=-fPIC
+CONFIGURE_ARGS+= LFLAGS_SHLIB=-shared
-MAKE_ENV+= QTPREFIX=${QTDIR}
+SUBST_CLASSES+= pyversfx
+SUBST_STAGE.pyversfx= pre-configure
+SUBST_FILES.pyversfx= sipgen/sipgen.sbf
+SUBST_SED.pyversfx= -e "s|@PYVERSSUFFIX@|${PYVERSSUFFIX}|g"
do-configure:
- ${MKDIR} -p ${PYQT_TMPDIR}
- (cd ${WRKSRC} && ${PYTHONBIN} build.py ${CONFIGURE_ARGS})
-
-# XXX - hack. Shouldn't need the symlinks as qmake should let us build
-# proper libraries that install outside of QTDIR more easily.
-post-install:
- (cd ${PYQT_TMPDIR} && ${INSTALL_PROGRAM} sip \
- ${PREFIX}/bin/sip${PYVERSSUFFIX})
- (cd ${PYQT_TMPDIR} && ${LIBTOOL} ${INSTALL_DATA} \
- libsip.la ${PREFIX}/${PYSITELIB})
- (cd ${PREFIX}/${PYSITELIB}; for i in libsip.*; do \
- ${LN} -sf ${PREFIX}/${PYSITELIB}/$$i \
- ${PREFIX}/${QTLIBDIR}/$$i; done)
+ (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
.include "../../lang/python/extension.mk"
.include "../../lang/python/application.mk"
-.include "../../x11/qt3-libs/buildlink2.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-sip/PLIST b/x11/py-qt3-sip/PLIST
index 7b431a746a1..6fcc734e9b5 100644
--- a/x11/py-qt3-sip/PLIST
+++ b/x11/py-qt3-sip/PLIST
@@ -1,14 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2003/08/19 04:35:05 jmc Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/09 17:04:22 recht Exp $
bin/sip${PYVERSSUFFIX}
${PYINC}/sip.h
-${PYINC}/sipQt.h
-${PYSITELIB}/libsip.a
-${PYSITELIB}/libsip.la
-${PYSITELIB}/libsip.so
-${PYSITELIB}/libsip.so.10
-${PYSITELIB}/libsip.so.10.1
-${QTLIBDIR}/libsip.a
-${QTLIBDIR}/libsip.la
-${QTLIBDIR}/libsip.so
-${QTLIBDIR}/libsip.so.10
-${QTLIBDIR}/libsip.so.10.1
+${PYSITELIB}/sip.so
+${PYSITELIB}/sipconfig.py
+${PYSITELIB}/sipconfig.pyc
diff --git a/x11/py-qt3-sip/buildlink2.mk b/x11/py-qt3-sip/buildlink2.mk
deleted file mode 100644
index ccb2aa53b95..00000000000
--- a/x11/py-qt3-sip/buildlink2.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/03/29 05:05:52 jlam Exp $
-
-.if !defined(PY_QT3_SIP_BUILDLINK2_MK)
-PY_QT3_SIP_BUILDLINK2_MK= # defined
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_PACKAGES+= pyqt3sip
-BUILDLINK_PKGBASE.pyqt3sip?= ${PYPKGPREFIX}-qt3-sip
-BUILDLINK_DEPENDS.pyqt3sip?= ${PYPKGPREFIX}-qt3-sip>=3.7nb1
-BUILDLINK_PKGSRCDIR.pyqt3sip?= ../../x11/py-qt3-sip
-
-EVAL_PREFIX+= BUILDLINK_PREFIX.pyqt3sip=pyqt3sip
-BUILDLINK_PREFIX.pyqt3sip_DEFAULT= ${LOCALBASE}
-
-BUILDLINK_FILES.pyqt3sip= ${PYINC}/sip.h
-BUILDLINK_FILES.pyqt3sip+= ${PYINC}/sipQt.h
-BUILDLINK_FILES.pyqt3sip+= ${PYSITELIB}/libsip.*
-
-SIPBIN= ${BUILDLINK_PREFIX.pyqt3sip}/bin/sip${PYVERSSUFFIX}
-
-BUILDLINK_LDFLAGS.pyqt3sip= -L${PREFIX}/${PYSITELIB} -Wl,-R${PREFIX}/${PYSITELIB}
-LDFLAGS+= -Wl,-R${PREFIX}/${PYSITELIB}
-
-BUILDLINK_TARGETS+= pyqt3sip-buildlink
-
-pyqt3sip-buildlink: _BUILDLINK_USE
-
-.endif # PY_QT3_SIP_BUILDLINK2_MK
diff --git a/x11/py-qt3-sip/buildlink3.mk b/x11/py-qt3-sip/buildlink3.mk
new file mode 100644
index 00000000000..20a23cef17d
--- /dev/null
+++ b/x11/py-qt3-sip/buildlink3.mk
@@ -0,0 +1,26 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/09 17:04:22 recht 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:N$pyqt3-sip}
+BUILDLINK_PACKAGES+= pyqt3-sip
+
+.if !empty(PYQT3_SIP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pyqt3-sip+= ${PYPKGPREFIX}-qt3-sip>=4.0rc3
+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
index 44d137e2ba0..e701d1fcd64 100644
--- a/x11/py-qt3-sip/distinfo
+++ b/x11/py-qt3-sip/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/08/23 15:02:25 drochner Exp $
+$NetBSD: distinfo,v 1.3 2004/05/09 17:04:22 recht Exp $
-SHA1 (sip-x11-gpl-3.8.tar.gz) = 290abe40a576ed3d165fd63bade84f16ca16898d
-Size (sip-x11-gpl-3.8.tar.gz) = 179221 bytes
-SHA1 (patch-aa) = 0f92b512f57b4b3e2187aaaeb0d153341d70eabf
+SHA1 (sip-4.0rc3.tar.gz) = 6d501fc422ee92ee3a77760cfb7a427e87e23d3b
+Size (sip-4.0rc3.tar.gz) = 244280 bytes
+SHA1 (patch-aa) = 23dc24a4c5f814213741af9390a86d860fa535cf
+SHA1 (patch-ab) = b16d9cb57c46bab01052896195be35a9b7b88246
diff --git a/x11/py-qt3-sip/patches/patch-aa b/x11/py-qt3-sip/patches/patch-aa
index 8013ed32515..11e75888f0d 100644
--- a/x11/py-qt3-sip/patches/patch-aa
+++ b/x11/py-qt3-sip/patches/patch-aa
@@ -1,33 +1,40 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/07/15 16:40:45 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2004/05/09 17:04:22 recht Exp $
---- build.py.orig 2003-07-05 12:44:43.000000000 +0200
-+++ build.py 2003-07-13 17:51:30.000000000 +0200
-@@ -259,8 +259,9 @@
- global pyFullVers, pyVersNr
+--- configure.py.orig 2004-03-16 21:39:56.000000000 +0100
++++ configure.py 2004-05-08 21:33:27.000000000 +0200
+@@ -240,7 +240,7 @@
+ 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]
- pyFullVers = string.split(sys.version)[0]
-+ pyFullVersn = string.replace(pyFullVers, 'p', '.');
+ plat_py_site_dir = sys.prefix + "/lib/python" + vers
+ if py_version >= 0x020000:
+@@ -249,7 +249,7 @@
+ 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
-- vl = string.split(re.findall("[0-9.]*",pyFullVers)[0],".")
-+ vl = string.split(re.findall("[0-9.]*",pyFullVersn)[0],".")
- major = vl[0]
- minor = vl[1]
-@@ -269,7 +270,7 @@
- except IndexError:
- bug = 0
+ def create_config(module, template, macros):
+@@ -265,7 +265,7 @@
+ 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,
+@@ -696,7 +696,7 @@
+ sipconfig.ParentMakefile(
+ configuration=cfg,
+ subdirs=["sipgen", "siplib"],
+- installs=("sipconfig.py", cfg.sip_mod_dir)
++ installs=(["sipconfig.py", "sipconfig.pyc"], cfg.sip_mod_dir)
+ ).generate()
-- pyVers = major + "." + minor
-+ pyVers = sys.version[0:3]
- pyVersNr = (int(major) << 16) + (int(minor) << 8) + int(bug)
-
- global platMake, platCopy, platPySiteDir, platPyIncDir, platPyLib
-@@ -683,7 +684,7 @@
- print "Type 'no' to decline the terms of the license."
- print
-
-- while 1:
-+ while 0:
- try:
- resp = raw_input("Do you accept the terms of the license? ")
- except:
+ 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
new file mode 100644
index 00000000000..fad100fccad
--- /dev/null
+++ b/x11/py-qt3-sip/patches/patch-ab
@@ -0,0 +1,12 @@
+$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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-18 23:11:45 +0000