diff options
| author | ben <ben> | 2004-03-29 16:02:08 +0000 |
|---|---|---|
| committer | ben <ben> | 2004-03-29 16:02:08 +0000 |
| commit | a5a0f429af4ba8dde7edea2322c43e0642275e70 (patch) | |
| tree | 27d8d6b690f91e925b986fe890684ac966acfa3b /graphics | |
| parent | da49246a34887d2423ec25846aebe97ee9c1c924 (diff) | |
| download | pkgsrc-a5a0f429af4ba8dde7edea2322c43e0642275e70.tar.gz | |
Install lib/pkgconfig/libpng12.pc, otherwise "pkg-config --list-all" will
fail with an error if imlib2 is installed.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/png/Makefile | 12 | ||||
| -rw-r--r-- | graphics/png/PLIST | 3 | ||||
| -rw-r--r-- | graphics/png/distinfo | 3 | ||||
| -rw-r--r-- | graphics/png/patches/patch-ad | 12 |
4 files changed, 27 insertions, 3 deletions
diff --git a/graphics/png/Makefile b/graphics/png/Makefile index 0e28f43c75d..ab8af99f8bf 100644 --- a/graphics/png/Makefile +++ b/graphics/png/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2004/03/19 18:36:46 ben Exp $ +# $NetBSD: Makefile,v 1.57 2004/03/29 16:02:08 ben Exp $ # On update, don't forget to increase shared library major/minor's in # accordance with changes (patch-aa). @@ -35,10 +35,20 @@ PLIST_SUBST+= LIBPNG_SO_MINOR=${LIBPNG_SO_MINOR} INSTALLATION_DIRS= include lib man/man3 man/man5 +PKGCONFIG_OVERRIDE= scripts/libpng12.pc.in + +SUBST_CLASSES= pc +SUBST_STAGE.pc= post-patch +SUBST_FILES.pc= scripts/libpng.pc.in +SUBST_SED.pc= s\!@PREFIX@!${PREFIX}! +SUBST_MESSAGE.pc= "Fixing libpng.pc.in." + post-install: ${INSTALL_MAN} ${WRKSRC}/libpng.3 ${PREFIX}/man/man3 ${INSTALL_MAN} ${WRKSRC}/libpngpf.3 ${PREFIX}/man/man3 ${INSTALL_MAN} ${WRKSRC}/png.5 ${PREFIX}/man/man5 + ${INSTALL_DATA} ${WRKSRC}/scripts/libpng.pc.in \ + ${PREFIX}/lib/pkgconfig/libpng12.pc .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/png/PLIST b/graphics/png/PLIST index 35ae12b410b..1052de6a0f5 100644 --- a/graphics/png/PLIST +++ b/graphics/png/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2004/03/19 18:36:46 ben Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/03/29 16:02:08 ben Exp $ include/png.h include/pngconf.h lib/libpng.a @@ -6,6 +6,7 @@ lib/libpng.la lib/libpng.so lib/libpng.so.${LIBPNG_SO_MAJOR} lib/libpng.so.${LIBPNG_SO_MAJOR}.${LIBPNG_SO_MINOR} +lib/pkgconfig/libpng12.pc man/man3/libpng.3 man/man3/libpngpf.3 man/man5/png.5 diff --git a/graphics/png/distinfo b/graphics/png/distinfo index eabace9dbaa..31751ea2156 100644 --- a/graphics/png/distinfo +++ b/graphics/png/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.13 2002/12/20 17:54:27 fredb Exp $ +$NetBSD: distinfo,v 1.14 2004/03/29 16:02:08 ben Exp $ SHA1 (libpng-1.2.5.tar.bz2) = 6752eaf1a604edbbb0149b781155ef9cb47d80c3 Size (libpng-1.2.5.tar.bz2) = 378030 bytes SHA1 (patch-aa) = 6cc8354eccd61a4355d64ca456dc950f379701ad SHA1 (patch-ab) = be7dc4a3e21c0056a913c5f1488528558024e6ea SHA1 (patch-ac) = 96e42c626b9aec1f2d68f920f147463ca77da27c +SHA1 (patch-ad) = edfe5d2c827939eba9d62f426f5dca51979be245 diff --git a/graphics/png/patches/patch-ad b/graphics/png/patches/patch-ad new file mode 100644 index 00000000000..5b1842cfe9b --- /dev/null +++ b/graphics/png/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.1 2004/03/29 16:02:08 ben Exp $ + +--- scripts/libpng.pc.in.orig Thu Oct 3 04:32:33 2002 ++++ scripts/libpng.pc.in +@@ -7,5 +7,5 @@ includedir=${exec_prefix}/include + Name: libpng12 + Description: Loads and saves PNG files + Version: 1.2.5 +-Libs: -L${libdir} -lpng12 -lz -lm +-Cflags: -I${includedir}/libpng12 ++Libs: -L${libdir} -lpng -lz -lm ++Cflags: -I${includedir} |