Mon May 16 21:23:31 2016 UTC ()
netpbm should use flex tool instead of lex and, while we're here, enable
vasprintf for SunOS.
bump PKGREVISION


(richard)
diff -r1.207 -r1.208 pkgsrc/graphics/netpbm/Makefile
diff -r1.101 -r1.102 pkgsrc/graphics/netpbm/distinfo
diff -r1.1 -r1.2 pkgsrc/graphics/netpbm/patches/patch-pm__config.in.h
cvs diff -r1.207 -r1.208 pkgsrc/graphics/netpbm/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/netpbm/Makefile 2016/04/09 20:08:53 1.207
+++ pkgsrc/graphics/netpbm/Makefile 2016/05/16 21:23:31 1.208
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1# $NetBSD: Makefile,v 1.207 2016/04/09 20:08:53 alnsn Exp $ 1# $NetBSD: Makefile,v 1.208 2016/05/16 21:23:31 richard Exp $
2 2
3DISTNAME= netpbm-10.68.02 3DISTNAME= netpbm-10.68.02
4CATEGORIES= graphics 4CATEGORIES= graphics
5MASTER_SITES= # 5MASTER_SITES= #
6PKGREVISION= 2 6PKGREVISION= 3
7# manually created from svn checkout of 7# manually created from svn checkout of
8# 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
9# 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
10# where VERSION comes from reading netpbm/doc/HISTORY 10# where VERSION comes from reading netpbm/doc/HISTORY
11# for the documentation: 11# for the documentation:
12# 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
13# 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 ..
14# 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]
15DISTFILES= ${DISTNAME}${EXTRACT_SUFX} netpbm-docs-r2313${EXTRACT_SUFX} 15DISTFILES= ${DISTNAME}${EXTRACT_SUFX} netpbm-docs-r2313${EXTRACT_SUFX}
16 16
17MAINTAINER= adam@NetBSD.org 17MAINTAINER= adam@NetBSD.org
18HOMEPAGE= http://netpbm.sourceforge.net/ 18HOMEPAGE= http://netpbm.sourceforge.net/
19COMMENT= Toolkit for conversion of images between different formats 19COMMENT= Toolkit for conversion of images between different formats
20LICENSE= gnu-gpl-v2 20LICENSE= gnu-gpl-v2
21 21
22USE_TOOLS+= gmake lex pax perl 22USE_TOOLS+= gmake flex pax perl
23USE_FEATURES= snprintf 23USE_FEATURES= snprintf
24 24
25INSTALL_TARGET= install-dev install-run 25INSTALL_TARGET= install-dev install-run
26MAKE_ENV+= INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \ 26MAKE_ENV+= INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \
27 pkgdir=${STAGEDIR:Q} MACHINE=${MACHINE:Q} 27 pkgdir=${STAGEDIR:Q} MACHINE=${MACHINE:Q}
28MAKE_FLAGS+= PKGMANDIR=${PKGMANDIR:Q} 28MAKE_FLAGS+= PKGMANDIR=${PKGMANDIR:Q}
29MAKE_FLAGS+= CFLAGS_FOR_BUILD=${CFLAGS:Q} 29MAKE_FLAGS+= CFLAGS_FOR_BUILD=${CFLAGS:Q}
30MAKE_FLAGS+= LDFLAGS_FOR_BUILD=${LDFLAGS:Q} 30MAKE_FLAGS+= LDFLAGS_FOR_BUILD=${LDFLAGS:Q}
31MAKE_FILE= GNUmakefile 31MAKE_FILE= GNUmakefile
32REPLACE_PERL+= converter/pbm/pbmtox10bm 32REPLACE_PERL+= converter/pbm/pbmtox10bm
33REPLACE_PERL+= editor/pnmflip 33REPLACE_PERL+= editor/pnmflip
34REPLACE_PERL+= editor/pnmquant 34REPLACE_PERL+= editor/pnmquant
35REPLACE_PERL+= editor/ppmfade 35REPLACE_PERL+= editor/ppmfade
cvs diff -r1.101 -r1.102 pkgsrc/graphics/netpbm/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/netpbm/distinfo 2015/11/03 21:34:11 1.101
+++ pkgsrc/graphics/netpbm/distinfo 2016/05/16 21:23:31 1.102
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: distinfo,v 1.101 2015/11/03 21:34:11 agc Exp $ 1$NetBSD: distinfo,v 1.102 2016/05/16 21:23:31 richard Exp $
2 2
3SHA1 (netpbm-10.68.02.tar.gz) = 90fa87549dc7fb33bd7f9f29abad09fe99faf3e1 3SHA1 (netpbm-10.68.02.tar.gz) = 90fa87549dc7fb33bd7f9f29abad09fe99faf3e1
4RMD160 (netpbm-10.68.02.tar.gz) = 7567eb6c38f06ad89b995b9315deec91db94bfb0 4RMD160 (netpbm-10.68.02.tar.gz) = 7567eb6c38f06ad89b995b9315deec91db94bfb0
5SHA512 (netpbm-10.68.02.tar.gz) = 7555889392e35f9b24ff70b62a5f9d80aa5157915ef7bf57efa3d5c0f0d0ca198c8baa97ce7985c68b6bea11c3dcfd64ca913b918b0d9d97f93d4927f6efa00b 5SHA512 (netpbm-10.68.02.tar.gz) = 7555889392e35f9b24ff70b62a5f9d80aa5157915ef7bf57efa3d5c0f0d0ca198c8baa97ce7985c68b6bea11c3dcfd64ca913b918b0d9d97f93d4927f6efa00b
6Size (netpbm-10.68.02.tar.gz) = 2703809 bytes 6Size (netpbm-10.68.02.tar.gz) = 2703809 bytes
7SHA1 (netpbm-docs-r2313.tar.gz) = 8c36b17b1d2dca6ab7bd34666a8929b9ea665743 7SHA1 (netpbm-docs-r2313.tar.gz) = 8c36b17b1d2dca6ab7bd34666a8929b9ea665743
8RMD160 (netpbm-docs-r2313.tar.gz) = 03854f545c7c0f4c825ee08bc779b62da0ea05c3 8RMD160 (netpbm-docs-r2313.tar.gz) = 03854f545c7c0f4c825ee08bc779b62da0ea05c3
9SHA512 (netpbm-docs-r2313.tar.gz) = 978f7e154aadfa2c4332c07f8e822ec1990697c22b4a3b56f5de434a1f249a6b552c6a76763d0ce2684dfbd5d14973bf0b05702dd0ad543c6f440a992bcac0d9 9SHA512 (netpbm-docs-r2313.tar.gz) = 978f7e154aadfa2c4332c07f8e822ec1990697c22b4a3b56f5de434a1f249a6b552c6a76763d0ce2684dfbd5d14973bf0b05702dd0ad543c6f440a992bcac0d9
10Size (netpbm-docs-r2313.tar.gz) = 447907 bytes 10Size (netpbm-docs-r2313.tar.gz) = 447907 bytes
11SHA1 (patch-common.mk) = f590cc66e0fe6a07e848b9b46662bca350557bea 11SHA1 (patch-common.mk) = f590cc66e0fe6a07e848b9b46662bca350557bea
12SHA1 (patch-converter_other_giftopnm.c) = d64d645307e12b32d3a9ce56885bbfb3a4a80d23 12SHA1 (patch-converter_other_giftopnm.c) = d64d645307e12b32d3a9ce56885bbfb3a4a80d23
13SHA1 (patch-lib_Makefile) = 3f93bd24c53aa1f22aa43545d7ca5422af8e78ca 13SHA1 (patch-lib_Makefile) = 3f93bd24c53aa1f22aa43545d7ca5422af8e78ca
14SHA1 (patch-pm__config.in.h) = 9cb3084371be4b354832581d47d552bfe9ff1ce1 14SHA1 (patch-pm__config.in.h) = c6d51bbdf6c1f7725f08f321591038e296761e61
15SHA1 (patch-wordaccess_be_aligned.h) = 7cc5cd1126f65b3307393c978ac9ff4a49d666de 15SHA1 (patch-wordaccess_be_aligned.h) = 7cc5cd1126f65b3307393c978ac9ff4a49d666de
cvs diff -r1.1 -r1.2 pkgsrc/graphics/netpbm/patches/patch-pm__config.in.h (expand / switch to unified diff)

--- pkgsrc/graphics/netpbm/patches/patch-pm__config.in.h 2014/11/23 14:38:34 1.1
+++ pkgsrc/graphics/netpbm/patches/patch-pm__config.in.h 2016/05/16 21:23:31 1.2
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: patch-pm__config.in.h,v 1.1 2014/11/23 14:38:34 gson Exp $ 1$NetBSD: patch-pm__config.in.h,v 1.2 2016/05/16 21:23:31 richard Exp $
2 2
3--- pm_config.in.h.orig 2014-11-23 14:12:37.000000000 +0000 3--- pm_config.in.h.orig 2014-09-08 21:53:09.000000000 +0000
4+++ pm_config.in.h 4+++ pm_config.in.h
5@@ -139,7 +139,7 @@ 5@@ -139,7 +139,8 @@
6  6
7 /* #define HAVE_SETMODE */ 7 /* #define HAVE_SETMODE */
8  8
9-#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__)) 9-#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__))
10+#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__)) || defined(__NetBSD__) 10+#if (defined(__GLIBC__) || defined(__GNU_LIBRARY__) || defined(__APPLE__)) \
 11+ || defined(__NetBSD__) || (defined(__SVR4) && defined (__sun))
11 #define HAVE_VASPRINTF 1 12 #define HAVE_VASPRINTF 1
12 #else 13 #else
13 #define HAVE_VASPRINTF 0 14 #define HAVE_VASPRINTF 0