From 1dafed5779fa62846dc616537526f0c7c1fba09c Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 21 Nov 2006 10:32:38 +0000
Subject: [PATCH] new MULTI_PACKAGES

---
 databases/mdbtools/snapshot/Makefile          | 27 +++++++------------
 .../snapshot/pkg/{DESCR => DESCR-main}        |  0
 .../pkg/{PFRAG.shared => PFRAG.shared-main}   |  2 +-
 .../snapshot/pkg/{PLIST => PLIST-main}        |  3 ++-
 4 files changed, 13 insertions(+), 19 deletions(-)
 rename databases/mdbtools/snapshot/pkg/{DESCR => DESCR-main} (100%)
 rename databases/mdbtools/snapshot/pkg/{PFRAG.shared => PFRAG.shared-main} (51%)
 rename databases/mdbtools/snapshot/pkg/{PLIST => PLIST-main} (83%)

diff --git a/databases/mdbtools/snapshot/Makefile b/databases/mdbtools/snapshot/Makefile
index 5391841e674..0f81052a155 100644
--- a/databases/mdbtools/snapshot/Makefile
+++ b/databases/mdbtools/snapshot/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2006/11/11 21:04:27 steven Exp $
+# $OpenBSD: Makefile,v 1.7 2006/11/21 10:32:38 espie Exp $
 
-COMMENT=	"read microsoft Access MDB"
+COMMENT-main=	"read microsoft Access MDB"
 COMMENT-gmdb=	"graphical interface to MDB tools"
 DATE=		20060425
 DISTNAME=	mdbtools-${DATE}
+PKGNAME-main=	mdbtools-${DATE}p0
 PKGNAME-gmdb=	gmdb-${DATE}p0
 HOMEPAGE=	http://mdbtools.sourceforge.net/
 
@@ -11,9 +12,7 @@ CATEGORIES=	databases converters
 MASTER_SITES=	ftp://quatramaran.ens.fr/pub/espie/
 
 #MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=mdbtools/}
-MULTI_PACKAGES=	-gmdb
-
-SUBPACKAGE?=
+MULTI_PACKAGES=	-main -gmdb
 
 SHARED_LIBS +=	mdb                  1.0      # .1.0
 SHARED_LIBS +=	mdbsql               1.0      # .1.0
@@ -39,9 +38,11 @@ WANTLIB=	c
 MODULES=	devel/gettext
 
 
-.if !defined(PACKAGING) || ${SUBPACKAGE} == "-gmdb"
-LIB_DEPENDS+=	gnomeui-2::x11/gnome/libgnomeui
-WANTLIB+=	audiofile bonobo-activation popt ORBit-2 pthread \
+LIB_DEPENDS-gmdb=${LIB_DEPENDS} \
+		gnomeui-2::x11/gnome/libgnomeui \
+		mdb,mdbsql::databases/mdbtools/snapshot
+WANTLIB-gmdb=	${WANTLIB} \
+		audiofile bonobo-activation popt ORBit-2 pthread \
 		bonoboui-2  atk-1.0 gobject-2.0 m jpeg \
 		SM esd fontconfig ssl z cairo glitz png \
 		gthread-2.0 art_lgpl_2 X11 glade-2.0 \
@@ -51,16 +52,8 @@ WANTLIB+=	audiofile bonobo-activation popt ORBit-2 pthread \
 		gnome-keyring freetype crypto gtk-x11-2.0 \
 		pangocairo-1.0 gdk_pixbuf-2.0 bonobo-2 \
 		gnomevfs-2 ORBitCosNaming-2
-.endif
-
-.if defined(PACKAGING) && ${SUBPACKAGE} == "-gmdb"
-LIB_DEPENDS+=	mdb,mdbsql::databases/mdbtools/snapshot
-.endif
-
-.if defined(PACKAGING) && ${SUBPACKAGE} == ""
-WANTLIB+= readline termcap
-.endif
 
+WANTLIB-main=	${WANTLIB} readline termcap
 
 .include <bsd.port.mk>
 
diff --git a/databases/mdbtools/snapshot/pkg/DESCR b/databases/mdbtools/snapshot/pkg/DESCR-main
similarity index 100%
rename from databases/mdbtools/snapshot/pkg/DESCR
rename to databases/mdbtools/snapshot/pkg/DESCR-main
diff --git a/databases/mdbtools/snapshot/pkg/PFRAG.shared b/databases/mdbtools/snapshot/pkg/PFRAG.shared-main
similarity index 51%
rename from databases/mdbtools/snapshot/pkg/PFRAG.shared
rename to databases/mdbtools/snapshot/pkg/PFRAG.shared-main
index 9201281a00d..3bfb5ae748c 100644
--- a/databases/mdbtools/snapshot/pkg/PFRAG.shared
+++ b/databases/mdbtools/snapshot/pkg/PFRAG.shared-main
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/05/01 09:55:33 espie Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 10:32:38 espie Exp $
 @lib lib/libmdb.so.${LIBmdb_VERSION}
 @lib lib/libmdbsql.so.${LIBmdbsql_VERSION}
diff --git a/databases/mdbtools/snapshot/pkg/PLIST b/databases/mdbtools/snapshot/pkg/PLIST-main
similarity index 83%
rename from databases/mdbtools/snapshot/pkg/PLIST
rename to databases/mdbtools/snapshot/pkg/PLIST-main
index b5c4953e728..969e6434248 100644
--- a/databases/mdbtools/snapshot/pkg/PLIST
+++ b/databases/mdbtools/snapshot/pkg/PLIST-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/05/01 09:55:33 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 10:32:38 espie Exp $
+@pkgpath databases/mdbtools/snapshot
 %%SHARED%%
 bin/mdb-array
 bin/mdb-export