Update to 1.3.2 [1]

Reorganize Makefile
Remove .la files

PR:		90109 [1]
Submitted by:	Vasil Dimov <vd@datamax.bg>

4 files changed, 62 insertions, 24 deletions

diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index fa3b5cb..519d04e 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -1,12 +1,12 @@
-# New ports collection makefile for:   OSSP uuid
-# Date created:                12 February 2004
-# Whom:                        Kimura Fuyuki <fuyuki@nigredo.org>
+# New ports collection makefile for:	OSSP uuid
+# Date created:				12 February 2004
+# Whom:					Kimura Fuyuki <fuyuki@nigredo.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	uuid
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	misc devel
 MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
@@ -17,36 +17,33 @@ COMMENT=	ISO-C & Perl API and CLI for generating Universally Unique Identifiers
 
 CONFLICTS=	e2fsprogs-[0-9]*
 
-USE_REINPLACE=		yes
+USE_REINPLACE=	yes
+USE_GCC=	3.2+
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=		yes
-CONFIGURE_ARGS+=	--disable-shared --enable-static
+INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--disable-shared --enable-static
 
-MAN1=		uuid-config.1 uuid.1
-MAN3=		uuid.3
+MAN1=	uuid-config.1 uuid.1
+MAN3=	uuid.3
 
 .if defined(WITH_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}
+PLIST_SUB+=	WITH_PERL=''
+MAN3=		OSSP::uuid.3
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 .else
-PLIST_SUB+=		WITH_PERL='@comment '
+PLIST_SUB+=	WITH_PERL='@comment '
 .endif
 
-test:
-	cd ${WRKSRC}; ${MAKE} check
-
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,\$$.libdir./pkgconfig,\$$\(prefix\)/libdata/pkgconfig,g' \
-		${WRKSRC}/Makefile.in
-
 .if defined(WITH_PERL) && ${PERL_LEVEL} < 500800
 IGNORE=	supports Perl 5.8.0 or above only
 .endif
 
+test:	build
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check
+
 .include <bsd.port.post.mk>
diff --git a/misc/ossp-uuid/distinfo b/misc/ossp-uuid/distinfo
index fd17076..d9b86991 100644
--- a/misc/ossp-uuid/distinfo
+++ b/misc/ossp-uuid/distinfo
@@ -1,3 +1,3 @@
-MD5 (uuid-1.3.1.tar.gz) = 004c12ee8e1a1c390573edae6f30392b
-SHA256 (uuid-1.3.1.tar.gz) = 34b9d69feed9aa42441387800cc4a430becf1474671b1d31e6a02444a50f49e2
-SIZE (uuid-1.3.1.tar.gz) = 378496
+MD5 (uuid-1.3.2.tar.gz) = df520ef922e944468345a4011c14a769
+SHA256 (uuid-1.3.2.tar.gz) = 9db27e0392e5685ef6487bf153dcb906deb4ff202d3d9c9d9735690b2dd4b991
+SIZE (uuid-1.3.2.tar.gz) = 442679
diff --git a/misc/ossp-uuid/files/patch-Makefile.in b/misc/ossp-uuid/files/patch-Makefile.in
new file mode 100644
index 0000000..cd2b952
--- /dev/null
+++ b/misc/ossp-uuid/files/patch-Makefile.in
@@ -0,0 +1,42 @@
+--- Makefile.in.orig	Fri Sep  2 15:11:29 2005
++++ Makefile.in	Thu Dec  8 16:34:29 2005
+@@ -210,12 +210,12 @@
+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)
+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)
+-	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)/pkgconfig
++	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)/libdata/pkgconfig
+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
+ 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
+ 	$(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
+ 	$(SHTOOL) install -c -m 644 $(S)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
+-	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(libdir)/pkgconfig/
++	$(SHTOOL) install -c -m 644 $(S)/uuid.pc $(DESTDIR)$(prefix)/libdata/pkgconfig/
+ 	$(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
+ 	-@if [ ".$(WITH_DCE)" = .yes ]; then \
+ 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
+@@ -230,7 +230,7 @@
+ 	    echo "$(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/"; \
+ 	    $(SHTOOL) install -c -m 644 $(S)/uuid++.3 $(DESTDIR)$(mandir)/man3/; \
+ 	fi
+-	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid.la $(DESTDIR)$(libdir)/
++	$(SHTOOL) install -c -m 644 .libs/libuuid.a $(DESTDIR)$(libdir)/
+ 	-@if [ ".$(WITH_DCE)" = .yes ]; then \
+ 	    $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid_dce.la $(DESTDIR)$(libdir)/; \
+ 	fi
+@@ -270,13 +270,13 @@
+ 	    echo "$(RM) $(DESTDIR)$(includedir)/uuid++.hh"; \
+ 	    $(RM) $(DESTDIR)$(includedir)/uuid++.hh; \
+ 	fi
+-	-$(RM) $(DESTDIR)$(libdir)/pkgconfig/uuid.pc
++	-$(RM) $(DESTDIR)$(prefix)/libdata/pkgconfig/uuid.pc
+ 	-$(RM) $(DESTDIR)$(mandir)/man1/uuid-config.1
+ 	-$(RM) $(DESTDIR)$(bindir)/uuid-config
+ 	-$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
+ 	-$(RMDIR) $(DESTDIR)$(mandir)/man3 >/dev/null 2>&1 || $(TRUE)
+ 	-$(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE)
+-	-$(RMDIR) $(DESTDIR)$(libdir)/pkgconfig >/dev/null 2>&1 || $(TRUE)
++	-$(RMDIR) $(DESTDIR)$(prefix)/libdata/pkgconfig >/dev/null 2>&1 || $(TRUE)
+ 	-$(RMDIR) $(DESTDIR)$(libdir) >/dev/null 2>&1 || $(TRUE)
+ 	-$(RMDIR) $(DESTDIR)$(includedir) >/dev/null 2>&1 || $(TRUE)
+ 	-$(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE)
diff --git a/misc/ossp-uuid/pkg-plist b/misc/ossp-uuid/pkg-plist
index cfb0563..63fa24a 100644
--- a/misc/ossp-uuid/pkg-plist
+++ b/misc/ossp-uuid/pkg-plist
@@ -2,7 +2,6 @@ bin/uuid
 bin/uuid-config
 include/uuid.h
 lib/libuuid.a
-lib/libuuid.la
 libdata/pkgconfig/uuid.pc
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OSSP/uuid.pm
 %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/OSSP/uuid.pod