CVS commit: pkgsrc/textproc/discount

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sat Mar 10 05:37:45 UTC 2018

Modified Files:
        pkgsrc/textproc/discount: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/textproc/discount/patches: patch-configure.inc

Log Message:
Build and install shared library. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/discount/Makefile \
    pkgsrc/textproc/discount/PLIST pkgsrc/textproc/discount/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/discount/buildlink3.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/discount/patches/patch-configure.inc

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

Modified files:

Index: pkgsrc/textproc/discount/Makefile
diff -u pkgsrc/textproc/discount/Makefile:1.3 pkgsrc/textproc/discount/Makefile:1.4
--- pkgsrc/textproc/discount/Makefile:1.3       Thu Mar  8 18:17:30 2018
+++ pkgsrc/textproc/discount/Makefile   Sat Mar 10 05:37:44 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2018/03/08 18:17:30 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2018/03/10 05:37:44 schmonz Exp $
 #
 
 DISTNAME=      discount-2.2.3a
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${HOMEPAGE}
 EXTRACT_SUFX=  .tar.bz2
@@ -17,6 +18,7 @@ CONFIGURE_ARGS=               --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --execdir=${PREFIX}/bin
 CONFIGURE_ARGS+=       --libdir=${PREFIX}/lib
 CONFIGURE_ARGS+=       --mandir=${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=       --shared
 CONFIGURE_ARGS+=       --enable-all-features
 
 INSTALL_TARGET=                install.everything
Index: pkgsrc/textproc/discount/PLIST
diff -u pkgsrc/textproc/discount/PLIST:1.3 pkgsrc/textproc/discount/PLIST:1.4
--- pkgsrc/textproc/discount/PLIST:1.3  Thu Mar  8 18:17:30 2018
+++ pkgsrc/textproc/discount/PLIST      Sat Mar 10 05:37:44 2018
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2018/03/08 18:17:30 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/03/10 05:37:44 schmonz Exp $
 bin/makepage
 bin/markdown
 bin/mkd2html
 bin/theme
 include/mkdio.h
-lib/libmarkdown.a
+lib/libmarkdown.so
 lib/pkgconfig/libmarkdown.pc
 man/man1/makepage.1
 man/man1/markdown.1
Index: pkgsrc/textproc/discount/distinfo
diff -u pkgsrc/textproc/discount/distinfo:1.3 pkgsrc/textproc/discount/distinfo:1.4
--- pkgsrc/textproc/discount/distinfo:1.3       Thu Mar  8 18:17:30 2018
+++ pkgsrc/textproc/discount/distinfo   Sat Mar 10 05:37:44 2018
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2018/03/08 18:17:30 schmonz Exp $
+$NetBSD: distinfo,v 1.4 2018/03/10 05:37:44 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-configure.inc) = 19e31e0b845e6c3f3822b556223d7a3cc3e2c028

Index: pkgsrc/textproc/discount/buildlink3.mk
diff -u pkgsrc/textproc/discount/buildlink3.mk:1.1 pkgsrc/textproc/discount/buildlink3.mk:1.2
--- pkgsrc/textproc/discount/buildlink3.mk:1.1  Thu Apr  4 09:40:23 2013
+++ pkgsrc/textproc/discount/buildlink3.mk      Sat Mar 10 05:37:44 2018
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2013/04/04 09:40:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/03/10 05:37:44 schmonz Exp $
 
 BUILDLINK_TREE+=       discount
 
 .if !defined(DISCOUNT_BUILDLINK3_MK)
 DISCOUNT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.discount+=       discount>=2.1.6
+BUILDLINK_API_DEPENDS.discount+=       discount>=2.2.3anb1
 BUILDLINK_PKGSRCDIR.discount?=         ../../textproc/discount
 .endif # DISCOUNT_BUILDLINK3_MK
 

Added files:

Index: pkgsrc/textproc/discount/patches/patch-configure.inc
diff -u /dev/null pkgsrc/textproc/discount/patches/patch-configure.inc:1.1
--- /dev/null   Sat Mar 10 05:37:45 2018
+++ pkgsrc/textproc/discount/patches/patch-configure.inc        Sat Mar 10 05:37:44 2018
@@ -0,0 +1,15 @@
+$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