summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-04-17 13:44:46 +0000
committerwiz <wiz@pkgsrc.org>2006-04-17 13:44:46 +0000
commit2a2c6fd1dc2a9dec232f47934cb38bb452f6c6aa (patch)
treeee66fa15d800ffab5b53fdc3be8be1950ff2ecb8 /graphics
parent0eb783d47e53cb3537b2429e6650bc518c4cc608 (diff)
downloadpkgsrc-2a2c6fd1dc2a9dec232f47934cb38bb452f6c6aa.tar.gz
Update to 1.2.9nb2 (hopefully final update for this weekend):
. add rpath to libpng-config output . link against libpng12 (instead of libpng) in all cases. The latter causes shlib dependency changes, so update BUILDLINK_ABI_DEPENDS.png.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/png/Makefile10
-rw-r--r--graphics/png/buildlink3.mk4
-rw-r--r--graphics/png/distinfo3
-rw-r--r--graphics/png/patches/patch-ac11
4 files changed, 11 insertions, 17 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index c9e67a0ba95..0b524c8fb13 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.76 2006/04/17 12:49:16 tron Exp $
+# $NetBSD: Makefile,v 1.77 2006/04/17 13:44:46 wiz Exp $
DISTNAME= libpng-1.2.9
PKGNAME= ${DISTNAME:S/lib//}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \
http://www.libpng.org/pub/png/src/ \
@@ -22,6 +22,12 @@ PKGCONFIG_OVERRIDE= scripts/libpng.pc.in
TEST_TARGET= test
USE_LIBTOOL= yes
+SUBST_CLASSES+= rpathfix
+SUBST_FILES.rpathfix= scripts/libpng-config.in
+SUBST_MESSAGE.rpathfix= Adding rpath to libpng-config.
+SUBST_SED.rpathfix= '/^L_opts=/s|-L\([ ]*[^ ]*\)"|${COMPILER_RPATH_FLAG}\1 -L\1"|g'
+SUBST_STAGE.rpathfix= pre-configure
+
# highly version dependent -- fix up libtool .la file contents, since
# just copying a .la file to a new filename is not enough
# PLIST breakage will show when it needs updating :)
diff --git a/graphics/png/buildlink3.mk b/graphics/png/buildlink3.mk
index 79df10592d5..08877ac13e4 100644
--- a/graphics/png/buildlink3.mk
+++ b/graphics/png/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2006/04/06 06:22:05 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2006/04/17 13:44:46 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PNG_BUILDLINK3_MK:= ${PNG_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= png
.if !empty(PNG_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.png+= png>=1.2.4
-BUILDLINK_ABI_DEPENDS.png?= png>=1.2.6nb1
+BUILDLINK_ABI_DEPENDS.png?= png>=1.2.9nb2
BUILDLINK_PKGSRCDIR.png?= ../../graphics/png
.endif # PNG_BUILDLINK3_MK
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index fb5523efe9a..f7a6eb95dac 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.27 2006/04/16 23:19:15 wiz Exp $
+$NetBSD: distinfo,v 1.28 2006/04/17 13:44:46 wiz Exp $
SHA1 (libpng-1.2.9.tar.bz2) = ee9b8b1d42b855561a6fddd1b98963f345c40254
RMD160 (libpng-1.2.9.tar.bz2) = fb00f7776639bf55446a0be87d38261859825efb
Size (libpng-1.2.9.tar.bz2) = 618689 bytes
SHA1 (patch-ab) = 979175c65587686b339a5556e8bcae3be95a07ca
-SHA1 (patch-ac) = 430cb02096983563f14d59b056bea81974131524
SHA1 (patch-ae) = a1edc8ea4eb892b67ecc0a96ee1263c532f7d0f2
diff --git a/graphics/png/patches/patch-ac b/graphics/png/patches/patch-ac
deleted file mode 100644
index 60be3ccf037..00000000000
--- a/graphics/png/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2006/04/16 23:19:15 wiz Exp $
-
---- scripts/libpng.pc.in.orig 2006-03-03 02:48:03.000000000 +0000
-+++ scripts/libpng.pc.in
-@@ -6,5 +6,5 @@ includedir=@includedir@/libpng@PNGLIB_MA
- Name: libpng
- Description: Loads and saves PNG files
- Version: @PNGLIB_VERSION@
--Libs: -L${libdir} -lpng@PNGLIB_MAJOR@
-+Libs: -L${libdir} -lpng
- Cflags: -I${includedir}