Mon Apr 23 14:42:03 2018 UTC ()
Accomplish libtoolization with less patching.


(schmonz)
diff -r1.6 -r1.7 pkgsrc/textproc/discount/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/discount/patches/patch-Makefile.in
diff -r1.1 -r0 pkgsrc/textproc/discount/patches/patch-configure.inc
cvs diff -r1.6 -r1.7 pkgsrc/textproc/discount/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/discount/distinfo 2018/03/17 20:54:06 1.6
+++ pkgsrc/textproc/discount/distinfo 2018/04/23 14:42:03 1.7
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.6 2018/03/17 20:54:06 schmonz Exp $ 1$NetBSD: distinfo,v 1.7 2018/04/23 14:42:03 schmonz Exp $
2 2
3SHA1 (discount-2.2.3a.tar.bz2) = 9ff2985b89e7bc7ca6a18f82aade2b25db2c97f8 3SHA1 (discount-2.2.3a.tar.bz2) = 9ff2985b89e7bc7ca6a18f82aade2b25db2c97f8
4RMD160 (discount-2.2.3a.tar.bz2) = 66a13d6848251ab8a73a59ba4ec95befe9bbdc2d 4RMD160 (discount-2.2.3a.tar.bz2) = 66a13d6848251ab8a73a59ba4ec95befe9bbdc2d
5SHA512 (discount-2.2.3a.tar.bz2) = cf995a46879f269f3e02f7d480303d229676bb36f71fe045d3a8eab7306fca9cce98496611b9fb9e0a14a9cf46ee66bd239dd9c946dff54ae09277fd66459c1f 5SHA512 (discount-2.2.3a.tar.bz2) = cf995a46879f269f3e02f7d480303d229676bb36f71fe045d3a8eab7306fca9cce98496611b9fb9e0a14a9cf46ee66bd239dd9c946dff54ae09277fd66459c1f
6Size (discount-2.2.3a.tar.bz2) = 98325 bytes 6Size (discount-2.2.3a.tar.bz2) = 98325 bytes
7SHA1 (patch-Makefile.in) = ee288e3b03368dbc4a0f4c472bfbbdf2283b9967 7SHA1 (patch-Makefile.in) = 66270dca27485373279bd9ce8c445cc5a931e29a
8SHA1 (patch-configure.inc) = 19e31e0b845e6c3f3822b556223d7a3cc3e2c028 
9SHA1 (patch-generate.c) = b584de3a654c3bc3f2a2b1204926164c6ed67035 8SHA1 (patch-generate.c) = b584de3a654c3bc3f2a2b1204926164c6ed67035
cvs diff -r1.1 -r1.2 pkgsrc/textproc/discount/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/textproc/discount/patches/patch-Makefile.in 2018/03/16 03:45:18 1.1
+++ pkgsrc/textproc/discount/patches/patch-Makefile.in 2018/04/23 14:42:03 1.2
@@ -1,103 +1,89 @@ @@ -1,103 +1,89 @@
1$NetBSD: patch-Makefile.in,v 1.1 2018/03/16 03:45:18 schmonz Exp $ 1$NetBSD: patch-Makefile.in,v 1.2 2018/04/23 14:42:03 schmonz Exp $
2 2
3Libtoolize for portability across pkgsrc platforms. 3Libtoolize for portability across pkgsrc platforms.
4 4
5--- Makefile.in.orig 2018-03-02 22:52:05.000000000 +0000 5--- Makefile.in.orig 2018-03-02 22:52:05.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -1,3 +1,10 @@ 7@@ -1,3 +1,8 @@
8+LIBTOOL=libtool --tag=CC 8+LIBTOOL=libtool --tag=CC
9+ 9+
10+.c.o: 10+.c.o:
11+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< 11+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $<
12+.c.lo: 
13+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c -o $@ $< 
14+ 12+
15 CC=@CC@ -I. 13 CC=@CC@ -I.
16 LFLAGS=-L. 14 LFLAGS=-L.
17 CFLAGS=@CFLAGS@ 15 CFLAGS=@CFLAGS@
18@@ -19,6 +26,11 @@ OBJS=mkdio.o markdown.o dumptree.o gener 16@@ -29,8 +34,10 @@ MAN3PAGES=mkd-callbacks.3 mkd-functions.
19 xml.o Csio.o xmlpage.o basename.o emmatch.o \ 
20 github_flavoured.o setup.o tags.o html5.o flags.o \ 
21 @AMALLOC@ @H1TITLE@ 
22+LOBJS=mkdio.lo markdown.lo dumptree.lo generate.lo \ 
23+ resource.lo docheader.lo version.lo toc.lo css.lo \ 
24+ xml.lo Csio.lo xmlpage.lo basename.lo emmatch.lo \ 
25+ github_flavoured.lo setup.lo tags.lo html5.lo flags.lo \ 
26+ @AMALLOC@ @H1TITLE@ 
27 TESTFRAMEWORK=echo cols branch 
28  
29 # modules that markdown, makepage, mkd2html, &tc use 
30@@ -29,8 +41,10 @@ MAN3PAGES=mkd-callbacks.3 mkd-functions. 
31 all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEWORK) 17 all: $(PGMS) $(SAMPLE_PGMS) $(TESTFRAMEWORK)
32  18
33 install: $(PGMS) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR) $(DESTDIR)$(PKGDIR) 19 install: $(PGMS) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(INCDIR) $(DESTDIR)$(PKGDIR)
34- @INSTALL_PROGRAM@ $(PGMS) $(DESTDIR)$(BINDIR) 20- @INSTALL_PROGRAM@ $(PGMS) $(DESTDIR)$(BINDIR)
35- ./librarian.sh install libmarkdown VERSION $(DESTDIR)$(LIBDIR) 21- ./librarian.sh install libmarkdown VERSION $(DESTDIR)$(LIBDIR)
36+ for x in $(PGMS); do \ 22+ for x in $(PGMS); do \
37+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(BINDIR)/$$x; \ 23+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(BINDIR)/$$x; \
38+ done 24+ done
39+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(MKDLIB).la $(DESTDIR)$(LIBDIR)/$(MKDLIB).la 25+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(MKDLIB).la $(DESTDIR)$(LIBDIR)/$(MKDLIB).la
40 @INSTALL_DATA@ mkdio.h $(DESTDIR)$(INCDIR) 26 @INSTALL_DATA@ mkdio.h $(DESTDIR)$(INCDIR)
41 @MK_PKGCONFIG@@INSTALL_DATA@ $(MKDLIB).pc $(DESTDIR)$(PKGDIR) 27 @MK_PKGCONFIG@@INSTALL_DATA@ $(MKDLIB).pc $(DESTDIR)$(PKGDIR)
42  28
43@@ -39,7 +53,7 @@ install.everything: install install.samp 29@@ -39,7 +46,7 @@ install.everything: install install.samp
44 install.samples: $(SAMPLE_PGMS) install $(DESTDIR)$(BINDIR) 30 install.samples: $(SAMPLE_PGMS) install $(DESTDIR)$(BINDIR)
45 @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1 31 @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1
46 for x in $(SAMPLE_PGMS); do \ 32 for x in $(SAMPLE_PGMS); do \
47- @INSTALL_PROGRAM@ $$x $(DESTDIR)$(BINDIR)/$(SAMPLE_PFX)$$x; \ 33- @INSTALL_PROGRAM@ $$x $(DESTDIR)$(BINDIR)/$(SAMPLE_PFX)$$x; \
48+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(BINDIR)/$(SAMPLE_PFX)$$x; \ 34+ $(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(BINDIR)/$(SAMPLE_PFX)$$x; \
49 @INSTALL_DATA@ $$x.1 $(DESTDIR)$(MANDIR)/man1/$(SAMPLE_PFX)$$x.1; \ 35 @INSTALL_DATA@ $$x.1 $(DESTDIR)$(MANDIR)/man1/$(SAMPLE_PFX)$$x.1; \
50 done 36 done
51  37
52@@ -75,7 +89,7 @@ $(DESTDIR)$(LIBDIR): 38@@ -75,7 +82,7 @@ $(DESTDIR)$(LIBDIR):
53 @MK_PKGCONFIG@ @INSTALL_DIR@ $(DESTDIR)$(PKGDIR) 39 @MK_PKGCONFIG@ @INSTALL_DIR@ $(DESTDIR)$(PKGDIR)
54  40
55 version.o: version.c VERSION branch 41 version.o: version.c VERSION branch
56- $(CC) $(CFLAGS) -DBRANCH=`./branch` -DVERSION=\"`cat VERSION`\" -c version.c 42- $(CC) $(CFLAGS) -DBRANCH=`./branch` -DVERSION=\"`cat VERSION`\" -c version.c
57+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -DBRANCH=`./branch` -DVERSION=\"`cat VERSION`\" -c version.c 43+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -DBRANCH=`./branch` -DVERSION=\"`cat VERSION`\" -c version.c
58  44
59 VERSION: 45 VERSION:
60 @true 46 @true
61@@ -87,20 +101,19 @@ blocktags: mktags 47@@ -87,20 +94,19 @@ blocktags: mktags
62  48
63 # example programs 49 # example programs
64 @THEME@theme: theme.o $(COMMON) $(MKDLIB) mkdio.h 50 @THEME@theme: theme.o $(COMMON) $(MKDLIB) mkdio.h
65-@THEME@ $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o $(COMMON) -lmarkdown @LIBS@ 51-@THEME@ $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o $(COMMON) -lmarkdown @LIBS@
66- 
67+@THEME@ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o $(COMMON) $(MKDLIB).la @LIBS@ 52+@THEME@ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) -o theme theme.o $(COMMON) $(MKDLIB).la @LIBS@
68  53
 54-
69-mkd2html: mkd2html.o $(MKDLIB) mkdio.h gethopt.h $(COMMON) 55-mkd2html: mkd2html.o $(MKDLIB) mkdio.h gethopt.h $(COMMON)
70- $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o $(COMMON) -lmarkdown @LIBS@ 56- $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o $(COMMON) -lmarkdown @LIBS@
71+mkd2html: mkd2html.o $(COMMON) $(MKDLIB) 57+mkd2html: mkd2html.o $(COMMON) $(MKDLIB)
72+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o $(COMMON) $(MKDLIB).la @LIBS@ 58+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o $(COMMON) $(MKDLIB).la @LIBS@
73  59
74 markdown: main.o $(COMMON) $(MKDLIB) 60 markdown: main.o $(COMMON) $(MKDLIB)
75- $(CC) $(CFLAGS) $(LFLAGS) -o markdown main.o $(COMMON) -lmarkdown @LIBS@ 61- $(CC) $(CFLAGS) $(LFLAGS) -o markdown main.o $(COMMON) -lmarkdown @LIBS@
76+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) -o markdown main.o $(COMMON) $(MKDLIB).la @LIBS@ 62+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) -o markdown main.o $(COMMON) $(MKDLIB).la @LIBS@
77  63
78-makepage: makepage.c $(COMMON) $(MKDLIB) mkdio.h 64-makepage: makepage.c $(COMMON) $(MKDLIB) mkdio.h
79- $(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.c $(COMMON) -lmarkdown @LIBS@ 65- $(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.c $(COMMON) -lmarkdown @LIBS@
80+makepage: makepage.o $(COMMON) $(MKDLIB) 66+makepage: makepage.o $(COMMON) $(MKDLIB)
81+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.o $(COMMON) $(MKDLIB).la @LIBS@ 67+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.o $(COMMON) $(MKDLIB).la @LIBS@
82  68
83 pgm_options.o: pgm_options.c mkdio.h config.h 69 pgm_options.o: pgm_options.c mkdio.h config.h
84- $(CC) $(CFLAGS) -I. -c pgm_options.c 70- $(CC) $(CFLAGS) -I. -c pgm_options.c
85+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I. -c pgm_options.c 71+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -I. -c pgm_options.c
86  72
87 notspecial.o: notspecial.c 73 notspecial.o: notspecial.c
88 $(CC) $(CFLAGS) -I. -c notspecial.c 74 $(CC) $(CFLAGS) -I. -c notspecial.c
89@@ -111,8 +124,12 @@ gethopt.o: gethopt.c 75@@ -111,8 +117,12 @@ gethopt.o: gethopt.c
90 main.o: main.c mkdio.h config.h 76 main.o: main.c mkdio.h config.h
91 $(CC) $(CFLAGS) -I. -c main.c 77 $(CC) $(CFLAGS) -I. -c main.c
92  78
93-$(MKDLIB): $(OBJS) 79-$(MKDLIB): $(OBJS)
94- ./librarian.sh make $(MKDLIB) VERSION $(OBJS) 80- ./librarian.sh make $(MKDLIB) VERSION $(OBJS)
95+libtool-version-info: VERSION 81+libtool-version-info: VERSION
96+ awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }' < VERSION > libtool-version-info 82+ awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }' < VERSION > libtool-version-info
97+ 83+
98+$(MKDLIB): $(MKDLIB).so 84+$(MKDLIB): $(MKDLIB).la
99+$(MKDLIB).so: $(OBJS) libtool-version-info 85+$(MKDLIB).la: $(OBJS) libtool-version-info
100+ $(LIBTOOL) --mode=link @CC@ $(LDFLAGS) -o $(MKDLIB).la $(LOBJS) -version-info `cat libtool-version-info` -rpath $(LIBDIR) 86+ $(LIBTOOL) --mode=link @CC@ $(LDFLAGS) -o $(MKDLIB).la $(OBJS:S/.o/.lo/g) -version-info `cat libtool-version-info` -rpath $(LIBDIR)
101  87
102 verify: echo tools/checkbits.sh 88 verify: echo tools/checkbits.sh
103 @./echo -n "headers ... "; tools/checkbits.sh && echo "GOOD" 89 @./echo -n "headers ... "; tools/checkbits.sh && echo "GOOD"
File Deleted: pkgsrc/textproc/discount/patches/Attic/patch-configure.inc