CVS commit: pkgsrc/devel/libslang2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Sep 30 08:33:21 UTC 2021

Modified Files:
        pkgsrc/devel/libslang2: Makefile buildlink3.mk distinfo
Added Files:
        pkgsrc/devel/libslang2/patches: patch-autoconf_slangpc.in

Log Message:
libslang2: fix pkg-config file

Reported by RVP in PR 56426.

Some pkglint cleanup while here.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/libslang2/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/libslang2/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/libslang2/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/libslang2/patches/patch-autoconf_slangpc.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/libslang2/Makefile
diff -u pkgsrc/devel/libslang2/Makefile:1.22 pkgsrc/devel/libslang2/Makefile:1.23
--- pkgsrc/devel/libslang2/Makefile:1.22        Sun Jan 26 17:30:59 2020
+++ pkgsrc/devel/libslang2/Makefile     Thu Sep 30 08:33:21 2021
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2020/01/26 17:30:59 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.23 2021/09/30 08:33:21 wiz Exp $
 
 DISTNAME=      slang-2.2.4
 PKGNAME=       lib${DISTNAME:slang%=slang2%}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  ftp://space.mit.edu/pub/davis/slang/v2.2/
 MASTER_SITES+= ftp://ftp.ntua.gr/pub/lang/slang/slang/v2.2/
@@ -25,6 +24,8 @@ CONFIGURE_ARGS+=      --with-iconv=${BUILDLIN
 CONFIGURE_ARGS+=       --without-x
 CONFIGURE_ARGS+=       --with-z=${BUILDLINK_PREFIX.zlib}
 
+PKGCONFIG_OVERRIDE+=   autoconf/slangpc.in
+
 DLOPEN_REQUIRE_PTHREADS=       no
 
 EGDIR=         ${PREFIX}/share/examples/libslang2

Index: pkgsrc/devel/libslang2/buildlink3.mk
diff -u pkgsrc/devel/libslang2/buildlink3.mk:1.10 pkgsrc/devel/libslang2/buildlink3.mk:1.11
--- pkgsrc/devel/libslang2/buildlink3.mk:1.10   Thu Mar 22 08:14:51 2018
+++ pkgsrc/devel/libslang2/buildlink3.mk        Thu Sep 30 08:33:21 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2018/03/22 08:14:51 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2021/09/30 08:33:21 wiz Exp $
 
 BUILDLINK_TREE+=       libslang2
 
@@ -13,13 +13,13 @@ BUILDLINK_TRANSFORM+=               l:slang:slang2
 pkgbase:=      libslang2
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.libslang2:Mpng)
+.if ${PKG_BUILD_OPTIONS.libslang2:Mpng}
 .  include "../../graphics/png/buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.libslang2:Mpcre)
+.if ${PKG_BUILD_OPTIONS.libslang2:Mpcre}
 .  include "../../devel/pcre/buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.libslang2:Moniguruma)
+.if ${PKG_BUILD_OPTIONS.libslang2:Moniguruma}
 .  include "../../textproc/oniguruma/buildlink3.mk"
 .endif
 

Index: pkgsrc/devel/libslang2/distinfo
diff -u pkgsrc/devel/libslang2/distinfo:1.8 pkgsrc/devel/libslang2/distinfo:1.9
--- pkgsrc/devel/libslang2/distinfo:1.8 Thu May 17 10:35:59 2018
+++ pkgsrc/devel/libslang2/distinfo     Thu Sep 30 08:33:21 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2018/05/17 10:35:59 jperkin Exp $
+$NetBSD: distinfo,v 1.9 2021/09/30 08:33:21 wiz Exp $
 
 SHA1 (slang-2.2.4.tar.bz2) = 34e68a993888d0ae2ebc7bc31b40bc894813a7e2
 RMD160 (slang-2.2.4.tar.bz2) = fc023080f021201a99263d686ab4a8b87bbb575a
@@ -11,4 +11,5 @@ SHA1 (patch-ad) = 9ab953b8d850832f49f8af
 SHA1 (patch-ae) = 85cc759196617a81cee65460e5aabb3a966a6a77
 SHA1 (patch-af) = 15ae3f27d727492c3bebcbfbca005a78455b8774
 SHA1 (patch-ag) = 25be7b526b2adb90d7b83645cc93fa67743fe86f
+SHA1 (patch-autoconf_slangpc.in) = face2e156e75854bb9ce07882ee02bbdc077aba5
 SHA1 (patch-src_slproc.c) = 297723830b85ebed124ec4ff7bd6608bf2e23f29

Added files:

Index: pkgsrc/devel/libslang2/patches/patch-autoconf_slangpc.in
diff -u /dev/null pkgsrc/devel/libslang2/patches/patch-autoconf_slangpc.in:1.1
--- /dev/null   Thu Sep 30 08:33:21 2021
+++ pkgsrc/devel/libslang2/patches/patch-autoconf_slangpc.in    Thu Sep 30 08:33:21 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-autoconf_slangpc.in,v 1.1 2021/09/30 08:33:21 wiz Exp $
+
+Fix library name.
+
+--- autoconf/slangpc.in.orig   2011-04-11 02:37:07.000000000 +0000
++++ autoconf/slangpc.in
+@@ -7,6 +7,6 @@ Name: slang
+ Description: S-Lang programming library and interpreter
+ URL: http://www.jedsoft.org/slang/
+ Version: @slang_version@
+-Libs: -L${libdir} -lslang
++Libs: -L${libdir} -lslang2
+ Libs.private: @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
+ Cflags: -I${includedir}