new MULTI_PACKAGES

devel/uuid/Makefile

@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.19 2006/08/01 23:39:08 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2006/11/20 20:27:34 espie Exp $
 
 SHARED_ONLY=	Yes
 
-COMMENT=	"ISO-C API and CLI for generating Universally Unique Identifiers"
+COMMENT-main=	"ISO-C API and CLI for generating Universally Unique Identifiers"
 COMMENT-perl=	"UUID modules for Perl"
 
 VERSION=		1.5.0
 DISTNAME=		uuid-${VERSION}
-FULLPKGNAME=		uuid-${VERSION}
+FULLPKGNAME-main=	uuid-${VERSION}p0
 FULLPKGNAME-perl= 	p5-UUID-${VERSION}
 CATEGORIES=		devel
 SHARED_LIBS=		uuid	13.22 \
@@ -23,18 +23,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c
 
-MULTI_PACKAGES=		-perl
-SUBPACKAGE?=
+MULTI_PACKAGES=		-main -perl
 
-.if ${SUBPACKAGE} == "-perl"
-CATEGORIES=		devel perl5
-WANTLIB=
-.  if defined(PACKAGING)
-LIB_DEPENDS+=		uuid.>=12::devel/uuid
-.  endif
-.endif
+WANTLIB-main=		c
+
+CATEGORIES-perl=	devel perl5
+WANTLIB-perl=
+LIB_DEPENDS-perl=	uuid.>=12::devel/uuid
 
 USE_LIBTOOL=		Yes
 

devel/uuid/pkg/PFRAG.shared

@@ -1,3 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.8 2006/03/12 23:11:31 robert Exp $
-@lib lib/libuuid++.so.${LIBuuid++_VERSION}
-@lib lib/libuuid.so.${LIBuuid_VERSION}

devel/uuid/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2006/03/12 23:11:31 robert Exp $
+@comment $OpenBSD: PLIST-main,v 1.1 2006/11/20 20:27:34 espie Exp $
 @conflict e2fsprogs-*
 bin/uuid
 bin/uuid-config
@@ -7,11 +7,12 @@ include/uuid.h
 lib/libuuid++.a
 lib/libuuid++.la
 lib/libuuid.a
+@lib lib/libuuid++.so.${LIBuuid++_VERSION}
 lib/libuuid.la
+@lib lib/libuuid.so.${LIBuuid_VERSION}
 lib/pkgconfig/
 lib/pkgconfig/uuid.pc
 @man man/man1/uuid-config.1
 @man man/man1/uuid.1
 @man man/man3/uuid++.3
 @man man/man3/uuid.3
-%%SHARED%%