diff options
author | tron <tron@pkgsrc.org> | 2003-03-18 12:11:55 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 2003-03-18 12:11:55 +0000 |
commit | 43dfa732c6fc1cc6deea7a011b8f0e53108d43bc (patch) | |
tree | 7975b0712cb7f9587282769f6fe80e522addff45 /graphics | |
parent | 38e4a2c5e482c9681170904d18fbe60e8c41fcd1 (diff) | |
download | pkgsrc-43dfa732c6fc1cc6deea7a011b8f0e53108d43bc.tar.gz |
Update "netpbm" package to latest stable version 10.11.6. Numerous bugs
have been fixed and a lot of features have been added since version 9.25.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/netpbm/Makefile | 36 | ||||
-rw-r--r-- | graphics/netpbm/PLIST | 518 | ||||
-rw-r--r-- | graphics/netpbm/buildlink2.mk | 23 | ||||
-rw-r--r-- | graphics/netpbm/distinfo | 12 | ||||
-rw-r--r-- | graphics/netpbm/patches/patch-aa | 137 | ||||
-rw-r--r-- | graphics/netpbm/patches/patch-ab | 15 | ||||
-rw-r--r-- | graphics/netpbm/patches/patch-ac | 6 | ||||
-rw-r--r-- | graphics/netpbm/patches/patch-ad | 21 |
8 files changed, 97 insertions, 671 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 6a38817f47b..92a52e221fb 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.66 2002/10/20 00:33:50 wiz Exp $ +# $NetBSD: Makefile,v 1.67 2003/03/18 12:11:55 tron Exp $ -DISTNAME= netpbm-9.25 +DISTNAME= netpbm-10.11.6 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=netpbm/} EXTRACT_SUFX= .tgz @@ -13,11 +13,14 @@ USE_BUILDLINK2= yes USE_GMAKE= yes USE_PERL5= yes -REPLACE_PERL= pnm/pnmquant ppm/ppmfade ppm/ppmrainbow ppm/ppmshadow - -INSTALL_TARGET= install-dev install -MAKE_ENV+= INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" +INSTALL_TARGET= install-dev install-run +MAKE_ENV+= INSTALL="${INSTALL}" STRIPFLAG="${_STRIPFLAG_INSTALL}" \ + pkgdir="${STAGEDIR}" MAKEFILE= GNUmakefile +PLIST_SRC= ${WRKDIR}/PLIST_STAGE +REPLACE_PERL= editor/ppmfade editor/ppmshadow editor/pnmquant \ + generator/ppmrainbow +STAGEDIR= ${WRKDIR}/staging .include "../../mk/bsd.prefs.mk" @@ -35,10 +38,27 @@ MAKE_ENV+= NETWORKLD="" pre-configure: ${CP} ${WRKSRC}/Makefile.config.in ${WRKSRC}/Makefile.config +pre-install: + ${RM} -rf ${STAGEDIR} + post-install: - ${INSTALL_DATA} ${WRKSRC}/shhopt/shhopt.h ${PREFIX}/include + cd ${STAGEDIR} && \ + ${MV} link/* lib && \ + ${RM} -rf link man/web && \ + ${MKDIR} share/doc/netpbm && \ + ${CP} ${WRKSRC}/doc/* share/doc/netpbm && \ + ${MV} share/doc/netpbm/*.1 man/man1 && \ + ${MV} misc share/netpbm && \ + ${CHOWN} -R ${BINOWN}:${BINGRP} . && \ + ${FIND} * \! -type d | ${SORT} >${PLIST_SRC} && \ + ${FIND} * -type d | \ + while read DIR; do \ + ${TEST} -d "${PREFIX}/$${DIR}" || \ + ${ECHO} "@dirrm $${DIR}"; \ + done >>${PLIST_SRC} && \ + ${GTAR} cf - * | ${GTAR} xpCf ${PREFIX} - && \ + ${RM} -fr ${STAGEDIR} .include "../../graphics/png/buildlink2.mk" .include "../../graphics/tiff/buildlink2.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/graphics/netpbm/PLIST b/graphics/netpbm/PLIST deleted file mode 100644 index e22a792daad..00000000000 --- a/graphics/netpbm/PLIST +++ /dev/null @@ -1,518 +0,0 @@ -@comment $NetBSD: PLIST,v 1.4 2002/04/09 06:33:10 jlam Exp $ -bin/411toppm -bin/anytopnm -bin/asciitopgm -bin/atktopbm -bin/bioradtopgm -bin/bmptopnm -bin/bmptoppm -bin/brushtopbm -bin/cmuwmtopbm -bin/eyuvtoppm -bin/fiascotopnm -bin/fitstopnm -bin/fstopgm -bin/g3topbm -bin/gemtopbm -bin/gemtopnm -bin/giftopnm -bin/gouldtoppm -bin/hipstopgm -bin/hpcdtoppm -bin/icontopbm -bin/ilbmtoppm -bin/imgtoppm -bin/jbigtopnm -bin/jpegtopnm -bin/leaftoppm -bin/lispmtopgm -bin/macptopbm -bin/mdatopbm -bin/mgrtopbm -bin/mtvtoppm -bin/neotoppm -bin/palmtopnm -bin/pamchannel -bin/pamcut -bin/pamdeinterlace -bin/pamdice -bin/pamfile -bin/pamoil -bin/pamstretch -bin/pamstretch-gen -bin/pamtopnm -bin/pbmclean -bin/pbmlife -bin/pbmmake -bin/pbmmask -bin/pbmpage -bin/pbmpscale -bin/pbmreduce -bin/pbmtext -bin/pbmto10x -bin/pbmto4425 -bin/pbmtoascii -bin/pbmtoatk -bin/pbmtobbnbg -bin/pbmtocmuwm -bin/pbmtoepsi -bin/pbmtoepson -bin/pbmtog3 -bin/pbmtogem -bin/pbmtogo -bin/pbmtoicon -bin/pbmtolj -bin/pbmtoln03 -bin/pbmtolps -bin/pbmtomacp -bin/pbmtomda -bin/pbmtomgr -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/pcdindex -bin/pcxtoppm -bin/pgmbentley -bin/pgmcrater -bin/pgmedge -bin/pgmenhance -bin/pgmhist -bin/pgmkernel -bin/pgmnoise -bin/pgmnorm -bin/pgmoil -bin/pgmramp -bin/pgmslice -bin/pgmtexture -bin/pgmtofs -bin/pgmtolispm -bin/pgmtopbm -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/pnmtile -bin/pnmtoddif -bin/pnmtofiasco -bin/pnmtofits -bin/pnmtojbig -bin/pnmtojpeg -bin/pnmtopalm -bin/pnmtoplainpnm -bin/pnmtopng -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/ppmdim -bin/ppmdist -bin/ppmdither -bin/ppmfade -bin/ppmflash -bin/ppmforge -bin/ppmhist -bin/ppmlabel -bin/ppmmake -bin/ppmmix -bin/ppmnorm -bin/ppmntsc -bin/ppmpat -bin/ppmquant -bin/ppmquantall -bin/ppmqvga -bin/ppmrainbow -bin/ppmrelief -bin/ppmshadow -bin/ppmshift -bin/ppmspread -bin/ppmtoacad -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/ppmtopuzz -bin/ppmtorgb3 -bin/ppmtosixel -bin/ppmtotga -bin/ppmtouil -bin/ppmtowinicon -bin/ppmtoxpm -bin/ppmtoyuv -bin/ppmtoyuvsplit -bin/ppmtv -bin/psidtopgm -bin/pstopnm -bin/qrttoppm -bin/rasttopnm -bin/rawtopgm -bin/rawtoppm -bin/rgb3toppm -bin/rletopnm -bin/sbigtopgm -bin/sgitopnm -bin/sirtopnm -bin/sldtoppm -bin/spctoppm -bin/spottopgm -bin/sputoppm -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/pam.h -include/pammap.h -include/pbm.h -include/pgm.h -include/pm.h -include/pm_config.h -include/pnm.h -include/ppm.h -include/ppmcmap.h -include/ppmfloyd.h -include/shhopt.h -lib/libpbm.a -lib/libpbm.so -lib/libpbm.so.9 -lib/libpbm.so.9.25 -lib/libpgm.a -lib/libpgm.so -lib/libpgm.so.9 -lib/libpgm.so.9.19 -lib/libpnm.a -lib/libpnm.so -lib/libpnm.so.9 -lib/libpnm.so.9.25 -lib/libppm.a -lib/libppm.so -lib/libppm.so.9 -lib/libppm.so.9.25 -lib/palmcolor8.map -lib/palmgray1.map -lib/palmgray2.map -lib/palmgray4.map -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/cmuwmtopbm.1 -man/man1/eyuvtoppm.1 -man/man1/fiascotopnm.1 -man/man1/fitstopnm.1 -man/man1/fstopgm.1 -man/man1/g3topbm.1 -man/man1/giftopnm.1 -man/man1/gouldtoppm.1 -man/man1/hipstopgm.1 -man/man1/hpcdtoppm.1 -man/man1/icontopbm.1 -man/man1/ilbmtoppm.1 -man/man1/imgtoppm.1 -man/man1/jbigtopnm.1 -man/man1/jpegtopnm.1 -man/man1/leaftoppm.1 -man/man1/lispmtopgm.1 -man/man1/macptopbm.1 -man/man1/mdatopbm.1 -man/man1/mgrtopbm.1 -man/man1/mtvtoppm.1 -man/man1/neotoppm.1 -man/man1/netpbm.1 -man/man1/palmtopnm.1 -man/man1/pamchannel.1 -man/man1/pamcut.1 -man/man1/pamdeinterlace.1 -man/man1/pamdice.1 -man/man1/pamfile.1 -man/man1/pamoil.1 -man/man1/pamstretch-gen.1 -man/man1/pamstretch.1 -man/man1/pamtopnm.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/pbmto10x.1 -man/man1/pbmto4425.1 -man/man1/pbmtoascii.1 -man/man1/pbmtoatk.1 -man/man1/pbmtobbnbg.1 -man/man1/pbmtocmuwm.1 -man/man1/pbmtoepsi.1 -man/man1/pbmtoepson.1 -man/man1/pbmtog3.1 -man/man1/pbmtogem.1 -man/man1/pbmtogo.1 -man/man1/pbmtoicon.1 -man/man1/pbmtolj.1 -man/man1/pbmtoln03.1 -man/man1/pbmtolps.1 -man/man1/pbmtomacp.1 -man/man1/pbmtomda.1 -man/man1/pbmtomgr.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/pcdindex.1 -man/man1/pcxtoppm.1 -man/man1/pgmbentley.1 -man/man1/pgmcrater.1 -man/man1/pgmedge.1 -man/man1/pgmenhance.1 -man/man1/pgmhist.1 -man/man1/pgmkernel.1 -man/man1/pgmnoise.1 -man/man1/pgmramp.1 -man/man1/pgmslice.1 -man/man1/pgmtexture.1 -man/man1/pgmtofs.1 -man/man1/pgmtolispm.1 -man/man1/pgmtopbm.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/pnmarith.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/pnmdepth.1 -man/man1/pnmenlarge.1 -man/man1/pnmfile.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/pnmsplit.1 -man/man1/pnmtile.1 -man/man1/pnmtoddif.1 -man/man1/pnmtofiasco.1 -man/man1/pnmtofits.1 -man/man1/pnmtojbig.1 -man/man1/pnmtojpeg.1 -man/man1/pnmtopalm.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/pnmtotiff.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/ppmdim.1 -man/man1/ppmdist.1 -man/man1/ppmdither.1 -man/man1/ppmfade.1 -man/man1/ppmflash.1 -man/man1/ppmforge.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/ppmqvga.1 -man/man1/ppmrainbow.1 -man/man1/ppmrelief.1 -man/man1/ppmshadow.1 -man/man1/ppmshift.1 -man/man1/ppmspread.1 -man/man1/ppmtoacad.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/ppmtopuzz.1 -man/man1/ppmtorgb3.1 -man/man1/ppmtosixel.1 -man/man1/ppmtotga.1 -man/man1/ppmtouil.1 -man/man1/ppmtowinicon.1 -man/man1/ppmtoxpm.1 -man/man1/ppmtoyuv.1 -man/man1/ppmtoyuvsplit.1 -man/man1/ppmtv.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/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/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/libpbm.3 -man/man3/libpgm.3 -man/man3/libpnm.3 -man/man3/libppm.3 -man/man5/pam.5 -man/man5/pbm.5 -man/man5/pgm.5 -man/man5/pnm.5 -man/man5/ppm.5 diff --git a/graphics/netpbm/buildlink2.mk b/graphics/netpbm/buildlink2.mk index 718e11fd6a5..ad94096913b 100644 --- a/graphics/netpbm/buildlink2.mk +++ b/graphics/netpbm/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2002/09/23 23:08:08 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2003/03/18 12:11:56 tron Exp $ .if !defined(NETPBM_BUILDLINK2_MK) NETPBM_BUILDLINK2_MK= # defined @@ -10,9 +10,12 @@ BUILDLINK_PKGSRCDIR.netpbm?= ../../graphics/netpbm EVAL_PREFIX+= BUILDLINK_PREFIX.netpbm=netpbm BUILDLINK_PREFIX.netpbm_DEFAULT= ${LOCALBASE} BUILDLINK_FILES.netpbm= include/bitio.h +BUILDLINK_FILES.netpbm+= include/colorname.h +BUILDLINK_FILES.netpbm+= include/nstring.h BUILDLINK_FILES.netpbm+= include/pam.h BUILDLINK_FILES.netpbm+= include/pammap.h BUILDLINK_FILES.netpbm+= include/pbm.h +BUILDLINK_FILES.netpbm+= include/pbmfont.h BUILDLINK_FILES.netpbm+= include/pgm.h BUILDLINK_FILES.netpbm+= include/pm.h BUILDLINK_FILES.netpbm+= include/pm_config.h @@ -21,13 +24,21 @@ BUILDLINK_FILES.netpbm+= include/ppm.h BUILDLINK_FILES.netpbm+= include/ppmcmap.h BUILDLINK_FILES.netpbm+= include/ppmfloyd.h BUILDLINK_FILES.netpbm+= include/shhopt.h -BUILDLINK_FILES.netpbm+= lib/libpbm.* -BUILDLINK_FILES.netpbm+= lib/libpgm.* -BUILDLINK_FILES.netpbm+= lib/libpnm.* -BUILDLINK_FILES.netpbm+= lib/libppm.* +BUILDLINK_FILES.netpbm+= lib/libnetpbm.* -BUILDLINK_TARGETS+= netpbm-buildlink +.include "../../graphics/tiff/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" + +BUILDLINK_TARGETS+= netpbm-buildlink netpbm-buildlink-lib netpbm-buildlink: _BUILDLINK_USE +netpbm-buildlink-lib: + ${_PKG_SILENT}${_PKG_DEBUG} \ + cd ${BUILDLINK_DIR}/lib; \ + for _NETPBM_LIB in pbm pgm pnm ppm; do \ + ${LN} -fs libnetpbm.a lib$${_NETPBM_LIB}.a; \ + ${LN} -fs libnetpbm.so.*.* lib$${_NETPBM_LIB}.so; \ + done + .endif # NETPBM_BUILDLINK2_MK diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 354184a5525..42fe69a9f0b 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.11 2002/08/25 18:39:19 jlam Exp $ +$NetBSD: distinfo,v 1.12 2003/03/18 12:11:56 tron Exp $ -SHA1 (netpbm-9.25.tgz) = 9c7f6a98348a5f3d6e908b514f33498b2a9c359a -Size (netpbm-9.25.tgz) = 2052922 bytes -SHA1 (patch-aa) = 0d505e205eb200653735a6bbc13cabac88c87df2 -SHA1 (patch-ab) = b6932fd52dff9a6acd01e42136ff7a70561c7434 -SHA1 (patch-ac) = 42a6dbfe24447132c6dd654512607c0c9c4a5699 -SHA1 (patch-ad) = 354059e1fe894b3776afe3d565fdaefb90941690 +SHA1 (netpbm-10.11.6.tgz) = acda105f98695998659e519255e3b366fbb6121b +Size (netpbm-10.11.6.tgz) = 1910873 bytes +SHA1 (patch-aa) = f1f305a3a5b3297ebc881e6135f3db064c59782e +SHA1 (patch-ac) = cd8bb4318828a9872cce2793635c4bc51272d199 diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa index b32096a4b50..5cbdb8da5e2 100644 --- a/graphics/netpbm/patches/patch-aa +++ b/graphics/netpbm/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.20 2002/08/25 18:39:19 jlam Exp $ +$NetBSD: patch-aa,v 1.21 2003/03/18 12:11:57 tron Exp $ ---- Makefile.config.in.orig Thu Mar 14 16:25:54 2002 -+++ Makefile.config.in Tue May 14 19:52:32 2002 +--- Makefile.config.in.orig 2002-10-15 19:17:21.000000000 +0200 ++++ Makefile.config.in 2003-03-18 10:44:40.000000000 +0100 @@ -33,7 +33,7 @@ - #Tru64 (= Digital Unix): - #CC = cc #CC = gcc --CC = gcc -+#CC = gcc + # Note that 'cc' is usually an alias for whatever is the main compiler + # on a system, e.g. the GNU Compiler on Linux. +-CC = cc ++#CC = cc # The linker. LD = $(CC) @@ -29,59 +29,27 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:39:19 jlam Exp $ # If you don't want to strip the binaries, just leave it null: #STRIPFLAG = -@@ -137,10 +137,10 @@ - # the directory information in the executable at link time. - +@@ -131,7 +131,7 @@ # Solaris, SunOS, NetBSD: --NEED_RUNTIME_PATH = N --#NEED_RUNTIME_PATH = Y -+#NEED_RUNTIME_PATH = N -+NEED_RUNTIME_PATH = Y + #NEED_RUNTIME_PATH = Y -LDFLAGS = +#LDFLAGS = # Eunice users may want to use -noshare so that the executables can # run standalone: #LDFLAGS = -noshare -@@ -156,16 +156,16 @@ - - ifeq ($(NEED_RUNTIME_PATH),Y) - #If the linker is gcc (e.g. NetBSD): --#LDFLAGS += -Wl,--rpath,$(INSTALLLIBS) -+LDFLAGS += -Wl,-R$(INSTALLLIBS) - #Any other linker: --LDFLAGS += -R$(INSTALLLIBS) -+#LDFLAGS += -R$(INSTALLLIBS) - endif - - # Linker options for created Netpbm shared libraries. - - # Here, $(SONAME) resolves to the soname for the shared library being created. - # The following are gcc options. This works on GNU libc systems. --LDSHLIB = -shared -Wl,-soname,$(SONAME) -+LDSHLIB = -nostdlib -shared -Wl,-Bshareable,-soname,$(SONAME) - # 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. -@@ -180,11 +180,15 @@ - #Tru64: - #LDSHLIB = -shared -expect_unresolved "*" +@@ -171,6 +171,10 @@ + #AIX: + #LDSHLIB = ??? +ifeq ($(OPSYS),SunOS) +LDSHLIB = -Wl,-B,dynamic,-G,-h,$(SONAME) +endif + - ifeq ($(NEED_RUNTIME_PATH),Y) - #If the linker is gcc (e.g. NetBSD): --#LDSHLIB += -Wl,--rpath,$(INSTALLLIBS) -+LDSHLIB += -Wl,-R$(INSTALLLIBS) - #Any other linker: --LDSHLIB += -R$(INSTALLLIBS) -+#LDSHLIB += -R$(INSTALLLIBS) - endif - # On older systems, you have to make shared libraries out of position -@@ -204,7 +208,7 @@ + # independent code, so you need -fpic or fPIC here. (The rule is: if + # -fpic works, use it. If it bombs, go to fPIC). On newer systems, +@@ -188,7 +192,7 @@ CFLAGS_SHLIB = # Solaris or SunOS with gcc, and NetBSD: #CFLAGS_SHLIB = -fpic @@ -90,55 +58,40 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:39:19 jlam Exp $ # Sun compiler: #CFLAGS_SHLIB = -Kpic #CFLAGS_SHLIB = -KPIC -@@ -222,11 +226,11 @@ - # The TIFF library. See above. If you want to build the tiff - # converters, you must have the tiff library already installed. - --TIFFLIB_DIR = /usr/lib --TIFFHDR_DIR = /usr/include/libtiff -+#TIFFLIB_DIR = /usr/lib -+#TIFFHDR_DIR = /usr/include/libtiff +@@ -244,8 +248,8 @@ + #TIFFLIB = libtiff.so + #TIFFHDR_DIR = /usr/include/libtiff #NetBSD: --#TIFFLIB_DIR = $(LOCALBASE)/lib +-#TIFFLIB = $(LOCALBASE)/lib/libtiff.so -#TIFFHDR_DIR = $(LOCALBASE)/include -+TIFFLIB_DIR = $(BUILDLINK_DIR)/lib ++TIFFLIB = $(BUILDLINK_DIR)/lib/libtiff.so +TIFFHDR_DIR = $(BUILDLINK_DIR)/include # OSF, Tru64: - #TIFFLIB_DIR = /usr/local1/DEC/lib + #TIFFLIB = /usr/local1/DEC/lib/libtiff.so #TIFFHDR_DIR = /usr/local1/DEC/include -@@ -250,11 +254,11 @@ - # JPEG stuff statically linked in, in which case you won't need - # JPEGLIB_DIR in order to build the Tiff converters. - --JPEGLIB_DIR = /usr/lib --JPEGHDR_DIR = /usr/include/jpeg -+#JPEGLIB_DIR = /usr/lib -+#JPEGHDR_DIR = /usr/include/jpeg +@@ -273,8 +277,8 @@ + #JPEGLIB = libjpeg.so + #JPEGHDR_DIR = /usr/include/jpeg # Netbsd: --#JPEGLIB_DIR = ${LOCALBASE}/lib +-#JPEGLIB = ${LOCALBASE}/lib/libjpeg.so -#JPEGHDR_DIR = ${LOCALBASE}/include -+JPEGLIB_DIR = ${LOCALBASE}/lib -+JPEGHDR_DIR = ${LOCALBASE}/include ++JPEGLIB = ${BUILDLINK_DIR}/lib/libjpeg.so ++JPEGHDR_DIR = ${BUILDLINK_DIR}/include # OSF, Tru64: - #JPEGLIB_DIR = /usr/local1/DEC/lib + #JPEGLIB = /usr/local1/DEC/libjpeg.so #JPEGHDR_DIR = /usr/local1/DEC/include -@@ -269,11 +273,11 @@ - # The PNG library. See above. If you want to build the PNG - # converters you must have the PNG library already installed. - --PNGLIB_DIR = /usr/lib --PNGHDR_DIR = /usr/include/png -+#PNGLIB_DIR = /usr/lib -+#PNGHDR_DIR = /usr/include/png +@@ -297,8 +301,8 @@ + #PNGLIB = libpng$(PNGVER).so + #PNGHDR_DIR = /usr/include/libpng$(PNGVER) # NetBSD: --#PNGLIB_DIR = $(LOCALBASE)/lib +-#PNGLIB = $(LOCALBASE)/lib/libpng$(PNGVER).so -#PNGHDR_DIR = $(LOCALBASE)/include -+PNGLIB_DIR = $(LOCALBASE)/lib -+PNGHDR_DIR = $(LOCALBASE)/include ++PNGLIB = $(BUILDLINK_DIR)/lib/libpng$(PNGVER).so ++PNGHDR_DIR = $(BUILDLINK_DIR)/include # OSF/Tru64: - #PNGLIB_DIR = /usr/local1/DEC/lib + #PNGLIB = /usr/local1/DEC/lib/libpng$(PNGVER).so #PNGHDR_DIR = /usr/local1/DEC/include -@@ -317,7 +321,7 @@ +@@ -337,7 +341,7 @@ # network functions is the option in ppmtompeg to run it on multiple # computers simultaneously. @@ -146,13 +99,11 @@ $NetBSD: patch-aa,v 1.20 2002/08/25 18:39:19 jlam Exp $ +#NETWORKLD = # Solaris, SunOS: #NETWORKLD = -lsocket -lnsl - # Don't build network functions: -@@ -364,7 +368,7 @@ - #INSTALL_PREFIX = /djgpp - # Typical: - #INSTALL_PREFIX = /usr/local/ --INSTALL_PREFIX = /usr/local/netpbm -+INSTALL_PREFIX = ${PREFIX} - - # Specify the directory where you want the executables. - # If you need scripts and binaries to be in different directories, you + # SCO: +@@ -450,4 +454,4 @@ + #NETPBM_DOCURL = file:/usr/doc/netpbm/ + + # This is where everything goes when you do 'make package': +-PKGDIR = /tmp/netpbm +\ No newline at end of file ++PKGDIR = /tmp/netpbm diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab deleted file mode 100644 index 0af35ac333c..00000000000 --- a/graphics/netpbm/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.11 2002/05/06 11:46:22 tron Exp $ - ---- GNUmakefile.orig Sun Mar 3 18:19:06 2002 -+++ GNUmakefile Mon Apr 29 17:21:21 2002 -@@ -139,7 +139,9 @@ - for i in $(SUBDIRS) ; do \ - $(MAKE) -C $$i -f $(SRCDIR)/$$i/Makefile install.lib ; \ - done -- $(SRCDIR)/buildtools/try_ldconfig -+ # this script is badly broken and it's not needed at all. -+ # someone should realize that sh is not bash.. -+ # $(SRCDIR)/buildtools/try_ldconfig - endif - - diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac index 3f140d98452..6f688709b92 100644 --- a/graphics/netpbm/patches/patch-ac +++ b/graphics/netpbm/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.12 2002/08/25 18:39:19 jlam Exp $ +$NetBSD: patch-ac,v 1.13 2003/03/18 12:11:57 tron Exp $ ---- ppm/ppmtompeg/param.c-orig Fri Aug 31 16:49:01 2001 -+++ ppm/ppmtompeg/param.c Sat Mar 23 19:20:02 2002 +--- converter/ppm/ppmtompeg/param.c-orig Fri Aug 31 16:49:01 2001 ++++ converter/ppm/ppmtompeg/param.c Sat Mar 23 19:20:02 2002 @@ -11,13 +11,6 @@ /* COPYRIGHT INFORMATION IS AT THE END OF THIS FILE */ diff --git a/graphics/netpbm/patches/patch-ad b/graphics/netpbm/patches/patch-ad deleted file mode 100644 index 431d5fe946d..00000000000 --- a/graphics/netpbm/patches/patch-ad +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ad,v 1.11 2002/08/25 18:39:20 jlam Exp $ ---- Makefile.common.orig Tue Jul 2 02:28:12 2002 -+++ Makefile.common Tue Jul 2 02:28:33 2002 -@@ -199,7 +199,7 @@ - lib$(LIBROOT).$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): \ - $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) - $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ -- `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG) -+ `$(LIBOPT) $(LIBLIBS)` $(CDEBUG) - endif - - ifeq ($(NETPBMLIBTYPE),dll) -@@ -223,7 +223,7 @@ - lib$(LIBROOT).$(MAJ).$(MIN).dylib: $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) \ - $(LIBOPT) - $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ -- `$(LIBOPT) $(LIBLIBS)` -lc $(CDEBUG) -+ `$(LIBOPT) $(LIBLIBS)` $(CDEBUG) - endif - - #-------------------------------------------------------------------------- |