pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/netpbm
Module Name: pkgsrc
Committed By: nia
Date: Mon Dec 20 20:41:38 UTC 2021
Modified Files:
pkgsrc/graphics/netpbm: Makefile PLIST distinfo
pkgsrc/graphics/netpbm/patches: patch-common.mk patch-lib_Makefile
Log Message:
netpbm: Update to 10.86.25
Based on a patch from Claes Nästén, distfiles generated by
myself.
CHANGE HISTORY
--------------
21.10.17 BJH Release 10.86.25
pamtogif: Fix bug: doesn't ignore the input alpha mask when user
specified -transparent. Broken in Netpbm 10.37 (December 2006).
libnetpbm: When validating computable size of width and height,
allow for adding up to 10 instead of 2, to account for rounding
up to a multiple of 8 in processing bit maps.
21.08.30 BJH Release 10.86.24
ximtoppm: Fix bug: invalid memory references with pathological
image input. Broken in Netpbm 86.15 (June 2020).
21.06.30 BJH Release 10.86.23
pamtopng: Fix -transparent option - program recognized
-transparency instead. Always broken (pamtopng was new in
Netpbm 10.71 (June 2015)).
Build: make it work on systems that don't have date +%s. Broken
in Netpbm 10.78 (March 2017). Thanks Claes Nästén
(pekdon%gmail.com@localhost).
21.05.15 BJH Release 10.86.22
pamtopng: Fix rejection of all BLACKANDWHITE_ALPHA images with
message about wrong depth. Always broken (pamtopng was new in
Netpbm 10.71 (June 2015)). Thanks Karol Kosek
<krkk%krkk.ct8.pl@localhost>.
pamtopng: Fix failure with GRAYSCALE_ALPHA images with maxval
less than 255. Always broken (pamtopng was new in Netpbm 10.71
(June 2015)). Thanks Karol Kosek <krkk%krkk.ct8.pl@localhost>.
pamtopng: Fix: treats all tuple types that start with BLA as
BLACKANDWHITE. Always broken (pamtopng was new in Netpbm 10.71
(June 2015)).
pamtogif: Fix failure with bogus message about wrong depth with
grayscale and black and white PAM images with transparency.
Always broken (pamtogif was new in Netpbm 10.37 (December 2006)).
Thanks Karol Kosek <krkk%krkk.ct8.pl@localhost>.
21.04.11 BJH Release 10.86.21
Build: fix failure of pammixmulti to compile for Mingw for lack
of drand48. Always broken (pammixmulti was new in Netpbm 10.85
(December 2018)).
make package: fix no such file pcdovtoppm.exe failure on
Windows.
21.03.21 BJH Release 10.86.20
pnmtopng: fix incorrect transparency in output when requesting
transparency. Introduced after Netpbm 10.35 (August 2006) but
not after Netpbm 10.47 (June 2009).
pnmtopng: fix buffer overrun or bogus "too many color/
transparency pairs" failure when requesting transparency.
Introduced after Netpbm 10.26 (January 2005) but not after
Netpbm 10.35 (August 2006).
pnmtops: Fix incorrect output (arithmetic overflow) when
bounding box is exactly INT_MAX high or wide. Always broken.
Pnmtops was in primordial Netpbm.
21.03.07 BJH Release 10.86.19
pamscale: fix bogus "bad magic number" or similar failure most
of the time with -nomix. Broken since Netpbm 10.49 (December
2009).
libnetpbm: pm_system: Fix bug: standard input feeder process
repositions unrelated files. Always broken (pm_system was new
in Netpbm 10.13 (September 2003).
Pamtowinicon: Fix crash or incorrect output with PNG encoding
(result of pm_system bug above). Always broken (Pamtowinicon
was new in Netpbm 10.63 (June 2013).
20.12.08 BJH Release 10.86.18
pamarith: Fix bug: fails with more than two operands for
-mulitply, -minimum, -maximum, -nand, and -nor.
pamaddnoise: fix bug: garbage output with -type impulse. Always
broken (pamaddnoise's precursors pnmaddnoise was new to Netpbm
in Netpbm 10.29 (August 2005).
20.09.26 BJH Release 10.86.17
pamfunc: Fix always wrong output with -not. Always broken.
(-not was new in Netpbm 10.40 (September 2007)).
jpeg2ktopam: Fix crash whenever the program fails. Broken in
Netpbm 10.42 (March 2008).
pamtojpeg2k: Fix failure with most -progression values. Always
broken (pamtojpeg2k was new in Netpbm 10.12 (November 2002)).
pamtojpeg2k: Fix wrong result with -tilegrdtly. Always
broken (pamtojpeg2k was new in Netpbm 10.12 (November 2002)).
pamarith: Fix crash with -compare where inputs are PBM. Broken
in Netpbm 10.14 (February 2003).
pamfunc: Fix crash with -changemaxval and PBM input. Always
broken. -changemaxval was new in Netpbm 10.65 (December 2013).
pammixmulti: Fix bug: -randomseed ignored on some systems.
Always broken. (pammixmulti was new in Netpbm 10.85 (December
2018).
pcdovtoppm: Fix some garbage from the conversion from csh to sh
in Netpbm 9.12 (March 2001) in conversion from csh arrays that
should have stopped it from working at all, despite reports from
users that they were using it.
20.08.29 BJH Release 10.86.16
anytopnm, pnmmargin: Fail properly when unable to create
temporary file. Broken in Netpbm 10.75 (June 2016).
pamdepth: fix bug: doesn't work on PAM with black and white
tuple type.
pnmnorm: Fix bug: output too dark when -bpercent and -wpercent
indicate overlapping values. Broken since Netpbm 10.43 (June
2008).
pcdovtoppm: Fix some garbage from the conversion from csh to sh
in Netpbm 9.12 (March 2001) in conversion from csh arrays that
should have stopped it from working at all, despite reports from
users that they were using it.
20.06.27 BJH Release 10.86.15
winicontoppm: Fix undefined behavior for various invalid input.
Always broken. Winicontoppm was new in Netpbm 9.3 (June 2000).
winicontoppm: Fix incorrect output with 256 pixel wide or high
image. Always broken. Winicontoppm was new in Netpbm 9.3 (June
2000).
cameratopam: Fix buffer overrun. Always present. (cameratopam
was new in Netpbm 10.28 (June 2005)).
ppmtompeg: Fix buffer overruns with very long names in input
parameter files. Always broken. Ppmtompeg was new in
Netpbm 8.4 (April 2000).
ximtoppm: Fix possible program crash due to invalid memory
reference. Always broken. ximtoppm was in primordial Netpbm,
ca 1989.
pjtoppm: Fix handling of input with width unspecified or not
positive. Always broken. (Pjtoppm was in primordial Netpbm, ca
1991).
20.06.06 BJH Release 10.86.14
pjtoppm: Handle input stream with no transmission mode command.
Always broken. Pjtoppm was in primordial Netpbm (1991).
picttoppm: Fix bug with an input file that specifies a clip
region (ClipRgn opcode) that is not contained within the
picture frame. Result is invalid memory access. Broken
some time 1994-2002.
picttoppm: Fix incorrect output (sheared) when a blit must be
scaled. Broken in Netpbm 10.34 (June 2006) or 10.35 (August
2006).
20.05.06 BJH Release 10.86.13
pbmtonokia: Fix incorrect output with -txt option.
pbmtonokia: Fix incorrect output with newer compiler.
20.03.26 BJH Release 10.86.12
Build: make deb: don't include empty Recommends; newer dpkg-deb
won't accept it.
20.03.26 BJH Release 10.86.11
pbmtopgm: Fix incorrect output when convolution area is not
square. Always broken. pbmtopgm was in primordial Netpbm,
ca 1991.
pbmtopgm: Fix crash when convolution matrix too large for word
size. Always broken. pbmtopgm was in primordial Netpbm, ca
1991.
pnmshear: Fix arithmetic overflow with shear angle near +/- 90
degrees.
20.03.15 BJH Release 10.86.10
pamdice: Fix crash when -width or -height is zero.
pamdice: Fix incorrect file names when -outstem contains "%s",
etc.
pnmquantall: remove accidentally published debugging trace.
20.02.14 BJH Release 10.86.09
pamdice: Fix junk output when -width or -height not specified.
libnetpbm: pm_getline, xvminitoppm, pamtris : Fix bug: crash
when reading empty line.
libnetpbm: pm_read_unknown_size, rawtopgm, zeisstopnm: crash
when out of memory
19.12.25 BJH Release 10.86.08
pamrubber: Fix bug: -frame doesn't work. Always broken.
(Pamrubber was new in Netpbm 10.54 (March 2011).
19.12.03 BJH Release 10.86.07
anytopnm: Fix unpredictable behavior when file name contains
spaces.
19.09.28 BJH Release 10.86.06
jpeg2ktopam, pamtojpeg2k: fix negative array index. Always
broken (pamtojpeg2k was new in Netpbm 10.12 (November 2002)).
jpeg2ktopam, pamtojpeg2k: fix assertion failure. Always
broken (pamtojpeg2k was new in Netpbm 10.12 (November 2002)).
jpeg2ktopam: Fix memory leak after decoder failure. Always
broken (pamtojpeg2k was new in Netpbm 10.12 (November 2002)).
jpeg2ktopam: fix null pointer dereference. Always broken
(pamtojpeg2k was new in Netpbm 10.12 (November 2002)).
Build: fix for Cygwin, "no rule to make pm_config.h".
19.08.09 BJH Release 10.86.05
pnmtorle, rletopnm: fix wild pointer dereference when a memory
allocation fails.
19.06.15 BJH Release 10.86.04
pamtris: Fix bug: debug trace left in
pbmtozinc: Fix wrong output on big-endian machines. Broken in
Netpbm 10.71 (June 2015).
19.05.04 BJH Release 10.86.03
pnmtopng: Fix bug: Defaults to no filters. Should be all
filters. Effect is larger PNG output. Broken after Netpbm
10.26 (January 2005) but no later than Netpbm 10.35 (August
2006).
pnmtopng: Fix bug: Doesn't allow multiple filter options.
Broken after Netpbm 10.26 (January 2005) but no later than
Netpbm 10.35 (August 2006).
pnmcrop: Don't allow -borderfile with -reportXXX. It doesn't
work.
19.04.10 BJH Release 10.86.02
pnmcrop: fix bug: -bgcolor doesn't work. Always present
(-bgcolor was introduced in Netpbm 10.86 (March 2019)).
19.04.06 BJH Release 10.86.01
pnmcrop: fix bug: incorrect identification of background with
-bgcolor and PBM or PGM image. Always present (-bgcolor was
introduced in Netpbm 10.86 (March 2019)).
19.03.30 BJH Release 10.86.00
Add pamfind.
Add pambrighten.
Add pamhue.
pnmcrop: Add -bg-color, bg-corner, -reportfull, -reportsize,
-blank-image .
pamtopng: Add -interlace .
pamenlarge: Add -scale, -xscale, -yscale .
pamenlarge: Much faster for PBM with xscale factor above 10;
slightly faster for xscale factor 2-10.
pamfile: Add -machine and -size .
pamscale: Add -reportonly
pamstretch-gen: Add -quiet, -plain.
pamstretch-gen: Use -dropedge on the 'pamstretch' piece for
better looking output.
pamstretch: Accept scale factor of 1 as a parameter (already
was accepted with -xscale and -yscale options).
pamstretch: Don't mess with edge when scale factor is 1,
regardless of -dropedge and -blackedge.
ppmwheel: Add -huevalue, -huesaturation, -maxval .
various: Fix unnormalizing code so a value exactly between two
sample values rounds consistently up. Affects many programs.
pstopnm: Fix bug: -textalphabits has no effect. Always broken.
(-textalphabits was new in Netpbm 10.53 (December 2010)).
pamtopng: Fix sBit chunk, bit shift value for 1-, 2-, and 4-bit-
per-sample images. Always broken (Pamtopng was new in Netpbm
10.71 (June 2015)).
pamtopng: Fix buffer overrun. Always broken (Pamtopng was new
in Netpbm 10.71 (June 2015)).
pnmtopng: fix bug: -interlace ignored. Broken in 10.55
(June 2011).
pamstretch: Reject very large scale factors instead of producing
incorrect output.
ppmbrighten: Fix crash with -normalize when there is only one
intensity in the image. Always broken - Ppmbrighten was new in
the first Netpbm release in 1991.
ppmdraw: Fix bug: 'setlinetype nodiag' says invalid type.
Always broken. (Ppmdraw was new in Netpbm 10.29 (August 2005)).
Build: split link/ directory in package tree into staticlink/
and sharedlink/ . Make 'installnetpbm' do separate prompts to
install static libraries and shared library stubs. Make
'installnetpbm' install clean symlink in the usual case that the
shared library stub and shared library are in the same
directory.
Build: update 'mkdeb' so it works on Debian 9 (in addition to
Debian 8). Thanks Neil R Ormos <ormos%ormos.org@localhost>.
18.12.29 BJH Release 10.85.00
pnmpaste: Add -nand, -nor, and -nxor.
pamcut: add -cropleft, -cropright, -croptop, -cropbottom.
ppmtobmp: respect -bpp with PBM input.
bmptopnm: allow single color colormap with bpp 1.
bmptopnm: validate plane count = 1.
bmptopnm: Add RLE4 compression decoding. This was ostensibly
added in Netpbm 10.32 (February 2006), but never worked.
Add pammixmulti. Thanks Scott Pakin (scott+pbm%pakin.org@localhost).
pamtotga: Add -cmap16 .
pamtris: Add -rgb, -grayscale. Add w parameter to vertex
instructions. Fix perspective correctness. Thanks Lucas Brunno
Luna <lucaslunar32%hotmail.com@localhost>.
picttoppm: accept rectangle specifications in input that have
the corners in any order, not just upper left, then lower right.
pamtotga: identify compressed colormapped format in error
message saying the program doesn't know how to interpret it.
pamtotga: Ignore extra planes in black and white or grayscale
input instead of generating junk output.
Merge build: make old names for JPEG, TIFF, and PNG converter
programs work (function previously omitted by design because it
was too hard).
bmptopnm: Fix wrong output for non-colormapped OS2 BMP. Broken
in Netpbm 10.18 (September 2003).
bmptopnm: Fix array bounds violation when index value in raster
is too big. Broken after Netpbm 10.11 (October 2002) but before
10.19 (November 2003).
libnetpbm: Fix invalid memory reference in color name processing
when trivial memory allocation fails.
pamtojpeg2k: fix incorrect interpretation of -ilyrrates option
when it contains multiple delimiter characters in a row. Always
broken (pamtojpeg2k was new in Netpbm 10.12 (November 2002)).
pnmtojbig: fix incorrect handling of -x option. Always broken
(pnmtojbig was new in Netpbm 9.2 (May 2000)).
pjtoppm, pbmtoppa: fix arithmetic overflow.
Build: fix parallel make.
Build: fix reference to nonexistent getline on Mac OS X 10.6.
Build: fix reference to nonexistent strndup on Mac OS X 10.6.
Merge build: fix duplicate symbol 'prefabCode' in g3topbm,
pbmtog3. Introduced in Netpbm 10.79 (June 2017).
18.09.29 BJH Release 10.84.00
Add pamaltsat. Thanks Anton Shepelev <anton.txt%gmail.com@localhost>.
Add pamtris. Thanks Lucas Brunno Luna
<lucaslunar32%hotmail.com@localhost>.
libpbmfont, pbmtext: fix bugs with BDF file lines with
insufficient number of fields. Unknown effect.
pbmtext: -wchar works with built-in fonts.
pbmtext: improved -verbose information about BDF fonts:
include CHARSET_REGISTRY, CHARSET_ENCODING.
libnetpbm font facilities: built-in fonts work with wide
characters.
pbmtext; libnetpbm BDF font processing: fix invalid memory
reference when BDF font file has invalid syntax. Broken
in primordial Netpbm, ca 1993.
pamgetcolor: fix bug: gets color of only the top half of a
region.
pnmfiasco, fiascotopnm: Fix trivial memory leak. Always broken
(programs were new in Netpbm 9.6, July 2000).
18.06.30 BJH Release 10.83.00
Add pamlevels. Thanks Anton Shepelev <anton.txt%gmail.com@localhost>.
Add pamgetcolor. Thanks Anton Shepelev <anton.txt%gmail.com@localhost>.
Add rgb-<maxval>:r/g/b color specification format.
pngtopam: Fix bogus warning of non-square pixels when image does
not contain pixel resolution information. Introduced in Netpbm
10.48 (September 2009).
pstopnm: Fix divide-by-zero crash when Postscript input says
the image has zero size.
pstopnm: Fix divide-by-zero crash when computed resolution
rounds down to zero dots per inch.
pbmmask: Fix invalid memory reference with zero-dimension
input image. Broken in primordial Netpbm, ca 1989.
pamtojpeg2k: Fix incorrect metadata in output with GRAYSCALE PAM
input. Always broken (pamtojpeg2k was new in Netpbm 10.12
(November 2002)).
libnetpbm: Add pnm_colorspec_rgb_integer,
pnm_colorspec_rgb_norm, pnm_colorspec_rgb_x11,
pnm_colorspec_dict, pnm_colorspec_dict_close.
libnetpbm: Add pnm_parsecolor2.
libnetpbm: Add pnm_allocpamtuplen, pnm_freepamtuplen.
libnetpbm: Make the normalized tuple functions respect the
allocation depth specified in struct pam (member
'allocation_depth') instead of using the actual tuple depth
(member 'depth').
ilbmtoppm: Fix bug: may fail with bogus error message about an
invalid CLUT chunk if image has a CLUT chunk. Introduced after
Netpbm 10.26 (January 2005) and at or before Netpbm 10.35
(August 2006).
18.03.25 BJH Release 10.82.00
pbmtext: Add -wchar.
pbmtext: Add -text-dump option.
ppmhist: Add color summary to top of output, (except with
-noheader).
pnmremap: Add -randomseed.
pnmquant: Add -norandom, -randomseed.
pamtogif: Add -noclear option.
giftopnm: Check "data width" value from GIF image properly:
can't be bigger than 11, because the minimum code size is one
more than the data width and the maximum code size is 12. (Note
that GIF spec prohibits anything more than 8).
pnmpsnr: Add -targetX options.
ppmrainbow: Add "ppmrainbow: " to error messages, like other
programs.
ppmrainbow: improve error message.
g3topbm: Fix bug - produces invalid empty PBM image if input
image is empty.
ppmpat: Fix bug - crash or junk output with -camo or -anticamo
and no -color. Introduced in Netpbm 10.78 (March 2017).
mrftopbm: Fix bug - wrong error messages or output when input
invalidly short. Always broken (mrftopbm was new in Netpbm
10.18 (September 2003).
Build: fix compile failure on systems without strnlen (such
as MacOS X before 10.7). Broken in 10.81 (December 2017).
17.12.30 BJH Release 10.81.00
sldtoppm: -lib and -dir don't work - always says slide not
found. Broken in Netpbm 10.63 (June 2013).
sldtoppm: fix bug: says AutoCAD slide file isn't an AutoCAD
slide file. Broken after Netpbm 10.26 (January 2005), but no
later than 10.35 (August 2006).
sldtoppm: fix bug: wild memory accesses, weird messages when
invalid input file has unterminated strings.
17.09.30 BJH Release 10.80.00
pnmtopalm: Refuse to create a compressed image with more than 8
bits per pixel.
pbmtext, libnetpbm font facilities: allow glyphs in font files
that have no bitmap data; just used for their advance value to
code a space.
pbmtext: Improve error message when there is a problem reading
the font file.
libnetpbm font facilities: consider font invalid if a glyph is
more than 65536 pixels high or wide.
ppmshadow: handle images with a black background and low
contrast images (i.e. little difference between foreground and
background).
ppmbrighten: fix bug: red pixels change hue. Introduced in
after Netpbm 10.11 (October 2002) and before Netpbm 10.18
(September 2003).
palmtopnm: fix crash if invalid input contains color index that
is not in the palette. Always broken (palmtopnm was new in
Netpbm 9.10 (October 2001)).
pnmtopalm: fix incorrect output with certain input files and
-packbits_compression. Always broken. -packbits_compression
was new in Netpbm 10.27 (March 2005).
pnmtopalm: Correct error message recommending running
pnmquant when the real solution is to run pnmremap to modify the
image to Palm standard colors.
pnmtopalm: Fix bug causing "color not in colormap" failure with
-colormap and maxval other than 255.
libnetpbm: font facilities: fix invalid memory reference with
certain font files.
libnetpbm: ppm_readcolordict: Improve error message when there is
a problem reading the color dictionary. Affects ppmhist.
pgmmake: Fix bug: treats non-numeric gray-level argument as zero.
Always broken (Pgmmake was new in Netpbm 10.32, February 2006).
pdbimgtopam, pamtopdbimg: fix various cases of incorrect output,
some always present (programs were new in Netpbm 10.52.00
(October 2010)).
libnetpbm: pnm_parsecolorn(), pnm_parsecolor(): fix parsing of
rgb: color specifications: yields value slightly too dim.
Affects many programs. Broken in Netpbm 10.79 (June 2017).
Makeman: make it work with Python 3.6 II.
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 pkgsrc/graphics/netpbm/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/netpbm/PLIST
cvs rdiff -u -r1.109 -r1.110 pkgsrc/graphics/netpbm/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/netpbm/patches/patch-common.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/netpbm/patches/patch-lib_Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/netpbm/Makefile
diff -u pkgsrc/graphics/netpbm/Makefile:1.232 pkgsrc/graphics/netpbm/Makefile:1.233
--- pkgsrc/graphics/netpbm/Makefile:1.232 Wed Dec 8 16:05:02 2021
+++ pkgsrc/graphics/netpbm/Makefile Mon Dec 20 20:41:38 2021
@@ -1,25 +1,26 @@
-# $NetBSD: Makefile,v 1.232 2021/12/08 16:05:02 adam Exp $
+# $NetBSD: Makefile,v 1.233 2021/12/20 20:41:38 nia Exp $
-DISTNAME= netpbm-10.79.04
-PKGREVISION= 9
+DISTNAME= netpbm-10.86.25
CATEGORIES= graphics
MASTER_SITES= #
# manually created from svn checkout of
-# svn checkout http://svn.code.sf.net/p/netpbm/code/advanced netpbm
+# svn checkout http://svn.code.sf.net/p/netpbm/code/stable netpbm
# tar --exclude netpbm/.svn -cvzf /archive/distfiles/netpbm-$VERSION.tar.gz netpbm
-# where VERSION comes from reading netpbm/doc/HISTORY
+# where VERSION comes from reading netpbm/version.mk
# for the documentation:
-# svn checkout http://svn.code.sf.net/p/netpbm/code/userguide netpbm-userguide
-# cd netpbm-userguide && for i in *.html; do python2.7 ../netpbm/buildtools/makeman $i; done && cd ..
-# tar -cvzf /archive/distfiles/netpbm-docs-r${SVN_REVISION}.tar.gz netpbm-userguide/*.[0-9]
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} netpbm-docs-r3052${EXTRACT_SUFX}
+# svn checkout http://svn.code.sf.net/p/netpbm/code/userguide userguide
+# cd userguide && for i in *.html; do python2.7 ../netpbm/buildtools/makeman $i; done && cd ..
+# # pamhomography not part of 10.86.25
+# rm userguide/pamhomography.1
+# tar -cvzf /archive/distfiles/netpbm-docs-r${SVN_REVISION}.tar.gz userguide/*.[0-9]
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} netpbm-docs-r4156${EXTRACT_SUFX}
MAINTAINER= adam%NetBSD.org@localhost
HOMEPAGE= http://netpbm.sourceforge.net/
COMMENT= Toolkit for conversion of images between different formats
LICENSE= gnu-gpl-v2
-USE_TOOLS+= gmake flex pax perl
+USE_TOOLS+= gmake gdate flex pax perl
USE_FEATURES= snprintf
INSTALL_TARGET= install-dev install-run
@@ -119,9 +120,9 @@ post-install:
${CHOWN} -R ${BINOWN}:${BINGRP} . && \
pax -rwppm . ${DESTDIR}${PREFIX}
${RM} -fr ${STAGEDIR}
- ${INSTALL_DATA} ${WRKDIR}/netpbm-userguide/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
- ${INSTALL_DATA} ${WRKDIR}/netpbm-userguide/*.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
- ${INSTALL_DATA} ${WRKDIR}/netpbm-userguide/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+ ${INSTALL_DATA} ${WRKDIR}/userguide/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+ ${INSTALL_DATA} ${WRKDIR}/userguide/*.3 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
+ ${INSTALL_DATA} ${WRKDIR}/userguide/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
Index: pkgsrc/graphics/netpbm/PLIST
diff -u pkgsrc/graphics/netpbm/PLIST:1.16 pkgsrc/graphics/netpbm/PLIST:1.17
--- pkgsrc/graphics/netpbm/PLIST:1.16 Wed Jul 17 01:05:12 2019
+++ pkgsrc/graphics/netpbm/PLIST Mon Dec 20 20:41:38 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2019/07/17 01:05:12 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.17 2021/12/20 20:41:38 nia Exp $
bin/411toppm
bin/anytopnm
bin/asciitopgm
@@ -43,9 +43,11 @@ bin/mtvtoppm
bin/neotoppm
bin/palmtopnm
bin/pamaddnoise
+bin/pamaltsat
bin/pamarith
bin/pambackground
bin/pambayer
+bin/pambrighten
bin/pamchannel
bin/pamcomp
bin/pamcrater
@@ -59,15 +61,20 @@ bin/pamendian
bin/pamenlarge
bin/pamexec
bin/pamfile
+bin/pamfind
bin/pamfix
bin/pamfixtrunc
bin/pamflip
bin/pamfunc
bin/pamgauss
+bin/pamgetcolor
bin/pamgradient
+bin/pamhue
+bin/pamlevels
bin/pamlookup
bin/pammasksharpen
bin/pammixinterlace
+bin/pammixmulti
bin/pammosaicknit
bin/pamoil
bin/pampaintspill
@@ -115,6 +122,7 @@ bin/pamtotiff
bin/pamtouil
bin/pamtowinicon
bin/pamtoxvmini
+bin/pamtris
bin/pamundice
bin/pamunlookup
bin/pamvalidate
@@ -169,6 +177,7 @@ bin/pbmtoybm
bin/pbmtozinc
bin/pbmupc
bin/pc1toppm
+bin/pcdindex
bin/pcdovtoppm
bin/pcxtoppm
bin/pdbimgtopam
@@ -372,6 +381,7 @@ include/netpbm/pamdraw.h
include/netpbm/pammap.h
include/netpbm/pbm.h
include/netpbm/pbmfont.h
+include/netpbm/pbmfontdata.h
include/netpbm/pgm.h
include/netpbm/pm.h
include/netpbm/pm_config.h
@@ -388,7 +398,7 @@ include/netpbm/shhopt.h
lib/libnetpbm.a
lib/libnetpbm.so
lib/libnetpbm.so.11
-lib/libnetpbm.so.11.79
+lib/libnetpbm.so.11.86
man/man1/411toppm.1
man/man1/anytopnm.1
man/man1/asciitopgm.1
@@ -439,9 +449,11 @@ man/man1/mtvtoppm.1
man/man1/neotoppm.1
man/man1/palmtopnm.1
man/man1/pamaddnoise.1
+man/man1/pamaltsat.1
man/man1/pamarith.1
man/man1/pambackground.1
man/man1/pambayer.1
+man/man1/pambrighten.1
man/man1/pamchannel.1
man/man1/pamcomp.1
man/man1/pamcrater.1
@@ -455,15 +467,20 @@ man/man1/pamendian.1
man/man1/pamenlarge.1
man/man1/pamexec.1
man/man1/pamfile.1
+man/man1/pamfind.1
man/man1/pamfix.1
man/man1/pamfixtrunc.1
man/man1/pamflip.1
man/man1/pamfunc.1
man/man1/pamgauss.1
+man/man1/pamgetcolor.1
man/man1/pamgradient.1
+man/man1/pamhue.1
+man/man1/pamlevels.1
man/man1/pamlookup.1
man/man1/pammasksharpen.1
man/man1/pammixinterlace.1
+man/man1/pammixmulti.1
man/man1/pammosaicknit.1
man/man1/pamoil.1
man/man1/pampaintspill.1
@@ -511,6 +528,7 @@ man/man1/pamtotiff.1
man/man1/pamtouil.1
man/man1/pamtowinicon.1
man/man1/pamtoxvmini.1
+man/man1/pamtris.1
man/man1/pamundice.1
man/man1/pamunlookup.1
man/man1/pamvalidate.1
@@ -770,6 +788,7 @@ man/man3/libmaketmpfile.3
man/man3/libmaketmpfilefd.3
man/man3/libnetpbm.3
man/man3/libnetpbm_draw.3
+man/man3/libnetpbm_font.3
man/man3/libnetpbm_image.3
man/man3/libnetpbm_ug.3
man/man3/libpbm.3
Index: pkgsrc/graphics/netpbm/distinfo
diff -u pkgsrc/graphics/netpbm/distinfo:1.109 pkgsrc/graphics/netpbm/distinfo:1.110
--- pkgsrc/graphics/netpbm/distinfo:1.109 Tue Oct 26 10:46:33 2021
+++ pkgsrc/graphics/netpbm/distinfo Mon Dec 20 20:41:38 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.109 2021/10/26 10:46:33 nia Exp $
+$NetBSD: distinfo,v 1.110 2021/12/20 20:41:38 nia Exp $
-BLAKE2s (netpbm-10.79.04.tar.gz) = 985936be502b6e39a3b0593fde9f0fb837f00085c7a152db8a4e1f1b90a77a9d
-SHA512 (netpbm-10.79.04.tar.gz) = b5a918bca061015fc6ef361074d010abe88f57dc27971a1db5d4102fd6a02cefc61f2220919d40c9c7a001afac466c74c8d9c1858e3c0f4370422cc4f4c31907
-Size (netpbm-10.79.04.tar.gz) = 2796774 bytes
-BLAKE2s (netpbm-docs-r3052.tar.gz) = a1ee7d62b77a9a0bc4b06b7adae5c905a678b3a85f99f860ee895fd6e04ccbfe
-SHA512 (netpbm-docs-r3052.tar.gz) = 0217139aaf8ddba720df3b5242988674d4e5c2ab8f7399de1ecbe169e702eb79dbb55e1622b1af14058cfd3110d1ef0453237e57fb498d3220369d99afa4d77f
-Size (netpbm-docs-r3052.tar.gz) = 472779 bytes
-SHA1 (patch-common.mk) = f590cc66e0fe6a07e848b9b46662bca350557bea
-SHA1 (patch-lib_Makefile) = ff67c418c9d16bdc9d9c95ba658686aa36f213a0
+BLAKE2s (netpbm-10.86.25.tar.gz) = 09371ab25d93a4065f7d841d2f8482b08b11e6bef3ba54bc33929b28f6f92474
+SHA512 (netpbm-10.86.25.tar.gz) = 712213ceeace1c083f163029828b39a39477812c9eb78c7e15a2773944932be44c04e7de1accabe00724b5d16937502e474d7277f46cb1ff2b1f4e7671e6fc01
+Size (netpbm-10.86.25.tar.gz) = 2884542 bytes
+BLAKE2s (netpbm-docs-r4156.tar.gz) = c9cd8a4e68c192c0cfbd058f3a2f9f283630b312571377dfe894db1bd46173bb
+SHA512 (netpbm-docs-r4156.tar.gz) = 19bc7c8139de03e876d0cbe5de934a1a13d324d5347b1d2e82fed8aa8b058c5765f0f984a7038ea7e1d12366d65bede49511adf3dd4314c9564432baccf02f5c
+Size (netpbm-docs-r4156.tar.gz) = 511790 bytes
+SHA1 (patch-common.mk) = f37a95014c04ad50fab09da61608590a63a06386
+SHA1 (patch-lib_Makefile) = dc9d14d911773b282d1f0169f665baccb5247337
SHA1 (patch-pm__config.in.h) = dfe51691507a2c7be2946013b1f1b6bdd9b39f49
Index: pkgsrc/graphics/netpbm/patches/patch-common.mk
diff -u pkgsrc/graphics/netpbm/patches/patch-common.mk:1.3 pkgsrc/graphics/netpbm/patches/patch-common.mk:1.4
--- pkgsrc/graphics/netpbm/patches/patch-common.mk:1.3 Thu Mar 12 12:35:42 2015
+++ pkgsrc/graphics/netpbm/patches/patch-common.mk Mon Dec 20 20:41:38 2021
@@ -1,13 +1,14 @@
-$NetBSD: patch-common.mk,v 1.3 2015/03/12 12:35:42 tnn Exp $
+$NetBSD: patch-common.mk,v 1.4 2021/12/20 20:41:38 nia Exp $
Simplify install target.
---- common.mk.orig 2014-09-08 21:26:50.000000000 +0000
+
+--- common.mk.orig 2021-11-16 12:20:01.000000000 +0000
+++ common.mk
-@@ -465,7 +465,7 @@ endif
+@@ -482,7 +482,7 @@ endif
PKGMANSUBDIRS = man1 man3 man5 web
--PKGSUBDIRS = bin include include/netpbm lib link misc \
+-PKGSUBDIRS = bin include include/netpbm lib sharedlink staticlink misc \
+PKGSUBDIRS = bin include include/netpbm lib misc \
$(PKGMANSUBDIRS:%=$(PKGMANDIR)/%)
Index: pkgsrc/graphics/netpbm/patches/patch-lib_Makefile
diff -u pkgsrc/graphics/netpbm/patches/patch-lib_Makefile:1.2 pkgsrc/graphics/netpbm/patches/patch-lib_Makefile:1.3
--- pkgsrc/graphics/netpbm/patches/patch-lib_Makefile:1.2 Wed Jul 12 09:00:33 2017
+++ pkgsrc/graphics/netpbm/patches/patch-lib_Makefile Mon Dec 20 20:41:38 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-lib_Makefile,v 1.2 2017/07/12 09:00:33 wiz Exp $
+$NetBSD: patch-lib_Makefile,v 1.3 2021/12/20 20:41:38 nia Exp $
Honor LDFLAGS.
Simplify install target.
---- lib/Makefile.orig 2017-02-04 18:09:33.000000000 +0000
+--- lib/Makefile.orig 2021-11-16 12:19:56.000000000 +0000
+++ lib/Makefile
-@@ -130,7 +130,7 @@ $(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).
+@@ -131,7 +131,7 @@ $(SONAME): libnetpbm.$(NETPBMLIBSUFFIX).
$(SYMLINK) $< $@
libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
@@ -14,33 +14,42 @@ Simplify install target.
endif
ifeq ($(NETPBMLIBTYPE),dll)
-@@ -217,7 +217,7 @@ libpm.o: compile.h
+@@ -207,7 +207,7 @@ standardppmdfont.c:
+ # else, so it was really sloppy.
+
+ compile.h:
+- $(SRCDIR)/buildtools/stamp-date >$@ || rm $@
++ echo >$@ || rm $@
+
+ $(LIBOBJECTS_X): FORCE
+ @if [ ! -d $(dir $@) ] ; then mkdir $(dir $@) ; fi
+@@ -221,7 +221,7 @@ libpm.o: compile.h
.PHONY: install.lib
ifeq ($(NETPBMLIBTYPE),unixshared)
# install a Unix-style shared library
--install.lib: $(PKGDIR)/lib $(PKGDIR)/link
+-install.lib: $(PKGDIR)/lib $(PKGDIR)/sharedlink
+install.lib: $(PKGDIR)/lib
cd $(PKGDIR)/lib ; rm -f libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).*
$(INSTALL) -c -m $(INSTALL_PERM_LIBD) \
libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN) $(PKGDIR)/lib/
-@@ -259,28 +259,28 @@ $(INTERFACE_HEADERS:%=%_installhdr): $(P
+@@ -263,29 +263,29 @@ $(INTERFACE_HEADERS:%=%_installhdr): $(P
$(SRCDIR)/lib/$(@:%_installhdr=%) $(PKGDIR)/include/netpbm/
.PHONY: install.staticlib
--install.staticlib: $(PKGDIR)/link
+-install.staticlib: $(PKGDIR)/staticlink
+install.staticlib: $(PKGDIR)/lib
$(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.$(STATICLIBSUFFIX) \
-- $(PKGDIR)/link
+- $(PKGDIR)/staticlink
+ $(PKGDIR)/lib
# Install a shared library stub -- the ".so" file used at link time to
# prepare a program for dynamically linking a library at run time
.PHONY: install.sharedlibstub
--install.sharedlibstub: $(PKGDIR)/link
+-install.sharedlibstub: $(PKGDIR)/sharedlink
+install.sharedlibstub: $(PKGDIR)/lib
ifeq ($(NETPBMLIBTYPE),unixshared)
# install the link-time (.so) links to the runtime libraries
-- cd $(PKGDIR)/link ; \
+- cd $(PKGDIR)/sharedlink ; \
+ cd $(PKGDIR)/lib ; \
rm -f libnetpbm.$(NETPBMLIBSUFFIX); \
- $(SYMLINK) ../lib/libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ) \
@@ -48,11 +57,12 @@ Simplify install target.
libnetpbm.$(NETPBMLIBSUFFIX)
endif
ifeq ($(NETPBMLIBTYPE),dll)
-- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a $(PKGDIR)/link
-+ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a $(PKGDIR)/lib
+ $(INSTALL) -c -m $(INSTALL_PERM_LIBS) libnetpbm.dll.a \
+- $(PKGDIR)/sharedlink
++ $(PKGDIR)/lib
endif
ifeq ($(NETPBMLIBTYPE),dylib)
-- cd $(PKGDIR)/link/ ; \
+- cd $(PKGDIR)/sharedlink/ ; \
+ cd $(PKGDIR)/lib/ ; \
rm -f libnetpbm.dylib; \
- $(SYMLINK) ../lib/libnetpbm.$(MAJ).$(MIN).dylib libnetpbm.dylib
Home |
Main Index |
Thread Index |
Old Index