From 43b115ae286afc18602a4eaafd06af583c6b8e44 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 6 Jul 2011 07:21:24 +0000
Subject: [PATCH] More ossp-uuid vs e2fs-uuid cleaning: rename uuid.pc to
 ossp-uuid.pc and e2fs-uuid.pc to uuid.pc. uuid.pc is what all projects using
 pkg-config expect to find when looking for the "standard" uuid lib nowadays.

prompted by aja@
ok aja@ landry@ sthen@
---
 devel/uuid/Makefile          | 7 ++++++-
 devel/uuid/pkg/PLIST-main    | 6 +++---
 sysutils/e2fsprogs/Makefile  | 5 ++---
 sysutils/e2fsprogs/pkg/PLIST | 5 +++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/devel/uuid/Makefile b/devel/uuid/Makefile
index 208d11ba7db..d5f8856b0ad 100644
--- a/devel/uuid/Makefile
+++ b/devel/uuid/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2010/12/23 23:04:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.40 2011/07/06 07:21:24 jasper Exp $
 
 SHARED_ONLY=	Yes
 
@@ -13,6 +13,8 @@ CATEGORIES=		devel
 SHARED_LIBS=		uuid	13.22 \
 			uuid++	14.21
 
+REVISION-main=		0
+
 # Note there is a different libuuid in sysutils/e2fsprogs,-uuid.
 # If you are porting something which needs libuuid, you may need
 # to look there instead.
@@ -44,4 +46,7 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-perl --with-cxx \
 			--without-php --without-pgsql
 
+post-install:
+	mv ${PREFIX}/lib/pkgconfig/uuid.pc ${PREFIX}/lib/pkgconfig/ossp-uuid.pc
+
 .include <bsd.port.mk>
diff --git a/devel/uuid/pkg/PLIST-main b/devel/uuid/pkg/PLIST-main
index f8d52263047..838f7c058f5 100644
--- a/devel/uuid/pkg/PLIST-main
+++ b/devel/uuid/pkg/PLIST-main
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST-main,v 1.6 2010/12/23 23:04:56 jasper Exp $
-@conflict e2fsprogs-<=1.27p4
+@comment $OpenBSD: PLIST-main,v 1.7 2011/07/06 07:21:24 jasper Exp $
+@conflict e2fsprogs-<=1.41.4p4
 @conflict uuid-*
 @pkgpath devel/uuid
 @bin bin/uuid
@@ -13,7 +13,7 @@ lib/libuuid.a
 lib/libuuid.la
 @lib lib/libuuid.so.${LIBuuid_VERSION}
 lib/pkgconfig/
-lib/pkgconfig/uuid.pc
+lib/pkgconfig/ossp-uuid.pc
 @man man/man1/uuid-config.1
 @man man/man1/uuid.1
 @man man/man3/uuid++.3
diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index ec7a7f85507..85128e4deb3 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2010/11/20 17:22:40 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2011/07/06 07:21:24 jasper Exp $
 # $FreeBSD: ports/sysutils/e2fsprogs/Makefile,v 1.8 2003/02/20 19:00:47 knu Exp $
 
 COMMENT=		utilities to manipulate ext2 filesystems
 
 DISTNAME=		e2fsprogs-1.41.4
-REVISION =		4
+REVISION =		5
 CATEGORIES=		sysutils devel
 SHARED_LIBS=		blkid		0.0 \
 			e2p		3.0 \
@@ -47,6 +47,5 @@ post-install:
 	cd ${PREFIX}/sbin && mv fsck fsck_ext2fs
 	cd ${PREFIX}/man/man8 && mv fsck.8 fsck_ext2fs.8
 	cd ${PREFIX}/man/man3 && mv uuid.3 e2fs-uuid.3
-	mv ${PREFIX}/lib/pkgconfig/uuid.pc ${PREFIX}/lib/pkgconfig/e2fs-uuid.pc
 
 .include <bsd.port.mk>
diff --git a/sysutils/e2fsprogs/pkg/PLIST b/sysutils/e2fsprogs/pkg/PLIST
index 6c94b79c07f..b6b583609ec 100644
--- a/sysutils/e2fsprogs/pkg/PLIST
+++ b/sysutils/e2fsprogs/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.7 2010/05/17 12:01:26 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.8 2011/07/06 07:21:24 jasper Exp $
 @conflict e2fs-uuid-*
+@conflict uuid-1.6.2
 @pkgpath sysutils/e2fsprogs,-main
 @pkgpath sysutils/e2fsprogs,-uuid
 @bin bin/chattr
@@ -41,10 +42,10 @@ lib/libss.a
 lib/pkgconfig/
 lib/pkgconfig/blkid.pc
 lib/pkgconfig/com_err.pc
-lib/pkgconfig/e2fs-uuid.pc
 lib/pkgconfig/e2p.pc
 lib/pkgconfig/ext2fs.pc
 lib/pkgconfig/ss.pc
+lib/pkgconfig/uuid.pc
 @man man/man1/chattr.1
 @comment man/man1/compile_et.1
 @man man/man1/lsattr.1