libwmf: fix png name library in libwmf-config

Bump PKGREVISION.

4 files changed, 51 insertions, 8 deletions

diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 30a2ce42f9d..e5e8e9fd3ae 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2022/04/18 19:09:53 adam Exp $
+# $NetBSD: Makefile,v 1.86 2022/07/22 13:43:46 wiz Exp $
 
 DISTNAME=	libwmf-0.2.8.4
-PKGREVISION=	21
+PKGREVISION=	22
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wvware/}
 
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index 11779569f8d..39546f6c825 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2022/04/18 19:09:53 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2022/07/22 13:43:46 wiz Exp $
 
 BUILDLINK_TREE+=	libwmf
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
 
 pkgbase:= libwmf
 .include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.libwmf:Mx11)
+.if ${PKG_BUILD_OPTIONS.libwmf:Mx11}
 .include "../../x11/libX11/buildlink3.mk"
 .endif
 
diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index 5f04d98aa95..feae0ce7227 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.23 2021/10/26 10:46:30 nia Exp $
+$NetBSD: distinfo,v 1.24 2022/07/22 13:43:46 wiz Exp $
 
 BLAKE2s (libwmf-0.2.8.4.tar.gz) = e3eb4ff4d57da5b13f40a8c9ba0e847099de8994b25451bc6b931831cd28d97d
 SHA512 (libwmf-0.2.8.4.tar.gz) = d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5
 Size (libwmf-0.2.8.4.tar.gz) = 2169375 bytes
 SHA1 (patch-aa) = e687f9f8c20e7a9b1ed4718c8d37b7407658c52c
-SHA1 (patch-ad) = b74be16c5da490394b86403009f5f35d80ba4bfa
+SHA1 (patch-ad) = dc16568018e244a211d6337cb26d3fb0f5534d52
 SHA1 (patch-ae) = f5cbb60757261aaf6084e9fcf16f9074b3013538
 SHA1 (patch-src_extra_gd_gd.c) = 4c00b5625cd054313c8780ed0fc4fb65520258a2
 SHA1 (patch-src_extra_gd_gd_gd.c) = 8678d62d2b1bbb5ee5d71c8e12e5f865ace98fdb
diff --git a/graphics/libwmf/patches/patch-ad b/graphics/libwmf/patches/patch-ad
index 28b1348c016..f3db98b5a0d 100644
--- a/graphics/libwmf/patches/patch-ad
+++ b/graphics/libwmf/patches/patch-ad
@@ -1,6 +1,11 @@
-$NetBSD: patch-ad,v 1.5 2006/01/18 22:04:58 adam Exp $
+$NetBSD: patch-ad,v 1.6 2022/07/22 13:43:46 wiz Exp $
 
---- configure.orig	2005-07-27 23:47:12.000000000 +0200
+Add rpath for X libraries.
+Use proper library name for libpng; the unversioned one
+works inside pkgsrc, but this paths leaks to the libwmf-config
+script and breaks other software.
+
+--- configure.orig	2005-07-27 21:47:12.000000000 +0000
 +++ configure
 @@ -21916,7 +21916,7 @@ else
  
@@ -11,6 +16,44 @@ $NetBSD: patch-ad,v 1.5 2006/01/18 22:04:58 adam Exp $
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
      case `(uname -sr) 2>/dev/null` in
+@@ -24373,13 +24373,13 @@ echo "${ECHO_T}$ac_cv_header_png_h" >&6
+ fi
+ if test $ac_cv_header_png_h = yes; then
+ 
+-	echo "$as_me:$LINENO: checking for png_write_image in -lpng" >&5
+-echo $ECHO_N "checking for png_write_image in -lpng... $ECHO_C" >&6
++	echo "$as_me:$LINENO: checking for png_write_image in -lpng16" >&5
++echo $ECHO_N "checking for png_write_image in -lpng16... $ECHO_C" >&6
+ if test "${ac_cv_lib_png_png_write_image+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng -lz -lm $LIBS"
++LIBS="-lpng16 -lz -lm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24441,9 +24441,9 @@ if test $ac_cv_lib_png_png_write_image =
+ 
+ 		if  test "x$PNG_DIR" != "x" ; then
+ 			WMF_PNG_CFLAGS="-I$PNG_DIR/include"
+-			WMF_PNG_LDFLAGS="-L$PNG_DIR/lib -lpng"
++			WMF_PNG_LDFLAGS="-L$PNG_DIR/lib -lpng16"
+ 		else
+-			WMF_PNG_LDFLAGS="-lpng"
++			WMF_PNG_LDFLAGS="-lpng16"
+ 		fi
+ 
+ else
+@@ -24867,7 +24867,7 @@ fi
+ 
+ 	CPPFLAGS="$CPPFLAGS $WMF_FT_CFLAGS $WMF_PNG_CFLAGS $WMF_Z_CFLAGS"
+ 	LDFLAGS="$LDFLAGS $WMF_FT_LDFLAGS $WMF_PNG_LDFLAGS $WMF_Z_LDFLAGS"
+-	other_libs="$other_libs -lfreetype -lpng -lz -lm"
++	other_libs="$other_libs -lfreetype -lpng16 -lz -lm"
+ 
+ 	if test "${ac_cv_header_gd_h+set}" = set; then
+   echo "$as_me:$LINENO: checking for gd.h" >&5
 @@ -26007,7 +26007,7 @@ echo "${ECHO_T}$GDK_PIXBUF_LIBS" >&6
  
  		GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`