redesign subpackages to allow for a debug flavor.

x11/qt3/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2004/01/08 01:12:59 brad Exp $
+# $OpenBSD: Makefile,v 1.32 2004/01/22 21:03:59 espie Exp $
 # $FreeBSD: Makefile,v 1.33 1999/02/27 03:09:57 andreas Exp $
 
 COMMENT=		"C++ X11 GUI toolkit"
@@ -24,7 +24,7 @@ HOMEPAGE=	http://www.trolltech.com/qt/
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
 
-FLAVORS=mt
+FLAVORS=mt debug
 
 PSEUDO_FLAVORS=	no_mysql no_postgresql
 FLAVOR?=
@@ -63,12 +63,23 @@ CONFIGURE_ARGS=	-qt-gif -system-libmng -system-libpng -system-libjpeg -system-zl
 
 MULTI_PACKAGES+=-base -html
 
+.if ${FLAVOR:L:Mdebug}
+CONFIGURE_ARGS+=-debug
+PKGDEBUG=-debug
+.else
+PKGDEBUG=
+.endif
+
 .if ${FLAVOR:L:Mmt}
-FULLPKGNAME=		qt3-mt-${VERSION}
+FULLPKGNAME=		qt3-mt-${VERSION}${PKGDEBUG}
 CONFIGURE_ARGS+=-thread
-MULTI_PACKAGES+=	-examples
 .else
 CONFIGURE_ARGS+=-no-thread
+.endif
+
+.if ${FLAVOR:L:Mmt} && !${FLAVOR:L:Mdebug}
+MULTI_PACKAGES+=	-examples
+.else
 ALL_TARGET=sub-src sub-tools
 .endif
 
@@ -142,7 +153,7 @@ QT_PLUGINSDIR=	${QT_LIBDIR}/plugins${MT_SUFX}
 QT_BINDIR=	${QT_LIBDIR}/bin${MT_SUFX}
 
 # for manpages in MESSAGE
-SUBST_VARS=	VERSION QT_LIBDIR QT_DOC
+SUBST_VARS=	VERSION QT_LIBDIR QT_DOC MT_SUFX
 
 DOCS=	FAQ LICENSE.GPL README README-QT.TXT \
 	changes-3*
@@ -153,10 +164,16 @@ NO_REGRESS=	Yes
 PROGRAMS3=designer findtr moc qt20fix qtrename140 uic
 PROGRAMS=assistant linguist lrelease lupdate qm2ts qmake qtconfig 
 
-.if ${FLAVOR:L:Mmt}
-MT_SUFX=-mt
 LIBRARIES=qt${MT_SUFX}.so.3.23 qui${MT_SUFX}.so.1.0
 
+.if ${FLAVOR:L:Mmt}
+MT_SUFX=-mt
+.else
+MT_SUFX=
+LIBRARIES+=editor.so.1.0
+.endif
+
+.if ${FLAVOR:L:Mmt} && !${FLAVOR:L:Mdebug}
 post-configure:
 	@cd ${WRKSRC} && cp -R examples examples-src
 	@find ${WRKSRC}/examples-src -name '*.orig' |xargs rm
@@ -186,8 +203,6 @@ pre-install:
 	    ${INSTALL_PROGRAM} $$i/$$i ${QT_TUTORIAL}/$$i; \
 	fi; done
 .else
-MT_SUFX=
-LIBRARIES=qt.so.3.23 editor.so.1.0 qui.so.1.0
 
 post-patch:
 	-rm -rf ${WRKSRC}/examples

x11/qt3/pkg/PFRAG.no-mt

@@ -0,0 +1,2 @@
+lib/qt3/libeditor.a
+

x11/qt3/pkg/PFRAG.shared

@@ -1,10 +1,10 @@
-@comment $OpenBSD: PFRAG.shared,v 1.10 2004/01/08 01:20:13 brad Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.11 2004/01/22 21:03:59 espie Exp $
-lib/libqt${FLAVOR_EXT}.so.3.23
+lib/libqt${MT_SUFX}.so.3.23
-lib/libqui${FLAVOR_EXT}.so.1.0
+lib/libqui${MT_SUFX}.so.1.0
-lib/qt3/libqt${FLAVOR_EXT}.so.3.23
+lib/qt3/libqt${MT_SUFX}.so.3.23
-lib/qt3/libqui${FLAVOR_EXT}.so.1.0
+lib/qt3/libqui${MT_SUFX}.so.1.0
-lib/qt3/plugins${FLAVOR_EXT}/designer/libcppeditor.so
+lib/qt3/plugins${MT_SUFX}/designer/libcppeditor.so
-lib/qt3/plugins${FLAVOR_EXT}/designer/libdlgplugin.so
+lib/qt3/plugins${MT_SUFX}/designer/libdlgplugin.so
-lib/qt3/plugins${FLAVOR_EXT}/designer/librcplugin.so
+lib/qt3/plugins${MT_SUFX}/designer/librcplugin.so
-lib/qt3/plugins${FLAVOR_EXT}/designer/libwizards.so
+lib/qt3/plugins${MT_SUFX}/designer/libwizards.so
 DYNLIBDIR(%D/lib)

x11/qt3/pkg/PLIST

@@ -1,38 +1,38 @@
-@comment $OpenBSD: PLIST,v 1.13 2004/01/08 01:20:13 brad Exp $
+@comment $OpenBSD: PLIST,v 1.14 2004/01/22 21:03:59 espie Exp $
-bin/assistant
+bin/assistant${MT_SUFX}
-bin/designer3
+bin/designer3${MT_SUFX}
-bin/findtr3
+bin/findtr3${MT_SUFX}
-bin/linguist
+bin/linguist${MT_SUFX}
-bin/lrelease
+bin/lrelease${MT_SUFX}
-bin/lupdate
+bin/lupdate${MT_SUFX}
-bin/moc3
+bin/moc3${MT_SUFX}
-bin/qm2ts
+bin/qm2ts${MT_SUFX}
-bin/qmake
+bin/qmake${MT_SUFX}
-bin/qt20fix3
+bin/qt20fix3${MT_SUFX}
-bin/qtconfig
+bin/qtconfig${MT_SUFX}
-bin/qtrename1403
+bin/qtrename1403${MT_SUFX}
-bin/uic3
+bin/uic3${MT_SUFX}
-lib/qt3/bin/assistant
+lib/qt3/bin${MT_SUFX}/assistant
-lib/qt3/bin/designer
+lib/qt3/bin${MT_SUFX}/designer
-lib/qt3/bin/findtr
+lib/qt3/bin${MT_SUFX}/findtr
-lib/qt3/bin/linguist
+lib/qt3/bin${MT_SUFX}/linguist
-lib/qt3/bin/lrelease
+lib/qt3/bin${MT_SUFX}/lrelease
-lib/qt3/bin/lupdate
+lib/qt3/bin${MT_SUFX}/lupdate
-lib/qt3/bin/moc
+lib/qt3/bin${MT_SUFX}/moc
-lib/qt3/bin/qm2ts
+lib/qt3/bin${MT_SUFX}/qm2ts
-lib/qt3/bin/qmake
+lib/qt3/bin${MT_SUFX}/qmake
-lib/qt3/bin/qt20fix
+lib/qt3/bin${MT_SUFX}/qt20fix
-lib/qt3/bin/qtconfig
+lib/qt3/bin${MT_SUFX}/qtconfig
-lib/qt3/bin/qtrename140
+lib/qt3/bin${MT_SUFX}/qtrename140
-lib/qt3/bin/uic
+lib/qt3/bin${MT_SUFX}/uic
-lib/qt3/libeditor.a
+!%%mt%%
 %%SHARED%%
-@exec mkdir -p %D/lib/qt3/plugins/imageformats
+@exec mkdir -p %D/lib/qt3/plugins${MT_SUFX}/imageformats
-@exec mkdir -p %D/lib/qt3/plugins/styles
+@exec mkdir -p %D/lib/qt3/plugins${MT_SUFX}/styles
-@exec mkdir -p %D/lib/qt3/plugins/sqldrivers
+@exec mkdir -p %D/lib/qt3/plugins${MT_SUFX}/sqldrivers
-@dirrm lib/qt3/plugins/styles
+@dirrm lib/qt3/plugins${MT_SUFX}/styles
-@dirrm lib/qt3/plugins/sqldrivers
+@dirrm lib/qt3/plugins${MT_SUFX}/sqldrivers
-@dirrm lib/qt3/plugins/imageformats
+@dirrm lib/qt3/plugins${MT_SUFX}/imageformats
-@dirrm lib/qt3/plugins/designer
+@dirrm lib/qt3/plugins${MT_SUFX}/designer
-@dirrm lib/qt3/plugins
+@dirrm lib/qt3/plugins${MT_SUFX}
-@dirrm lib/qt3/bin
+@dirrm lib/qt3/bin${MT_SUFX}

x11/qt3/pkg/PLIST-mt

@@ -1,37 +0,0 @@
-@comment $OpenBSD: PLIST-mt,v 1.9 2004/01/08 01:20:13 brad Exp $
-bin/assistant${FLAVOR_EXT}
-bin/designer3${FLAVOR_EXT}
-bin/findtr3${FLAVOR_EXT}
-bin/linguist${FLAVOR_EXT}
-bin/lrelease${FLAVOR_EXT}
-bin/lupdate${FLAVOR_EXT}
-bin/moc3${FLAVOR_EXT}
-bin/qm2ts${FLAVOR_EXT}
-bin/qmake${FLAVOR_EXT}
-bin/qt20fix3${FLAVOR_EXT}
-bin/qtconfig${FLAVOR_EXT}
-bin/qtrename1403${FLAVOR_EXT}
-bin/uic3${FLAVOR_EXT}
-lib/qt3/bin${FLAVOR_EXT}/assistant
-lib/qt3/bin${FLAVOR_EXT}/designer
-lib/qt3/bin${FLAVOR_EXT}/findtr
-lib/qt3/bin${FLAVOR_EXT}/linguist
-lib/qt3/bin${FLAVOR_EXT}/lrelease
-lib/qt3/bin${FLAVOR_EXT}/lupdate
-lib/qt3/bin${FLAVOR_EXT}/moc
-lib/qt3/bin${FLAVOR_EXT}/qm2ts
-lib/qt3/bin${FLAVOR_EXT}/qmake
-lib/qt3/bin${FLAVOR_EXT}/qt20fix
-lib/qt3/bin${FLAVOR_EXT}/qtconfig
-lib/qt3/bin${FLAVOR_EXT}/qtrename140
-lib/qt3/bin${FLAVOR_EXT}/uic
-%%SHARED%%
-@exec mkdir -p %D/lib/qt3/plugins${FLAVOR_EXT}/imageformats
-@exec mkdir -p %D/lib/qt3/plugins${FLAVOR_EXT}/styles
-@exec mkdir -p %D/lib/qt3/plugins${FLAVOR_EXT}/sqldrivers
-@dirrm lib/qt3/plugins${FLAVOR_EXT}/styles
-@dirrm lib/qt3/plugins${FLAVOR_EXT}/sqldrivers
-@dirrm lib/qt3/plugins${FLAVOR_EXT}/imageformats
-@dirrm lib/qt3/plugins${FLAVOR_EXT}/designer
-@dirrm lib/qt3/plugins${FLAVOR_EXT}
-@dirrm lib/qt3/bin${FLAVOR_EXT}

x11/qt3/pkg/PLIST-mysql

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PLIST-mysql,v 1.2 2002/07/17 21:43:37 espie Exp $
+@comment $OpenBSD: PLIST-mysql,v 1.3 2004/01/22 21:03:59 espie Exp $
-lib/qt3/plugins/sqldrivers/libqsqlmysql.so
+lib/qt3/plugins${MT_SUFX}/sqldrivers/libqsqlmysql.so

x11/qt3/pkg/PLIST-mysql-mt

@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-mysql-mt,v 1.1 2003/01/06 06:22:53 espie Exp $
-lib/qt3/plugins-mt/sqldrivers/libqsqlmysql.so

x11/qt3/pkg/PLIST-postgresql

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PLIST-postgresql,v 1.2 2002/07/17 21:43:37 espie Exp $
+@comment $OpenBSD: PLIST-postgresql,v 1.3 2004/01/22 21:03:59 espie Exp $
-lib/qt3/plugins/sqldrivers/libqsqlpsql.so
+lib/qt3/plugins${MT_SUFX}/sqldrivers/libqsqlpsql.so

x11/qt3/pkg/PLIST-postgresql-mt

@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-postgresql-mt,v 1.1 2003/01/06 06:22:53 espie Exp $
-lib/qt3/plugins-mt/sqldrivers/libqsqlpsql.so