Wed Jan 14 08:33:27 2015 UTC ()
Pullup ticket #4588 - requested by is
graphics/netpbm: bug fix patch

Revisions pulled up:
- graphics/netpbm/Makefile                                      1.199-1.200

---
   Module Name:	pkgsrc
   Committed By:	is
   Date:		Mon Jan 12 11:44:09 UTC 2015

   Modified Files:
   	pkgsrc/graphics/netpbm: Makefile

   Log Message:
   new rgb.txt location finding code requires new SUBST.
   This is incomplete in that the X11 locations should probably be patched,
   too; OTOH, the netpbm rgb.txt is found now, and the environment variable
   RGBDEF works also.

---
   Module Name:	pkgsrc
   Committed By:	is
   Date:		Mon Jan 12 11:47:59 UTC 2015

   Modified Files:
   	pkgsrc/graphics/netpbm: Makefile

   Log Message:
   forgot to bump revision


(tron)
diff -r1.198 -r1.198.2.1 pkgsrc/graphics/netpbm/Makefile
cvs diff -r1.198 -r1.198.2.1 pkgsrc/graphics/netpbm/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/netpbm/Makefile 2014/11/23 16:12:10 1.198
+++ pkgsrc/graphics/netpbm/Makefile 2015/01/14 08:33:27 1.198.2.1
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: Makefile,v 1.198 2014/11/23 16:12:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.198.2.1 2015/01/14 08:33:27 tron Exp $
2 2
3DISTNAME= netpbm-10.68.02 3DISTNAME= netpbm-10.68.02
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= # 5MASTER_SITES= #
 6PKGREVISION= 1
6# manually created from svn checkout of 7# manually created from svn checkout of
7# svn checkout http://svn.code.sf.net/p/netpbm/code/advanced netpbm 8# svn checkout http://svn.code.sf.net/p/netpbm/code/advanced netpbm
8# tar --exclude netpbm/.svn/\* -cvzf /archive/distfiles/netpbm-$VERSION.tar.gz netpbm 9# tar --exclude netpbm/.svn/\* -cvzf /archive/distfiles/netpbm-$VERSION.tar.gz netpbm
9# where VERSION comes from reading netpbm/doc/HISTORY 10# where VERSION comes from reading netpbm/doc/HISTORY
10# for the documentation: 11# for the documentation:
11# svn checkout http://svn.code.sf.net/p/netpbm/code/userguide netpbm-userguide 12# svn checkout http://svn.code.sf.net/p/netpbm/code/userguide netpbm-userguide
12# cd netpbm-userguide && for i in *.html; do python2.7 ../netpbm/buildtools/makeman $i; done && cd .. 13# cd netpbm-userguide && for i in *.html; do python2.7 ../netpbm/buildtools/makeman $i; done && cd ..
13# tar -cvzf /archive/distfiles/netpbm-docs-r${SVN_REVISION}.tar.gz netpbm-userguide/*.[0-9] 14# tar -cvzf /archive/distfiles/netpbm-docs-r${SVN_REVISION}.tar.gz netpbm-userguide/*.[0-9]
14DISTFILES= ${DISTNAME}${EXTRACT_SUFX} netpbm-docs-r2313${EXTRACT_SUFX} 15DISTFILES= ${DISTNAME}${EXTRACT_SUFX} netpbm-docs-r2313${EXTRACT_SUFX}
15 16
16MAINTAINER= adam@NetBSD.org 17MAINTAINER= adam@NetBSD.org
17HOMEPAGE= http://netpbm.sourceforge.net/ 18HOMEPAGE= http://netpbm.sourceforge.net/
18COMMENT= Toolkit for conversion of images between different formats 19COMMENT= Toolkit for conversion of images between different formats
@@ -31,27 +32,27 @@ REPLACE_PERL+= editor/pnmquant @@ -31,27 +32,27 @@ REPLACE_PERL+= editor/pnmquant
31REPLACE_PERL+= editor/ppmfade 32REPLACE_PERL+= editor/ppmfade
32REPLACE_PERL+= editor/ppmquant 33REPLACE_PERL+= editor/ppmquant
33REPLACE_PERL+= editor/ppmshadow 34REPLACE_PERL+= editor/ppmshadow
34REPLACE_PERL+= generator/ppmrainbow 35REPLACE_PERL+= generator/ppmrainbow
35REPLACE_PERL+= manweb 36REPLACE_PERL+= manweb
36STAGEDIR= ${WRKDIR}/staging 37STAGEDIR= ${WRKDIR}/staging
37WRKSRC= ${WRKDIR}/netpbm 38WRKSRC= ${WRKDIR}/netpbm
38 39
39WRAPPER_REORDER_CMDS+= reorder:l:rle:netpbm 40WRAPPER_REORDER_CMDS+= reorder:l:rle:netpbm
40 41
41SUBST_CLASSES+= rgb_txt 42SUBST_CLASSES+= rgb_txt
42SUBST_STAGE.rgb_txt= post-patch 43SUBST_STAGE.rgb_txt= post-patch
43SUBST_MESSAGE.rgb_txt= Configure RGB_TXT 44SUBST_MESSAGE.rgb_txt= Configure RGB_TXT
44SUBST_FILES.rgb_txt= pm_config.in.h 45SUBST_FILES.rgb_txt= config.mk
45SUBST_SED.rgb_txt+= -e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.txt,' 46SUBST_SED.rgb_txt+= -e 's,/usr/share/netpbm/rgb.txt,${PREFIX}/share/netpbm/rgb.txt,'
46 47
47.include "../../mk/bsd.prefs.mk" 48.include "../../mk/bsd.prefs.mk"
48 49
49# only used if NEED_RUNTIME_PATH is set, so set it unconditionally 50# only used if NEED_RUNTIME_PATH is set, so set it unconditionally
50MAKE_FLAGS+= NETPBMLIB_RUNTIME_PATH=${PREFIX} 51MAKE_FLAGS+= NETPBMLIB_RUNTIME_PATH=${PREFIX}
51 52
52.if ${OPSYS} == "NetBSD" 53.if ${OPSYS} == "NetBSD"
53MAKE_FLAGS+= NEED_RUNTIME_PATH=Y 54MAKE_FLAGS+= NEED_RUNTIME_PATH=Y
54.elif ${OPSYS} == "Darwin" 55.elif ${OPSYS} == "Darwin"
55MAKE_FLAGS+= NETPBMLIBTYPE=dylib 56MAKE_FLAGS+= NETPBMLIBTYPE=dylib
56MAKE_FLAGS+= NETPBMLIBSUFFIX=dylib 57MAKE_FLAGS+= NETPBMLIBSUFFIX=dylib
57.elif ${OPSYS} == "SunOS" 58.elif ${OPSYS} == "SunOS"