pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/libslang2 libslang2: fix pkg-config file



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1f29c5d763d8
branches:  trunk
changeset: 459124:1f29c5d763d8
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Sep 30 08:33:21 2021 +0000

description:
libslang2: fix pkg-config file

Reported by RVP in PR 56426.

Some pkglint cleanup while here.

Bump PKGREVISION.

diffstat:

 devel/libslang2/Makefile                          |   7 ++++---
 devel/libslang2/buildlink3.mk                     |   8 ++++----
 devel/libslang2/distinfo                          |   3 ++-
 devel/libslang2/patches/patch-autoconf_slangpc.in |  14 ++++++++++++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diffs (83 lines):

diff -r 5a9259f1c669 -r 1f29c5d763d8 devel/libslang2/Makefile
--- a/devel/libslang2/Makefile  Thu Sep 30 05:32:27 2021 +0000
+++ b/devel/libslang2/Makefile  Thu Sep 30 08:33:21 2021 +0000
@@ -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+=       --without-x
 CONFIGURE_ARGS+=       --with-z=${BUILDLINK_PREFIX.zlib}
 
+PKGCONFIG_OVERRIDE+=   autoconf/slangpc.in
+
 DLOPEN_REQUIRE_PTHREADS=       no
 
 EGDIR=         ${PREFIX}/share/examples/libslang2
diff -r 5a9259f1c669 -r 1f29c5d763d8 devel/libslang2/buildlink3.mk
--- a/devel/libslang2/buildlink3.mk     Thu Sep 30 05:32:27 2021 +0000
+++ b/devel/libslang2/buildlink3.mk     Thu Sep 30 08:33:21 2021 +0000
@@ -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 @@
 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
 
diff -r 5a9259f1c669 -r 1f29c5d763d8 devel/libslang2/distinfo
--- a/devel/libslang2/distinfo  Thu Sep 30 05:32:27 2021 +0000
+++ b/devel/libslang2/distinfo  Thu Sep 30 08:33:21 2021 +0000
@@ -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-ae) = 85cc759196617a81cee65460e5aabb3a966a6a77
 SHA1 (patch-af) = 15ae3f27d727492c3bebcbfbca005a78455b8774
 SHA1 (patch-ag) = 25be7b526b2adb90d7b83645cc93fa67743fe86f
+SHA1 (patch-autoconf_slangpc.in) = face2e156e75854bb9ce07882ee02bbdc077aba5
 SHA1 (patch-src_slproc.c) = 297723830b85ebed124ec4ff7bd6608bf2e23f29
diff -r 5a9259f1c669 -r 1f29c5d763d8 devel/libslang2/patches/patch-autoconf_slangpc.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/libslang2/patches/patch-autoconf_slangpc.in Thu Sep 30 08:33:21 2021 +0000
@@ -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}



Home | Main Index | Thread Index | Old Index