Tue May 18 10:05:18 2021 UTC ()
png: Fix libpng-config --libs and --ldflags output.

They should include the full list of libraries and linker flags, similar
to pkg-config and other *-config scripts.  Bump PKGREVISION.


(jperkin)
diff -r1.199 -r1.200 pkgsrc/graphics/png/Makefile
diff -r1.142 -r1.143 pkgsrc/graphics/png/distinfo
diff -r0 -r1.1 pkgsrc/graphics/png/patches/patch-libpng-config.in
cvs diff -r1.199 -r1.200 pkgsrc/graphics/png/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/png/Makefile 2020/04/14 12:35:05 1.199
+++ pkgsrc/graphics/png/Makefile 2021/05/18 10:05:18 1.200
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.199 2020/04/14 12:35:05 wiz Exp $ 1# $NetBSD: Makefile,v 1.200 2021/05/18 10:05:18 jperkin Exp $
2 2
3DISTNAME= libpng-1.6.37 3DISTNAME= libpng-1.6.37
4PKGNAME= ${DISTNAME:S/lib//} 4PKGNAME= ${DISTNAME:S/lib//}
 5PKGREVISION= 1
5CATEGORIES= graphics 6CATEGORIES= graphics
6MASTER_SITES= https://ftp-osl.osuosl.org/pub/libpng/src/archive/xz/libpng16/ 7MASTER_SITES= https://ftp-osl.osuosl.org/pub/libpng/src/archive/xz/libpng16/
7MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=libpng/} 8MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=libpng/}
8MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/graphics/png/src/libpng16/ 9MASTER_SITES+= ftp://ftp.fu-berlin.de/unix/graphics/png/src/libpng16/
9EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
10 11
11MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.libpng.org/pub/png/libpng.html 13HOMEPAGE= http://www.libpng.org/pub/png/libpng.html
13COMMENT= Library for manipulating PNG images 14COMMENT= Library for manipulating PNG images
14LICENSE= zlib 15LICENSE= zlib
15 16
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
@@ -24,19 +25,18 @@ INSTALL_TARGET= install install-header- @@ -24,19 +25,18 @@ INSTALL_TARGET= install install-header-
24PKGCONFIG_OVERRIDE= scripts/libpng.pc.in libpng.pc.in 25PKGCONFIG_OVERRIDE= scripts/libpng.pc.in libpng.pc.in
25TEST_TARGET= check 26TEST_TARGET= check
26 27
27CPPFLAGS+= -DPNG_USER_CHUNK_CACHE_MAX=128 -DPNG_USER_CHUNK_MALLOC_MAX=8000000 28CPPFLAGS+= -DPNG_USER_CHUNK_CACHE_MAX=128 -DPNG_USER_CHUNK_MALLOC_MAX=8000000
28 29
29.include "../../mk/bsd.prefs.mk" 30.include "../../mk/bsd.prefs.mk"
30# keep this in sync with the same code in buildlink3.mk 31# keep this in sync with the same code in buildlink3.mk
31.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64" 32.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "x86_64"
32CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE 33CPPFLAGS+= -DPNG_NO_ASSEMBLER_CODE
33.endif 34.endif
34 35
35SUBST_CLASSES+= rpathfix 36SUBST_CLASSES+= rpathfix
36SUBST_FILES.rpathfix= libpng-config.in 37SUBST_FILES.rpathfix= libpng-config.in
37SUBST_MESSAGE.rpathfix= Adding rpath to libpng-config 38SUBST_VARS.rpathfix= COMPILER_RPATH_FLAG
38SUBST_SED.rpathfix= -e 's/-L$${libdir}/${COMPILER_RPATH_FLAG}$${libdir} -L$${libdir}/g' 39SUBST_STAGE.rpathfix= post-build
39SUBST_STAGE.rpathfix= pre-configure 
40 40
41.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 42.include "../../mk/bsd.pkg.mk"
cvs diff -r1.142 -r1.143 pkgsrc/graphics/png/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/png/distinfo 2019/04/17 07:05:20 1.142
+++ pkgsrc/graphics/png/distinfo 2021/05/18 10:05:18 1.143
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.142 2019/04/17 07:05:20 wiz Exp $ 1$NetBSD: distinfo,v 1.143 2021/05/18 10:05:18 jperkin Exp $
2 2
3SHA1 (libpng-1.6.37.tar.xz) = 3ab93fabbf4c27e1c4724371df408d9a1bd3f656 3SHA1 (libpng-1.6.37.tar.xz) = 3ab93fabbf4c27e1c4724371df408d9a1bd3f656
4RMD160 (libpng-1.6.37.tar.xz) = 7d68b596480e994aeccb2794df48a3613f1de9c4 4RMD160 (libpng-1.6.37.tar.xz) = 7d68b596480e994aeccb2794df48a3613f1de9c4
5SHA512 (libpng-1.6.37.tar.xz) = 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074 5SHA512 (libpng-1.6.37.tar.xz) = 59e8c1059013497ae616a14c3abbe239322d3873c6ded0912403fc62fb260561768230b6ab997e2cccc3b868c09f539fd13635616b9fa0dd6279a3f63ec7e074
6Size (libpng-1.6.37.tar.xz) = 1012272 bytes 6Size (libpng-1.6.37.tar.xz) = 1012272 bytes
 7SHA1 (patch-libpng-config.in) = 04f8d6af31114017ce9d1280e62f1768c35c289d
7SHA1 (patch-pngpriv.h) = 3da29edb5d89ab26b9787a71b87c3fd8f451ea39 8SHA1 (patch-pngpriv.h) = 3da29edb5d89ab26b9787a71b87c3fd8f451ea39
File Added: pkgsrc/graphics/png/patches/patch-libpng-config.in
$NetBSD: patch-libpng-config.in,v 1.1 2021/05/18 10:05:18 jperkin Exp $

Make --libs behave the same as --ldflags and include all libs.

--- libpng-config.in.orig	2019-04-14 18:10:32.000000000 +0000
+++ libpng-config.in
@@ -19,7 +19,7 @@ includedir="@includedir@/libpng@PNGLIB_M
 libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@"
 all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@"
 I_opts="-I${includedir}"
-L_opts="-L${libdir}"
+L_opts="@COMPILER_RPATH_FLAG@${libdir} -L${libdir}"
 R_opts=""
 cppflags=""
 ccopts=""
@@ -88,7 +88,7 @@ while test $# -gt 0; do
         ;;
 
     --libs)
-        echo ${libs}
+        echo ${ldopts} ${L_opts} ${R_opts} ${all_libs}
         ;;
 
     --I_opts)
@@ -108,7 +108,7 @@ while test $# -gt 0; do
         ;;
 
     --ldflags)
-        echo ${ldopts} ${L_opts} ${R_opts} ${libs}
+        echo ${ldopts} ${L_opts} ${R_opts} ${all_libs}
         ;;
 
     --static)