[pkgsrc/trunk]: pkgsrc/textproc/discount Accomplish libtoolizati...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9e83feabe18
branches:  trunk
changeset: 306712:f9e83feabe18
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Apr 23 14:42:03 2018 +0000
description:
Accomplish libtoolization with less patching.

diffstat:

 textproc/discount/distinfo                    |   5 +--
 textproc/discount/patches/patch-Makefile.in   |  36 ++++++++------------------
 textproc/discount/patches/patch-configure.inc |  15 -----------
 3 files changed, 13 insertions(+), 43 deletions(-)

diffs (131 lines):

diff -r 565b63cc7fce -r f9e83feabe18 textproc/discount/distinfo
--- a/textproc/discount/distinfo        Mon Apr 23 14:31:11 2018 +0000
+++ b/textproc/discount/distinfo        Mon Apr 23 14:42:03 2018 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2018/03/17 20:54:06 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2018/04/23 14:42:03 schmonz Exp $
 
 SHA1 (discount-2.2.3a.tar.bz2) = 9ff2985b89e7bc7ca6a18f82aade2b25db2c97f8
 RMD160 (discount-2.2.3a.tar.bz2) = 66a13d6848251ab8a73a59ba4ec95befe9bbdc2d
 SHA512 (discount-2.2.3a.tar.bz2) = cf995a46879f269f3e02f7d480303d229676bb36f71fe045d3a8eab7306fca9cce98496611b9fb9e0a14a9cf46ee66bd239dd9c946dff54ae09277fd66459c1f
 Size (discount-2.2.3a.tar.bz2) = 98325 bytes
-SHA1 (patch-Makefile.in) = ee288e3b03368dbc4a0f4c472bfbbdf2283b9967
-SHA1 (patch-configure.inc) = 19e31e0b845e6c3f3822b556223d7a3cc3e2c028
+SHA1 (patch-Makefile.in) = 66270dca27485373279bd9ce8c445cc5a931e29a
 SHA1 (patch-generate.c) = b584de3a654c3bc3f2a2b1204926164c6ed67035
diff -r 565b63cc7fce -r f9e83feabe18 textproc/discount/patches/patch-Makefile.in
--- a/textproc/discount/patches/patch-Makefile.in       Mon Apr 23 14:31:11 2018 +0000
+++ b/textproc/discount/patches/patch-Makefile.in       Mon Apr 23 14:42:03 2018 +0000
@@ -1,33 +1,19 @@
-$NetBSD: patch-Makefile.in,v 1.1 2018/03/16 03:45:18 schmonz Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2018/04/23 14:42:03 schmonz Exp $
 
 Libtoolize for portability across pkgsrc platforms.
 
 --- Makefile.in.orig   2018-03-02 22:52:05.000000000 +0000
 +++ Makefile.in
-@@ -1,3 +1,10 @@
+@@ -1,3 +1,8 @@
 +LIBTOOL=libtool --tag=CC
 +
 +.c.o:
 +      $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
-+.c.lo:
-+      $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
 +
  CC=@CC@ -I.
  LFLAGS=-L.
  CFLAGS=@CFLAGS@
-@@ -19,6 +26,11 @@ OBJS=mkdio.o markdown.o dumptree.o gener
-      xml.o Csio.o xmlpage.o basename.o emmatch.o \
-      github_flavoured.o setup.o tags.o html5.o flags.o \
-      @AMALLOC@ @H1TITLE@
-+LOBJS=mkdio.lo markdown.lo dumptree.lo generate.lo \
-+     resource.lo docheader.lo version.lo toc.lo css.lo \
-+     xml.lo Csio.lo xmlpage.lo basename.lo emmatch.lo \
-+     github_flavoured.lo setup.lo tags.lo html5.lo flags.lo \
-+     @AMALLOC@ @H1TITLE@
- TESTFRAMEWORK=echo cols branch
- 
- # modules that markdown, makepage, mkd2html, &tc use
-@@ -29,8 +41,10 @@ MAN3PAGES=mkd-callbacks.3 mkd-functions.
+@@ -29,8 +34,10 @@ MAN3PAGES=mkd-callbacks.3 mkd-functions.
  all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEWORK)
  
  install: $(PGMS) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR) $(DESTDIR)$(PKGDIR)
@@ -40,7 +26,7 @@
        @INSTALL_DATA@ mkdio.h $(DESTDIR)$(INCDIR)
        @MK_PKGCONFIG@@INSTALL_DATA@ $(MKDLIB).pc $(DESTDIR)$(PKGDIR)
  
-@@ -39,7 +53,7 @@ install.everything: install install.samp
+@@ -39,7 +46,7 @@ install.everything: install install.samp
  install.samples: $(SAMPLE_PGMS) install $(DESTDIR)$(BINDIR)
        @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1
        for x in $(SAMPLE_PGMS); do \
@@ -49,7 +35,7 @@
            @INSTALL_DATA@ $$x.1 $(DESTDIR)$(MANDIR)/man1/$(SAMPLE_PFX)$$x.1; \
        done
  
-@@ -75,7 +89,7 @@ $(DESTDIR)$(LIBDIR):
+@@ -75,7 +82,7 @@ $(DESTDIR)$(LIBDIR):
  @MK_PKGCONFIG@        @INSTALL_DIR@ $(DESTDIR)$(PKGDIR)
  
  version.o: version.c VERSION branch
@@ -58,14 +44,14 @@
  
  VERSION:
        @true
-@@ -87,20 +101,19 @@ blocktags: mktags
+@@ -87,20 +94,19 @@ blocktags: mktags
  
  # example programs
  @THEME@theme:  theme.o $(COMMON) $(MKDLIB) mkdio.h
 -@THEME@       $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o $(COMMON) -lmarkdown @LIBS@
--
 +@THEME@       $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o $(COMMON) $(MKDLIB).la @LIBS@
  
+-
 -mkd2html:  mkd2html.o $(MKDLIB) mkdio.h gethopt.h $(COMMON)
 -      $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o $(COMMON) -lmarkdown @LIBS@
 +mkd2html:  mkd2html.o $(COMMON) $(MKDLIB)
@@ -86,7 +72,7 @@
  
  notspecial.o: notspecial.c
        $(CC) $(CFLAGS) -I. -c notspecial.c
-@@ -111,8 +124,12 @@ gethopt.o: gethopt.c
+@@ -111,8 +117,12 @@ gethopt.o: gethopt.c
  main.o: main.c mkdio.h config.h
        $(CC) $(CFLAGS) -I. -c main.c
  
@@ -95,9 +81,9 @@
 +libtool-version-info: VERSION
 +      awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }' < VERSION > libtool-version-info
 +
-+$(MKDLIB): $(MKDLIB).so
-+$(MKDLIB).so: $(OBJS) libtool-version-info
-+      $(LIBTOOL) --mode=link @CC@ $(LDFLAGS) -o $(MKDLIB).la $(LOBJS) -version-info `cat libtool-version-info` -rpath $(LIBDIR)
++$(MKDLIB): $(MKDLIB).la
++$(MKDLIB).la: $(OBJS) libtool-version-info
++      $(LIBTOOL) --mode=link @CC@ $(LDFLAGS) -o $(MKDLIB).la $(OBJS:S/.o/.lo/g) -version-info `cat libtool-version-info` -rpath $(LIBDIR)
  
  verify: echo tools/checkbits.sh
        @./echo -n "headers ... "; tools/checkbits.sh && echo "GOOD"
diff -r 565b63cc7fce -r f9e83feabe18 textproc/discount/patches/patch-configure.inc
--- a/textproc/discount/patches/patch-configure.inc     Mon Apr 23 14:31:11 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.inc,v 1.1 2018/03/10 05:37:44 schmonz Exp $
-
-Fix installed dylib linker path on Darwin.
-
---- configure.inc.orig 2018-03-02 22:52:05.000000000 +0000
-+++ configure.inc
-@@ -1362,7 +1362,7 @@ FULLNAME=\$LIBNAME
- 
- case "\$ACTION" in
- make)   FLAGS="$AC_CFLAGS -dynamiclib"
--      VFLAGS="-current_version \$VERSION -compatibility_version \$MAJOR"
-+      VFLAGS="-install_name $AC_LIBDIR/\$LIBNAME -current_version \$VERSION -compatibility_version \$MAJOR"
- 
-       rm -f \$LIBRARY
-       if $AC_CC \$FLAGS \$VFLAGS -o \$FULLNAME "\$@"; then