[pkgsrc/pkgsrc-2006Q4]: pkgsrc/graphics/png Pullup ticket 1973 - requested by tv

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1c70894a68cb
branches:  pkgsrc-2006Q4
changeset: 522944:1c70894a68cb
user:      salo <salo%pkgsrc.org@localhost>
date:      Thu Jan 04 15:09:26 2007 +0000

description:
Pullup ticket 1973 - requested by tv
portability fix for png

Revisions pulled up:
- pkgsrc/graphics/png/Makefile                          1.87, 1.88
- pkgsrc/graphics/png/buildlink3.mk                     1.18, 1.19, 1.20
- pkgsrc/graphics/png/distinfo                          1.35
- pkgsrc/graphics/png/patches/patch-ac                  1.6

   Module Name:         pkgsrc
   Committed By:        tv
   Date:                Wed Jan  3 16:23:10 UTC 2007

   Modified Files:
        pkgsrc/graphics/png: Makefile buildlink3.mk distinfo
   Added Files:
        pkgsrc/graphics/png/patches: patch-ac

   Log Message:
   Don't allow "ld --version-script" on Interix.  Fixes PR pkg/35210.
   Based on patch idea from Aleksey Cheusov <cheusov%tut.by@localhost>.
   (Sanity tested for breakage on a non-Interix platform, NetBSD.)
---
   Module Name:         pkgsrc
   Committed By:        joerg
   Date:                Wed Jan  3 19:54:12 UTC 2007

   Modified Files:
        pkgsrc/graphics/png: buildlink3.mk

   Log Message:
   Include bsd.fast.prefs.mk before accessing OPSYS.
---
   Module Name:         pkgsrc
   Committed By:        rillig
   Date:                Wed Jan  3 20:38:46 UTC 2007

   Modified Files:
        pkgsrc/graphics/png: Makefile buildlink3.mk

   Log Message:
   Fixed pkglint warnings.

diffstat:

 graphics/png/Makefile         |   5 +++--
 graphics/png/buildlink3.mk    |  13 +++++++++----
 graphics/png/distinfo         |   3 ++-
 graphics/png/patches/patch-ac |  13 +++++++++++++
 4 files changed, 27 insertions(+), 7 deletions(-)

diffs (82 lines):

diff -r 52aabe9f1c8a -r 1c70894a68cb graphics/png/Makefile
--- a/graphics/png/Makefile     Thu Jan 04 14:36:27 2007 +0000
+++ b/graphics/png/Makefile     Thu Jan 04 15:09:26 2007 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.86 2006/11/30 10:58:17 drochner Exp $
+# $NetBSD: Makefile,v 1.86.2.1 2007/01/04 15:09:26 salo Exp $
 
 DISTNAME=      libpng-1.2.14
 PKGNAME=       ${DISTNAME:S/lib//}
+PKGREVISION=   1
 # temporary, distfile was changed after release
-DIST_SUBDIR=   libpng-1.2.14-20061130
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=libpng/} \
                http://www.libpng.org/pub/png/src/ \
                ftp://swrinde.nde.swri.edu/pub/png/src/ \
                ftp://ftp.simplesystems.org/pub/libpng/src/ \
                ftp://ftp.fu-berlin.de/unix/graphics/png/src/
+DIST_SUBDIR=   libpng-1.2.14-20061130
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    fredb%NetBSD.org@localhost
diff -r 52aabe9f1c8a -r 1c70894a68cb graphics/png/buildlink3.mk
--- a/graphics/png/buildlink3.mk        Thu Jan 04 14:36:27 2007 +0000
+++ b/graphics/png/buildlink3.mk        Thu Jan 04 15:09:26 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2006/12/12 21:52:36 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.17.2.1 2007/01/04 15:09:26 salo Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 PNG_BUILDLINK3_MK:=    ${PNG_BUILDLINK3_MK}+
@@ -12,11 +12,16 @@
 BUILDLINK_ORDER:=      ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}png
 
 .if !empty(PNG_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.png+=            png>=1.2.4
-BUILDLINK_ABI_DEPENDS.png?=    png>=1.2.9nb2
+# XXX tv - remove this OPSYS block the next time ABI_DEPENDS is bumped:
+.  include "../../mk/bsd.fast.prefs.mk"
+.  if ${OPSYS} == "Interix"
+BUILDLINK_ABI_DEPENDS.png+=    png>=1.2.14nb1 # fixes linkage bug
+.  endif
+
+BUILDLINK_API_DEPENDS.png+=    png>=1.2.4
+BUILDLINK_ABI_DEPENDS.png+=    png>=1.2.9nb2
 BUILDLINK_PKGSRCDIR.png?=      ../../graphics/png
 
-.   include "../../mk/bsd.fast.prefs.mk"
 # keep this in sync with the same code in Makefile
 .  if ${MACHINE_ARCH} != "i386"
 CPPFLAGS+=     -DPNG_NO_ASSEMBLER_CODE
diff -r 52aabe9f1c8a -r 1c70894a68cb graphics/png/distinfo
--- a/graphics/png/distinfo     Thu Jan 04 14:36:27 2007 +0000
+++ b/graphics/png/distinfo     Thu Jan 04 15:09:26 2007 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.34 2006/11/30 10:58:18 drochner Exp $
+$NetBSD: distinfo,v 1.34.2.1 2007/01/04 15:09:26 salo Exp $
 
 SHA1 (libpng-1.2.14-20061130/libpng-1.2.14.tar.bz2) = 3cf3efcada7896982b165ea34ed6b399ef7fb4af
 RMD160 (libpng-1.2.14-20061130/libpng-1.2.14.tar.bz2) = 37c91bc411a8c4bc467bb8b229a4e39bcca4bd8a
 Size (libpng-1.2.14-20061130/libpng-1.2.14.tar.bz2) = 620379 bytes
 SHA1 (patch-aa) = 4b6437906e6f2f644c731a293859e64f69300bb0
 SHA1 (patch-ab) = 979175c65587686b339a5556e8bcae3be95a07ca
+SHA1 (patch-ac) = 87850d6ac555f1d8863a96d287a1ccccfa89230b
 SHA1 (patch-ae) = b9bf9de3caa32ac78a17685cdd5df5b80d1ccbbf
diff -r 52aabe9f1c8a -r 1c70894a68cb graphics/png/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/png/patches/patch-ac     Thu Jan 04 15:09:26 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.5.6.1 2007/01/04 15:09:26 salo Exp $
+
+--- configure.orig     2006-11-28 11:26:14.000000000 -0500
++++ configure
+@@ -21341,7 +21341,7 @@ fi
+ { echo "$as_me:$LINENO: checking if libraries can be versioned" >&5
+ echo $ECHO_N "checking if libraries can be versioned... $ECHO_C" >&6; }
+ GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
+-if test "$GLD"; then
++if test "$GLD" && test "`uname -s`" != "Interix"; then
+     have_ld_version_script=yes
+     { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }