CVS commit: pkgsrc/www/webalizer

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 27 18:56:43 UTC 2022

Modified Files:
        pkgsrc/www/webalizer: Makefile distinfo
Added Files:
        pkgsrc/www/webalizer/patches: patch-configure

Log Message:
webalizer: fix png library name.

Add explicit png buildlink3.mk inclusion, since this uses png
directly.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/www/webalizer/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/webalizer/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/webalizer/patches/patch-configure

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

Modified files:

Index: pkgsrc/www/webalizer/Makefile
diff -u pkgsrc/www/webalizer/Makefile:1.73 pkgsrc/www/webalizer/Makefile:1.74
--- pkgsrc/www/webalizer/Makefile:1.73  Sat Feb 20 14:37:23 2021
+++ pkgsrc/www/webalizer/Makefile       Wed Jul 27 18:56:42 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2021/02/20 14:37:23 bsiegert Exp $
+# $NetBSD: Makefile,v 1.74 2022/07/27 18:56:42 wiz Exp $
 
 DISTNAME=      webalizer-2.23-08-src
 PKGNAME=       webalizer-2.23.8
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  ftp://ftp.mrunix.net/pub/webalizer/
 EXTRACT_SUFX=  .tar.bz2
@@ -53,5 +53,6 @@ post-install:
 BUILDLINK_TRANSFORM+=  l:db:${BDB_TYPE}
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/webalizer/distinfo
diff -u pkgsrc/www/webalizer/distinfo:1.20 pkgsrc/www/webalizer/distinfo:1.21
--- pkgsrc/www/webalizer/distinfo:1.20  Tue Oct 26 11:31:13 2021
+++ pkgsrc/www/webalizer/distinfo       Wed Jul 27 18:56:42 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 11:31:13 nia Exp $
+$NetBSD: distinfo,v 1.21 2022/07/27 18:56:42 wiz Exp $
 
 BLAKE2s (webalizer-2.23-08-src.tar.bz2) = 8f97b531ba3c0e1fb811c5864a52eebd05616ffc04c1f07b7bedb81c02411d49
 SHA512 (webalizer-2.23-08-src.tar.bz2) = 23fe6e3ef1c85aa527ffafef16c31c13ad8e1f9feb774557c07a5c8fd6c67986b98180ef16d6cebe62d59c5f7ca214b8292e94ce8f195fa0541de9c5438fb9bd
@@ -10,4 +10,5 @@ SHA1 (patch-ba) = eadf9f9d22c89d441debd9
 SHA1 (patch-bb) = d8a5f6f60f53d6de8fc24d3b1844a052be0ad69a
 SHA1 (patch-bc) = 98d263cfb585477798f620a6f3690680ce2759b6
 SHA1 (patch-bd) = 21f074725a85de5d9d865b84cc88dc04919226d4
+SHA1 (patch-configure) = 8b4aaca2a8ec704313b9b4fed37b8479c85cf854
 SHA1 (patch-preserve.c) = 5fc85459af088b773073f161a29160a2cff73ba8

Added files:

Index: pkgsrc/www/webalizer/patches/patch-configure
diff -u /dev/null pkgsrc/www/webalizer/patches/patch-configure:1.1
--- /dev/null   Wed Jul 27 18:56:43 2022
+++ pkgsrc/www/webalizer/patches/patch-configure        Wed Jul 27 18:56:43 2022
@@ -0,0 +1,32 @@
+$NetBSD: patch-configure,v 1.1 2022/07/27 18:56:43 wiz Exp $
+
+Fix png library name.
+
+--- configure.orig     2010-10-09 06:19:22.000000000 +0000
++++ configure
+@@ -4695,13 +4695,13 @@ echo "$as_me: error: zlib.h header not f
+ fi
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for main in -lpng" >&5
+-echo $ECHO_N "checking for main in -lpng... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for main in -lpng16" >&5
++echo $ECHO_N "checking for main in -lpng16... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png_main+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="-lpng16  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4751,7 +4751,7 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_png_main" >&5
+ echo "${ECHO_T}$ac_cv_lib_png_main" >&6; }
+ if test $ac_cv_lib_png_main = yes; then
+-  LIBPNG="yes"; LIBS="-lpng ${LIBS}"
++  LIBPNG="yes"; LIBS="-lpng16 ${LIBS}"
+ else
+   LIBPNG="no"
+ fi