CVS commit: pkgsrc/devel/libcfg+

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Fri Jul  2 22:49:39 UTC 2021

Modified Files:
        pkgsrc/devel/libcfg+: distinfo
        pkgsrc/devel/libcfg+/patches: patch-ab

Log Message:
devel/libcfg+: re-generate src/Makefile.in patch to contain more context

This fixes the patch on one of my Linux systems. I just did mkpatches
on a box where the old patch works. It adds to lines of context that
make another box happy that failed to apply the patch before.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/libcfg+/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libcfg+/patches/patch-ab

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

Modified files:

Index: pkgsrc/devel/libcfg+/distinfo
diff -u pkgsrc/devel/libcfg+/distinfo:1.6 pkgsrc/devel/libcfg+/distinfo:1.7
--- pkgsrc/devel/libcfg+/distinfo:1.6   Sun Nov 27 09:04:27 2016
+++ pkgsrc/devel/libcfg+/distinfo       Fri Jul  2 22:49:39 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2016/11/27 09:04:27 wiz Exp $
+$NetBSD: distinfo,v 1.7 2021/07/02 22:49:39 thor Exp $
 
 SHA1 (libcfg+-0.7.0.tar.gz) = ebcba4033b3c5451a1e485ce129488298aa19a9f
 RMD160 (libcfg+-0.7.0.tar.gz) = 51f632cb9578e67eaf968bb1c27f625ff90b1224
 SHA512 (libcfg+-0.7.0.tar.gz) = 73444c89aab9e835ecc630b8fee5e83717fccc3d78736b1e9055b2404cbac7caf9b9fb84709b48800e2409bd40a8727e74db77eeb796079cd435aec8e3bdcc2b
 Size (libcfg+-0.7.0.tar.gz) = 248406 bytes
 SHA1 (patch-aa) = ba63ccc5c031a893b111caac1ba9ddf13c18b4fc
-SHA1 (patch-ab) = dd2afd5a7491bb195c0e688a6c5b7a2ac610fbe1
+SHA1 (patch-ab) = 96732574c5036883e62286f6f9c6ea34dd202442

Index: pkgsrc/devel/libcfg+/patches/patch-ab
diff -u pkgsrc/devel/libcfg+/patches/patch-ab:1.2 pkgsrc/devel/libcfg+/patches/patch-ab:1.3
--- pkgsrc/devel/libcfg+/patches/patch-ab:1.2   Sun Nov 27 09:04:27 2016
+++ pkgsrc/devel/libcfg+/patches/patch-ab       Fri Jul  2 22:49:39 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2016/11/27 09:04:27 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2021/07/02 22:49:39 thor Exp $
 
---- src/Makefile.in.orig       2004-02-18 01:37:47.000000000 +0900
-+++ src/Makefile.in    2004-09-29 00:32:45.000000000 +0900
-@@ -60,14 +60,14 @@
+--- src/Makefile.in.orig       2015-09-13 09:23:22.000000000 +0000
++++ src/Makefile.in
+@@ -60,16 +60,16 @@ SOURCES = $(srcdir)/cfg+.c \
                  $(srcdir)/platon/str/strdyn.c \
                  $(srcdir)/platon/str/dynfgets.c
  
@@ -27,7 +27,9 @@ $NetBSD: patch-ab,v 1.2 2016/11/27 09:04
 +                $(top_builddir)/src/platon/str/strdyn.lo \
 +                $(top_builddir)/src/platon/str/dynfgets.lo
  
-@@ -97,8 +97,7 @@
+ # SunOS 4 make does not allow multiple makefiles to be specified in one �include directive.
+ DEP_FILES = $(top_builddir)/src/.deps/cfg+.P \
+@@ -97,8 +97,7 @@ noinst_HEADERS  = cfgfile.h \
                                  platon/str/strplus.h
  
  LIBSTATIC   = $(PACKAGE).a
@@ -37,7 +39,7 @@ $NetBSD: patch-ab,v 1.2 2016/11/27 09:04
  
  install_LIB     = $(LIBSTATIC) $(LIBDYNAMICV)
  
-@@ -166,7 +165,7 @@
+@@ -166,7 +165,7 @@ install-lib: $(install_LIB)
        @list='$(install_LIB)'; for p in $$list; do \
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
          echo "        Installing file $(DESTDIR)$(libdir)/$$p"; \
@@ -46,7 +48,7 @@ $NetBSD: patch-ab,v 1.2 2016/11/27 09:04
        done
  uninstall-lib:
        @$(NORMAL_UNINSTALL)
-@@ -217,11 +216,7 @@
+@@ -217,11 +216,7 @@ install-symlinks:
                cd platon && $(LN_S) $$p $(include_SYMLINK); \
          ); \
          cd $$here; \
@@ -59,7 +61,7 @@ $NetBSD: patch-ab,v 1.2 2016/11/27 09:04
  uninstall-symlinks:
        @$(NORMAL_UNINSTALL)
        -@list='$(include_SYMLINK)'; for p in $$list; do \
-@@ -229,11 +224,7 @@
+@@ -229,11 +224,7 @@ uninstall-symlinks:
          rm -f $(DESTDIR)$(includedir)/$$p; \
          echo "        rm -f $(DESTDIR)$(includedir_platon)/$$p"; \
          rm -f $(DESTDIR)$(includedir_platon)/$$p; \