CVS commit: pkgsrc/devel/libuuid

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Tue Dec 12 20:56:09 UTC 2017

Modified Files:
        pkgsrc/devel/libuuid: Makefile Makefile.common

Log Message:
libuuid: on further thought, move nls disable Makefile.common, the configure
script is shared by all the util-linux packages.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/libuuid/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/libuuid/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libuuid/Makefile
diff -u pkgsrc/devel/libuuid/Makefile:1.22 pkgsrc/devel/libuuid/Makefile:1.23
--- pkgsrc/devel/libuuid/Makefile:1.22  Tue Dec 12 20:52:19 2017
+++ pkgsrc/devel/libuuid/Makefile       Tue Dec 12 20:56:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/12/12 20:52:19 maya Exp $
+# $NetBSD: Makefile,v 1.23 2017/12/12 20:56:09 maya Exp $
 
 .include "Makefile.common"
 
@@ -10,10 +10,6 @@ LICENSE=     modified-bsd
 CONFIGURE_ARGS+=       --enable-libuuid
 CONFIGURE_ARGS+=       --enable-uuidgen
 
-# netbsd libintl lacks _nl_expand_alias, resulting in NLS being
-# disabled. for consistency, disable for all
-CONFIGURE_ARGS+=       --disable-nls
-
 PKGCONFIG_OVERRIDE+=   libuuid/uuid.pc.in
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/libuuid/Makefile.common
diff -u pkgsrc/devel/libuuid/Makefile.common:1.1 pkgsrc/devel/libuuid/Makefile.common:1.2
--- pkgsrc/devel/libuuid/Makefile.common:1.1    Fri Dec  8 08:03:35 2017
+++ pkgsrc/devel/libuuid/Makefile.common        Tue Dec 12 20:56:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2017/12/08 08:03:35 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2017/12/12 20:56:09 maya Exp $
 # used by devel/libblkid/Makefile
 # used by devel/libuuid/Makefile
 # used by x11/mcookie/Makefile
@@ -23,4 +23,8 @@ CONFIGURE_ARGS+=      --disable-bash-completi
 CONFIGURE_ARGS+=       --without-ncurses
 CONFIGURE_ARGS+=       --without-ncursesw
 
+# netbsd libintl lacks _nl_expand_alias, resulting in NLS being
+# disabled. for consistency, disable for all
+CONFIGURE_ARGS+=       --disable-nls
+
 TEST_TARGET=           check