Implement Debian patches to avoid the conflict with devel/libuuid. Effectively

renames the lib installed to libossp-uuid, which is already supported by
databases/postgresql*-datatypes.
Bump PKGREVISION.

12 files changed, 230 insertions, 21 deletions

diff --git a/devel/ossp-uuid/Makefile b/devel/ossp-uuid/Makefile
index 4b21896170a..b7b0a65f303 100644
--- a/devel/ossp-uuid/Makefile
+++ b/devel/ossp-uuid/Makefile
@@ -1,19 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2013/05/31 12:40:02 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2014/02/12 11:43:53 fhajny Exp $
 #
 
 DISTNAME=		uuid-1.6.2
 PKGNAME=		ossp-${DISTNAME}
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.ossp.org/pkg/lib/uuid/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.ossp.org/pkg/lib/uuid/
 COMMENT=		C-API and command line tool for generating UUIDs
-
-CONFLICTS=		libuuid-[0-9]* # libuuid.* uuid.pc uuid.3
-# conflicts with package in pkgsrc-wip
-#CONFLICTS+=		e2fsprogs>1.32 # libuuid.* uuid.pc uuid.3
+LICENSE=		mit
 
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/uuid.pc.in
diff --git a/devel/ossp-uuid/PLIST b/devel/ossp-uuid/PLIST
index ac50f8078c7..8ed6fcff38e 100644
--- a/devel/ossp-uuid/PLIST
+++ b/devel/ossp-uuid/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/20 02:42:27 heinz Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/02/12 11:43:53 fhajny Exp $
 bin/uuid
 bin/uuid-config
 include/uuid++.hh
 include/uuid.h
 include/uuid_dce.h
-lib/libuuid++.la
-lib/libuuid.la
-lib/libuuid_dce.la
-lib/pkgconfig/uuid.pc
+lib/libossp-uuid++.la
+lib/libossp-uuid.la
+lib/libossp-uuid_dce.la
+lib/pkgconfig/ossp-uuid.pc
 man/man1/uuid-config.1
 man/man1/uuid.1
-man/man3/uuid++.3
-man/man3/uuid.3
+man/man3/uuid++.3ossp
+man/man3/uuid.3ossp
diff --git a/devel/ossp-uuid/distinfo b/devel/ossp-uuid/distinfo
index 5eceecc32e1..7ad1648d61c 100644
--- a/devel/ossp-uuid/distinfo
+++ b/devel/ossp-uuid/distinfo
@@ -1,6 +1,14 @@
-$NetBSD: distinfo,v 1.2 2008/07/14 00:02:38 bjs Exp $
+$NetBSD: distinfo,v 1.3 2014/02/12 11:43:53 fhajny Exp $
 
 SHA1 (uuid-1.6.2.tar.gz) = 3e22126f0842073f4ea6a50b1f59dcb9d094719f
 RMD160 (uuid-1.6.2.tar.gz) = f9cd513577557c4f1d7de869f80035b8844b56d7
 Size (uuid-1.6.2.tar.gz) = 397048 bytes
-SHA1 (patch-aa) = 3ba1b261ed40ec882e45b92c60383515e81939db
+SHA1 (patch-aa) = 45bf02ae84db3215fd0bce6a751753f708a33bda
+SHA1 (patch-perl_Makefile.PL) = ade3f5d3f49ba6e5300017500da7dca1f4c4f4a7
+SHA1 (patch-php_config.m4) = 8953299eaae14b39f3ae2e6c9739914654348f5b
+SHA1 (patch-uuid++.pod) = e3e25151aab22976b1f392e130974a07fd571d97
+SHA1 (patch-uuid-config.in) = bdd46fdeef93799405e7672e649caa61b59530e6
+SHA1 (patch-uuid.pc.in) = 496471bf24c88afe4713b7aaf3c07b837f4cf3b6
+SHA1 (patch-uuid.pod) = 4c9d7dbfc428a8794c5dea436beaa6d18f6d7a12
+SHA1 (patch-uuid__cli.c) = 515be1ca002ca17296cc5cecc00072a8714478b7
+SHA1 (patch-uuid__cli.pod) = 86c475d361b08ff3807e269bf0808e0f8b87071d
diff --git a/devel/ossp-uuid/patches/patch-aa b/devel/ossp-uuid/patches/patch-aa
index 0c53e15ffa7..071720f532d 100644
--- a/devel/ossp-uuid/patches/patch-aa
+++ b/devel/ossp-uuid/patches/patch-aa
@@ -1,9 +1,28 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/05/20 02:42:27 heinz Exp $
+$NetBSD: patch-aa,v 1.2 2014/02/12 11:43:53 fhajny Exp $
 
-  Use pkgsrc install commands.
+Rename package files to avoid conflict with devel/libuuid (based
+on Debian patches).
+Use pkgsrc install scripts.
 
---- Makefile.in.orig	2007-05-19 21:58:11.000000000 +0200
+--- Makefile.in.orig	2008-03-08 18:31:40.000000000 +0000
 +++ Makefile.in
+@@ -62,13 +62,13 @@ PERL        = @PERL@
+ PHP         = @PHP@
+ PG_CONFIG   = @PG_CONFIG@
+ 
+-LIB_NAME    = libuuid.la
++LIB_NAME    = libossp-uuid.la
+ LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_time.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
+ 
+-DCE_NAME    = libuuid_dce.la
++DCE_NAME    = libossp-uuid_dce.la
+ DCE_OBJS    = uuid_dce.lo $(LIB_OBJS)
+ 
+-CXX_NAME    = libuuid++.la
++CXX_NAME    = libossp-uuid++.la
+ CXX_OBJS    = uuid++.lo $(LIB_OBJS)
+ 
+ PRG_NAME    = uuid
 @@ -223,38 +223,38 @@ check: all
  
  .PHONY: install
@@ -26,7 +45,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/05/20 02:42:27 heinz Exp $
 +	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
 +	$(BSD_INSTALL_SCRIPT) uuid-config $(DESTDIR)$(bindir)/
 +	$(BSD_INSTALL_MAN) $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
-+	$(BSD_INSTALL_DATA) $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
++	$(BSD_INSTALL_DATA) $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/ossp-uuid.pc
 +	$(BSD_INSTALL_DATA) uuid.h $(DESTDIR)$(includedir)/
  	-@if [ ".$(WITH_DCE)" = .yes ]; then \
 -	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
@@ -41,12 +60,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/05/20 02:42:27 heinz Exp $
 +	    $(BSD_INSTALL_DATA) $(S)/uuid++.hh $(DESTDIR)$(includedir)/; \
  	fi
 -	$(SHTOOL) install -c -m 644 $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
-+	$(BSD_INSTALL_MAN) $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/
++	$(BSD_INSTALL_MAN) $(S)/uuid.3 $(DESTDIR)$(mandir)/man3/uuid.3ossp
  	-@if [ ".$(WITH_CXX)" = .yes ]; then \
 -	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
 -	    $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
 +	    echo "$(BSD_INSTALL_MAN) $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
-+	    $(BSD_INSTALL_MAN) $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
++	    $(BSD_INSTALL_MAN) $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/uuid++.3ossp; \
  	fi
 -	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/
 +	@$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LIB_NAME) $(DESTDIR)$(libdir)/
diff --git a/devel/ossp-uuid/patches/patch-perl_Makefile.PL b/devel/ossp-uuid/patches/patch-perl_Makefile.PL
new file mode 100644
index 00000000000..1fcf2850a0f
--- /dev/null
+++ b/devel/ossp-uuid/patches/patch-perl_Makefile.PL
@@ -0,0 +1,39 @@
+$NetBSD: patch-perl_Makefile.PL,v 1.1 2014/02/12 11:43:53 fhajny Exp $
+
+Rename package files to avoid conflict with devel/libuuid (based
+on Debian patches).
+
+--- perl/Makefile.PL.orig	2007-01-01 18:13:18.000000000 +0000
++++ perl/Makefile.PL
+@@ -33,9 +33,9 @@ use Config;
+ use ExtUtils::MakeMaker;
+ 
+ #   determine source directory
+-my ($srcdir) = map { my $d = $_; $d =~ s/\/libuuid\.la$//; $d }
+-               grep { -f $_ } ("../libuuid.la", glob("../*/libuuid.la"))
+-    or die "no source directory found (where libuuid.la is located)";
++my ($srcdir) = map { my $d = $_; $d =~ s/\/libossp-uuid\.la$//; $d }
++               grep { -f $_ } ("../libossp-uuid.la", glob("../*/libossp-uuid.la"))
++    or die "no source directory found (where libossp-uuid.la is located)";
+ 
+ #   determine extra build options
+ my $compat = 0;
+@@ -47,15 +47,15 @@ WriteMakefile(
+     VERSION_FROM      => 'uuid.pm',
+     ABSTRACT_FROM     => 'uuid.pod',
+     PREREQ_PM         => {},
+-    LIBS              => [ "-L$srcdir/.libs -L$srcdir -luuid" ],
++    LIBS              => [ "-L$srcdir/.libs -L$srcdir -lossp-uuid" ],
+     DEFINE            => '',
+     INC               => "-I. -I$srcdir",
+     PM                => { 'uuid.pm'   => '$(INST_LIBDIR)/uuid.pm',
+                            'uuid.pod'  => '$(INST_LIBDIR)/uuid.pod',
+                            ($compat ? ('uuid_compat.pm'  => '$(INST_LIBDIR)/../Data/UUID.pm')  : ()),
+                            ($compat ? ('uuid_compat.pod' => '$(INST_LIBDIR)/../Data/UUID.pod') : ()), },
+-    MAN3PODS          => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3',
+-                           ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3') : ()), },
++    MAN3PODS          => { 'uuid.pod' => '$(INST_MAN3DIR)/OSSP::uuid.3pm',
++                           ($compat ? ('uuid_compat.pod' => '$(INST_MAN3DIR)/Data::UUID.3pm') : ()), },
+     TYPEMAPS          => [ 'uuid.tm' ],
+     test              => { TESTS => 'uuid.ts' . ($compat ? ' uuid_compat.ts' : '') },
+     NO_META           => 1,
diff --git a/devel/ossp-uuid/patches/patch-php_config.m4 b/devel/ossp-uuid/patches/patch-php_config.m4
new file mode 100644
index 00000000000..a6a308ac116
--- /dev/null
+++ b/devel/ossp-uuid/patches/patch-php_config.m4
@@ -0,0 +1,16 @@
+$NetBSD: patch-php_config.m4,v 1.1 2014/02/12 11:43:53 fhajny Exp $
+
+Rename package files to avoid conflict with devel/libuuid (based
+on Debian patches).
+
+--- php/config.m4.orig	2007-05-19 19:26:56.000000000 +0000
++++ php/config.m4
+@@ -34,7 +34,7 @@ if test "$PHP_UUID" != "no"; then
+     PHP_NEW_EXTENSION(uuid, uuid.c, $ext_shared)
+     AC_DEFINE(HAVE_UUID, 1, [Have OSSP uuid library])
+     PHP_ADD_LIBPATH([..], )
+-    PHP_ADD_LIBRARY([uuid],, UUID_SHARED_LIBADD)
++    PHP_ADD_LIBRARY([ossp-uuid],, UUID_SHARED_LIBADD)
+     PHP_ADD_INCLUDE([..])
+     PHP_SUBST(UUID_SHARED_LIBADD)
+ 
diff --git a/devel/ossp-uuid/patches/patch-uuid++.pod b/devel/ossp-uuid/patches/patch-uuid++.pod
new file mode 100644
index 00000000000..78d858dcfb7
--- /dev/null
+++ b/devel/ossp-uuid/patches/patch-uuid++.pod
@@ -0,0 +1,16 @@
+$NetBSD: patch-uuid++.pod,v 1.1 2014/02/12 11:43:53 fhajny Exp $
+
+Rename package files to avoid conflict with devel/libuuid (based
+on Debian patches).
+
+--- uuid++.pod.orig	2008-03-07 10:49:59.000000000 +0000
++++ uuid++.pod
+@@ -31,7 +31,7 @@
+ 
+ =head1 NAME
+ 
+-B<OSSP uuid> - B<Universally Unique Identifier> (C++ API)
++B<uuid++> - B<Universally Unique Identifier> (C++ API)
+ 
+ =head1 VERSION
+ 
diff --git a/devel/ossp-uuid/patches/patch-uuid-config.in b/devel/ossp-uuid/patches/patch-uuid-config.in
new file mode 100644
index 00000000000..4d7f72f7a08
--- /dev/null
+++ b/devel/ossp-uuid/patches/patch-uuid-config.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-uuid-config.in,v 1.1 2014/02/12 11:43:53 fhajny Exp $
+
+Rename package files to avoid conflict with devel/libuuid (based
+on Debian patches).
+
+--- uuid-config.in.orig	2008-03-07 10:49:59.000000000 +0000
++++ uuid-config.in
+@@ -121,7 +121,7 @@ do
+             output_extra="$output_extra $uuid_ldflags"
+             ;;
+         --libs)
+-            output="$output -luuid"
++            output="$output -lossp-uuid"
+             output_extra="$output_extra $uuid_libs"
+             ;;
+         * )
diff --git a/devel/ossp-uuid/patches/patch-uuid.pc.in b/devel/ossp-uuid/patches/patch-uuid.pc.in
new file mode 100644
index 00000000000..3d1df4758d4
--- /dev/null
+++ b/devel/ossp-uuid/patches/patch-uuid.pc.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-uuid.pc.in,v 1.1 2014/02/12 11:43:53 fhajny Exp $
+
+Rename package files to avoid conflict with devel/libuuid (based
+on Debian patches).
+
+--- uuid.pc.in.orig	2008-03-07 10:49:59.000000000 +0000
++++ uuid.pc.in
+@@ -36,7 +36,7 @@ Name: OSSP uuid
+ Description: Universally Unique Identifier (UUID) Library
+ Version: @UUID_VERSION_RAW@
+ URL: http://www.ossp.org/pkg/lib/uuid/
+-Cflags: -I${includedir}
+-Libs: -L${libdir} -luuid
++Cflags: -I${includedir}/ossp
++Libs: -L${libdir} -lossp-uuid
+ Libs.private: @LIBS@
+ 
diff --git a/devel/ossp-uuid/patches/patch-uuid.pod b/devel/ossp-uuid/patches/patch-uuid.pod
new file mode 100644
index 00000000000..ac28f6815a3
--- /dev/null
+++ b/devel/ossp-uuid/patches/patch-uuid.pod
@@ -0,0 +1,16 @@
+$NetBSD: patch-uuid.pod,v 1.1 2014/02/12 11:43:53 fhajny Exp $
+
+Rename package files to avoid conflict with devel/libuuid (based
+on Debian patches).
+
+--- uuid.pod.orig	2008-05-14 11:53:35.000000000 +0000
++++ uuid.pod
+@@ -31,7 +31,7 @@
+ 
+ =head1 NAME
+ 
+-B<OSSP uuid> - B<Universally Unique Identifier>
++B<uuid> - B<Universally Unique Identifier>
+ 
+ =head1 VERSION
+ 
diff --git a/devel/ossp-uuid/patches/patch-uuid__cli.c b/devel/ossp-uuid/patches/patch-uuid__cli.c
new file mode 100644
index 00000000000..68d469ae9fd
--- /dev/null
+++ b/devel/ossp-uuid/patches/patch-uuid__cli.c
@@ -0,0 +1,49 @@
+$NetBSD: patch-uuid__cli.c,v 1.1 2014/02/12 11:43:53 fhajny Exp $
+
+Preserve -m option status in -v option handling. Based on
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=531396
+
+--- uuid_cli.c.orig	2008-03-07 10:49:59.000000000 +0000
++++ uuid_cli.c
+@@ -140,11 +140,12 @@ int main(int argc, char *argv[])
+                 i = strtol(optarg, &p, 10);
+                 if (*p != '\0')
+                     usage("invalid argument to option 'v'");
++                version &= ~(UUID_MAKE_V1|UUID_MAKE_V3|UUID_MAKE_V4|UUID_MAKE_V5);
+                 switch (i) {
+-                    case 1: version = UUID_MAKE_V1; break;
+-                    case 3: version = UUID_MAKE_V3; break;
+-                    case 4: version = UUID_MAKE_V4; break;
+-                    case 5: version = UUID_MAKE_V5; break;
++                    case 1: version |= UUID_MAKE_V1; break;
++                    case 3: version |= UUID_MAKE_V3; break;
++                    case 4: version |= UUID_MAKE_V4; break;
++                    case 5: version |= UUID_MAKE_V5; break;
+                     default:
+                         usage("invalid version on option 'v'");
+                         break;
+@@ -213,10 +214,10 @@ int main(int argc, char *argv[])
+     }
+     else {
+         /* encoding */
+-        if (   (version == UUID_MAKE_V1 && argc != 0)
+-            || (version == UUID_MAKE_V3 && argc != 2)
+-            || (version == UUID_MAKE_V4 && argc != 0)
+-            || (version == UUID_MAKE_V5 && argc != 2))
++        if (   (version & UUID_MAKE_V1 && argc != 0)
++            || (version & UUID_MAKE_V3 && argc != 2)
++            || (version & UUID_MAKE_V4 && argc != 0)
++            || (version & UUID_MAKE_V5 && argc != 2))
+             usage("invalid number of arguments");
+         if ((rc = uuid_create(&uuid)) != UUID_RC_OK)
+             error(1, "uuid_create: %s", uuid_error(rc));
+@@ -232,7 +233,7 @@ int main(int argc, char *argv[])
+                 if ((rc = uuid_load(uuid, "nil")) != UUID_RC_OK)
+                     error(1, "uuid_load: %s", uuid_error(rc));
+             }
+-            if (version == UUID_MAKE_V3 || version == UUID_MAKE_V5) {
++            if (version & UUID_MAKE_V3 || version & UUID_MAKE_V5) {
+                 if ((rc = uuid_create(&uuid_ns)) != UUID_RC_OK)
+                     error(1, "uuid_create: %s", uuid_error(rc));
+                 if ((rc = uuid_load(uuid_ns, argv[0])) != UUID_RC_OK) {
diff --git a/devel/ossp-uuid/patches/patch-uuid__cli.pod b/devel/ossp-uuid/patches/patch-uuid__cli.pod
new file mode 100644
index 00000000000..e1e76131921
--- /dev/null
+++ b/devel/ossp-uuid/patches/patch-uuid__cli.pod
@@ -0,0 +1,16 @@
+$NetBSD: patch-uuid__cli.pod,v 1.1 2014/02/12 11:43:53 fhajny Exp $
+
+Rename package files to avoid conflict with devel/libuuid (based
+on Debian patches).
+
+--- uuid_cli.pod.orig	2008-03-07 13:49:38.000000000 +0000
++++ uuid_cli.pod
+@@ -31,7 +31,7 @@
+ 
+ =head1 NAME
+ 
+-B<OSSP uuid> - B<Universally Unique Identifier Command-Line Tool>
++B<uuid> - B<Universally Unique Identifier Command-Line Tool>
+ 
+ =head1 VERSION
+