diff options
| author | spz <spz@pkgsrc.org> | 2010-02-25 08:43:28 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2010-02-25 08:43:28 +0000 |
| commit | b6eb7cc7ff4d4ece69a139d70a909dd55233524b (patch) | |
| tree | 0a5095aa9b4d68e7c8263c3c1030f81d416ef15f | |
| parent | be0be34cd932d0107e35adf4129c0fefa6c7eec3 (diff) | |
| download | pkgsrc-b6eb7cc7ff4d4ece69a139d70a909dd55233524b.tar.gz | |
Pullup ticket 3022 - requested by taca
security update
Revisions pulled up:
- pkgsrc/graphics/netpbm/Makefile
- pkgsrc/graphics/netpbm/distinfo
- pkgsrc/graphics/netpbm/patches/patch-aa
- pkgsrc/graphics/netpbm/patches/patch-ao
- pkgsrc/graphics/netpbm/patches/patch-da
- pkgsrc/graphics/netpbm/patches/patch-db
- pkgsrc/graphics/netpbm/patches/patch-dd
Files added:
pkgsrc/graphics/netpbm/PLIST
pkgsrc/graphics/netpbm/patches/patch-ec
Files deleted:
pkgsrc/graphics/netpbm/patches/patch-ac
pkgsrc/graphics/netpbm/patches/patch-af
pkgsrc/graphics/netpbm/patches/patch-ag
pkgsrc/graphics/netpbm/patches/patch-ai
pkgsrc/graphics/netpbm/patches/patch-aj
pkgsrc/graphics/netpbm/patches/patch-ak
pkgsrc/graphics/netpbm/patches/patch-al
pkgsrc/graphics/netpbm/patches/patch-am
pkgsrc/graphics/netpbm/patches/patch-an
pkgsrc/graphics/netpbm/patches/patch-ap
pkgsrc/graphics/netpbm/patches/patch-aq
pkgsrc/graphics/netpbm/patches/patch-ar
pkgsrc/graphics/netpbm/patches/patch-as
pkgsrc/graphics/netpbm/patches/patch-at
pkgsrc/graphics/netpbm/patches/patch-au
pkgsrc/graphics/netpbm/patches/patch-av
pkgsrc/graphics/netpbm/patches/patch-az
pkgsrc/graphics/netpbm/patches/patch-ba
pkgsrc/graphics/netpbm/patches/patch-ca
pkgsrc/graphics/netpbm/patches/patch-ea
--------------------------------------------------------------------
Module Name: pkgsrc
Committed By: drochner
Date: Fri Feb 19 18:25:44 UTC 2010
Modified Files:
pkgsrc/graphics/netpbm: Makefile distinfo
pkgsrc/graphics/netpbm/patches: patch-aa patch-ao patch-da patch-db
patch-dd
Added Files:
pkgsrc/graphics/netpbm: PLIST
pkgsrc/graphics/netpbm/patches: patch-ec
Removed Files:
pkgsrc/graphics/netpbm/patches: patch-ac patch-af patch-ag patch-ai
patch-aj patch-ak patch-al patch-am patch-an patch-ap patch-aq
patch-ar patch-as patch-at patch-au patch-av patch-az patch-ba
patch-ca patch-ea
Log Message:
update to 10.35.73
changes: many bugfixes, especially:
xpmtoppm: fix wild pointer with color index > 127.
which fixes a stack-based buffer overflow (CVE-2009-4274)
pkgsrc change: use a fixed PLIST instead of generating on install,
helps to detect problems
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 pkgsrc/graphics/netpbm/Makefile
cvs rdiff -u -r0 -r1.6 pkgsrc/graphics/netpbm/PLIST
cvs rdiff -u -r1.71 -r1.72 pkgsrc/graphics/netpbm/distinfo
cvs rdiff -u -r1.39 -r1.40 pkgsrc/graphics/netpbm/patches/patch-aa
cvs rdiff -u -r1.17 -r0 pkgsrc/graphics/netpbm/patches/patch-ac
cvs rdiff -u -r1.12 -r0 pkgsrc/graphics/netpbm/patches/patch-af
cvs rdiff -u -r1.18 -r0 pkgsrc/graphics/netpbm/patches/patch-ag
cvs rdiff -u -r1.11 -r0 pkgsrc/graphics/netpbm/patches/patch-ai \
pkgsrc/graphics/netpbm/patches/patch-aj
cvs rdiff -u -r1.7 -r0 pkgsrc/graphics/netpbm/patches/patch-ak
cvs rdiff -u -r1.3 -r0 pkgsrc/graphics/netpbm/patches/patch-al \
pkgsrc/graphics/netpbm/patches/patch-am \
pkgsrc/graphics/netpbm/patches/patch-an \
pkgsrc/graphics/netpbm/patches/patch-ap \
pkgsrc/graphics/netpbm/patches/patch-aq \
pkgsrc/graphics/netpbm/patches/patch-ar \
pkgsrc/graphics/netpbm/patches/patch-as \
pkgsrc/graphics/netpbm/patches/patch-at \
pkgsrc/graphics/netpbm/patches/patch-au
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/netpbm/patches/patch-ao
cvs rdiff -u -r1.4 -r0 pkgsrc/graphics/netpbm/patches/patch-av \
pkgsrc/graphics/netpbm/patches/patch-az
cvs rdiff -u -r1.5 -r0 pkgsrc/graphics/netpbm/patches/patch-ba
cvs rdiff -u -r1.1 -r0 pkgsrc/graphics/netpbm/patches/patch-ca \
pkgsrc/graphics/netpbm/patches/patch-ea
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/netpbm/patches/patch-da \
pkgsrc/graphics/netpbm/patches/patch-db \
pkgsrc/graphics/netpbm/patches/patch-dd
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/netpbm/patches/patch-ec
29 files changed, 749 insertions, 535 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 394f9839607..06daed3ca30 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.163 2009/08/26 19:56:52 sno Exp $ +# $NetBSD: Makefile,v 1.163.4.1 2010/02/25 08:43:28 spz Exp $ -DISTNAME= netpbm-10.34 -PKGREVISION= 3 +DISTNAME= netpbm-10.35.73 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/} EXTRACT_SUFX= .tgz @@ -22,7 +21,6 @@ INSTALL_TARGET= install-dev install-run MAKE_ENV+= INSTALL=${INSTALL:Q} STRIPFLAG=${_STRIPFLAG_INSTALL:Q} \ pkgdir=${STAGEDIR:Q} MACHINE=${MACHINE:Q} MAKE_FILE= GNUmakefile -PLIST_SRC= ${WRKDIR}/PLIST_STAGE REPLACE_PERL+= editor/ppmfade editor/ppmshadow editor/pnmquant \ generator/ppmrainbow manweb editor/pnmflip editor/ppmquant STAGEDIR= ${WRKDIR}/staging @@ -90,7 +88,6 @@ post-install: ${MV} share/doc/netpbm/*.1 ${PKGMANDIR}/man1 && \ ${MV} misc share/netpbm && \ ${CHOWN} -R ${BINOWN}:${BINGRP} . && \ - ${FIND} * \! -type d -print | ${SORT} >${PLIST_SRC} && \ pax -rwpppm . ${DESTDIR}${PREFIX} ${RM} -fr ${STAGEDIR} ${FIND} ${DESTDIR}${PREFIX}/share/doc/netpbm -type f -print | \ diff --git a/graphics/netpbm/PLIST b/graphics/netpbm/PLIST new file mode 100644 index 00000000000..4b78a3dc73e --- /dev/null +++ b/graphics/netpbm/PLIST @@ -0,0 +1,671 @@ +@comment $NetBSD: PLIST,v 1.5.46.1 2010/02/25 08:43:28 spz Exp $ +bin/411toppm +bin/anytopnm +bin/asciitopgm +bin/atktopbm +bin/bioradtopgm +bin/bmptopnm +bin/bmptoppm +bin/brushtopbm +bin/cameratopam +bin/cmuwmtopbm +bin/ddbugtopbm +bin/doc.url +bin/escp2topbm +bin/eyuvtoppm +bin/fiascotopnm +bin/fitstopnm +bin/fstopgm +bin/g3topbm +bin/gemtopbm +bin/gemtopnm +bin/giftopnm +bin/gouldtoppm +bin/hdifftopam +bin/hipstopgm +bin/hpcdtoppm +bin/icontopbm +bin/ilbmtoppm +bin/imgtoppm +bin/infotopam +bin/jbigtopnm +bin/jpeg2ktopam +bin/jpegtopnm +bin/leaftoppm +bin/lispmtopgm +bin/macptopbm +bin/manweb +bin/mdatopbm +bin/mgrtopbm +bin/mrftopbm +bin/mtvtoppm +bin/neotoppm +bin/palmtopnm +bin/pamaddnoise +bin/pamarith +bin/pambayer +bin/pamchannel +bin/pamcomp +bin/pamcut +bin/pamdeinterlace +bin/pamdepth +bin/pamdice +bin/pamditherbw +bin/pamedge +bin/pamendian +bin/pamenlarge +bin/pamfile +bin/pamflip +bin/pamfunc +bin/pamgauss +bin/pamgradient +bin/pamlookup +bin/pammasksharpen +bin/pammixinterlace +bin/pamoil +bin/pamperspective +bin/pampick +bin/pampop9 +bin/pamrgbatopng +bin/pamscale +bin/pamseq +bin/pamsharpmap +bin/pamsharpness +bin/pamslice +bin/pamsplit +bin/pamstack +bin/pamstereogram +bin/pamstretch +bin/pamstretch-gen +bin/pamsumm +bin/pamsummcol +bin/pamthreshold +bin/pamtilt +bin/pamtodjvurle +bin/pamtofits +bin/pamtohdiff +bin/pamtohtmltbl +bin/pamtojpeg2k +bin/pamtopfm +bin/pamtopnm +bin/pamtosvg +bin/pamtotga +bin/pamtotiff +bin/pamtouil +bin/pamtoxvmini +bin/pbmclean +bin/pbmlife +bin/pbmmake +bin/pbmmask +bin/pbmpage +bin/pbmpscale +bin/pbmreduce +bin/pbmtext +bin/pbmtextps +bin/pbmto10x +bin/pbmto4425 +bin/pbmtoascii +bin/pbmtoatk +bin/pbmtobbnbg +bin/pbmtocmuwm +bin/pbmtodjvurle +bin/pbmtoepsi +bin/pbmtoepson +bin/pbmtoescp2 +bin/pbmtog3 +bin/pbmtogem +bin/pbmtogo +bin/pbmtoibm23xx +bin/pbmtoicon +bin/pbmtolj +bin/pbmtoln03 +bin/pbmtolps +bin/pbmtomacp +bin/pbmtomatrixorbital +bin/pbmtomda +bin/pbmtomgr +bin/pbmtomrf +bin/pbmtonokia +bin/pbmtopgm +bin/pbmtopi3 +bin/pbmtopk +bin/pbmtoplot +bin/pbmtoppa +bin/pbmtopsg3 +bin/pbmtoptx +bin/pbmtowbmp +bin/pbmtox10bm +bin/pbmtoxbm +bin/pbmtoybm +bin/pbmtozinc +bin/pbmupc +bin/pc1toppm +bin/pcdovtoppm +bin/pcxtoppm +bin/pfmtopam +bin/pgmabel +bin/pgmbentley +bin/pgmcrater +bin/pgmdeshadow +bin/pgmedge +bin/pgmenhance +bin/pgmhist +bin/pgmkernel +bin/pgmmake +bin/pgmmedian +bin/pgmminkowski +bin/pgmmorphconv +bin/pgmnoise +bin/pgmnorm +bin/pgmoil +bin/pgmramp +bin/pgmslice +bin/pgmtexture +bin/pgmtofs +bin/pgmtolispm +bin/pgmtopbm +bin/pgmtopgm +bin/pgmtoppm +bin/pi1toppm +bin/pi3topbm +bin/picttoppm +bin/pjtoppm +bin/pktopbm +bin/pngtopnm +bin/pnmalias +bin/pnmarith +bin/pnmcat +bin/pnmcolormap +bin/pnmcomp +bin/pnmconvol +bin/pnmcrop +bin/pnmcut +bin/pnmdepth +bin/pnmenlarge +bin/pnmfile +bin/pnmflip +bin/pnmgamma +bin/pnmhisteq +bin/pnmhistmap +bin/pnmindex +bin/pnminterp +bin/pnminvert +bin/pnmmargin +bin/pnmmontage +bin/pnmnlfilt +bin/pnmnoraw +bin/pnmnorm +bin/pnmpad +bin/pnmpaste +bin/pnmpsnr +bin/pnmquant +bin/pnmremap +bin/pnmrotate +bin/pnmscale +bin/pnmscalefixed +bin/pnmshear +bin/pnmsmooth +bin/pnmsplit +bin/pnmstitch +bin/pnmtile +bin/pnmtoddif +bin/pnmtofiasco +bin/pnmtofits +bin/pnmtojbig +bin/pnmtojpeg +bin/pnmtopalm +bin/pnmtopclxl +bin/pnmtoplainpnm +bin/pnmtopng +bin/pnmtopnm +bin/pnmtops +bin/pnmtorast +bin/pnmtorle +bin/pnmtosgi +bin/pnmtosir +bin/pnmtotiff +bin/pnmtotiffcmyk +bin/pnmtoxwd +bin/ppm3d +bin/ppmbrighten +bin/ppmchange +bin/ppmcie +bin/ppmcolormask +bin/ppmcolors +bin/ppmdcfont +bin/ppmddumpfont +bin/ppmdim +bin/ppmdist +bin/ppmdither +bin/ppmdmkfont +bin/ppmdraw +bin/ppmfade +bin/ppmflash +bin/ppmforge +bin/ppmglobe +bin/ppmhist +bin/ppmlabel +bin/ppmmake +bin/ppmmix +bin/ppmnorm +bin/ppmntsc +bin/ppmpat +bin/ppmquant +bin/ppmquantall +bin/ppmrainbow +bin/ppmrelief +bin/ppmrough +bin/ppmshadow +bin/ppmshift +bin/ppmspread +bin/ppmtoacad +bin/ppmtoarbtxt +bin/ppmtobmp +bin/ppmtoeyuv +bin/ppmtogif +bin/ppmtoicr +bin/ppmtoilbm +bin/ppmtojpeg +bin/ppmtoleaf +bin/ppmtolj +bin/ppmtomap +bin/ppmtomitsu +bin/ppmtompeg +bin/ppmtoneo +bin/ppmtopcx +bin/ppmtopgm +bin/ppmtopi1 +bin/ppmtopict +bin/ppmtopj +bin/ppmtopjxl +bin/ppmtoppm +bin/ppmtopuzz +bin/ppmtorgb3 +bin/ppmtosixel +bin/ppmtoterm +bin/ppmtouil +bin/ppmtowinicon +bin/ppmtoxpm +bin/ppmtoyuv +bin/ppmtoyuvsplit +bin/ppmtv +bin/ppmwheel +bin/psidtopgm +bin/pstopnm +bin/qrttoppm +bin/rasttopnm +bin/rawtopgm +bin/rawtoppm +bin/rgb3toppm +bin/rlatopam +bin/rletopnm +bin/sbigtopgm +bin/sgitopnm +bin/sirtopnm +bin/sldtoppm +bin/spctoppm +bin/spottopgm +bin/sputoppm +bin/svgtopam +bin/tgatoppm +bin/thinkjettopbm +bin/tifftopnm +bin/wbmptopbm +bin/winicontoppm +bin/xbmtopbm +bin/ximtoppm +bin/xpmtoppm +bin/xvminitoppm +bin/xwdtopnm +bin/ybmtopbm +bin/yuvsplittoppm +bin/yuvtoppm +bin/zeisstopnm +include/bitio.h +include/colorname.h +include/mallocvar.h +include/nstring.h +include/pam.h +include/pammap.h +include/pbm.h +include/pbmfont.h +include/pgm.h +include/pm.h +include/pm_config.h +include/pm_gamma.h +include/pm_system.h +include/pnm.h +include/ppm.h +include/ppmcmap.h +include/ppmfloyd.h +include/shhopt.h +lib/libnetpbm.a +lib/libnetpbm.so +lib/libnetpbm.so.10 +lib/libnetpbm.so.10.35 +man/man1/411toppm.1 +man/man1/anytopnm.1 +man/man1/asciitopgm.1 +man/man1/atktopbm.1 +man/man1/bioradtopgm.1 +man/man1/bmptopnm.1 +man/man1/brushtopbm.1 +man/man1/cameratopam.1 +man/man1/cmuwmtopbm.1 +man/man1/ddbugtopbm.1 +man/man1/escp2topbm.1 +man/man1/eyuvtoppm.1 +man/man1/fiascotopnm.1 +man/man1/fitstopnm.1 +man/man1/fstopgm.1 +man/man1/g3topbm.1 +man/man1/gemtopnm.1 +man/man1/giftopnm.1 +man/man1/gouldtoppm.1 +man/man1/hdifftopam.1 +man/man1/hipstopgm.1 +man/man1/hpcdtoppm.1 +man/man1/icontopbm.1 +man/man1/ilbmtoppm.1 +man/man1/imgtoppm.1 +man/man1/infotopam.1 +man/man1/jbigtopnm.1 +man/man1/jpeg2ktopam.1 +man/man1/jpegtopnm.1 +man/man1/leaftoppm.1 +man/man1/lispmtopgm.1 +man/man1/macptopbm.1 +man/man1/manweb.1 +man/man1/mdatopbm.1 +man/man1/mgrtopbm.1 +man/man1/mrftopbm.1 +man/man1/mtvtoppm.1 +man/man1/neotoppm.1 +man/man1/netpbm.1 +man/man1/palmtopnm.1 +man/man1/pamaddnoise.1 +man/man1/pamarith.1 +man/man1/pambayer.1 +man/man1/pamchannel.1 +man/man1/pamcomp.1 +man/man1/pamcut.1 +man/man1/pamdeinterlace.1 +man/man1/pamdepth.1 +man/man1/pamdice.1 +man/man1/pamditherbw.1 +man/man1/pamedge.1 +man/man1/pamendian.1 +man/man1/pamenlarge.1 +man/man1/pamfile.1 +man/man1/pamflip.1 +man/man1/pamfunc.1 +man/man1/pamgauss.1 +man/man1/pamgradient.1 +man/man1/pamlookup.1 +man/man1/pammasksharpen.1 +man/man1/pammixinterlace.1 +man/man1/pamoil.1 +man/man1/pamperspective.1 +man/man1/pampick.1 +man/man1/pampop9.1 +man/man1/pamrgbatopng.1 +man/man1/pamscale.1 +man/man1/pamseq.1 +man/man1/pamsharpmap.1 +man/man1/pamsharpness.1 +man/man1/pamslice.1 +man/man1/pamsplit.1 +man/man1/pamstack.1 +man/man1/pamstereogram.1 +man/man1/pamstretch-gen.1 +man/man1/pamstretch.1 +man/man1/pamsumm.1 +man/man1/pamsummcol.1 +man/man1/pamthreshold.1 +man/man1/pamtilt.1 +man/man1/pamtodjvurle.1 +man/man1/pamtofits.1 +man/man1/pamtohdiff.1 +man/man1/pamtohtmltbl.1 +man/man1/pamtojpeg2k.1 +man/man1/pamtopfm.1 +man/man1/pamtopnm.1 +man/man1/pamtosvg.1 +man/man1/pamtotga.1 +man/man1/pamtotiff.1 +man/man1/pamtouil.1 +man/man1/pamtoxvmini.1 +man/man1/pbmclean.1 +man/man1/pbmlife.1 +man/man1/pbmmake.1 +man/man1/pbmmask.1 +man/man1/pbmpage.1 +man/man1/pbmpscale.1 +man/man1/pbmreduce.1 +man/man1/pbmtext.1 +man/man1/pbmtextps.1 +man/man1/pbmto10x.1 +man/man1/pbmto4425.1 +man/man1/pbmtoascii.1 +man/man1/pbmtoatk.1 +man/man1/pbmtobbnbg.1 +man/man1/pbmtocmuwm.1 +man/man1/pbmtodjvurle.1 +man/man1/pbmtoepsi.1 +man/man1/pbmtoepson.1 +man/man1/pbmtoescp2.1 +man/man1/pbmtog3.1 +man/man1/pbmtogem.1 +man/man1/pbmtogo.1 +man/man1/pbmtoibm23xx.1 +man/man1/pbmtoicon.1 +man/man1/pbmtolj.1 +man/man1/pbmtoln03.1 +man/man1/pbmtolps.1 +man/man1/pbmtomacp.1 +man/man1/pbmtomatrixorbital.1 +man/man1/pbmtomda.1 +man/man1/pbmtomgr.1 +man/man1/pbmtomrf.1 +man/man1/pbmtonokia.1 +man/man1/pbmtopgm.1 +man/man1/pbmtopi3.1 +man/man1/pbmtopk.1 +man/man1/pbmtoplot.1 +man/man1/pbmtoppa.1 +man/man1/pbmtopsg3.1 +man/man1/pbmtoptx.1 +man/man1/pbmtowbmp.1 +man/man1/pbmtox10bm.1 +man/man1/pbmtoxbm.1 +man/man1/pbmtoybm.1 +man/man1/pbmtozinc.1 +man/man1/pbmupc.1 +man/man1/pc1toppm.1 +man/man1/pcdovtoppm.1 +man/man1/pcxtoppm.1 +man/man1/pfmtopam.1 +man/man1/pgmabel.1 +man/man1/pgmbentley.1 +man/man1/pgmcrater.1 +man/man1/pgmdeshadow.1 +man/man1/pgmenhance.1 +man/man1/pgmhist.1 +man/man1/pgmkernel.1 +man/man1/pgmmake.1 +man/man1/pgmmedian.1 +man/man1/pgmminkowski.1 +man/man1/pgmmorphconv.1 +man/man1/pgmnoise.1 +man/man1/pgmramp.1 +man/man1/pgmtexture.1 +man/man1/pgmtofs.1 +man/man1/pgmtolispm.1 +man/man1/pgmtopbm.1 +man/man1/pgmtopgm.1 +man/man1/pgmtoppm.1 +man/man1/pi1toppm.1 +man/man1/pi3topbm.1 +man/man1/picttoppm.1 +man/man1/pjtoppm.1 +man/man1/pktopbm.1 +man/man1/pngtopnm.1 +man/man1/pnmalias.1 +man/man1/pnmcat.1 +man/man1/pnmcolormap.1 +man/man1/pnmcomp.1 +man/man1/pnmconvol.1 +man/man1/pnmcrop.1 +man/man1/pnmcut.1 +man/man1/pnmflip.1 +man/man1/pnmgamma.1 +man/man1/pnmhisteq.1 +man/man1/pnmhistmap.1 +man/man1/pnmindex.1 +man/man1/pnminvert.1 +man/man1/pnmmargin.1 +man/man1/pnmmontage.1 +man/man1/pnmnlfilt.1 +man/man1/pnmnorm.1 +man/man1/pnmpad.1 +man/man1/pnmpaste.1 +man/man1/pnmpsnr.1 +man/man1/pnmquant.1 +man/man1/pnmremap.1 +man/man1/pnmrotate.1 +man/man1/pnmscale.1 +man/man1/pnmscalefixed.1 +man/man1/pnmshear.1 +man/man1/pnmsmooth.1 +man/man1/pnmstitch.1 +man/man1/pnmtile.1 +man/man1/pnmtoddif.1 +man/man1/pnmtofiasco.1 +man/man1/pnmtojbig.1 +man/man1/pnmtojpeg.1 +man/man1/pnmtopalm.1 +man/man1/pnmtopclxl.1 +man/man1/pnmtoplainpnm.1 +man/man1/pnmtopng.1 +man/man1/pnmtops.1 +man/man1/pnmtorast.1 +man/man1/pnmtorle.1 +man/man1/pnmtosgi.1 +man/man1/pnmtosir.1 +man/man1/pnmtotiffcmyk.1 +man/man1/pnmtoxwd.1 +man/man1/ppm3d.1 +man/man1/ppmbrighten.1 +man/man1/ppmchange.1 +man/man1/ppmcie.1 +man/man1/ppmcolormask.1 +man/man1/ppmcolors.1 +man/man1/ppmdcfont.1 +man/man1/ppmddumpfont.1 +man/man1/ppmdim.1 +man/man1/ppmdist.1 +man/man1/ppmdither.1 +man/man1/ppmdmkfont.1 +man/man1/ppmdraw.1 +man/man1/ppmfade.1 +man/man1/ppmflash.1 +man/man1/ppmforge.1 +man/man1/ppmglobe.1 +man/man1/ppmhist.1 +man/man1/ppmlabel.1 +man/man1/ppmmake.1 +man/man1/ppmmix.1 +man/man1/ppmntsc.1 +man/man1/ppmpat.1 +man/man1/ppmquant.1 +man/man1/ppmquantall.1 +man/man1/ppmrainbow.1 +man/man1/ppmrelief.1 +man/man1/ppmrough.1 +man/man1/ppmshadow.1 +man/man1/ppmshift.1 +man/man1/ppmspread.1 +man/man1/ppmtoacad.1 +man/man1/ppmtoarbtxt.1 +man/man1/ppmtobmp.1 +man/man1/ppmtoeyuv.1 +man/man1/ppmtogif.1 +man/man1/ppmtoicr.1 +man/man1/ppmtoilbm.1 +man/man1/ppmtoleaf.1 +man/man1/ppmtolj.1 +man/man1/ppmtomap.1 +man/man1/ppmtomitsu.1 +man/man1/ppmtompeg.1 +man/man1/ppmtoneo.1 +man/man1/ppmtopcx.1 +man/man1/ppmtopgm.1 +man/man1/ppmtopi1.1 +man/man1/ppmtopict.1 +man/man1/ppmtopj.1 +man/man1/ppmtopjxl.1 +man/man1/ppmtoppm.1 +man/man1/ppmtopuzz.1 +man/man1/ppmtorgb3.1 +man/man1/ppmtosixel.1 +man/man1/ppmtoterm.1 +man/man1/ppmtowinicon.1 +man/man1/ppmtoxpm.1 +man/man1/ppmtoyuv.1 +man/man1/ppmtoyuvsplit.1 +man/man1/ppmtv.1 +man/man1/ppmwheel.1 +man/man1/psidtopgm.1 +man/man1/pstopnm.1 +man/man1/qrttoppm.1 +man/man1/rasttopnm.1 +man/man1/rawtopgm.1 +man/man1/rawtoppm.1 +man/man1/rgb3toppm.1 +man/man1/rlatopam.1 +man/man1/rletopnm.1 +man/man1/sbigtopgm.1 +man/man1/sgitopnm.1 +man/man1/sirtopnm.1 +man/man1/sldtoppm.1 +man/man1/spctoppm.1 +man/man1/spottopgm.1 +man/man1/sputoppm.1 +man/man1/svgtopam.1 +man/man1/tgatoppm.1 +man/man1/thinkjettopbm.1 +man/man1/tifftopnm.1 +man/man1/wbmptopbm.1 +man/man1/winicontoppm.1 +man/man1/xbmtopbm.1 +man/man1/ximtoppm.1 +man/man1/xpmtoppm.1 +man/man1/xvminitoppm.1 +man/man1/xwdtopnm.1 +man/man1/ybmtopbm.1 +man/man1/yuvsplittoppm.1 +man/man1/yuvtoppm.1 +man/man1/zeisstopnm.1 +man/man3/libnetpbm.3 +man/man5/pam.5 +man/man5/pbm.5 +man/man5/pgm.5 +man/man5/pnm.5 +man/man5/ppm.5 +share/doc/netpbm/COPYRIGHT.PATENT +share/doc/netpbm/GPL_LICENSE.txt +share/doc/netpbm/HISTORY +share/doc/netpbm/INSTALL +share/doc/netpbm/Netpbm.programming +share/doc/netpbm/README.CYGWIN +share/doc/netpbm/README.DJGPP +share/doc/netpbm/USERDOC +share/doc/netpbm/copyright_summary +share/doc/netpbm/lgpl_v21.txt +share/doc/netpbm/netpbm.html +share/netpbm/palmcolor8.map +share/netpbm/palmgray1.map +share/netpbm/palmgray2.map +share/netpbm/palmgray4.map +share/netpbm/pcxstd.ppm +share/netpbm/rgb.txt diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 237bc720515..649495e1288 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,41 +1,22 @@ -$NetBSD: distinfo,v 1.71 2009/08/27 09:18:06 dholland Exp $ +$NetBSD: distinfo,v 1.71.4.1 2010/02/25 08:43:28 spz Exp $ -SHA1 (netpbm-10.34.tgz) = 530458871f9d3dc763a1bf82f227eeb79098c601 -RMD160 (netpbm-10.34.tgz) = 57a596efa6cacb981135d554a72cbaffc4cfe72c -Size (netpbm-10.34.tgz) = 2507007 bytes -SHA1 (patch-aa) = 28cfd7950d72a041cd4a7fe6660849561846c582 +SHA1 (netpbm-10.35.73.tgz) = e498fcedbc88c618e69163cdb9fa782178a1645e +RMD160 (netpbm-10.35.73.tgz) = b4507ac7897227bf0fb8addceb9a14c9f4601ee8 +Size (netpbm-10.35.73.tgz) = 2548185 bytes +SHA1 (patch-aa) = fb94fb43c4c63113e9c720ea399a5cecb2c79977 SHA1 (patch-ab) = 7781c51e9a8cc9de953540a04e19303244ef8d57 -SHA1 (patch-ac) = 0dd7205df79267045d6884ee59e07480e3192341 SHA1 (patch-ad) = b4a5833e18afd5a991aad897674386a3f00c3ee1 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1 -SHA1 (patch-af) = 17b17c99b61efa819d251ea559b689910946b9f8 -SHA1 (patch-ag) = 59417c163c0ddc822a887a29e595d38323b87af5 SHA1 (patch-ah) = f2a542983932edebee2110868e631b394f380b26 -SHA1 (patch-ai) = e9b3a473af2251f1779b3cd33b572002064d548a -SHA1 (patch-aj) = 5501ffdb7217b111bf4d32b844e2bd3379bed3c9 -SHA1 (patch-ak) = 18f5b387bd54bf9edf14d165c3c68dd8d0b7a5b1 -SHA1 (patch-al) = ef80a678d20a5c19a13e37a24450509134655e2c -SHA1 (patch-am) = 5dec683fca749cde93f08551188a3ec3c6a4c164 -SHA1 (patch-an) = ad3181141fa96cca50527a53ec517f1eacad9e21 -SHA1 (patch-ao) = e2ef759040a863fd2fe7dccdd3c6e5103b7abd9c -SHA1 (patch-ap) = 3be9b2bc02b8a4237dc83f9911c710b8812c7e95 -SHA1 (patch-aq) = 2d89416ae882a504193b1b8a67e29c02ad829120 -SHA1 (patch-ar) = 4e78f0002f568cb85a3dc24aab1d642e980d4232 -SHA1 (patch-as) = 3b479e30b5c19ab63045685ec705d600209fa8b4 -SHA1 (patch-at) = 48cbc777fac07c7cfe12c06a9c37b54031b0c32d -SHA1 (patch-au) = d098d29cd3b62236e3e4a84b1d74de18de85c06f -SHA1 (patch-av) = ef10c607f40dc5cc64dc77c04b1daca4e0ce34eb +SHA1 (patch-ao) = b4307205f605d4c9c8f11c00e1a633960b33b2d3 SHA1 (patch-aw) = bd890324e95fa7bb893d9d5cdab9d5a33dcff777 SHA1 (patch-ax) = d50e56191192b4caf423ed081581868bb1a63de8 SHA1 (patch-ay) = 60ab532de6d6ec498ada140f795bba327a562e13 -SHA1 (patch-az) = 587cf5443099d31e20132d10aa3f330668097d6f -SHA1 (patch-ba) = 775c2903bd030776c6f8c55f83c317e9d1751401 -SHA1 (patch-ca) = b63be9bd38dd182949edf3b892608b72d13c1fa0 SHA1 (patch-cb) = b1be33ae6acfe57bf2f407cd48a6b140c3ddea85 -SHA1 (patch-da) = 37b30f7b6674150685d406570802a7250dce51a6 -SHA1 (patch-db) = 028f1c8b879d640f3f04dfb252c5efca21949031 +SHA1 (patch-da) = 5580d9cf0336b6a28010d1448e2749db9ea2ff5d +SHA1 (patch-db) = e087de63043bbae5f45afd17c742fa603188cae4 SHA1 (patch-dc) = 8ed1365dccf5abb0e158a4f7a65749ff5b244ef3 -SHA1 (patch-dd) = b64f1826549ffd949e19cb986e1e367918ccf5ba -SHA1 (patch-ea) = 49a135fe2466636f73e328ec67202dca065ce764 +SHA1 (patch-dd) = 2acbcffeef96fd8b0419e60fa44a1eaf9f4b291b SHA1 (patch-eb) = 5c3dfac08038fce372fabc7c526081bb8051e908 +SHA1 (patch-ec) = 042bf6f3f1bc9d66e0c958d9eebd9f2e3898af2e SHA1 (patch-ppmdraw) = d901a690f8f21a1af940129d1edef509b369ea1a diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index 4b6ff715a5c..3d3885a3e07 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ +$NetBSD: patch-aa,v 1.39.28.1 2010/02/25 08:43:28 spz Exp $ ---- Makefile.config.in.orig 2006-06-18 21:23:40.000000000 +0200 +--- Makefile.config.in.orig 2008-12-07 01:58:20.000000000 +0000 +++ Makefile.config.in @@ -24,7 +24,7 @@ DEFAULT_TARGET = nonmerge # and skip it on those systems unless you want to debug it and fix it. @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ # The linker. LD = $(CC) -@@ -99,7 +99,7 @@ CFLAGS_FOR_BUILD = $(CFLAGS) +@@ -100,7 +100,7 @@ CFLAGS_FOR_BUILD = $(CFLAGS) # MAKE is set automatically by Make to what was used to invoke Make. @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ #Solaris: #INSTALL = /usr/ucb/install #Tru64: -@@ -111,7 +111,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s +@@ -112,7 +112,7 @@ INSTALL = $(SRCDIR)/buildtools/install.s # STRIPFLAG is the option you pass to the above install program to make it # strip unnecessary information out of binaries. @@ -38,20 +38,25 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ # If you don't want to strip the binaries, just leave it null: #STRIPFLAG = -@@ -130,8 +130,10 @@ MANPAGE_FORMAT = nroff +@@ -131,13 +131,15 @@ MANPAGE_FORMAT = nroff AR = ar RANLIB = ranlib # IRIX, SCO don't have Ranlib: -#RANLIB = true --LEX = flex +ifeq ($(OPSYS),IRIX) +RANLIB = ar rs +endif + + # LEX is the beginning of a shell command that runs a Lex-like + # pattern matcher generator. Null string means there isn't any such + # command. That means the build will skip parts that need one. + +-LEX = flex +#LEX = flex # Solaris: # LEX = flex -e - # Or just skip parts that need Lex: -@@ -220,7 +222,7 @@ EXE = + # Windows Mingw: +@@ -228,7 +230,7 @@ EXE = # Here, $(SONAME) resolves to the soname for the shared library being created. # The following are gcc options. This works on GNU libc systems. @@ -60,7 +65,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ # You need -nostart instead of -shared on BeOS. Though the BeOS compiler is # ostensibly gcc, it has the -nostart option, which is not mentioned in gcc # documentation and doesn't exist in at least one non-BeOS installation. -@@ -253,6 +255,19 @@ LDRELOC = NONE +@@ -261,6 +263,19 @@ LDRELOC = NONE #LDRELOC = ld --reloc #LDRELOC = ld -r @@ -80,9 +85,9 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ # On older systems, you have to make shared libraries out of position # independent code, so you need -fpic or fPIC here. (The rule is: if -@@ -275,11 +290,23 @@ LDRELOC = NONE +@@ -283,11 +298,23 @@ LDRELOC = NONE CFLAGS_SHLIB = - # Solaris or SunOS with gcc, and NetBSD: + # Gcc: #CFLAGS_SHLIB = -fpic -#CFLAGS_SHLIB = -fPIC +CFLAGS_SHLIB = -fPIC @@ -105,7 +110,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ # SHLIB_CLIB is the link option to include the C library in a shared library, # normally "-lc". On typical systems, this serves no purpose. On some, # though, it causes information about which C library to use to be recorded -@@ -348,8 +375,8 @@ TIFFHDR_DIR = +@@ -356,8 +383,8 @@ TIFFHDR_DIR = #TIFFLIB = libtiff.so #TIFFHDR_DIR = /usr/include/libtiff #NetBSD: @@ -116,7 +121,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ # OSF, Tru64: #TIFFLIB = /usr/local1/DEC/lib/libtiff.so #TIFFHDR_DIR = /usr/local1/DEC/include -@@ -379,8 +406,8 @@ JPEGHDR_DIR = +@@ -387,8 +414,8 @@ JPEGHDR_DIR = #JPEGLIB = libjpeg.so #JPEGHDR_DIR = /usr/include/jpeg # Netbsd: @@ -127,8 +132,8 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ # OSF, Tru64: #JPEGLIB = /usr/local1/DEC/libjpeg.so #JPEGHDR_DIR = /usr/local1/DEC/include -@@ -400,12 +427,12 @@ JPEGHDR_DIR = - # option. +@@ -415,12 +442,12 @@ JPEGHDR_DIR = + PNGLIB = NONE PNGHDR_DIR = -PNGVER = @@ -139,13 +144,13 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ -#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so -#PNGHDR_DIR = $(LOCALBASE)/include +PNGLIB = $(BUILDLINK_DIR)/lib/libpng$(PNGVER).so -+PNGHDR_DIR = $(BUILDLINK_DIR)/include ++#PNGHDR_DIR = $(BUILDLINK_DIR)/include # OSF/Tru64: #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so #PNGHDR_DIR = /usr/local1/DEC/include -@@ -415,8 +442,8 @@ PNGVER = - # NONE for the PNG library, it doesn't matter what you specify here -- - # it won't get used. +@@ -432,8 +459,8 @@ PNGVER = + # + # If you have 'libpng-config' (see above), these are irrelevant. -ZLIB = NONE -ZHDR_DIR = @@ -154,7 +159,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ #ZLIB = libz.so # The JBIG lossless image compression library (aka JBIG-KIT): -@@ -425,8 +452,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb +@@ -442,8 +469,8 @@ JBIGLIB = $(BUILDDIR)/converter/other/jb JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig # The Jasper JPEG-2000 image compression library (aka JasPer): @@ -165,7 +170,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ # JASPERDEPLIBS is the libraries (-l options or file names) on which # The Jasper library depends -- i.e. what you have to link into any # executable that links in the Jasper library. -@@ -471,7 +498,7 @@ OMIT_NETWORK = +@@ -488,7 +515,7 @@ OMIT_NETWORK = # built into the standard C library, so this can be null. This is irrelevant # if OMIT_NETWORK is "y". @@ -174,7 +179,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ # Solaris, SunOS: #NETWORKLD = -lsocket -lnsl # SCO: -@@ -525,7 +552,7 @@ SUFFIXMANUALS5 = 5 +@@ -542,7 +569,7 @@ SUFFIXMANUALS5 = 5 #Netpbm library functions. The value is used only in make file tests. # "unixshared" means a unix-style shared library, typically named like # libxyz.so.2.3 @@ -183,7 +188,7 @@ $NetBSD: patch-aa,v 1.39 2007/02/19 02:25:19 rillig Exp $ # "unixstatic" means a unix-style static library, (like libxyz.a) #NETPBMLIBTYPE = unixstatic # "dll" means a Windows DLL shared library -@@ -536,7 +563,7 @@ NETPBMLIBTYPE = unixshared +@@ -553,7 +580,7 @@ NETPBMLIBTYPE = unixshared #NETPBMLIBSUFFIX is the suffix used on whatever kind of library is #selected above. All this is used for is to construct library names. #The make files never examine the actual value. diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac deleted file mode 100644 index 8f3b5a56455..00000000000 --- a/graphics/netpbm/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.17 2006/10/03 23:01:25 schwarz Exp $ - ---- lib/ppmdraw.h.orig 2006-09-26 21:01:00.000000000 +0200 -+++ lib/ppmdraw.h 2006-09-26 21:13:09.000000000 +0200 -@@ -59,7 +59,7 @@ - - - --typedef void ppmd_drawproc(pixel **, int, int, pixval, int, int, const void *); -+typedef void ppmd_drawproc(pixel ** const, int const, int const, pixval const, int const, int const, const void *const); - - ppmd_drawproc ppmd_point_drawproc; - -@@ -274,7 +274,7 @@ - int const height, - int const angle, - const char * const sArg, -- void (*drawprocP)(pixel**, int, int, pixval, int, int, const void*), -+ ppmd_drawproc drawproc, - const void* const clientdata); - /* Draws the null-terminated string 's' left justified at the point - ('x', 'y'). The text will be 'height' pixels high and will be aligned on a diff --git a/graphics/netpbm/patches/patch-af b/graphics/netpbm/patches/patch-af deleted file mode 100644 index ad552e82f1e..00000000000 --- a/graphics/netpbm/patches/patch-af +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-af,v 1.12 2009/04/07 08:09:06 hasso Exp $ - ---- converter/other/cameratopam/identify.c.orig 2005-08-27 19:29:58.000000000 +0200 -+++ converter/other/cameratopam/identify.c -@@ -23,7 +23,12 @@ - - static loadRawFn load_raw; - -+#include <sys/param.h> - -+#if !(defined(__GLIBC__) \ -+ || (defined(__NetBSD__) && (__NetBSD_Version__ >= 300000000)) \ -+ || (defined(__FreeBSD__) && (__FreeBSD_version >= 600000)) \ -+ || (defined(__DragonFly__) && (__DragonFly_version >= 200202))) - /* This does the same as the function of the same name in the GNU C library */ - static const char *memmem (const char *haystack, size_t haystacklen, - const char *needle, size_t needlelen) -@@ -34,6 +38,7 @@ static const char *memmem (const char *h - return c; - return NULL; - } -+#endif - - /* - Thanks to Adobe for providing these excellent CAM -> XYZ matrices! diff --git a/graphics/netpbm/patches/patch-ag b/graphics/netpbm/patches/patch-ag deleted file mode 100644 index c4ab4500f26..00000000000 --- a/graphics/netpbm/patches/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ag,v 1.18 2006/10/03 22:56:50 schwarz Exp $ - ---- lib/libppmd.c.orig 2006-10-03 17:51:58.000000000 +0200 -+++ lib/libppmd.c 2006-10-03 17:53:15.000000000 +0200 -@@ -688,7 +688,9 @@ - - - -+#ifndef SGI_IDO_CC - static qsort_compare yx_compare; -+#endif - - static int - yx_compare(const void * const c1Arg, diff --git a/graphics/netpbm/patches/patch-ai b/graphics/netpbm/patches/patch-ai deleted file mode 100644 index 808dca2189d..00000000000 --- a/graphics/netpbm/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.11 2006/10/03 22:56:50 schwarz Exp $ - ---- lib/pm.h.orig 2006-09-26 20:49:52.000000000 +0200 -+++ lib/pm.h 2006-09-26 19:53:11.000000000 +0200 -@@ -65,7 +65,7 @@ - #ifdef __GNUC__ - #define PM_GNU_PRINTF_ATTR(a,b) __attribute__ ((format (printf, a, b))) - #else --#define PM_GNU_PRINTF_ATTR -+#define PM_GNU_PRINTF_ATTR(a,b) - #endif - - diff --git a/graphics/netpbm/patches/patch-aj b/graphics/netpbm/patches/patch-aj deleted file mode 100644 index a195db29862..00000000000 --- a/graphics/netpbm/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.11 2006/10/03 22:56:50 schwarz Exp $ - ---- converter/ppm/sldtoppm.c.orig 2006-09-26 22:50:39.000000000 +0200 -+++ converter/ppm/sldtoppm.c 2006-09-26 22:50:58.000000000 +0200 -@@ -74,7 +74,7 @@ - void (*slflood) ARGS((struct spolygon *poly, int color)) )); - static void slidefind ARGS((char *sname, int dironly, int ucasen)); - static void draw ARGS((struct svector *vec, int color)); --static void flood ARGS((struct spolygon *poly, int color)); -+static void flood ARGS((struct spolygon *const poly, int const color)); - - static int ixdots, iydots; /* Screen size in dots */ - static FILE *slfile; /* Slide file descriptor */ diff --git a/graphics/netpbm/patches/patch-ak b/graphics/netpbm/patches/patch-ak deleted file mode 100644 index cadd4f7caeb..00000000000 --- a/graphics/netpbm/patches/patch-ak +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-ak,v 1.7 2006/10/03 22:56:51 schwarz Exp $ - ---- converter/ppm/ppmtompeg/headers/frame.h.orig 2005-12-24 04:23:55.000000000 +0100 -+++ converter/ppm/ppmtompeg/headers/frame.h 2006-09-27 00:02:16.000000000 +0200 -@@ -131,17 +131,17 @@ - int const outsize_y); - - --extern void Frame_Free _ANSI_ARGS_((MpegFrame *frame)); -+extern void Frame_Free _ANSI_ARGS_((MpegFrame * const frame)); - extern void Frame_Exit _ANSI_ARGS_((void)); - extern void Frame_AllocPPM _ANSI_ARGS_((MpegFrame * frame)); --extern void Frame_AllocYCC _ANSI_ARGS_((MpegFrame * mf)); --extern void Frame_AllocDecoded _ANSI_ARGS_((MpegFrame *frame, -- boolean makeReference)); --extern void Frame_AllocHalf _ANSI_ARGS_((MpegFrame *frame)); --extern void Frame_AllocBlocks _ANSI_ARGS_((MpegFrame *mf)); --extern void Frame_Resize _ANSI_ARGS_((MpegFrame *omf, MpegFrame *mf, -- int insize_x, int insize_y, -- int outsize_x, int outsize_y)); -+extern void Frame_AllocYCC _ANSI_ARGS_((MpegFrame * const mf)); -+extern void Frame_AllocDecoded _ANSI_ARGS_((MpegFrame * const frame, -+ boolean const makeReference)); -+extern void Frame_AllocHalf _ANSI_ARGS_((MpegFrame * const frame)); -+extern void Frame_AllocBlocks _ANSI_ARGS_((MpegFrame * const mf)); -+extern void Frame_Resize _ANSI_ARGS_((MpegFrame * const omf, MpegFrame * const mf, -+ int const insize_x, int const insize_y, -+ int const outsize_x, int const outsize_y)); - - - #endif /* FRAME_INCLUDED */ diff --git a/graphics/netpbm/patches/patch-al b/graphics/netpbm/patches/patch-al deleted file mode 100644 index 42f39516154..00000000000 --- a/graphics/netpbm/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.3 2006/10/03 22:56:51 schwarz Exp $ - ---- ./converter/ppm/ppmtompeg/mheaders.c.orig 2006-09-30 16:44:28.000000000 +0200 -+++ ./converter/ppm/ppmtompeg/mheaders.c 2006-09-30 16:45:11.000000000 +0200 -@@ -293,7 +293,7 @@ - static void GenMBType _ANSI_ARGS_((BitBucket *bb, uint32 pict_code_type, - uint32 mb_quant, uint32 motion_forw, uint32 motion_back, - uint32 mb_pattern, uint32 mb_intra)); --static void GenMotionCode _ANSI_ARGS_((BitBucket *bb, int32 vector)); -+static void GenMotionCode _ANSI_ARGS_((BitBucket * const bb, int32 const vector)); - static void GenBlockPattern _ANSI_ARGS_((BitBucket *bb, - uint32 mb_pattern)); - diff --git a/graphics/netpbm/patches/patch-am b/graphics/netpbm/patches/patch-am deleted file mode 100644 index 578e46df99c..00000000000 --- a/graphics/netpbm/patches/patch-am +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-am,v 1.3 2006/10/03 22:56:51 schwarz Exp $ - ---- converter/ppm/ppmtompeg/iframe.c.orig 2006-09-30 16:49:39.000000000 +0200 -+++ converter/ppm/ppmtompeg/iframe.c 2006-09-30 16:58:18.000000000 +0200 -@@ -136,14 +136,14 @@ - /*=====================* - * EXPORTED PROCEDURES * - *=====================*/ --extern void PrintItoIBitRate _ANSI_ARGS_((int numBits, int frameNum)); -+extern void PrintItoIBitRate _ANSI_ARGS_((int const numBits, int const frameNum)); - - /*===============================* - * INTERNAL PROCEDURE prototypes * - *===============================*/ - void AllocDctBlocks(void ); --int SetFCodeHelper (int sr); --void CalcDistortion (MpegFrame *current, int y, int x); -+int SetFCodeHelper (int const sr); -+void CalcDistortion (MpegFrame * const current, int const y, int const x); - - int - SetFCodeHelper(int const SR) { diff --git a/graphics/netpbm/patches/patch-an b/graphics/netpbm/patches/patch-an deleted file mode 100644 index 6b055d36e3e..00000000000 --- a/graphics/netpbm/patches/patch-an +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-an,v 1.3 2006/10/03 22:56:51 schwarz Exp $ - ---- converter/ppm/ppmtompeg/headers/prototypes.h.orig 2006-09-30 16:51:04.000000000 +0200 -+++ converter/ppm/ppmtompeg/headers/prototypes.h 2006-09-30 17:01:04.000000000 +0200 -@@ -47,7 +47,7 @@ - void ResetIFrameStats _ANSI_ARGS_((void)); - void - SetPixelSearch(const char * const searchType); --void SetIQScale _ANSI_ARGS_((int qI)); -+void SetIQScale _ANSI_ARGS_((int const qI)); - void SetPQScale _ANSI_ARGS_((int qP)); - void SetBQScale _ANSI_ARGS_((int qB)); - float EstimateSecondsPerIFrame _ANSI_ARGS_((void)); -@@ -56,7 +56,7 @@ - void SetGOPSize _ANSI_ARGS_((int size)); - void - SetStatFileName(const char * const fileName); --void SetSlicesPerFrame _ANSI_ARGS_((int number)); -+void SetSlicesPerFrame _ANSI_ARGS_((int const number)); - void SetBlocksPerSlice _ANSI_ARGS_((void)); - - -@@ -64,7 +64,7 @@ - - void PPMtoYCC _ANSI_ARGS_((MpegFrame * mf)); - --void MotionSearchPreComputation _ANSI_ARGS_((MpegFrame *frame)); -+void MotionSearchPreComputation _ANSI_ARGS_((MpegFrame * const frame)); - - void ComputeHalfPixelData _ANSI_ARGS_((MpegFrame *frame)); - void mp_validate_size _ANSI_ARGS_((int *x, int *y)); diff --git a/graphics/netpbm/patches/patch-ao b/graphics/netpbm/patches/patch-ao index 0d266058c77..8764c672d8c 100644 --- a/graphics/netpbm/patches/patch-ao +++ b/graphics/netpbm/patches/patch-ao @@ -1,7 +1,7 @@ -$NetBSD: patch-ao,v 1.3 2006/10/03 22:56:51 schwarz Exp $ +$NetBSD: patch-ao,v 1.3.30.1 2010/02/25 08:43:28 spz Exp $ ---- converter/ppm/ppmtompeg/headers/frames.h.orig 2006-10-03 17:41:32.000000000 +0200 -+++ converter/ppm/ppmtompeg/headers/frames.h 2006-10-03 17:45:50.000000000 +0200 +--- converter/ppm/ppmtompeg/headers/frames.h.orig 2006-10-18 18:29:13.000000000 +0000 ++++ converter/ppm/ppmtompeg/headers/frames.h @@ -8,6 +8,8 @@ #ifndef FRAMES_INCLUDED #define FRAMES_INCLUDED @@ -11,12 +11,3 @@ $NetBSD: patch-ao,v 1.3 2006/10/03 22:56:51 schwarz Exp $ /*==============* * HEADER FILES * *==============*/ -@@ -85,7 +87,7 @@ - int fmotionX, fmotionY, bmotionX, bmotionY; - } dct_data_type; - --void EncodeYDC _ANSI_ARGS_((int32 dc_term, int32 *pred_term, BitBucket *bb)); -+void EncodeYDC _ANSI_ARGS_((int32 const dc_term, int32 * const pred_term, BitBucket * const bb)); - void - EncodeCDC(int32 const dc_term, - int32 * const pred_term, diff --git a/graphics/netpbm/patches/patch-ap b/graphics/netpbm/patches/patch-ap deleted file mode 100644 index 550d982cacb..00000000000 --- a/graphics/netpbm/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.3 2006/10/03 22:56:51 schwarz Exp $ - ---- converter/ppm/ppmtompeg/headers/mpeg.h.orig 2006-09-30 16:55:59.000000000 +0200 -+++ converter/ppm/ppmtompeg/headers/mpeg.h 2006-09-30 16:56:18.000000000 +0200 -@@ -90,7 +90,7 @@ - ReadDecodedRefFrame(MpegFrame * const frameP, - unsigned int const frameNumber); - --extern void WriteDecodedFrame _ANSI_ARGS_((MpegFrame *frame)); -+extern void WriteDecodedFrame _ANSI_ARGS_((MpegFrame * const frame)); - extern void SetBitRateFileName _ANSI_ARGS_((char *fileName)); - extern void SetFrameRate _ANSI_ARGS_((void)); - diff --git a/graphics/netpbm/patches/patch-aq b/graphics/netpbm/patches/patch-aq deleted file mode 100644 index 25d5794daba..00000000000 --- a/graphics/netpbm/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.3 2006/10/03 22:56:51 schwarz Exp $ - ---- converter/ppm/ppmtompeg/headers/parallel.h.orig 2006-09-30 17:03:27.000000000 +0200 -+++ converter/ppm/ppmtompeg/headers/parallel.h 2006-09-30 17:03:43.000000000 +0200 -@@ -86,7 +86,7 @@ - NoteFrameDone(int frameStart, int frameEnd); - - void --SetIOConvert(boolean separate); -+SetIOConvert(boolean const separate); - - void - SetRemoteShell(const char * const shell); diff --git a/graphics/netpbm/patches/patch-ar b/graphics/netpbm/patches/patch-ar deleted file mode 100644 index b785ca190ed..00000000000 --- a/graphics/netpbm/patches/patch-ar +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ar,v 1.3 2006/10/03 22:56:51 schwarz Exp $ - ---- converter/other/pnmtojpeg.c.orig 2006-09-30 18:49:42.000000000 +0200 -+++ converter/other/pnmtojpeg.c 2006-09-30 18:50:38.000000000 +0200 -@@ -334,7 +334,7 @@ - compute_rescaling_array(JSAMPLE ** const rescale_p, const pixval maxval, - const struct jpeg_compress_struct cinfo); - static void --convert_scanlines(struct jpeg_compress_struct *cinfo_p, FILE *input_file, -+convert_scanlines(struct jpeg_compress_struct * const cinfo_p, FILE * const input_file, - const pixval maxval, const int input_fmt, - JSAMPLE xlate_table[]); - diff --git a/graphics/netpbm/patches/patch-as b/graphics/netpbm/patches/patch-as deleted file mode 100644 index 427178d4458..00000000000 --- a/graphics/netpbm/patches/patch-as +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-as,v 1.3 2006/10/03 22:56:51 schwarz Exp $ - ---- converter/other/pamtosvg/fit.c.orig 2006-09-30 19:02:50.000000000 +0200 -+++ converter/other/pamtosvg/fit.c 2006-09-30 19:06:43.000000000 +0200 -@@ -61,12 +61,12 @@ - at_exception_type * exception); - static void filter (curve_type, fitting_opts_type *); - static void find_vectors -- (unsigned, pixel_outline_type, vector_type *, vector_type *, unsigned); -+ (unsigned const, pixel_outline_type const, vector_type * const, vector_type * const, unsigned const); - static float find_error (curve_type, spline_type, unsigned *, - at_exception_type * exception); - static vector_type find_half_tangent (curve_type, bool start, unsigned *, unsigned); - static void find_tangent (curve_type, bool, bool, unsigned); --static void remove_knee_points (curve_type, bool); -+static void remove_knee_points (curve_type const, bool const); - static void set_initial_parameter_values (curve_type); - static float distance (float_coord, float_coord); - diff --git a/graphics/netpbm/patches/patch-at b/graphics/netpbm/patches/patch-at deleted file mode 100644 index 33de8708680..00000000000 --- a/graphics/netpbm/patches/patch-at +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-at,v 1.3 2006/10/03 22:56:51 schwarz Exp $ - ---- converter/other/pamtosvg/curve.h.orig 2006-09-30 19:10:27.000000000 +0200 -+++ converter/other/pamtosvg/curve.h 2006-09-30 19:10:52.000000000 +0200 -@@ -83,7 +83,7 @@ - pm_pixelcoord const p); - - /* Like `append_pixel', for a point in real coordinates. */ --extern void append_point (curve_type c, float_coord p); -+extern void append_point (curve_type const c, float_coord const p); - - /* Write some or all, respectively, of the curve C in human-readable - form to the log file, if logging is enabled. */ diff --git a/graphics/netpbm/patches/patch-au b/graphics/netpbm/patches/patch-au deleted file mode 100644 index 012d22cf773..00000000000 --- a/graphics/netpbm/patches/patch-au +++ /dev/null @@ -1,44 +0,0 @@ -$NetBSD: patch-au,v 1.3 2006/10/03 22:56:51 schwarz Exp $ - ---- generator/pamstereogram.c.orig 2006-10-03 17:54:39.000000000 +0200 -+++ generator/pamstereogram.c 2006-10-03 17:56:04.000000000 +0200 -@@ -299,7 +299,9 @@ - }; - - -+#ifndef SGI_IDO_CC - static coord2Color randomColor; -+#endif - - static tuple - randomColor(outGenerator * const outGenP, -@@ -336,7 +338,9 @@ - - - -+#ifndef SGI_IDO_CC - static outGenStateTerm termRandomColor; -+#endif - - static void - termRandomColor(outGenerator * const outGenP) { -@@ -402,7 +406,9 @@ - - - -+#ifndef SGI_IDO_CC - static coord2Color patternPixel; -+#endif - - static tuple - patternPixel(outGenerator * const outGenP, -@@ -431,7 +437,9 @@ - - - -+#ifndef SGI_IDO_CC - static outGenStateTerm termPatternPixel; -+#endif - - static void - termPatternPixel(outGenerator * const outGenP) { diff --git a/graphics/netpbm/patches/patch-av b/graphics/netpbm/patches/patch-av deleted file mode 100644 index b3ff68b01d9..00000000000 --- a/graphics/netpbm/patches/patch-av +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-av,v 1.4 2006/10/03 23:01:25 schwarz Exp $ - ---- other/pnmcolormap.c.orig 2006-10-03 17:57:34.000000000 +0200 -+++ other/pnmcolormap.c 2006-10-03 17:58:12.000000000 +0200 -@@ -169,7 +169,9 @@ - typedef int qsort_comparison_fn(const void *, const void *); - /* A collation function to be used as argument to qsort() */ - -+#ifndef SGI_IDO_CC - static qsort_comparison_fn compareplane; -+#endif - - static unsigned int compareplanePlane; - /* This is a parameter to compareplane(). We use this global variable -@@ -189,7 +191,9 @@ - - - -+#ifndef SGI_IDO_CC - static qsort_comparison_fn sumcompare; -+#endif - - static int - sumcompare(const void * const b1, const void * const b2) { diff --git a/graphics/netpbm/patches/patch-az b/graphics/netpbm/patches/patch-az deleted file mode 100644 index 0c04ff3881e..00000000000 --- a/graphics/netpbm/patches/patch-az +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-az,v 1.4 2009/07/21 12:40:54 tnn Exp $ - ---- lib/libpbm3.c.orig 2004-12-13 19:42:39.000000000 +0100 -+++ lib/libpbm3.c -@@ -14,7 +14,7 @@ - #include "libpbm.h" - #include "bitreverse.h" - --#if defined(__GNUC__) && (__GNUC__ >=3) && (__GNUC_MINOR__ >=1) && defined (__SSE__) -+#if defined(__GNUC__) && (__GNUC__ >=3) && (__GNUC_MINOR__ >=1) && defined (__SSE__) && !(__GNUC__ == 4 && __GNUC_MINOR__ >= 3) - /* intel MMX-SSE enhancement for pbm_writepbmowraw() */ - /* GCC only. Turn on with -msse */ - diff --git a/graphics/netpbm/patches/patch-ba b/graphics/netpbm/patches/patch-ba deleted file mode 100644 index b4dc83df842..00000000000 --- a/graphics/netpbm/patches/patch-ba +++ /dev/null @@ -1,61 +0,0 @@ -$NetBSD: patch-ba,v 1.5 2009/08/27 09:18:06 dholland Exp $ - -Upstream patch to fix build with jpeg 7. - ---- converter/ppm/ppmtompeg/jpeg.c 2009/07/24 02:59:59 959 -+++ converter/ppm/ppmtompeg/jpeg.c 2009/07/31 02:21:47 960 -@@ -53,6 +53,17 @@ - #define HEADER_SIZE 607 /*JFIF header size used on output images*/ - - -+static int -+minDctVScaledSize(struct jpeg_decompress_struct const cinfo) { -+ -+#if JPEG_LIB_VERSION >= 70 -+ return cinfo.min_DCT_v_scaled_size; -+#else -+ return cinfo.min_DCT_scaled_size; -+#endif -+} -+ -+ - - /*=======================================================================* - * * -@@ -417,11 +428,7 @@ - */ - - /* set parameters for decompression */ --#ifdef JPEG4 -- cinfo.want_raw_output = TRUE; --#else - cinfo.raw_data_out = TRUE; --#endif - cinfo.out_color_space = JCS_YCbCr; - - /* calculate image output dimensions */ -@@ -467,11 +474,7 @@ - /* Make an 8-row-high sample array that will go away when done - with image - */ --#ifdef JPEG4 -- buffer_height = 8; /* could be 2, 4,8 rows high */ --#else -- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; --#endif -+ buffer_height = cinfo.max_v_samp_factor * minDctVScaledSize(cinfo); - - for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; - cp++,compptr++) { -@@ -495,11 +498,7 @@ - - while (cinfo.output_scanline < cinfo.output_height) { - --#ifdef JPEG4 -- (void) jpeg_read_raw_scanlines(&cinfo, scanarray, buffer_height); --#else - (void) jpeg_read_raw_data(&cinfo, scanarray, buffer_height); --#endif - - /* alter subsample ratio's if neccessary */ - if ((h_samp[0]==2) && (h_samp[1]==1) && (h_samp[2]==1) && diff --git a/graphics/netpbm/patches/patch-ca b/graphics/netpbm/patches/patch-ca deleted file mode 100644 index 88feddc8d97..00000000000 --- a/graphics/netpbm/patches/patch-ca +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ca,v 1.1 2006/05/10 17:19:00 jlam Exp $ - ---- converter/other/rlatopam.c.orig 2006-01-08 00:02:13.000000000 -0500 -+++ converter/other/rlatopam.c -@@ -13,6 +13,7 @@ - **/ - - -+#include <sys/types.h> - #include <netinet/in.h> /* For ntohs, htons */ - #include <string.h> - #include <errno.h> diff --git a/graphics/netpbm/patches/patch-da b/graphics/netpbm/patches/patch-da index 2566b722cc5..cbb1149e5e6 100644 --- a/graphics/netpbm/patches/patch-da +++ b/graphics/netpbm/patches/patch-da @@ -1,15 +1,15 @@ -$NetBSD: patch-da,v 1.1 2006/11/03 07:45:19 rillig Exp $ +$NetBSD: patch-da,v 1.1.30.1 2010/02/25 08:43:28 spz Exp $ ---- converter/other/jpeg2000/pamtojpeg2k.c.orig Tue Oct 31 09:41:12 2006 -+++ converter/other/jpeg2000/pamtojpeg2k.c Tue Oct 31 10:53:02 2006 -@@ -9,7 +9,11 @@ - *****************************************************************************/ +--- converter/other/jpeg2000/pamtojpeg2k.c.orig 2007-12-27 22:32:59.000000000 +0000 ++++ converter/other/jpeg2000/pamtojpeg2k.c +@@ -10,7 +10,11 @@ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ + /* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ +#ifdef __osf__ +#define _OSF_SOURCE +#else - #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ + #define _XOPEN_SOURCE 600 +#endif /* __osf__ */ #include <string.h> diff --git a/graphics/netpbm/patches/patch-db b/graphics/netpbm/patches/patch-db index 220427dcb6b..6273f47da9e 100644 --- a/graphics/netpbm/patches/patch-db +++ b/graphics/netpbm/patches/patch-db @@ -1,15 +1,15 @@ -$NetBSD: patch-db,v 1.1 2006/11/03 07:45:19 rillig Exp $ +$NetBSD: patch-db,v 1.1.30.1 2010/02/25 08:43:28 spz Exp $ ---- converter/other/jpeg2000/jpeg2ktopam.c.orig Tue Oct 31 09:41:56 2006 -+++ converter/other/jpeg2000/jpeg2ktopam.c Tue Oct 31 10:52:39 2006 -@@ -9,7 +9,11 @@ - *****************************************************************************/ +--- converter/other/jpeg2000/jpeg2ktopam.c.orig 2007-12-27 22:32:59.000000000 +0000 ++++ converter/other/jpeg2000/jpeg2ktopam.c +@@ -10,7 +10,11 @@ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ + /* Make sure strdup() is in string.h and int_fast32_t is in inttypes.h */ +#ifdef __osf__ +#define _OSF_SOURCE +#else - #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ + #define _XOPEN_SOURCE 600 +#endif /* __osf__ */ #include <string.h> diff --git a/graphics/netpbm/patches/patch-dd b/graphics/netpbm/patches/patch-dd index 1b9e8ef2048..aa8c0368f54 100644 --- a/graphics/netpbm/patches/patch-dd +++ b/graphics/netpbm/patches/patch-dd @@ -1,11 +1,11 @@ -$NetBSD: patch-dd,v 1.1 2006/11/03 07:45:19 rillig Exp $ +$NetBSD: patch-dd,v 1.1.30.1 2010/02/25 08:43:28 spz Exp $ ---- converter/other/cameratopam/cameratopam.c.orig Tue Oct 31 09:55:51 2006 -+++ converter/other/cameratopam/cameratopam.c Tue Oct 31 10:55:17 2006 -@@ -18,7 +18,11 @@ - */ - #include <time.h> +--- converter/other/cameratopam/cameratopam.c.orig 2006-08-19 03:12:28.000000000 +0000 ++++ converter/other/cameratopam/cameratopam.c +@@ -8,7 +8,11 @@ + + #define _BSD_SOURCE 1 /* Make sure string.h contains strcasecmp() */ +#ifdef __osf__ +#define _OSF_SOURCE +#else diff --git a/graphics/netpbm/patches/patch-ea b/graphics/netpbm/patches/patch-ea deleted file mode 100644 index 80032f0df9a..00000000000 --- a/graphics/netpbm/patches/patch-ea +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-ea,v 1.1 2009/07/18 03:04:41 smb Exp $ - ---- converter/ppm/xvminitoppm.c.orig 2009-07-17 22:51:05.000000000 -0400 -+++ converter/ppm/xvminitoppm.c 2009-07-17 22:51:42.000000000 -0400 -@@ -52,7 +52,7 @@ - - - static void --getline(FILE * const ifP, -+get_line(FILE * const ifP, - char * const buf, - size_t const size) { - -@@ -105,7 +105,7 @@ - int rc; - bool endOfComments; - -- getline(ifP, buf, sizeof(buf)); -+ get_line(ifP, buf, sizeof(buf)); - - if (!STRNEQ(buf, "P7 332", 6)) - pm_error("Input is not a XV thumbnail picture. It does not " -@@ -113,14 +113,14 @@ - - endOfComments = FALSE; - while (!endOfComments) { -- getline(ifP, buf, sizeof(buf)); -+ get_line(ifP, buf, sizeof(buf)); - if (STRNEQ(buf, "#END_OF_COMMENTS", 16)) - endOfComments = TRUE; - else if (STRNEQ(buf, "#BUILTIN", 8)) - pm_error("This program does not know how to " - "convert builtin XV thumbnail pictures"); - } -- getline(ifP, buf, sizeof(buf)); -+ get_line(ifP, buf, sizeof(buf)); - rc = sscanf(buf, "%u %u %u", &cols, &rows, &maxval); - if (rc != 3) - pm_error("error parsing dimension info '%s'. " diff --git a/graphics/netpbm/patches/patch-ec b/graphics/netpbm/patches/patch-ec new file mode 100644 index 00000000000..dd7c071f305 --- /dev/null +++ b/graphics/netpbm/patches/patch-ec @@ -0,0 +1,17 @@ +$NetBSD: patch-ec,v 1.1.2.2 2010/02/25 08:43:28 spz Exp $ + +--- lib/libsystem.c.orig 2009-12-29 20:46:34.000000000 +0000 ++++ lib/libsystem.c +@@ -223,8 +223,11 @@ signalName(unsigned int const signalClas + default: + return "???"; + } +- } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX) ++ } ++#if 0 ++ else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX) + return "SIGRTxxx"; ++#endif + else + return "???"; + } |