- upgrade to OSSP uuid 1.1.0

- build both Perl API, C API and CLI
- allow Perl API to be disabled with WITHOUT_PERL
- build static libraries only because of the conflict
  with libc's uuid_create(3)

4 files changed, 28 insertions, 10 deletions

diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index 710bd31b244c..9f4c8327b300 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -6,23 +6,35 @@
 #
 
 PORTNAME=	uuid
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.0
 CATEGORIES=	misc devel
 MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
 PKGNAMEPREFIX=	ossp-
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An ISO-C API and CLI for generating Universally Unique Identifiers
+COMMENT=	An ISO-C & Perl API and CLI for generating Universally Unique Identifiers (UUID)
 
 CONFLICTS=	e2fsprogs-[0-9]*
 
 USE_LIBTOOL_VER=	15
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS+=	--disable-shared --enable-static
 
 MAN1=		uuid-config.1 uuid.1
 MAN3=		uuid.3
 
+.if !defined(WITHOUT_PERL)
+USE_PERL5=	yes
+CONFIGURE_ENV+=	PERL=${PERL5}
+CONFIGURE_ARGS+=	--with-perl
+PLIST_SUB+=		WITH_PERL=''
+MAN3=			OSSP::uuid.3
+MAN3PREFIX=		${PREFIX}/lib/perl5/${PERL_VERSION}
+.else
+PLIST_SUB+=		WITH_PERL='@comment '
+.endif
+
 test:
 	cd ${WRKSRC}; ${MAKE} check
 
diff --git a/misc/ossp-uuid/distinfo b/misc/ossp-uuid/distinfo
index 74e2b308c058..32564a7a496d 100644
--- a/misc/ossp-uuid/distinfo
+++ b/misc/ossp-uuid/distinfo
@@ -1,2 +1,2 @@
-MD5 (uuid-1.0.1.tar.gz) = 55fbb64f4458c028a25171eac0f04c01
-SIZE (uuid-1.0.1.tar.gz) = 336423
+MD5 (uuid-1.1.0.tar.gz) = e8a809848759c9c59436845d2c33fc9d
+SIZE (uuid-1.1.0.tar.gz) = 347434
diff --git a/misc/ossp-uuid/pkg-descr b/misc/ossp-uuid/pkg-descr
index 2d91941c6806..497dfba513cf 100644
--- a/misc/ossp-uuid/pkg-descr
+++ b/misc/ossp-uuid/pkg-descr
@@ -1,7 +1,7 @@
-OSSP uuid is a ISO-C application programming interface (API) and
-corresponding command line interface (CLI) for the generation of DCE
-1.1 and ISO/IEC 11578:1996 compliant Universally Unique Identifiers
-(UUID).  It supports DCE 1.1 variant UUIDs of version 1 (time and node
+OSSP uuid is a ISO-C and Perl application programming interface (API)
+and corresponding command line interface (CLI) for the generation of
+DCE 1.1 and ISO/IEC 11578:1996 compliant Universally Unique Identifiers
+(UUID). It supports DCE 1.1 variant UUIDs of version 1 (time and node
 based), version 3 (name based) and version 4 (random number based).
 
 WWW: http://www.ossp.org/pkg/lib/uuid/
diff --git a/misc/ossp-uuid/pkg-plist b/misc/ossp-uuid/pkg-plist
index 7e3f308dce6d..1caa65f201db 100644
--- a/misc/ossp-uuid/pkg-plist
+++ b/misc/ossp-uuid/pkg-plist
@@ -3,5 +3,11 @@ bin/uuid-config
 include/uuid.h
 lib/libuuid.a
 lib/libuuid.la
-lib/libuuid.so
-lib/libuuid.so.1
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OSSP/uuid.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OSSP/uuid.pod
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/uuid.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid/uuid.so
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP/uuid
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/OSSP
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/OSSP