From 923fbd131a36ed927119d27ef2d803d3602839c9 Mon Sep 17 00:00:00 2001
From: steven <steven@openbsd.org>
Date: Tue, 21 Nov 2006 20:42:30 +0000
Subject: [PATCH] new MULTI_PACKAGES

looks good espie@
---
 math/fftw3/Makefile                           | 23 +++++++------------
 math/fftw3/pkg/{DESCR => DESCR-main}          |  0
 .../pkg/{PFRAG.double => PFRAG.double-main}   |  3 ++-
 math/fftw3/pkg/PFRAG.double-shared            |  2 --
 math/fftw3/pkg/PFRAG.double-shared-main       |  2 ++
 .../pkg/{PFRAG.float => PFRAG.float-main}     |  3 ++-
 math/fftw3/pkg/PFRAG.float-shared             |  2 --
 math/fftw3/pkg/PFRAG.float-shared-main        |  2 ++
 math/fftw3/pkg/PFRAG.shared                   |  3 ---
 math/fftw3/pkg/PFRAG.shared-main              |  3 +++
 math/fftw3/pkg/PLIST                          |  5 ----
 math/fftw3/pkg/PLIST-main                     |  5 ++++
 12 files changed, 24 insertions(+), 29 deletions(-)
 rename math/fftw3/pkg/{DESCR => DESCR-main} (100%)
 rename math/fftw3/pkg/{PFRAG.double => PFRAG.double-main} (53%)
 delete mode 100644 math/fftw3/pkg/PFRAG.double-shared
 create mode 100644 math/fftw3/pkg/PFRAG.double-shared-main
 rename math/fftw3/pkg/{PFRAG.float => PFRAG.float-main} (50%)
 delete mode 100644 math/fftw3/pkg/PFRAG.float-shared
 create mode 100644 math/fftw3/pkg/PFRAG.float-shared-main
 delete mode 100644 math/fftw3/pkg/PFRAG.shared
 create mode 100644 math/fftw3/pkg/PFRAG.shared-main
 delete mode 100644 math/fftw3/pkg/PLIST
 create mode 100644 math/fftw3/pkg/PLIST-main

diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile
index 652542db04e..d7c8a877f68 100644
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.8 2006/10/28 23:23:29 steven Exp $
+# $OpenBSD: Makefile,v 1.9 2006/11/21 20:42:30 steven Exp $
 
-COMMENT=	"C routines for computing the Discrete Fourier Transform"
+COMMENT-main=	"C routines for computing the Discrete Fourier Transform"
 COMMENT-common=	"common files for the fftw3 packages"
 
 V=		3.1.2
 DISTNAME=	fftw-${V}
 PKGNAME=	fftw3-${V}
-FULLPKGNAME=	fftw3-${V}p1
+FULLPKGNAME-main=	fftw3-${V}p2
 FULLPKGNAME-common=	fftw3-common-${V}
 SHARED_LIBS=	fftw3	4.2 \
 		fftw3f	4.2
@@ -21,7 +21,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c m
 
 MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/ \
 		http://fftw.mirror.fr/ \
@@ -29,8 +28,7 @@ MASTER_SITES=	ftp://ftp.fftw.org/pub/fftw/ \
 
 SEPARATE_BUILD=	concurrent
 
-MULTI_PACKAGES=	-common
-SUBPACKAGE?=
+MULTI_PACKAGES=	-main -common
 
 FLAVORS=	double float
 FLAVOR?=	double
@@ -43,17 +41,12 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 
 .if ${FLAVOR} == "float"
 CONFIGURE_ARGS+=--enable-float
-FULLPKGNAME=	fftw3-float-${V}
+FULLPKGNAME-main=	fftw3-float-${V}p0
 .endif
 
-.if defined(PACKAGING)
-.  if empty(SUBPACKAGE)
-RUN_DEPENDS=	::math/fftw3,-common
-.  elif ${SUBPACKAGE} == "-common"
-PKG_ARCH=	*
-WANTLIB=
-.  endif
-.endif
+RUN_DEPENDS-main=	::math/fftw3,-common
+WANTLIB-main=		c m
+PKG_ARCH-common=	*
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fftw3
diff --git a/math/fftw3/pkg/DESCR b/math/fftw3/pkg/DESCR-main
similarity index 100%
rename from math/fftw3/pkg/DESCR
rename to math/fftw3/pkg/DESCR-main
diff --git a/math/fftw3/pkg/PFRAG.double b/math/fftw3/pkg/PFRAG.double-main
similarity index 53%
rename from math/fftw3/pkg/PFRAG.double
rename to math/fftw3/pkg/PFRAG.double-main
index 544c209a188..8a5f7415935 100644
--- a/math/fftw3/pkg/PFRAG.double
+++ b/math/fftw3/pkg/PFRAG.double-main
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PFRAG.double,v 1.2 2006/10/28 23:23:29 steven Exp $
+@comment $OpenBSD: PFRAG.double-main,v 1.1 2006/11/21 20:42:30 steven Exp $
 @pkgpath math/fftw3
+@pkgpath math/fftw3,double
 bin/fftw-wisdom
 lib/libfftw3.a
 lib/libfftw3.la
diff --git a/math/fftw3/pkg/PFRAG.double-shared b/math/fftw3/pkg/PFRAG.double-shared
deleted file mode 100644
index 113e25b83a0..00000000000
--- a/math/fftw3/pkg/PFRAG.double-shared
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.double-shared,v 1.1 2006/10/18 17:40:38 steven Exp $
-@lib lib/libfftw3.so.${LIBfftw3_VERSION}
diff --git a/math/fftw3/pkg/PFRAG.double-shared-main b/math/fftw3/pkg/PFRAG.double-shared-main
new file mode 100644
index 00000000000..9de764b8b0b
--- /dev/null
+++ b/math/fftw3/pkg/PFRAG.double-shared-main
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.double-shared-main,v 1.1 2006/11/21 20:42:30 steven Exp $
+@lib lib/libfftw3.so.${LIBfftw3_VERSION}
diff --git a/math/fftw3/pkg/PFRAG.float b/math/fftw3/pkg/PFRAG.float-main
similarity index 50%
rename from math/fftw3/pkg/PFRAG.float
rename to math/fftw3/pkg/PFRAG.float-main
index 0dd089ae71a..6de0b3992fe 100644
--- a/math/fftw3/pkg/PFRAG.float
+++ b/math/fftw3/pkg/PFRAG.float-main
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PFRAG.float,v 1.1 2006/10/18 17:40:38 steven Exp $
+@comment $OpenBSD: PFRAG.float-main,v 1.1 2006/11/21 20:42:30 steven Exp $
+@pkgpath math/fftw3,float
 bin/fftwf-wisdom
 lib/libfftw3f.a
 lib/libfftw3f.la
diff --git a/math/fftw3/pkg/PFRAG.float-shared b/math/fftw3/pkg/PFRAG.float-shared
deleted file mode 100644
index 6b903e78a88..00000000000
--- a/math/fftw3/pkg/PFRAG.float-shared
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.float-shared,v 1.1 2006/10/18 17:40:38 steven Exp $
-@lib lib/libfftw3f.so.${LIBfftw3f_VERSION}
diff --git a/math/fftw3/pkg/PFRAG.float-shared-main b/math/fftw3/pkg/PFRAG.float-shared-main
new file mode 100644
index 00000000000..0135edeb720
--- /dev/null
+++ b/math/fftw3/pkg/PFRAG.float-shared-main
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.float-shared-main,v 1.1 2006/11/21 20:42:30 steven Exp $
+@lib lib/libfftw3f.so.${LIBfftw3f_VERSION}
diff --git a/math/fftw3/pkg/PFRAG.shared b/math/fftw3/pkg/PFRAG.shared
deleted file mode 100644
index 9b5c208e996..00000000000
--- a/math/fftw3/pkg/PFRAG.shared
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2006/10/18 17:40:38 steven Exp $
-%%double%%
-%%float%%
diff --git a/math/fftw3/pkg/PFRAG.shared-main b/math/fftw3/pkg/PFRAG.shared-main
new file mode 100644
index 00000000000..575bfe2e3ad
--- /dev/null
+++ b/math/fftw3/pkg/PFRAG.shared-main
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 20:42:30 steven Exp $
+%%double%%
+%%float%%
diff --git a/math/fftw3/pkg/PLIST b/math/fftw3/pkg/PLIST
deleted file mode 100644
index 0f1bd4d445f..00000000000
--- a/math/fftw3/pkg/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.2 2006/10/18 17:40:38 steven Exp $
-%%SHARED%%
-%%double%%
-%%float%%
-lib/pkgconfig/
diff --git a/math/fftw3/pkg/PLIST-main b/math/fftw3/pkg/PLIST-main
new file mode 100644
index 00000000000..e13fef61f2f
--- /dev/null
+++ b/math/fftw3/pkg/PLIST-main
@@ -0,0 +1,5 @@
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/21 20:42:30 steven Exp $
+%%SHARED%%
+%%double%%
+%%float%%
+lib/pkgconfig/