Lots of little changes to package. Not an upgrade though.

Split this up into a Makefile.common to be used by other packages.

For Darwin, use a different DISTFILE as told by the py-kde list.

Improve DESCR. (The same DESCRiption was used by multiple packages.)

8 files changed, 67 insertions, 34 deletions

diff --git a/x11/py-qt3-base/DESCR b/x11/py-qt3-base/DESCR
index 5749991f597..cf42f05a36b 100644
--- a/x11/py-qt3-base/DESCR
+++ b/x11/py-qt3-base/DESCR
@@ -1,6 +1,13 @@
-These are the Python bindings for Qt.  You must also have the SIP Python
-bindings generator installed.
+PyQt is a set of Python bindings for the Qt toolkit. PyQt brings
+together the Qt C++ cross-platform toolkit and the cross-platform
+interpreted language Python.  PyQt contains 300 classes and over
+5,750 functions and methods.
 
-The homepage is http://www.riverbankcomputing.co.uk/pyqt/.
+PyQt also includes the pyuic and pylupdate utilities which correspond
+to the Qt uic and lupdate utilities.  pyuic converts the GUI designs
+created with Qt Designer to executable Python code.  pylupdate
+scans Python code, extracts all strings that are candidates for
+internationalisation, and creates an XML file for use by Qt Linguist.
 
-The homepage of SIP is http://www.riverbankcomputing.co.uk/sip/.
+The x11/py-qt3-modules and x11/py-qt3-qscintilla packages provide
+more Python modules for Qt.
diff --git a/x11/py-qt3-base/Makefile.common b/x11/py-qt3-base/Makefile.common
new file mode 100644
index 00000000000..c79b377c7e4
--- /dev/null
+++ b/x11/py-qt3-base/Makefile.common
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile.common,v 1.1 2005/07/01 01:20:28 reed Exp $
+#
+
+# XXX: when updating version, be sure to update distinfo for both
+# XXX: PyQt-mac-gpl and PyQt-x11-gpl in py-qt3-qscintilla,
+# XXX: py-qt3-base, and py-qt3-modules.
+
+PYQT_VERSION=		3.14.1
+CATEGORIES=		x11 python
+MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
+
+MAINTAINER=		tech-pkg@NetBSD.org
+HOMEPAGE=		http://www.riverbankcomputing.co.uk/pyqt/
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+DISTNAME=		PyQt-mac-gpl-${PYQT_VERSION}
+.else
+DISTNAME=		PyQt-x11-gpl-${PYQT_VERSION}
+.endif
+
+USE_LIBTOOL=		yes
+USE_TOOLS+=		gmake
+USE_LANGUAGES=		c c++
+
+CONFIGURE_ARGS=		-b ${PREFIX}/bin
+CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
+CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
+
+PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
+PY_PATCHPLIST=	yes
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
+
+do-configure:
+	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
+
+.include "../../lang/python/extension.mk"
diff --git a/x11/py-qt3-base/PLIST.Darwin b/x11/py-qt3-base/PLIST.Darwin
new file mode 100644
index 00000000000..259ff953128
--- /dev/null
+++ b/x11/py-qt3-base/PLIST.Darwin
@@ -0,0 +1,2 @@
+@comment $NetBSD
+share/sip${PYVERSSUFFIX}/qt/qwindowdefs_mac.sip
diff --git a/x11/py-qt3-base/PLIST.X11 b/x11/py-qt3-base/PLIST.X11
new file mode 100644
index 00000000000..d13561f4a33
--- /dev/null
+++ b/x11/py-qt3-base/PLIST.X11
@@ -0,0 +1,3 @@
++@comment $NetBSD: PLIST.X11,v 1.1 2005/07/01 01:20:28 reed Exp $
+share/sip${PYVERSSUFFIX}/qt/qwindowdefs_qws.sip
+share/sip${PYVERSSUFFIX}/qt/qwindowdefs_x11.sip
diff --git a/x11/py-qt3-base/PLIST b/x11/py-qt3-base/PLIST.common
index 996b86a7e10..b7f48032595 100644
--- a/x11/py-qt3-base/PLIST
+++ b/x11/py-qt3-base/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/02/24 20:17:37 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2005/07/01 01:20:28 reed Exp $
 bin/pylupdate${PYVERSSUFFIX}
 bin/pyuic${PYVERSSUFFIX}
 ${PYSITELIB}/pyqtconfig.py
@@ -176,13 +176,9 @@ share/sip${PYVERSSUFFIX}/qt/qwidgetlist.sip
 share/sip${PYVERSSUFFIX}/qt/qwidgetstack.sip
 share/sip${PYVERSSUFFIX}/qt/qwindow.sip
 share/sip${PYVERSSUFFIX}/qt/qwindowdefs.sip
-share/sip${PYVERSSUFFIX}/qt/qwindowdefs_qws.sip
-share/sip${PYVERSSUFFIX}/qt/qwindowdefs_x11.sip
 share/sip${PYVERSSUFFIX}/qt/qwindowsstyle.sip
 share/sip${PYVERSSUFFIX}/qt/qwindowsxpstyle.sip
 share/sip${PYVERSSUFFIX}/qt/qwizard.sip
 share/sip${PYVERSSUFFIX}/qt/qwmatrix.sip
 share/sip${PYVERSSUFFIX}/qt/qworkspace.sip
 share/sip${PYVERSSUFFIX}/qt/versions.sip
-@dirrm share/sip${PYVERSSUFFIX}/qt
-@dirrm share/sip${PYVERSSUFFIX}
diff --git a/x11/py-qt3-base/PLIST.common_end b/x11/py-qt3-base/PLIST.common_end
new file mode 100644
index 00000000000..f44a741fe4c
--- /dev/null
+++ b/x11/py-qt3-base/PLIST.common_end
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.common_end,v 1.1 2005/07/01 01:20:28 reed Exp $
+@dirrm share/sip${PYVERSSUFFIX}/qt
+@dirrm share/sip${PYVERSSUFFIX}
diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index ba1e4647429..4f0ef6d6579 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,35 +1,15 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:30 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/01 01:20:28 reed Exp $
 #
 
-DISTNAME=		PyQt-x11-gpl-3.14.1
-PKGNAME=		${PYPKGPREFIX}-qt3-modules-3.14.1
-CATEGORIES=		x11 python
-MASTER_SITES=		http://www.river-bank.demon.co.uk/download/PyQt/
+.include "../../x11/py-qt3-base/Makefile.common"
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://www.riverbankcomputing.co.uk/pyqt/
-COMMENT=		Python binding for qt3
+PKGNAME=		${PYPKGPREFIX}-qt3-modules-${PYQT_VERSION}
 
-USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-USE_LANGUAGES=		c c++
-
-CONFIGURE_ARGS=		-b ${PREFIX}/bin
-CONFIGURE_ARGS+=	-d ${PREFIX}/${PYSITELIB}
-CONFIGURE_ARGS+=	-v ${PREFIX}/share/sip${PYVERSSUFFIX}
-
-PYTHON_VERSIONS_ACCEPTED=	24 23 22 21
-PY_PATCHPLIST=	yes
-PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
+COMMENT=		Various Python modules for Qt3
 
 INSTALL_DIRS=	${WRKSRC}/qtcanvas ${WRKSRC}/qtgl ${WRKSRC}/qtnetwork
 INSTALL_DIRS+=	${WRKSRC}/qtsql ${WRKSRC}/qttable ${WRKSRC}/qtui
 INSTALL_DIRS+=	${WRKSRC}/qtxml
 
-do-configure:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		${PYTHONBIN} configure.py ${CONFIGURE_ARGS})
-
-.include "../../lang/python/extension.mk"
 .include "../../x11/py-qt3-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-qt3-modules/distinfo b/x11/py-qt3-modules/distinfo
index c9462a4b312..56b9dafb114 100644
--- a/x11/py-qt3-modules/distinfo
+++ b/x11/py-qt3-modules/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.8 2005/05/02 15:36:53 drochner Exp $
+$NetBSD: distinfo,v 1.9 2005/07/01 01:20:28 reed Exp $
 
 SHA1 (PyQt-x11-gpl-3.14.1.tar.gz) = b29c1d319c132ba09648f70e01f7af1fa92c18b0
 RMD160 (PyQt-x11-gpl-3.14.1.tar.gz) = d8caef8513bc715f2f0e6107daa5d6d2ba883ddb
 Size (PyQt-x11-gpl-3.14.1.tar.gz) = 782274 bytes
+SHA1 (PyQt-mac-gpl-3.14.1.tar.gz) = 391edbd2a06d5a50802a44a81c95ab0aa067d928
+RMD160 (PyQt-mac-gpl-3.14.1.tar.gz) = 79e62b2775e229c325eff0c3d6f837e00f431dde
+Size (PyQt-mac-gpl-3.14.1.tar.gz) = 776559 bytes
 SHA1 (patch-aa) = 7119fe04aa5bb82c2775a9458238cc99590c3c1c