diff options
| author | adam <adam@pkgsrc.org> | 2010-11-04 10:57:50 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2010-11-04 10:57:50 +0000 |
| commit | 61856fda4dc698a1f270ad7a865a7bf656bfc7b2 (patch) | |
| tree | 2b36bb4ac700d4c6a4e01a7ff4dfc4ddb32f6312 /graphics/netpbm | |
| parent | 59bc40eb35da21500458dfe938d388322ba1de18 (diff) | |
| download | pkgsrc-61856fda4dc698a1f270ad7a865a7bf656bfc7b2.tar.gz | |
Fix problem finding rgb.txt, PR#43934
Diffstat (limited to 'graphics/netpbm')
| -rw-r--r-- | graphics/netpbm/Makefile | 18 | ||||
| -rw-r--r-- | graphics/netpbm/distinfo | 3 | ||||
| -rw-r--r-- | graphics/netpbm/patches/patch-ai | 13 |
3 files changed, 26 insertions, 8 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index e45951c9571..e477974e1f8 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.169 2010/09/23 09:09:20 tron Exp $ +# $NetBSD: Makefile,v 1.170 2010/11/04 10:57:50 adam Exp $ DISTNAME= netpbm-10.35.77 CATEGORIES= graphics @@ -33,7 +33,6 @@ WRAPPER_REORDER_CMDS+= reorder:l:rle:netpbm # Several of the netpbm shell scripts use bashisms, so force using # bash for all of the shell scripts. -# REPLACE_INTERPRETER+= bash REPLACE.bash.old= .*/bin/sh REPLACE.bash.new= ${TOOLS_PATH.bash} @@ -47,6 +46,12 @@ REPLACE_FILES.bash+= editor/pnmmargin REPLACE_FILES.bash+= editor/ppmquantall REPLACE_FILES.bash+= other/ppmtomap +SUBST_CLASSES+= rgb_txt +SUBST_STAGE.rgb_txt= post-patch +SUBST_MESSAGE.rgb_txt= Configure RGB_TXT +SUBST_FILES.rgb_txt= pm_config.in.h +SUBST_SED.rgb_txt+= -e 's,@@PREFIX@@,${PREFIX},' + .include "../../mk/bsd.prefs.mk" # Fiasco fails to compile on Darwin-8.x. @@ -69,11 +74,6 @@ MAKE_ENV+= NETPBMLIBTYPE="unixshared" NETPBMLIBSUFFIX="so" CPPFLAGS+= -DSGI_IDO_CC .endif -.include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" -.include "../../textproc/libxml2/buildlink3.mk" - pre-configure: ${CP} ${WRKSRC}/Makefile.config.in ${WRKSRC}/Makefile.config @@ -96,4 +96,8 @@ post-install: ${FIND} ${DESTDIR}${PREFIX}/share/doc/netpbm -type f -print | \ ${XARGS} ${CHMOD} ${NONBINMODE} +.include "../../graphics/jasper/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../graphics/tiff/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index cf017598a7a..c880af0fb30 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.78 2010/10/28 07:09:13 adam Exp $ +$NetBSD: distinfo,v 1.79 2010/11/04 10:57:50 adam Exp $ SHA1 (netpbm-10.35.77.tgz) = 81a2b02db339e2bae8cc38db9b987b1cb0b228e2 RMD160 (netpbm-10.35.77.tgz) = e7d7fa5a696ef962fd8d61eaed803548716e510c @@ -11,6 +11,7 @@ SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1 SHA1 (patch-af) = 7ac8b5a431cd007ccc23ea337194a5c542ff0a54 SHA1 (patch-ag) = 093fe392a3e6156cc55f225a6f139842c0d00570 SHA1 (patch-ah) = 10d7e7f59a0d7c857531db872cd35dc02a048ba1 +SHA1 (patch-ai) = 083ddf8b36a74ca39508b6a3b0c35956ac19fbb7 SHA1 (patch-ao) = b4307205f605d4c9c8f11c00e1a633960b33b2d3 SHA1 (patch-aw) = bd890324e95fa7bb893d9d5cdab9d5a33dcff777 SHA1 (patch-ax) = d50e56191192b4caf423ed081581868bb1a63de8 diff --git a/graphics/netpbm/patches/patch-ai b/graphics/netpbm/patches/patch-ai new file mode 100644 index 00000000000..d2e39c9bcf6 --- /dev/null +++ b/graphics/netpbm/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.13 2010/11/04 10:57:50 adam Exp $ + +--- pm_config.in.h.orig 2010-11-04 10:46:22.000000000 +0000 ++++ pm_config.in.h +@@ -68,7 +68,7 @@ + #define RGB_DB3 "PBMplus_Dir:RGB.TXT" + #else + #define RGB_DB1 "/usr/lib/X11/rgb.txt" +-#define RGB_DB2 "/usr/share/X11/rgb.txt" ++#define RGB_DB2 "@@PREFIX@@/share/netpbm/rgb.txt" + #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" + #endif + |