split the libuuid that's part of e2fs into its separate package. Move it

so it no longer conflicts with devel/uuid.

sysutils/e2fsprogs/Makefile

@@ -1,10 +1,13 @@
-# $OpenBSD: Makefile,v 1.7 2006/02/20 16:51:46 aanriot Exp $
+# $OpenBSD: Makefile,v 1.8 2007/01/07 19:13:49 espie Exp $
 # $FreeBSD: ports/sysutils/e2fsprogs/Makefile,v 1.8 2003/02/20 19:00:47 knu Exp $
 
-COMMENT=		"utilities to manipulate ext2 filesystems"
+COMMENT-main=		"utilities to manipulate ext2 filesystems"
+COMMENT-uuid=		"unique id generator library"
 
 DISTNAME=		e2fsprogs-1.27
-PKGNAME=		${DISTNAME}p4
+PKGNAME-main=		${DISTNAME}p5
+PKGNAME-uuid=		e2fs-uuid-1.27
+CATEGORIES-uuid=	devel
 CATEGORIES=		sysutils
 SHARED_LIBS=		e2p		2.3 \
 			ext2fs		2.4 \
@@ -17,6 +20,8 @@ HOMEPAGE=		http://e2fsprogs.sourceforge.net/
 MAINTAINER=		Laurent Corbes <caf@glot.net> \
 			Sebastien Bombal <acide@bombal.org>
 
+MULTI_PACKAGES=		-main -uuid
+
 # GPL
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
@@ -37,6 +42,7 @@ MAKE_FLAGS=		LIBe2p_VERSION=${LIBe2p_VERSION} \
 			LIBss_VERSION=${LIBss_VERSION} \
 			LIBuuid_VERSION=${LIBuuid_VERSION}
 FAKE_FLAGS=		${MAKE_FLAGS}
+LIB_DEPENDS-main=	lib/uuid/uuid::${BUILD_PKGPATH},-uuid
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/ext2fs
@@ -45,5 +51,11 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/uuid/*.h ${PREFIX}/include/uuid
 	@cd ${PREFIX}/sbin && mv fsck pfsck
 	@cd ${PREFIX}/man/man8 && mv fsck.8 pfsck.8
+	@${INSTALL_DATA_DIR} ${PREFIX}/lib/uuid
+	@mv ${PREFIX}/lib/libuuid.* ${PREFIX}/lib/uuid
+	if [ -f ${PREFIX}/lib/uuid/libuuid.so.${LIBuuid_VERSION} ]; then \
+		ln -s uuid/libuuid.so.${LIBuuid_VERSION} ${PREFIX}/lib; \
+	fi
+
 
 .include <bsd.port.mk>

sysutils/e2fsprogs/pkg/DESCR-uuid

@@ -0,0 +1,5 @@
+unique id library, normally part of e2fsprogs, moved into its separate
+package and its separate directory so that it does not conflict with
+another libuuid.
+
+Be sure to link with -L${PREFIX}/lib/uuid to get the right one.

sysutils/e2fsprogs/pkg/PFRAG.shared-main

@@ -1,6 +1,5 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/23 16:43:08 mbalmer Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.1 2007/01/07 19:13:49 espie Exp $
 @lib lib/libe2p.so.${LIBe2p_VERSION}
 @lib lib/libext2fs.so.${LIBext2fs_VERSION}
 @lib lib/libext2fs_com_err.so.${LIBext2fs_com_err_VERSION}
 @lib lib/libss.so.${LIBss_VERSION}
-@lib lib/libuuid.so.${LIBuuid_VERSION}

sysutils/e2fsprogs/pkg/PFRAG.shared-uuid

@@ -0,0 +1,3 @@
+@comment $OpenBSD: PFRAG.shared-uuid,v 1.1 2007/01/07 19:13:49 espie Exp $
+@lib lib/libuuid.so.${LIBuuid_VERSION}
+@lib lib/uuid/libuuid.so.${LIBuuid_VERSION}

sysutils/e2fsprogs/pkg/PLIST-main

@@ -1,8 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/12/30 00:16:05 espie Exp $
-@conflict uuid-*
+@comment $OpenBSD: PLIST-main,v 1.1 2007/01/07 19:13:49 espie Exp $
 bin/chattr
 bin/lsattr
-bin/uuidgen
 include/ext2fs/
 include/ext2fs/bitops.h
 include/ext2fs/brel.h
@@ -19,18 +17,13 @@ include/ext2fs/jfs_dat.h
 include/ext2fs/jfs_user.h
 include/ext2fs/kernel-jbd.h
 include/ext2fs/kernel-list.h
-include/uuid/
-include/uuid/uuid.h
-include/uuid/uuidP.h
 @info info/libext2fs.info
 lib/libe2p.a
 lib/libext2fs.a
 lib/libext2fs_com_err.a
 lib/libss.a
-lib/libuuid.a
 @man man/man1/chattr.1
 @man man/man1/lsattr.1
-@man man/man1/uuidgen.1
 @man man/man8/badblocks.8
 @man man/man8/debugfs.8
 @man man/man8/dumpe2fs.8

sysutils/e2fsprogs/pkg/PLIST-uuid

@@ -0,0 +1,9 @@
+@comment $OpenBSD: PLIST-uuid,v 1.1 2007/01/07 19:13:49 espie Exp $
+bin/uuidgen
+include/uuid/
+include/uuid/uuid.h
+include/uuid/uuidP.h
+lib/uuid/
+lib/uuid/libuuid.a
+@man man/man1/uuidgen.1
+%%SHARED%%