diff options
| author | tnn <tnn@pkgsrc.org> | 2010-03-04 10:13:16 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2010-03-04 10:13:16 +0000 |
| commit | 81920af91ba7c1201b46e62cddc9fef6b5dae182 (patch) | |
| tree | 08847a12bd075b290a1557063127ab649f8a0821 | |
| parent | 7bbacc00879cf1bc01ea105bb31f673cae4a9af7 (diff) | |
| download | pkgsrc-81920af91ba7c1201b46e62cddc9fef6b5dae182.tar.gz | |
"pkg-config --libs png" and "libpng-config --libs" should
request -lz linkage. Bump PKGREVISION.
| -rw-r--r-- | graphics/png/Makefile | 3 | ||||
| -rw-r--r-- | graphics/png/distinfo | 4 | ||||
| -rw-r--r-- | graphics/png/patches/patch-af | 13 | ||||
| -rw-r--r-- | graphics/png/patches/patch-ag | 11 |
4 files changed, 29 insertions, 2 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 0df6b1269ba..81f94611e3e 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.120 2009/12/04 00:02:07 wiz Exp $ +# $NetBSD: Makefile,v 1.121 2010/03/04 10:13:16 tnn Exp $ DISTNAME= libpng-1.2.41 PKGNAME= ${DISTNAME:S/lib//} +PKGREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libpng/} \ ftp://ftp.fu-berlin.de/unix/graphics/png/src/ diff --git a/graphics/png/distinfo b/graphics/png/distinfo index d66e755ec37..92ae6016fca 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.63 2009/12/04 00:02:07 wiz Exp $ +$NetBSD: distinfo,v 1.64 2010/03/04 10:13:16 tnn Exp $ SHA1 (libpng-1.2.41.tar.bz2) = e859ce73c5344ce10576d03cab3b660459b30c13 RMD160 (libpng-1.2.41.tar.bz2) = b9d3f22ef7fbe43327cb3d5153fed1ca237785cb @@ -6,3 +6,5 @@ Size (libpng-1.2.41.tar.bz2) = 670288 bytes SHA1 (patch-aa) = 27df7893fc54f7e87790850eb9f047155c73f7d3 SHA1 (patch-ac) = 44b167433e066556022d9b43fa33a7f887f83617 SHA1 (patch-ae) = e9700e7d3dd536d80e47cffa20b412a6c69660be +SHA1 (patch-af) = 1998c2faf616666ad8b975e8ffbacdb9c594a714 +SHA1 (patch-ag) = bd45b5ed8edb2cfb70f84fcb0ff89500540099c2 diff --git a/graphics/png/patches/patch-af b/graphics/png/patches/patch-af new file mode 100644 index 00000000000..5e5947cd232 --- /dev/null +++ b/graphics/png/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.3 2010/03/04 10:13:16 tnn Exp $ + +--- scripts/libpng-config.in.orig 2009-12-03 01:46:02.000000000 +0000 ++++ scripts/libpng-config.in +@@ -16,7 +16,7 @@ prefix="@prefix@" + exec_prefix="@exec_prefix@" + libdir="@libdir@" + includedir="@includedir@/libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" +-libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@" ++libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@" + all_libs="-lpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ @LIBS@" + I_opts="-I${includedir}" + L_opts="-L${libdir}" diff --git a/graphics/png/patches/patch-ag b/graphics/png/patches/patch-ag new file mode 100644 index 00000000000..b96c0c8578a --- /dev/null +++ b/graphics/png/patches/patch-ag @@ -0,0 +1,11 @@ +$NetBSD: patch-ag,v 1.1 2010/03/04 10:13:16 tnn Exp $ + +--- ./scripts/libpng.pc.in.orig 2010-03-04 10:02:50.000000000 +0000 ++++ ./scripts/libpng.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@/libpng12 + Name: libpng + Description: Loads and saves PNG files + Version: 1.2.41 +-Libs: -Wl,-R${libdir} -L${libdir} -lpng12 ++Libs: -Wl,-R${libdir} -L${libdir} -lpng12 -lz -lm + Cflags: -I${includedir} |