CVS commit: pkgsrc/x11/fox

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 27 18:53:29 UTC 2022

Modified Files:
        pkgsrc/x11/fox: Makefile distinfo
        pkgsrc/x11/fox/patches: patch-aa

Log Message:
fox: fix png library name.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/x11/fox/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/x11/fox/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/fox/patches/patch-aa

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

Modified files:

Index: pkgsrc/x11/fox/Makefile
diff -u pkgsrc/x11/fox/Makefile:1.61 pkgsrc/x11/fox/Makefile:1.62
--- pkgsrc/x11/fox/Makefile:1.61        Mon Aug 17 20:17:49 2020
+++ pkgsrc/x11/fox/Makefile     Wed Jul 27 18:53:29 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2020/08/17 20:17:49 leot Exp $
+# $NetBSD: Makefile,v 1.62 2022/07/27 18:53:29 wiz Exp $
 
 DISTNAME=      fox-1.6.57
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ftp://www.fox-toolkit.org/pub/
 

Index: pkgsrc/x11/fox/distinfo
diff -u pkgsrc/x11/fox/distinfo:1.26 pkgsrc/x11/fox/distinfo:1.27
--- pkgsrc/x11/fox/distinfo:1.26        Mon Apr 25 15:17:21 2022
+++ pkgsrc/x11/fox/distinfo     Wed Jul 27 18:53:29 2022
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.26 2022/04/25 15:17:21 tnn Exp $
+$NetBSD: distinfo,v 1.27 2022/07/27 18:53:29 wiz Exp $
 
 BLAKE2s (fox-1.6.57.tar.gz) = 6ecaf9f17afdcec1d5e4797d36178600913b217688954bb5f720057e8921b8b9
 SHA512 (fox-1.6.57.tar.gz) = e7b91054a9ea674818803415284cb61572935d22466e446cb37ef68344e2684e8acd567f7c8a6912f939dcbcc37455119ad6a01ac30513f460d0b3937b7e6087
 Size (fox-1.6.57.tar.gz) = 4284018 bytes
-SHA1 (patch-aa) = 06444b562a32d3471dd8d65f5af2c49e11b3e491
+SHA1 (patch-aa) = bb2702cec4df2a8f173b0ee0ddad6ac38f733eb5
 SHA1 (patch-src_FXGUISignal.cpp) = 389f3a8ee75942cb6c52eedd0c9d429db4e521b1

Index: pkgsrc/x11/fox/patches/patch-aa
diff -u pkgsrc/x11/fox/patches/patch-aa:1.9 pkgsrc/x11/fox/patches/patch-aa:1.10
--- pkgsrc/x11/fox/patches/patch-aa:1.9 Sun Feb 15 14:04:59 2015
+++ pkgsrc/x11/fox/patches/patch-aa     Wed Jul 27 18:53:29 2022
@@ -1,8 +1,11 @@
-$NetBSD: patch-aa,v 1.9 2015/02/15 14:04:59 ryoon Exp $
+$NetBSD: patch-aa,v 1.10 2022/07/27 18:53:29 wiz Exp $
 
---- configure.orig     2014-05-14 04:33:43.000000000 +0000
+pthread changes: ?
+Fix png library name.
+
+--- configure.orig     2018-04-04 03:47:18.000000000 +0000
 +++ configure
-@@ -17640,7 +17640,7 @@ if ${ac_cv_lib_pthread_pthread_exit+:} f
+@@ -18493,7 +18493,7 @@ if ${ac_cv_lib_pthread_pthread_exit+:} f
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,7 +14,7 @@ $NetBSD: patch-aa,v 1.9 2015/02/15 14:04
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -17675,7 +17675,7 @@ if test "x$ac_cv_lib_pthread_pthread_exi
+@@ -18528,7 +18528,7 @@ if test "x$ac_cv_lib_pthread_pthread_exi
  #define HAVE_LIBPTHREAD 1
  _ACEOF
  
@@ -20,3 +23,12 @@ $NetBSD: patch-aa,v 1.9 2015/02/15 14:04
  
  fi
  
+@@ -18730,7 +18730,7 @@ if test "x$ac_cv_header_png_h" = xyes; t
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_PNG_H 1
+ _ACEOF
+- CXXFLAGS="${CXXFLAGS} -DHAVE_PNG_H=1"; LIBS="${LIBS} ${LIBPNG:=-lpng}"
++ CXXFLAGS="${CXXFLAGS} -DHAVE_PNG_H=1"; LIBS="${LIBS} ${LIBPNG:=-lpng16}"
+ fi
+ 
+ done