Upgrade from 1.4.2 to 1.5.1

3 files changed, 18 insertions, 34 deletions

diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index c5c314b..85d16c3 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uuid
-PORTVERSION=	1.4.2
+PORTVERSION=	1.5.1
 CATEGORIES=	misc devel
 MASTER_SITES=	${MASTER_SITE_OSSP}
 MASTER_SITE_SUBDIR=	lib/${PORTNAME}
@@ -21,7 +21,7 @@ USE_GCC=	3.2+
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--disable-shared --enable-static
+CONFIGURE_ARGS=	--disable-shared --enable-static --mandir=${PREFIX}/man
 
 MAN1=	uuid-config.1 uuid.1
 MAN3=	uuid.3
@@ -43,7 +43,7 @@ PLIST_SUB+=	WITH_PERL='@comment '
 IGNORE=	supports Perl 5.8.0 or above only
 .endif
 
-test:	build
+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 29cb08a..9a60ae4 100644
--- a/misc/ossp-uuid/distinfo
+++ b/misc/ossp-uuid/distinfo
@@ -1,3 +1,3 @@
-MD5 (uuid-1.4.2.tar.gz) = fdfe93bc134dfb73814456c3b444dda1
-SHA256 (uuid-1.4.2.tar.gz) = a8d4723b45a90e85c2250123a634cd00ea1912e79737c71c593fd78b1413176e
-SIZE (uuid-1.4.2.tar.gz) = 390542
+MD5 (uuid-1.5.1.tar.gz) = d7df0c4cb02dad7ce3e1ec8fc669f724
+SHA256 (uuid-1.5.1.tar.gz) = ff9bd6815bd8509ac1b6a019128c6731eeb99249ac811293d929ab101fc7c570
+SIZE (uuid-1.5.1.tar.gz) = 401963
diff --git a/misc/ossp-uuid/files/patch-Makefile.in b/misc/ossp-uuid/files/patch-Makefile.in
index cd2b952..9ae6442 100644
--- a/misc/ossp-uuid/files/patch-Makefile.in
+++ b/misc/ossp-uuid/files/patch-Makefile.in
@@ -1,6 +1,15 @@
---- Makefile.in.orig	Fri Sep  2 15:11:29 2005
-+++ Makefile.in	Thu Dec  8 16:34:29 2005
-@@ -210,12 +210,12 @@
+--- Makefile.in.orig	Mon Jul 31 15:20:03 2006
++++ Makefile.in	Wed Aug  2 17:55:11 2006
+@@ -61,7 +61,7 @@
+ PHP         = @PHP@
+ PG_CONFIG   = @PG_CONFIG@
+ 
+-LIB_NAME    = libuuid.la
++LIB_NAME    = libuuid.a
+ LIB_OBJS    = uuid.lo uuid_md5.lo uuid_sha1.lo uuid_prng.lo uuid_mac.lo uuid_ui64.lo uuid_ui128.lo uuid_str.lo
+ 
+ DCE_NAME    = libuuid_dce.la
+@@ -225,12 +225,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)
@@ -15,28 +24,3 @@
  	$(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)