new MULTI_PACKAGES

devel/doxygen/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2006/08/01 22:46:16 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2006/11/26 17:43:44 espie Exp $
 
-COMMENT=	"documentation system for C++/C/Java/Objective-C/IDL and others"
+COMMENT-main=	"documentation system for C++/C/Java/Objective-C/IDL and others"
 COMMENT-gui=	"GUI front-end for doxygen"
 
 VERSION=	1.4.7
 DISTNAME=	doxygen-${VERSION}.src
-PKGNAME=	doxygen-${VERSION}
+PKGNAME-main=	doxygen-${VERSION}p0
 FULLPKGNAME-gui=doxygen-gui-${VERSION}
 CATEGORIES=	devel textproc 
 
@@ -22,7 +22,7 @@ MASTER_SITES=	ftp://ftp.stack.nl/pub/users/dimitri/
 PSEUDO_FLAVORS=	gui
 FLAVOR?=
 
-LIB_DEPENDS=	png.>=4::graphics/png
+LIB_DEPENDS-main=png.>=4::graphics/png
 
 WANTLIB=	m c stdc++
 
@@ -31,27 +31,21 @@ CONFIGURE_ARGS=	--prefix ${WRKINST}${LOCALBASE} \
 		--install /usr/bin/install \
 		--make /usr/bin/make
 
-SUBPACKAGE?=	
-
+MULTI_PACKAGES=	-main
 .if ${FLAVOR:Mgui}
 CONFIGURE_ARGS+=--with-doxywizard
 CONFIGURE_ENV=	QTDIR=${LOCALBASE}
 
 MODULES=	x11/qt3
 
-MULTI_PACKAGES=	-gui
+MULTI_PACKAGES+=-gui
 .endif
 
-.if defined(PACKAGING)
-.  if !empty(SUBPACKAGE)
-WANTLIB+=	X11 Xext pthread
-LIB_DEPENDS=
-RUN_DEPENDS=	:doxygen-${VERSION}:devel/doxygen
-.  else
-WANTLIB+=	z
-MODULES=
-.  endif
-.endif
+WANTLIB-gui=	${WANTLIB} X11 Xext pthread
+LIB_DEPENDS-gui=${MODQT_LIB_DEPENDS}
+RUN_DEPENDS-gui=:doxygen-${VERSION}:${BUILD_PKGPATH}
+
+WANTLIB-main=	${WANTLIB} z
 
 MAKE_FLAGS+=	CXX=${CXX} CC=${CC} _CFLAGS="${CXXFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib"

devel/doxygen/pkg/PLIST-main

@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/02/07 10:20:36 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/26 17:43:44 espie Exp $
 @pkgpath devel/doxygen,gui
+@pkgpath devel/doxygen
 bin/doxygen
 bin/doxytag
 @man man/man1/doxygen.1