CVS commit: pkgsrc/devel/libuuid

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/libuuid
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Thu, 12 Mar 2020 10:11:34 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Mar 12 10:11:34 UTC 2020

Modified Files:
        pkgsrc/devel/libuuid: distinfo
        pkgsrc/devel/libuuid/patches: patch-Makefile.in
Added Files:
        pkgsrc/devel/libuuid/patches: patch-Makefile.am
            patch-libblkid_docs_Makefile.in patch-libfdisk_docs_Makefile.in
            patch-libmount_docs_Makefile.in patch-libsmartcols_docs_Makefile.in

Log Message:
libuuid: Fix POSIX shell portability in Makefile.*s


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/libuuid/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/libuuid/patches/patch-Makefile.am \
    pkgsrc/devel/libuuid/patches/patch-libblkid_docs_Makefile.in \
    pkgsrc/devel/libuuid/patches/patch-libfdisk_docs_Makefile.in \
    pkgsrc/devel/libuuid/patches/patch-libmount_docs_Makefile.in \
    pkgsrc/devel/libuuid/patches/patch-libsmartcols_docs_Makefile.in
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libuuid/patches/patch-Makefile.in

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/distinfo
diff -u pkgsrc/devel/libuuid/distinfo:1.20 pkgsrc/devel/libuuid/distinfo:1.21
--- pkgsrc/devel/libuuid/distinfo:1.20  Wed Aug 29 12:25:52 2018
+++ pkgsrc/devel/libuuid/distinfo       Thu Mar 12 10:11:34 2020
@@ -1,13 +1,18 @@
-$NetBSD: distinfo,v 1.20 2018/08/29 12:25:52 adam Exp $
+$NetBSD: distinfo,v 1.21 2020/03/12 10:11:34 ryoon Exp $
 
 SHA1 (util-linux-2.32.1.tar.xz) = de9271fb93fb651d21c027e2efb0cf0ac80f2e9a
 RMD160 (util-linux-2.32.1.tar.xz) = bf61cb460eabcfdb90909dbcfd8e64bb9097ce65
 SHA512 (util-linux-2.32.1.tar.xz) = 267fedae24a874ee4dc558081f6b8d07b33b955b0635f3348f021c111c17f2e95c01b2cbf909fe13c6ca448cbcf23c658c75f72f25749aa65e99f68fabb94698
 Size (util-linux-2.32.1.tar.xz) = 4561088 bytes
-SHA1 (patch-Makefile.in) = ace0b141c2fbda821c0f14c385fed698bb5f5423
+SHA1 (patch-Makefile.am) = a3470f6d286ca7c7ddebf27f9a205507b67f836d
+SHA1 (patch-Makefile.in) = a415bb922d7154387f71882b1f1fa06c9e49c174
 SHA1 (patch-configure) = 400904ae2e58b717e990ba26c111b90bc8f240d1
 SHA1 (patch-include_c.h) = 4596369e4b742329be513952c66d1fa3705de017
 SHA1 (patch-include_ttyutils.h) = fa2b253d568e5aface99727c397d3c4c892b2c93
 SHA1 (patch-lib_ismounted.c) = 11f5148020dba2a22e1fbe4882fe423dfb11ad73
 SHA1 (patch-lib_randutils.c) = 422e94d9bdaf6a77894b79d67285fd8a0cb1d05a
+SHA1 (patch-libblkid_docs_Makefile.in) = 97a1559dad77e32d78bd504d8d3523b9cc403c36
+SHA1 (patch-libfdisk_docs_Makefile.in) = def97b85e8760cd18af736ab331e2f476f0c9c67
+SHA1 (patch-libmount_docs_Makefile.in) = a55063e89161221cecda661039d0a62174592669
+SHA1 (patch-libsmartcols_docs_Makefile.in) = aa44d1a9ffd9bf4422ed8892d91b4e0e72e50407
 SHA1 (patch-libuuid_src_gen__uuid.c) = d15aa418ab497e2e3634c62633d2f3212f1b42be

Index: pkgsrc/devel/libuuid/patches/patch-Makefile.in
diff -u pkgsrc/devel/libuuid/patches/patch-Makefile.in:1.3 pkgsrc/devel/libuuid/patches/patch-Makefile.in:1.4
--- pkgsrc/devel/libuuid/patches/patch-Makefile.in:1.3  Wed Aug 29 12:25:52 2018
+++ pkgsrc/devel/libuuid/patches/patch-Makefile.in      Thu Mar 12 10:11:34 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.in,v 1.3 2018/08/29 12:25:52 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2020/03/12 10:11:34 ryoon Exp $
 
 Linker script depends on non-portable constructs.
 Do not compile setproctitle; it conflicts with NetBSD and is not needed.
 Do not build common libraries.
 Do not install terminal-colors.d.5.
 
---- Makefile.in.orig   2018-07-16 10:34:43.000000000 +0000
+--- Makefile.in.orig   2018-07-16 10:34:43.896171527 +0000
 +++ Makefile.in
 @@ -186,7 +186,7 @@ check_PROGRAMS = test_blkdev$(EXEEXT) te
  
@@ -52,3 +52,12 @@ Do not install terminal-colors.d.5.
        $(am__append_38) $(am__append_78) $(am__append_80) \
        $(am__append_82) $(am__append_84) $(am__append_86) \
        $(am__append_88) $(am__append_90) $(am__append_92) \
+@@ -12816,7 +12816,7 @@ checkusage:
+       echo $(VERSION) > $@-t && mv $@-t $@
+ 
+ $(CHANGELOG_FILE):
+-      @ if test "x$$PREVIOUS_VERSION" == "x"; then \
++      @ if test "x$$PREVIOUS_VERSION" = "x"; then \
+               echo "Usage make changelog PREVIOUS_VERSION=<version>"; \
+               exit 1; \
+       fi

Added files:

Index: pkgsrc/devel/libuuid/patches/patch-Makefile.am
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-Makefile.am:1.1
--- /dev/null   Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/patches/patch-Makefile.am      Thu Mar 12 10:11:34 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile.am,v 1.1 2020/03/12 10:11:34 ryoon Exp $
+
+--- Makefile.am.orig   2018-06-04 07:57:02.784445952 +0000
++++ Makefile.am
+@@ -206,7 +206,7 @@ BUILT_SOURCES = .version
+ CHANGELOG_FILE = v$(VERSION)-ChangeLog
+ 
+ $(CHANGELOG_FILE):
+-      @ if test "x$$PREVIOUS_VERSION" == "x"; then \
++      @ if test "x$$PREVIOUS_VERSION" = "x"; then \
+               echo "Usage make changelog PREVIOUS_VERSION=<version>"; \
+               exit 1; \
+       fi
Index: pkgsrc/devel/libuuid/patches/patch-libblkid_docs_Makefile.in
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-libblkid_docs_Makefile.in:1.1
--- /dev/null   Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/patches/patch-libblkid_docs_Makefile.in        Thu Mar 12 10:11:34 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-libblkid_docs_Makefile.in,v 1.1 2020/03/12 10:11:34 ryoon Exp $
+
+--- libblkid/docs/Makefile.in.orig     2018-07-16 10:34:43.928171337 +0000
++++ libblkid/docs/Makefile.in
+@@ -806,7 +806,7 @@ distclean-local:
+       rm -rf xml html $(REPORT_FILES) *.stamp \
+              $(DOC_MODULE)-overrides.txt \
+              $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+-      test $(abs_builddir) ==  $(abs_srcdir) || \
++      test $(abs_builddir) =  $(abs_srcdir) || \
+              rm -f $(DOC_MODULE)-*.txt $(DOC_MODULE)-*.xml *.xml.in
+ 
+ install-data-local:
Index: pkgsrc/devel/libuuid/patches/patch-libfdisk_docs_Makefile.in
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-libfdisk_docs_Makefile.in:1.1
--- /dev/null   Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/patches/patch-libfdisk_docs_Makefile.in        Thu Mar 12 10:11:34 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-libfdisk_docs_Makefile.in,v 1.1 2020/03/12 10:11:34 ryoon Exp $
+
+--- libfdisk/docs/Makefile.in.orig     2018-07-16 10:34:43.952171193 +0000
++++ libfdisk/docs/Makefile.in
+@@ -803,7 +803,7 @@ distclean-local:
+       rm -rf xml html $(REPORT_FILES) *.stamp \
+              $(DOC_MODULE)-overrides.txt \
+              $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+-      test $(abs_builddir) ==  $(abs_srcdir) || \
++      test $(abs_builddir) =  $(abs_srcdir) || \
+              rm -f $(DOC_MODULE)-*.txt $(DOC_MODULE)-*.xml *.xml.in
+ 
+ install-data-local:
Index: pkgsrc/devel/libuuid/patches/patch-libmount_docs_Makefile.in
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-libmount_docs_Makefile.in:1.1
--- /dev/null   Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/patches/patch-libmount_docs_Makefile.in        Thu Mar 12 10:11:34 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-libmount_docs_Makefile.in,v 1.1 2020/03/12 10:11:34 ryoon Exp $
+
+--- libmount/docs/Makefile.in.orig     2018-07-16 10:34:43.977171044 +0000
++++ libmount/docs/Makefile.in
+@@ -803,7 +803,7 @@ distclean-local:
+       rm -rf xml html $(REPORT_FILES) *.stamp \
+              $(DOC_MODULE)-overrides.txt \
+              $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+-      test $(abs_builddir) ==  $(abs_srcdir) || \
++      test $(abs_builddir) =  $(abs_srcdir) || \
+              rm -f $(DOC_MODULE)-*.txt $(DOC_MODULE)-*.xml *.xml.in
+ 
+ install-data-local:
Index: pkgsrc/devel/libuuid/patches/patch-libsmartcols_docs_Makefile.in
diff -u /dev/null pkgsrc/devel/libuuid/patches/patch-libsmartcols_docs_Makefile.in:1.1
--- /dev/null   Thu Mar 12 10:11:34 2020
+++ pkgsrc/devel/libuuid/patches/patch-libsmartcols_docs_Makefile.in    Thu Mar 12 10:11:34 2020
@@ -0,0 +1,13 @@
+$NetBSD: patch-libsmartcols_docs_Makefile.in,v 1.1 2020/03/12 10:11:34 ryoon Exp $
+
+--- libsmartcols/docs/Makefile.in.orig 2018-07-16 10:34:44.001170901 +0000
++++ libsmartcols/docs/Makefile.in
+@@ -803,7 +803,7 @@ distclean-local:
+       rm -rf xml html $(REPORT_FILES) *.stamp \
+              $(DOC_MODULE)-overrides.txt \
+              $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+-      test $(abs_builddir) ==  $(abs_srcdir) || \
++      test $(abs_builddir) =  $(abs_srcdir) || \
+              rm -f $(DOC_MODULE)-*.txt $(DOC_MODULE)-*.xml *.xml.in
+ 
+ install-data-local:

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/devel/bison
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/devel/bison
Indexes:

Home | Main Index | Thread Index | Old Index