Changes 2.19.1:

Bug fixes.

4 files changed, 43 insertions, 55 deletions

diff --git a/devel/libuuid/Makefile b/devel/libuuid/Makefile
index 54a143b8e5c..a8ffa3e2c1d 100644
--- a/devel/libuuid/Makefile
+++ b/devel/libuuid/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/01/08 20:40:33 markd Exp $
-#
+# $NetBSD: Makefile,v 1.2 2011/05/12 12:26:15 adam Exp $
 
-DISTNAME=	util-linux-ng-2.18
-PKGNAME=	libuuid-2.18
+DISTNAME=	util-linux-2.19.1
+PKGNAME=	${DISTNAME:S/util-linux/libuuid/}
 CATEGORIES=	devel
-MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.18/
+MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.19/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -16,24 +15,32 @@ CONFLICTS=	ossp-uuid-[0-9]* # libuuid.* uuid.pc uuid.3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_LIBTOOL=	yes
-GNU_CONFIGURE=	yes
-PKGCONFIG_OVERRIDE+=	shlibs/uuid/uuid.pc.in
-
-CONFIGURE_ARGS+=	--without-ncurses
-CONFIGURE_ARGS+=	--disable-mount
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--disable-agetty
+CONFIGURE_ARGS+=	--disable-cramfs
+CONFIGURE_ARGS+=	--disable-fallocate
 CONFIGURE_ARGS+=	--disable-fsck
-CONFIGURE_ARGS+=	--disable-uuidd
+CONFIGURE_ARGS+=	--disable-mount
 CONFIGURE_ARGS+=	--disable-libblkid
 CONFIGURE_ARGS+=	--disable-libmount
-CONFIGURE_ARGS+=	--disable-agetty
-CONFIGURE_ARGS+=	--disable-cramfs
-CONFIGURE_ARGS+=	--disable-switch_root
 CONFIGURE_ARGS+=	--disable-pivot_root
-CONFIGURE_ARGS+=	--disable-fallocate
-CONFIGURE_ARGS+=	--disable-unshare
 CONFIGURE_ARGS+=	--disable-rename
 CONFIGURE_ARGS+=	--disable-schedutils
+CONFIGURE_ARGS+=	--disable-switch_root
+CONFIGURE_ARGS+=	--disable-unshare
+CONFIGURE_ARGS+=	--disable-uuidd
 CONFIGURE_ARGS+=	--disable-wall
+CONFIGURE_ARGS+=	--without-ncurses
+
+PKGCONFIG_OVERRIDE+=	shlibs/uuid/uuid.pc.in
+
+BUILD_DIRS=		include shlibs/uuid
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+BUILDLINK_TRANSFORM+=	rm:-Wl,--version-script=../../../shlibs/uuid/src/uuid.sym
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libuuid/distinfo b/devel/libuuid/distinfo
index fa38e48a588..950cfbdb2eb 100644
--- a/devel/libuuid/distinfo
+++ b/devel/libuuid/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2011/01/08 22:19:52 dsainty Exp $
+$NetBSD: distinfo,v 1.3 2011/05/12 12:26:15 adam Exp $
 
-SHA1 (util-linux-ng-2.18.tar.bz2) = 154db0512caae0b6e90eee4b7312d4caf3d6b978
-RMD160 (util-linux-ng-2.18.tar.bz2) = 4781871a8f86195b886e81d364d41a57d67869e3
-Size (util-linux-ng-2.18.tar.bz2) = 7669676 bytes
-SHA1 (patch-aa) = 83f8038278928899def6db0f28e3f13b78effbc4
-SHA1 (patch-ab) = 3cdd8d9c40b0b25fce088f0537f2d2443bcfb311
+SHA1 (util-linux-2.19.1.tar.bz2) = 96af5d4a37c42296dae5365ba533316216a6b347
+RMD160 (util-linux-2.19.1.tar.bz2) = e4763d21a3a32029ccc525a0222e271f0946a4fd
+Size (util-linux-2.19.1.tar.bz2) = 4396543 bytes
+SHA1 (patch-aa) = 07d66ef414f5781d75159b446d6c822b1e543477
diff --git a/devel/libuuid/patches/patch-aa b/devel/libuuid/patches/patch-aa
index a9c19b6f33e..66d42e56eed 100644
--- a/devel/libuuid/patches/patch-aa
+++ b/devel/libuuid/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/01/08 20:40:33 markd Exp $
+$NetBSD: patch-aa,v 1.2 2011/05/12 12:26:15 adam Exp $
 
 sh doesn't like the empty case
 
---- configure.orig	2010-06-30 12:53:01.000000000 +0000
+--- configure.orig	2011-05-02 09:49:20.000000000 +0000
 +++ configure
-@@ -18952,11 +18952,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
+@@ -15993,11 +15993,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
+ else
  
  	  syscall=no
 -	  if test "x$linux_os" = xyes; then
@@ -15,9 +15,9 @@ sh doesn't like the empty case
 -	  fi
  
  fi
- 
-@@ -19082,11 +19077,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -16073,11 +16068,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
+ else
  
  	  syscall=no
 -	  if test "x$linux_os" = xyes; then
@@ -27,9 +27,9 @@ sh doesn't like the empty case
 -	  fi
  
  fi
- 
-@@ -19489,11 +19479,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -16330,11 +16320,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
+ else
  
  	  syscall=no
 -	  if test "x$linux_os" = xyes; then
@@ -39,9 +39,9 @@ sh doesn't like the empty case
 -	  fi
  
  fi
- 
-@@ -19701,11 +19686,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+@@ -16461,11 +16446,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
+ else
  
  	  syscall=no
 -	  if test "x$linux_os" = xyes; then
@@ -51,4 +51,4 @@ sh doesn't like the empty case
 -	  fi
  
  fi
- 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
diff --git a/devel/libuuid/patches/patch-ab b/devel/libuuid/patches/patch-ab
deleted file mode 100644
index 9ddab3ca121..00000000000
--- a/devel/libuuid/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2011/01/08 22:19:52 dsainty Exp $
-
-Don't try to build things we don't care about, including hwclock - pulled in
-unconditionally if building on Linux via am__append_1.
-
---- Makefile.in.orig	2010-06-30 12:53:07.000000000 +0000
-+++ Makefile.in
-@@ -311,9 +311,7 @@ ul_libmount_la = $(top_builddir)/shlibs/
- 
- # mount.h is generated by ./configure script and stored in build directory
- ul_libmount_incdir = $(ul_libmount_builddir)
--SUBDIRS = include disk-utils fdisk getopt lib shlibs login-utils \
--	misc-utils po schedutils sys-utils text-utils tests \
--	$(am__append_1) $(am__append_2) $(am__append_3)
-+SUBDIRS = include shlibs
- RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \
- 		-name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o
-