switch to new MULTI_PACKAGES

x11/qt3/Makefile

@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.65 2006/10/24 22:39:36 espie Exp $
+# $OpenBSD: Makefile,v 1.66 2006/11/20 20:41:00 espie Exp $
 # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
 
-COMMENT=		"C++ X11 GUI toolkit"
+COMMENT-main=		"C++ X11 GUI toolkit"
 COMMENT-examples=	"examples and tutorial for qt3"
 COMMENT-html=		"off-line html documentation for qt3"
 COMMENT-postgresql=	"PostgresSQL plugin for qt3"
@@ -11,7 +11,7 @@ PKGNAME=		qt3-${VERSION}
 PKGNAME-mysql=		qt3-mysql-${VERSION}p1
 PKGNAME-postgresql=	qt3-postgresql-${VERSION}p1
 PKGNAME-examples=	qt3-examples-${VERSION}
-FULLPKGNAME=		qt3-mt-${VERSION}p8${PKGDEBUG}
+FULLPKGNAME-main=	qt3-mt-${VERSION}p9${PKGDEBUG}
 FULLPKGNAME-html=	qt3-html-${VERSION}
 SHARED_LIBS=		qt-mt	30.2 \
 			qui	2.0 \
@@ -50,8 +50,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-myWANTLIB=		GL GLU ICE SM X11 Xcursor Xext Xft Xi Xinerama Xmu \
-			Xrandr Xrender fontconfig freetype jpeg lcms m z
 
 USE_X11=	Yes
 MAKE_ENV=	QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \
@@ -81,7 +79,7 @@ CONFIGURE_ARGS=	-qt-gif -system-libmng -system-libpng -system-libjpeg -system-zl
 		-L${WRKSRC}/lib \
 		-L${LOCALBASE}/lib
 
-MULTI_PACKAGES+=-html
+MULTI_PACKAGES+=-main -html
 
 .if ${FLAVOR:L:Mdebug}
 CONFIGURE_ARGS+=-debug
@@ -92,6 +90,7 @@ PKGDEBUG=
 
 CONFIGURE_ARGS+=-thread
 
+
 .if !${FLAVOR:L:Mdebug} && !${FLAVOR:L:Mno_examples}
 MULTI_PACKAGES+=	-examples
 .else
@@ -104,8 +103,6 @@ CONFIGURE_ARGS+=	-plugindir ${QT_PLUGINSDIR}
 
 CONFIGURE_ENV=	QTDIR="${WRKSRC}" 
 
-SUBPACKAGE?=
-
 LIB_DEPENDS=
 BUILD_DEPENDS=::graphics/jpeg
 BUILD_DEPENDS=::print/cups
@@ -122,44 +119,51 @@ e:=$e,no_postgresql
 CONFIGURE_ARGS+=-no-sql-mysql
 .else
 MULTI_PACKAGES+=	-mysql
-.  if !defined(PACKAGING) || ${SUBPACKAGE} == "-mysql"
-LIB_DEPENDS+=mysqlclient::databases/mysql
-.  endif
 CONFIGURE_ARGS+= -I${LOCALBASE}/include/mysql -L${LOCALBASE}/lib/mysql \
 	-plugin-sql-mysql
 .endif
 
+
 .if !empty(FLAVOR:L:Mno_postgresql)
 CONFIGURE_ARGS+=-no-sql-psql
 .else
 MULTI_PACKAGES+=	-postgresql
-.  if !defined(PACKAGING) || ${SUBPACKAGE} == "-postgresql"
-LIB_DEPENDS+=pq.>=2:postgresql-client-*:databases/postgresql
 BUILD_DEPENDS+=::databases/postgresql,-server
-.  endif
 CONFIGURE_ARGS+= -I${LOCALBASE}/include/postgresql \
 	    -I${LOCALBASE}/include/postgresql/server \
 	    -L${LOCALBASE}/lib \
 	    -I${LOCALBASE}/include -plugin-sql-psql
 .endif
 
-.if ${SUBPACKAGE} == "-examples" || ${SUBPACKAGE} == ""
-myWANTLIB+=	pthread stdc++ c
-.endif
 
-.if !defined(PACKAGING) || ${SUBPACKAGE} != "-html"
-LIB_DEPENDS+=	png.>=2::graphics/png \
-		mng.>=1::graphics/libmng
-WANTLIB=	${myWANTLIB}
-.endif
+LIB_DEPENDS=		png.>=2::graphics/png \
+			mng.>=1::graphics/libmng
+WANTLIB=		GL GLU ICE SM X11 Xcursor Xext Xft Xi Xinerama Xmu \
+			Xrandr Xrender fontconfig freetype jpeg lcms m z
 
-.if defined(PACKAGING) && ${SUBPACKAGE} != "-html" && ${SUBPACKAGE} != ""
-LIB_DEPENDS+=	qt-mt.>=3::x11/qt3$e
-.endif
 
-.if defined(PACKAGING) && ${SUBPACKAGE} == "-html"
-PKG_ARCH=	*
-.endif
+WANTLIB-main=		${WANTLIB} pthread stdc++ c
+
+
+LIB_DEPENDS-mysql=	${LIB_DEPENDS} \
+			qt-mt.>=3::x11/qt3$e \
+			mysqlclient::databases/mysql
+
+
+LIB_DEPENDS-postgresql=	${LIB_DEPENDS} \
+			qt-mt.>=3::x11/qt3$e \
+			pq.>=2:postgresql-client-*:databases/postgresql
+
+
+LIB_DEPENDS-examples=	${LIB_DEPENDS} \
+			qt-mt.>=3::x11/qt3$e
+WANTLIB-examples=	${WANTLIB} pthread stdc++ c
+
+
+LIB_DEPENDS-html=
+WANTLIB-html=
+PKG_ARCH-html=		*
+
 
 QT_INCDIR=	${PREFIX}/include/X11/qt3
 TRUEDIR=	${TRUEPREFIX}/lib/qt3

x11/qt3/pkg/PFRAG.shared-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.19 2005/12/28 16:50:59 espie Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/20 20:41:01 espie Exp $
 @lib lib/libqt-mt.so.${LIBqt-mt_VERSION}
 @lib lib/libqui-mt.so.${LIBqui-mt_VERSION}
 @lib lib/libqui.so.${LIBqui_VERSION}

x11/qt3/pkg/PLIST-main

@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.28 2006/03/07 19:29:20 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/20 20:41:01 espie Exp $
 @conflict qt3-*
 @conflict qt3-base-*
 @pkgpath x11/qt3,mt
+@pkgpath x11/qt3
 %%SHARED%%
 bin/assistant
 bin/assistant-mt

x11/qt3/qt3.port.mk

@@ -1,4 +1,4 @@
-# $OpenBSD: qt3.port.mk,v 1.6 2006/10/24 22:39:36 espie Exp $
+# $OpenBSD: qt3.port.mk,v 1.7 2006/11/20 20:41:00 espie Exp $
 
 MODULES+=	gcc3
 MODGCC3_ARCHES+=sparc64
@@ -20,7 +20,7 @@ _MODQT_SETUP+=	UIC=${MODQT_UIC}
 .endif
 
 MODQT_LIB_DEPENDS=lib/qt3/qt-mt.>=3::x11/qt3
-LIB_DEPENDS+=lib/qt3/qt-mt.>=3::x11/qt3
+LIB_DEPENDS+=	${MODQT_LIB_DEPENDS}
 
 # may be needed to find plugins
 MODQT_MOC=	${LOCALBASE}/bin/moc3-mt