Date: Fri, 2 Jun 2000 17:37:48 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/18976: Update port: graphics/netpbm to 9.3 Message-ID: <20000603003748.6A4EC37B891@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 18976 >Category: ports >Synopsis: Update port: graphics/netpbm to 9.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jun 02 17:40:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.0-RELEASE i386 >Organization: >Environment: >Description: - Update to version 9.3 New file: patches/patch-bt files/manpages >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/netpbm/Makefile graphics/netpbm/Makefile --- /usr/ports/graphics/netpbm/Makefile Mon May 22 21:46:10 2000 +++ graphics/netpbm/Makefile Sat Jun 3 00:00:00 2000 @@ -6,7 +6,7 @@ # PORTNAME= netpbm -PORTVERSION= 9.2 +PORTVERSION= 9.3 CATEGORIES= graphics MASTER_SITES= http://download.sourceforge.net/netpbm/ EXTRACT_SUFX= .tgz @@ -14,49 +14,15 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.9:${PORTSDIR}/graphics/jpeg \ + png.3:${PORTSDIR}/graphics/png USE_GMAKE= yes MAKEFILE= GNUmakefile ALL_TARGET= merge -INSTALL_TARGET= install-merge +INSTALL_TARGET= install-merge install-dev -MAN1= anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 bmptoppm.1 \ - brushtopbm.1 cmuwmtopbm.1 eyuvtoppm.1 fitstopnm.1 fstopgm.1 g3topbm.1 \ - gemtopnm.1 giftopnm.1 gouldtoppm.1 hipstopgm.1 hpcdtoppm.1 \ - icontopbm.1 ilbmtoppm.1 imgtoppm.1 jpegtopnm.1 lispmtopgm.1 \ - macptopbm.1 mdatopbm.1 mgrtopbm.1 mtvtoppm.1 pbmclean.1 pbmlife.1 \ - pbmmake.1 pbmmask.1 pbmpscale.1 pbmpage.1 pbmreduce.1 pbmtext.1 \ - pbmto10x.1 pbmto4425.1 pbmtoascii.1 pbmtoatk.1 pbmtobbnbg.1 \ - pbmtocmuwm.1 pbmtoepsi.1 pbmtoepson.1 pbmtog3.1 pbmtogem.1 pbmtogo.1 \ - pbmtoicon.1 pbmtolj.1 pbmtoln03.1 pbmtolps.1 pbmtomacp.1 pbmtomda.1 \ - pbmtomgr.1 pbmtopgm.1 pbmtopi3.1 pbmtopk.1 pbmtoplot.1 pbmtoptx.1 \ - pbmtox10bm.1 pbmtoxbm.1 pbmtoybm.1 pbmtozinc.1 pbmupc.1 pcxtoppm.1 \ - pgmbentley.1 pgmcrater.1 pgmedge.1 pgmenhance.1 pgmhist.1 pgmkernel.1 \ - pgmnoise.1 pgmnorm.1 pgmoil.1 pgmramp.1 pgmtexture.1 pgmtofs.1 \ - pgmtolispm.1 pgmtopbm.1 pgmtoppm.1 pi1toppm.1 pi3topbm.1 picttoppm.1 \ - pjtoppm.1 pktopbm.1 pnmalias.1 pnmarith.1 pnmcat.1 pnmcomp.1 \ - pnmconvol.1 pnmcrop.1 pnmcut.1 pnmdepth.1 pnmenlarge.1 pnmfile.1 \ - pnmflip.1 pnmgamma.1 pnmhisteq.1 pnmhistmap.1 pnmindex.1 pnminterp.1 \ - pnminterp-gen.1 pnminvert.1 pnmmargin.1 pnmnlfilt.1 pnmpad.1 \ - pnmpaste.1 pnmrotate.1 pnmscale.1 pnmshear.1 pnmsmooth.1 pnmtile.1 \ - pnmtoddif.1 pnmtofits.1 pnmtoplainpnm.1 pnmtops.1 pnmtorast.1 \ - pnmtosgi.1 pnmtosir.1 pnmtotiff.1 pnmtotiffcmyk.1 pnmtoxwd.1 ppm3d.1 \ - ppmbrighten.1 ppmchange.1 ppmcie.1 ppmcolormask.1 ppmdim.1 ppmdist.1 \ - ppmdither.1 ppmfade.1 ppmflash.1 ppmforge.1 ppmhist.1 ppmlabel.1 \ - ppmmake.1 ppmmix.1 ppmnorm.1 ppmntsc.1 ppmpat.1 ppmquant.1 \ - ppmquantall.1 ppmqvga.1 ppmrelief.1 ppmshadow.1 ppmshift.1 \ - ppmspread.1 ppmtoacad.1 ppmtobmp.1 ppmtoeyuv.1 ppmtogif.1 ppmtoicr.1 \ - ppmtojpeg.1 ppmtoilbm.1 ppmtomap.1 ppmtomitsu.1 ppmtopcx.1 ppmtopgm.1 \ - ppmtopi1.1 ppmtopict.1 ppmtopj.1 ppmtopjxl.1 ppmtopuzz.1 ppmtorgb3.1 \ - ppmtosixel.1 ppmtotga.1 ppmtouil.1 ppmtoxpm.1 ppmtoyuv.1 \ - ppmtoyuvsplit.1 ppmtv.1 psidtopgm.1 pstopnm.1 qrttoppm.1 rasttopnm.1 \ - rawtopgm.1 rawtoppm.1 rgb3toppm.1 sbigtopgm.1 sgitopnm.1 sirtopnm.1 \ - sldtoppm.1 spctoppm.1 spottopgm.1 sputoppm.1 tgatoppm.1 tifftopnm.1 \ - xbmtopbm.1 ximtoppm.1 xpmtoppm.1 xvminitoppm.1 xwdtopnm.1 ybmtopbm.1 \ - yuvsplittoppm.1 yuvtoppm.1 zeisstopnm.1 -MAN3= libpbm.3 libpgm.3 libpnm.3 libppm.3 -MAN5= pbm.5 pgm.5 pnm.5 ppm.5 +.include "files/manpages" post-patch: @${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/pbmplus.h diff -urN /usr/ports/graphics/netpbm/files/manpages graphics/netpbm/files/manpages --- /usr/ports/graphics/netpbm/files/manpages Thu Jan 1 09:00:00 1970 +++ graphics/netpbm/files/manpages Sat Jun 3 00:00:00 2000 @@ -0,0 +1,208 @@ +MAN1+= anytopnm.1 +MAN1+= asciitopgm.1 +MAN1+= atktopbm.1 +MAN1+= bioradtopgm.1 +MAN1+= bmptoppm.1 +MAN1+= brushtopbm.1 +MAN1+= cmuwmtopbm.1 +MAN1+= eyuvtoppm.1 +MAN1+= fitstopnm.1 +MAN1+= fstopgm.1 +MAN1+= g3topbm.1 +MAN1+= gemtopnm.1 +MAN1+= giftopnm.1 +MAN1+= gouldtoppm.1 +MAN1+= hipstopgm.1 +MAN1+= hpcdtoppm.1 +MAN1+= icontopbm.1 +MAN1+= ilbmtoppm.1 +MAN1+= imgtoppm.1 +MAN1+= jpegtopnm.1 +MAN1+= leaftoppm.1 +MAN1+= lispmtopgm.1 +MAN1+= macptopbm.1 +MAN1+= mdatopbm.1 +MAN1+= mgrtopbm.1 +MAN1+= mtvtoppm.1 +MAN1+= pbmclean.1 +MAN1+= pbmlife.1 +MAN1+= pbmmake.1 +MAN1+= pbmmask.1 +MAN1+= pbmpage.1 +MAN1+= pbmpscale.1 +MAN1+= pbmreduce.1 +MAN1+= pbmtext.1 +MAN1+= pbmto10x.1 +MAN1+= pbmto4425.1 +MAN1+= pbmtoascii.1 +MAN1+= pbmtoatk.1 +MAN1+= pbmtobbnbg.1 +MAN1+= pbmtocmuwm.1 +MAN1+= pbmtoepsi.1 +MAN1+= pbmtoepson.1 +MAN1+= pbmtog3.1 +MAN1+= pbmtogem.1 +MAN1+= pbmtogo.1 +MAN1+= pbmtoicon.1 +MAN1+= pbmtolj.1 +MAN1+= pbmtoln03.1 +MAN1+= pbmtolps.1 +MAN1+= pbmtomacp.1 +MAN1+= pbmtomda.1 +MAN1+= pbmtomgr.1 +MAN1+= pbmtopgm.1 +MAN1+= pbmtopi3.1 +MAN1+= pbmtopk.1 +MAN1+= pbmtoplot.1 +MAN1+= pbmtoptx.1 +MAN1+= pbmtox10bm.1 +MAN1+= pbmtoxbm.1 +MAN1+= pbmtoybm.1 +MAN1+= pbmtozinc.1 +MAN1+= pbmupc.1 +MAN1+= pcxtoppm.1 +MAN1+= pgmbentley.1 +MAN1+= pgmcrater.1 +MAN1+= pgmedge.1 +MAN1+= pgmenhance.1 +MAN1+= pgmhist.1 +MAN1+= pgmkernel.1 +MAN1+= pgmnoise.1 +MAN1+= pgmnorm.1 +MAN1+= pgmoil.1 +MAN1+= pgmramp.1 +MAN1+= pgmslice.1 +MAN1+= pgmtexture.1 +MAN1+= pgmtofs.1 +MAN1+= pgmtolispm.1 +MAN1+= pgmtopbm.1 +MAN1+= pgmtoppm.1 +MAN1+= pi1toppm.1 +MAN1+= pi3topbm.1 +MAN1+= picttoppm.1 +MAN1+= pjtoppm.1 +MAN1+= pktopbm.1 +MAN1+= pngtopnm.1 +MAN1+= pnmalias.1 +MAN1+= pnmarith.1 +MAN1+= pnmcat.1 +MAN1+= pnmcomp.1 +MAN1+= pnmconvol.1 +MAN1+= pnmcrop.1 +MAN1+= pnmcut.1 +MAN1+= pnmdepth.1 +MAN1+= pnmenlarge.1 +MAN1+= pnmfile.1 +MAN1+= pnmflip.1 +MAN1+= pnmgamma.1 +MAN1+= pnmhisteq.1 +MAN1+= pnmhistmap.1 +MAN1+= pnmindex.1 +MAN1+= pnminterp-gen.1 +MAN1+= pnminterp.1 +MAN1+= pnminvert.1 +MAN1+= pnmmargin.1 +MAN1+= pnmnlfilt.1 +MAN1+= pnmpad.1 +MAN1+= pnmpaste.1 +MAN1+= pnmrotate.1 +MAN1+= pnmscale.1 +MAN1+= pnmshear.1 +MAN1+= pnmsmooth.1 +MAN1+= pnmtile.1 +MAN1+= pnmtoddif.1 +MAN1+= pnmtofits.1 +MAN1+= pnmtoplainpnm.1 +MAN1+= pnmtopng.1 +MAN1+= pnmtops.1 +MAN1+= pnmtorast.1 +MAN1+= pnmtosgi.1 +MAN1+= pnmtosir.1 +MAN1+= pnmtotiff.1 +MAN1+= pnmtotiffcmyk.1 +MAN1+= pnmtoxwd.1 +MAN1+= ppm3d.1 +MAN1+= ppmbrighten.1 +MAN1+= ppmchange.1 +MAN1+= ppmcie.1 +MAN1+= ppmcolormask.1 +MAN1+= ppmdim.1 +MAN1+= ppmdist.1 +MAN1+= ppmdither.1 +MAN1+= ppmfade.1 +MAN1+= ppmflash.1 +MAN1+= ppmforge.1 +MAN1+= ppmhist.1 +MAN1+= ppmlabel.1 +MAN1+= ppmmake.1 +MAN1+= ppmmix.1 +MAN1+= ppmnorm.1 +MAN1+= ppmntsc.1 +MAN1+= ppmpat.1 +MAN1+= ppmquant.1 +MAN1+= ppmquantall.1 +MAN1+= ppmqvga.1 +MAN1+= ppmrelief.1 +MAN1+= ppmshadow.1 +MAN1+= ppmshift.1 +MAN1+= ppmspread.1 +MAN1+= ppmtoacad.1 +MAN1+= ppmtobmp.1 +MAN1+= ppmtoeyuv.1 +MAN1+= ppmtogif.1 +MAN1+= ppmtoicr.1 +MAN1+= ppmtoilbm.1 +MAN1+= ppmtojpeg.1 +MAN1+= ppmtoleaf.1 +MAN1+= ppmtomap.1 +MAN1+= ppmtomitsu.1 +MAN1+= ppmtopcx.1 +MAN1+= ppmtopgm.1 +MAN1+= ppmtopi1.1 +MAN1+= ppmtopict.1 +MAN1+= ppmtopj.1 +MAN1+= ppmtopjxl.1 +MAN1+= ppmtopuzz.1 +MAN1+= ppmtorgb3.1 +MAN1+= ppmtosixel.1 +MAN1+= ppmtotga.1 +MAN1+= ppmtouil.1 +MAN1+= ppmtowinicon.1 +MAN1+= ppmtoxpm.1 +MAN1+= ppmtoyuv.1 +MAN1+= ppmtoyuvsplit.1 +MAN1+= ppmtv.1 +MAN1+= psidtopgm.1 +MAN1+= pstopnm.1 +MAN1+= qrttoppm.1 +MAN1+= rasttopnm.1 +MAN1+= rawtopgm.1 +MAN1+= rawtoppm.1 +MAN1+= rgb3toppm.1 +MAN1+= sbigtopgm.1 +MAN1+= sgitopnm.1 +MAN1+= sirtopnm.1 +MAN1+= sldtoppm.1 +MAN1+= spctoppm.1 +MAN1+= spottopgm.1 +MAN1+= sputoppm.1 +MAN1+= tgatoppm.1 +MAN1+= tifftopnm.1 +MAN1+= winicontoppm.1 +MAN1+= xbmtopbm.1 +MAN1+= ximtoppm.1 +MAN1+= xpmtoppm.1 +MAN1+= xvminitoppm.1 +MAN1+= xwdtopnm.1 +MAN1+= ybmtopbm.1 +MAN1+= yuvsplittoppm.1 +MAN1+= yuvtoppm.1 +MAN1+= zeisstopnm.1 +MAN3+= libpbm.3 +MAN3+= libpgm.3 +MAN3+= libpnm.3 +MAN3+= libppm.3 +MAN5+= pbm.5 +MAN5+= pgm.5 +MAN5+= pnm.5 +MAN5+= ppm.5 diff -urN /usr/ports/graphics/netpbm/files/md5 graphics/netpbm/files/md5 --- /usr/ports/graphics/netpbm/files/md5 Mon May 22 21:46:11 2000 +++ graphics/netpbm/files/md5 Sat Jun 3 00:00:00 2000 @@ -1 +1 @@ -MD5 (netpbm-9.2.tgz) = 11c7bcd42a4edca8f093e7996bf4dc97 +MD5 (netpbm-9.3.tgz) = bd50468014c62cdf5f1fdd48ffb9a10c diff -urN /usr/ports/graphics/netpbm/patches/patch-aj graphics/netpbm/patches/patch-aj --- /usr/ports/graphics/netpbm/patches/patch-aj Mon May 22 21:46:11 2000 +++ graphics/netpbm/patches/patch-aj Sat Jun 3 00:00:00 2000 @@ -1,16 +1,16 @@ ---- pbmplus.h.orig Mon May 8 05:00:47 2000 -+++ pbmplus.h Sat May 20 00:00:00 2000 -@@ -25,6 +25,9 @@ +--- pbmplus.h.orig Sat May 27 03:50:50 2000 ++++ pbmplus.h Sat Jun 3 00:00:00 2000 +@@ -18,6 +18,9 @@ + #include <stdio.h> #include <errno.h> - #endif - #endif + #include <sys/stat.h> +#if (defined(__unix__) || defined(unix)) && !defined(USG) +#include <sys/param.h> +#endif - #if defined(USG) || defined(SVR4) || defined(VMS) || defined(__SVR4) - #define SYSV -@@ -35,7 +38,7 @@ + #ifdef VMS + #include <perror.h> +@@ -32,7 +35,7 @@ ** and if you run on an Amiga, set AMIGA. If your compiler is ANSI C, you're ** probably better off setting SYSV - all it affects is string handling. */ @@ -19,7 +19,7 @@ /* #define SYSV */ /* #define MSDOS */ /* #define AMIGA */ -@@ -54,7 +57,7 @@ +@@ -51,7 +54,7 @@ #define RGB_DB1 "PBMplus_Dir:RGB.TXT" #define RGB_DB2 "PBMplus_Dir:RGB.TXT" #else @@ -28,10 +28,10 @@ #define RGB_DB2 "/usr/openwin/lib/rgb.txt" #endif -@@ -285,37 +288,6 @@ - int pm_writelittleshort ARGS(( FILE* out, short s )); - int pm_readlittlelong ARGS(( FILE* in, long* lP )); - int pm_writelittlelong ARGS(( FILE* out, long l )); +@@ -299,37 +302,6 @@ + PM_CHECK_BASIC + }; + - -/* By making this <> instead of "", we avoid making shhopt.h a dependency - of every program in the package when we do make dep. diff -urN /usr/ports/graphics/netpbm/patches/patch-ba graphics/netpbm/patches/patch-ba --- /usr/ports/graphics/netpbm/patches/patch-ba Mon May 22 21:46:11 2000 +++ graphics/netpbm/patches/patch-ba Sat Jun 3 00:00:00 2000 @@ -1,21 +1,10 @@ ---- GNUmakefile.orig Tue May 16 10:15:34 2000 -+++ GNUmakefile Sat May 20 00:00:00 2000 -@@ -68,8 +68,8 @@ - - - .PHONY: install --install: install.bin install.lib install.man --install-merge: install.merge install.lib install.man -+install: install.bin install.lib install.man install.dev -+install-merge: install.merge install.lib install.man install.dev - - .PHONY: merge - merge: compile.h +--- GNUmakefile.orig Thu May 25 02:00:10 2000 ++++ GNUmakefile Sat Jun 3 00:00:00 2000 @@ -79,21 +79,21 @@ .PHONY: install.bin install.bin: -- $(INSTALL) -d -mu=rwx,go=rx $(INSTALLBINARIES) +- mkinstalldirs $(INSTALLBINARIES) + -mkdir -p $(INSTALLBINARIES) for i in $(SUBDIRS) ; do \ ( echo install.bin.$$i ; cd $$i ; $(MAKE) install.bin ); \ @@ -23,7 +12,7 @@ .PHONY: install-merge install.merge: -- $(INSTALL) -d -mu=rwx,go=rx $(INSTALLBINARIES) +- mkinstalldirs $(INSTALLBINARIES) + -mkdir -p $(INSTALLBINARIES) for i in $(SUBDIRS) ; do \ ( echo install.merge.$$i ; cd $$i ; $(MAKE) install.merge ); \ @@ -31,7 +20,7 @@ .PHONY: install.lib install.lib: -- $(INSTALL) -d -mu=rwx,go=rx $(INSTALLLIBS) +- mkinstalldirs $(INSTALLLIBS) + -mkdir -p $(INSTALLLIBS) for i in $(SUBDIRS) ; do \ ( echo install.lib.$$i ; cd $$i ; $(MAKE) install.lib ); \ @@ -40,27 +29,28 @@ .PHONY: install.man install.man: -- $(INSTALL) -d -mu=rwx,go=rx \ +- mkinstalldirs \ + -mkdir -p \ $(INSTALLMANUALS1) $(INSTALLMANUALS3) $(INSTALLMANUALS5) for i in $(SUBDIRS) ; do \ ( echo install.man.$$i ; cd $$i ; $(MAKE) install.man ); \ -@@ -115,8 +115,8 @@ +@@ -115,9 +115,8 @@ .PHONY: install.hdr install.hdr: -- $(INSTALL) -d -mu=rwx,go=rx $(INSTALLHDRS) -- $(INSTALL) -m$(INSTALL_PERM_HDR) pbmplus.h $(INSTALLHDRS) +- mkinstalldirs $(INSTALLHDRS) +- $(INSTALL) -c -m$(INSTALL_PERM_HDR) pbmplus.h $(INSTALLHDRS) +- $(INSTALL) -c -m$(INSTALL_PERM_HDR) shhopt/shhopt.h $(INSTALLHDRS) + -mkdir -p $(INSTALLHDRS) + ${BSD_INSTALL_DATA} pbmplus.h $(INSTALLHDRS) for i in $(SUBDIRS) ; do \ ( echo install.hdr.$$i ; cd $$i ; $(MAKE) install.hdr ); \ done -@@ -127,7 +127,7 @@ +@@ -128,7 +127,7 @@ .PHONY: install.staticlib install.staticlib: -- $(INSTALL) -d -mu=rwx,go=rx $(INSTALLLIBS) +- mkinstalldirs $(INSTALLLIBS) + -mkdir -p $(INSTALLLIBS) for i in $(SUBDIRS) ; do \ (echo install.staticlib.$$i; cd $$i; $(MAKE) install.staticlib ); \ diff -urN /usr/ports/graphics/netpbm/patches/patch-bb graphics/netpbm/patches/patch-bb --- /usr/ports/graphics/netpbm/patches/patch-bb Mon May 22 21:46:12 2000 +++ graphics/netpbm/patches/patch-bb Sat Jun 3 00:00:00 2000 @@ -1,5 +1,5 @@ ---- Makefile.common.orig Tue May 16 10:14:14 2000 -+++ Makefile.common Sat May 20 00:00:00 2000 +--- Makefile.common.orig Fri Jun 2 02:38:14 2000 ++++ Makefile.common Sat Jun 3 00:00:00 2000 @@ -97,24 +97,20 @@ # BUILDING NETPBM LIBRARIES @@ -13,90 +13,88 @@ +SONAME = lib$(LIBROOT).so.$(SOVER) # The libxxx.so link is needed to link the executables. --lib$(LIBROOT).so: $(SONAME) -- rm -f $@ -- ln -s $< $@ + lib$(LIBROOT).so: $(SONAME) + rm -f $@ + ln -s $< $@ -# The $(SONAME) link is only needed to test the programs without -# installing the libraries (in that case, you also need to direct the -# dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH). -$(SONAME): lib$(LIBROOT).so.$(MAJ).$(MIN) -+lib$(LIBROOT).so: $(SONAME) lib$(LIBROOT).a - rm -f $@ +- rm -f $@ - ln -s $< $@ -lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) \ - $(LIBOPT) - $(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \ - `$(LIBOPT) $(LIBLIBS)` -lc -+ ln -sf $< $@ -+$(SONAME): $(LIBSOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) ++$(SONAME): $(LIBSOBJECTS) $(LIBOBJECTS_X) $(LIBLIBS) $(LIBOPT) lib$(LIBROOT).a + $(LD) $(LDSHLIB) -o $@ $(LIBSOBJECTS) $(LIBOBJECTS_X) \ + `$(LIBOPT) $(LIBLIBS)` # Static library. Unused by default, but with a small change to make files... lib$(LIBROOT).a: $(LIBOBJECTS) $(LIBOBJECTS_X) -@@ -129,15 +125,14 @@ +@@ -138,7 +134,7 @@ install.merge.common: $(MERGENAME) $(NOMERGEBINARIES) install.script cd $(INSTALLBINARIES) ; rm -f $(BINARIES) $(MERGE_ALIASES) ifneq ($(MERGENAME)x,x) -- $(INSTALL) -s -m$(INSTALL_PERM_BIN) $(MERGENAME) $(INSTALLBINARIES) +- $(INSTALL) -s -m $(INSTALL_PERM_BIN) $(MERGENAME) $(INSTALLBINARIES) + ${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES) cd $(INSTALLBINARIES) ; \ for i in $(MERGEBINARIES) $(MERGE_ALIASES) ; \ -- do ln -s $(MERGENAME)$(EXE) $$i ; \ -+ do ln -sf $(MERGENAME)$(EXE) $$i ; \ - done - endif - ifneq ($(NOMERGEBINARIES)x,x) -- $(INSTALL) -s -m$(INSTALL_PERM_BIN) \ -- $(NOMERGEBINARIES) $(INSTALLBINARIES) -+ ${BSD_INSTALL_PROGRAM} $(NOMERGEBINARIES) $(INSTALLBINARIES) + do ln -s $(MERGENAME)$(EXE) $$i ; \ +@@ -146,7 +142,7 @@ endif + for x in $(NOMERGEBINARIES); \ + do \ +- $(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $$x $(INSTALLBINARIES); \ ++ ${BSD_INSTALL_PROGRAM} $$x $(INSTALLBINARIES); \ + done # INSTALLING -@@ -146,12 +141,12 @@ - install.bin.common: $(BINARIES) install.script - # Note that on Cygwin, the executables are actually pbmmake.exe, etc. +@@ -157,7 +153,7 @@ # Make and Install know that pbmmake.exe counts as pbmmake. -- $(INSTALL) -s -m$(INSTALL_PERM_BIN) $(BINARIES) $(INSTALLBINARIES) -+ ${BSD_INSTALL_PROGRAM} $(BINARIES) $(INSTALLBINARIES) + for x in $(BINARIES); \ + do \ +- $(INSTALL) -c -s -m $(INSTALL_PERM_BIN) $$x $(INSTALLBINARIES); \ ++ ${BSD_INSTALL_PROGRAM} $$x $(INSTALLBINARIES); \ + done .PHONY: install.script - install.script: $(SCRIPTS) +@@ -165,7 +161,7 @@ ifneq ($(SCRIPTS)x,x) -- $(INSTALL) -m$(INSTALL_PERM_BIN) $(SCRIPTS) $(INSTALLSCRIPTS) -+ ${BSD_INSTALL_SCRIPT} $(SCRIPTS) $(INSTALLSCRIPTS) + for x in $(SCRIPTS); \ + do \ +- $(INSTALL) -c -m $(INSTALL_PERM_BIN) $$x $(INSTALLSCRIPTS); \ ++ ${BSD_INSTALL_SCRIPT} $$x $(INSTALLSCRIPTS); \ + done endif - .PHONY: install.man.common -@@ -181,8 +176,7 @@ - # compile programs that use the Netpbm libraries. Alternatively, you may - # prefer not to "install" them, but just to access the Netpbm source +@@ -198,7 +194,7 @@ # directory when you compile your programs. -- $(INSTALL) -m$(INSTALL_PERM_HDR) \ -- $(INTERFACE_HEADERS) $(INSTALLHDRS) -+ ${BSD_INSTALL_DATA} $(INTERFACE_HEADERS) $(INSTALLHDRS) + for x in $(INTERFACE_HEADERS); \ + do \ +- $(INSTALL) -c -m $(INSTALL_PERM_HDR) $$x $(INSTALLHDRS); \ ++ ${BSD_INSTALL_DATA} $$x $(INSTALLHDRS); \ + done # Install a static library - # -@@ -192,16 +186,15 @@ +@@ -209,16 +205,15 @@ # library, the dependency here will do that. .PHONY: install.staticlib install.staticlib: lib$(LIBROOT).a -- $(INSTALL) -m$(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$< -+ ${BSD_INSTALL_DATA} $< $(INSTALLLIBS) +- $(INSTALL) -c -m $(INSTALL_PERM_LIBS) $< $(INSTALLLIBS)/$< ++ ${BSD_INSTALL_DATA} $< $(INSTALLLIBS)/$< .PHONY: install.lib.common ifeq ($(NETPBMLIBSUFFIX),so) # install a shared library -install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN) - cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).* -- $(INSTALL) -m$(INSTALL_PERM_LIBD) $< $(INSTALLLIBS) -- cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so; ln -s $< lib$(LIBROOT).so -- cd $(INSTALLLIBS) ; rm -f $(SONAME); ln -s $< $(SONAME) +- $(INSTALL) -c -m $(INSTALL_PERM_LIBD) $< $(INSTALLLIBS) +install.lib.common: $(SONAME) + cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.* + ${BSD_INSTALL_DATA} $< $(INSTALLLIBS) -+ cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so; ln -sf $< lib$(LIBROOT).so + cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so; ln -s $< lib$(LIBROOT).so +- cd $(INSTALLLIBS) ; rm -f $(SONAME); ln -s $< $(SONAME) endif .PHONY: clean.common diff -urN /usr/ports/graphics/netpbm/patches/patch-bc graphics/netpbm/patches/patch-bc --- /usr/ports/graphics/netpbm/patches/patch-bc Mon May 22 21:46:13 2000 +++ graphics/netpbm/patches/patch-bc Sat Jun 3 00:00:00 2000 @@ -1,50 +1,44 @@ ---- Makefile.config.orig Tue May 9 09:32:59 2000 -+++ Makefile.config Sat May 20 00:00:00 2000 -@@ -38,12 +38,12 @@ - # The C compiler (including macro preprocessor) +--- Makefile.config.orig Fri Jun 2 02:17:32 2000 ++++ Makefile.config Sat Jun 3 00:00:00 2000 +@@ -39,7 +39,7 @@ + #Tru64: #CC = cc #CC = gcc --CC = gcc -fpcc-struct-return -+CC ?= gcc -fpcc-struct-return +-CC = gcc ++CC ?= gcc # The linker. - #LD = ld - #LD = cc --LD = gcc -+LD = ${CC} - - # Normally the man pages are installed using "install". But via this - # variable, you can use something else, for example a script that -@@ -51,7 +51,7 @@ + LD = $(CC) +@@ -53,7 +53,7 @@ + # calls compress or pack. Mantocat, included with Netpbm, is used on # systems which use man pages in the "cat" format. - #MANCP = $(SRCDIR)/mantocat --MANCP = $(INSTALL) -m$(INSTALL_PERM_MAN) +-MANCP = $(INSTALL) -m $(INSTALL_PERM_MAN) +MANCP = ${BSD_INSTALL_MAN} + #MANCP = $(SRCDIR)/mantocat # MAKE is set automatically by Make to what was used to invoke Make. - SHELL = /bin/sh -@@ -66,7 +66,7 @@ +@@ -73,7 +73,7 @@ + + # C compiler options - # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg. - #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG) -CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG) +CFLAGS += $(CDEBUG) + # On DEC Tru64 4.0F (at least), you need -DLONG_32 for ppmtompeg. + #Tru64: + #CFLAGS = -O2 -std1 DLONG_32 $(CDEBUG) +@@ -124,7 +124,7 @@ + # -fpic works, use it. If it bombs, go to fPIC). + # SunOS and NetBSD require this. - # EXE is a suffix that the linker puts on any executable it generates. - # In cygwin, this is .exe and most program deal with its existence without -@@ -113,7 +113,7 @@ - - #CFLAGS_SHLIB = -fpic - #CFLAGS_SHLIB = -fPIC -CFLAGS_SHLIB = +CFLAGS_SHLIB = -fPIC -DPIC + #CFLAGS_SHLIB = -fpic + #CFLAGS_SHLIB = -fPIC - # The netpbm package contains a version of the Tiff library, - # libtiff. If you want to use your own, fill in the appropriate paths -@@ -126,13 +126,13 @@ - # but otherwise will not. - +@@ -142,8 +142,8 @@ + TIFFHDR_DIR = $(SRCDIR)/libtiff + TIFFLIB_DIR = $(SRCDIR)/libtiff #NetBSD: -#TIFFHDR_DIR = $(LOCALBASE)/include -#TIFFLIB_DIR = $(LOCALBASE)/lib @@ -53,16 +47,14 @@ # OSF, Tru64: #TIFFHDR_DIR = /usr/local1/DEC/include #TIFFLIB_DIR = /usr/local1/DEC/lib --TIFFHDR_DIR = $(SRCDIR)/libtiff --TIFFLIB_DIR = $(SRCDIR)/libtiff -+#TIFFHDR_DIR = $(SRCDIR)/libtiff -+#TIFFLIB_DIR = $(SRCDIR)/libtiff - - # Put the location of your JPEG library here. - # If you want to build the jpeg converters or tiff -@@ -151,8 +151,8 @@ +@@ -164,11 +164,11 @@ + # at least JPEGLIB_DIR here, or the tiff converters will not build at # all. +-JPEGLIB_DIR = /usr/lib/jpeg +-JPEGHDR_DIR = /usr/include/jpeg ++#JPEGLIB_DIR = /usr/lib/jpeg ++#JPEGHDR_DIR = /usr/include/jpeg # Netbsd: -#JPEGLIB_DIR = ${LOCALBASE}/lib -#JPEGHDR_DIR = ${LOCALBASE}/include @@ -71,29 +63,32 @@ # OSF, Tru64: #JPEGLIB_DIR = /usr/local1/DEC/lib #JPEGHDR_DIR = /usr/local1/DEC/include -@@ -160,8 +160,8 @@ - #JPEGHDR_DIR = /usr/local/include - #JPEGLIB_DIR = NONE - #JPEGHDR_DIR = NONE --JPEGLIB_DIR = /usr/lib/jpeg --JPEGHDR_DIR = /usr/include/jpeg -+#JPEGLIB_DIR = /usr/lib/jpeg -+#JPEGHDR_DIR = /usr/include/jpeg - +@@ -186,11 +186,11 @@ + # here. If you do not have the PNG library, and still want to + # successully build everything else, put NONE for these. - # Put the location of your PNG library here. If you want to build the -@@ -180,10 +180,10 @@ - #PNGLIB_DIR = /usr/local/lib - #PNGHDR_DIR = /usr/local/include - # No PNG: --#PNGLIB_DIR = NONE --#PNGHDR_DIR = NONE -PNGLIB_DIR = /lib -PNGHDR_DIR = /usr/include/png -+PNGLIB_DIR = NONE -+PNGHDR_DIR = NONE +#PNGLIB_DIR = /lib +#PNGHDR_DIR = /usr/include/png - + # NetBSD: +-#PNGLIB_DIR = $(LOCALBASE)/lib +-#PNGHDR_DIR = $(LOCALBASE)/include ++PNGLIB_DIR = $(LOCALBASE)/lib ++PNGHDR_DIR = $(LOCALBASE)/include + # OSF/Tru64: + #PNGLIB_DIR = /usr/local1/DEC/lib + #PNGHDR_DIR = /usr/local1/DEC/include +@@ -204,8 +204,10 @@ # And the Utah Raster Toolkit (aka URT aka RLE) library: + +-URTHDR_DIR = $(SRCDIR)/urt +-URTLIB_DIR = $(SRCDIR)/urt ++#URTLIB_DIR = $(SRCDIR)/urt ++#URTHDR_DIR = $(SRCDIR)/urt ++URTLIB_DIR = NONE ++URTHDR_DIR = NONE + + # These are -l options to link in the network libraries. Often, these are + # built into the standard C library, so this can be null. If you don't diff -urN /usr/ports/graphics/netpbm/patches/patch-bd graphics/netpbm/patches/patch-bd --- /usr/ports/graphics/netpbm/patches/patch-bd Mon May 22 21:46:13 2000 +++ graphics/netpbm/patches/patch-bd Sat Jun 3 00:00:00 2000 @@ -1,5 +1,5 @@ ---- pbm/Makefile.orig Tue May 16 10:01:33 2000 -+++ pbm/Makefile Sat May 20 00:00:00 2000 +--- pbm/Makefile.orig Fri Jun 2 02:17:51 2000 ++++ pbm/Makefile Sat Jun 3 00:00:00 2000 @@ -4,13 +4,12 @@ include $(SRCDIR)/Makefile.config @@ -11,22 +11,25 @@ LIBROOT = pbm LIBPBM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) -MAJ = 9 --MIN = 2 +-MIN = 3 +SOVER = 1 LIBLIBS = NETPBMLIBS = $(LIBPBM) -@@ -37,8 +36,7 @@ +@@ -37,11 +36,10 @@ # Library objects to be built and linked by Makefile.common: LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o ++LIBSOBJECTS = $(patsubst %.o, %.so, $(LIBOBJECTS)) + ifneq (${VMS}x,x) + LIBOBJECTS += libpbmvms.o + endif -# Library objects to be linked but not built by Makefile.common: -LIBOBJECTS_X = $(SRCDIR)/shhopt/shhopt.o -+LIBSOBJECTS = libpbm1.so libpbm2.so libpbm3.so libpbm4.so libpbm5.so MANUALS1 = $(BINARIES) MANUALS3 = libpbm -@@ -50,26 +48,21 @@ +@@ -53,26 +51,21 @@ .PHONY: all all: $(BINARIES) @@ -53,7 +56,7 @@ include $(SRCDIR)/Makefile.common -@@ -77,13 +70,7 @@ +@@ -80,13 +73,7 @@ ../compile.h: $(MAKE) -C $(SRCDIR) compile.h diff -urN /usr/ports/graphics/netpbm/patches/patch-be graphics/netpbm/patches/patch-be --- /usr/ports/graphics/netpbm/patches/patch-be Mon May 22 21:46:13 2000 +++ graphics/netpbm/patches/patch-be Sat Jun 3 00:00:00 2000 @@ -1,11 +1,11 @@ ---- pgm/Makefile.orig Sat May 13 09:36:06 2000 -+++ pgm/Makefile Sat May 20 00:00:00 2000 +--- pgm/Makefile.orig Sat May 27 04:14:36 2000 ++++ pgm/Makefile Sat Jun 3 00:00:00 2000 @@ -3,14 +3,13 @@ LIBROOT = pgm LIBPGM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) -MAJ = 9 --MIN = 0 +-MIN = 3 +SOVER = 1 PBMDIR = $(SRCDIR)/pbm @@ -21,7 +21,7 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) LIBOBJECTS = libpgm1.o libpgm2.o -+LIBSOBJECTS = libpgm1.so libpgm2.so ++LIBSOBJECTS = $(patsubst %.o, %.so, $(LIBOBJECTS)) MANUALS1 = $(BINARIES) MANUALS3 = libpgm diff -urN /usr/ports/graphics/netpbm/patches/patch-bf graphics/netpbm/patches/patch-bf --- /usr/ports/graphics/netpbm/patches/patch-bf Mon May 22 21:46:13 2000 +++ graphics/netpbm/patches/patch-bf Sat Jun 3 00:00:00 2000 @@ -1,25 +1,42 @@ ---- pnm/Makefile.orig Tue May 16 10:29:36 2000 -+++ pnm/Makefile Sat May 20 00:00:00 2000 +--- pnm/Makefile.orig Sat May 27 04:14:52 2000 ++++ pnm/Makefile Sat Jun 3 00:00:00 2000 @@ -3,8 +3,7 @@ LIBROOT = pnm LIBPNM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) -MAJ = 9 --MIN = 0 +-MIN = 3 +SOVER = 1 PPMDIR = $(SRCDIR)/ppm LIBPPM = libppm.$(NETPBMLIBSUFFIX) -@@ -102,6 +101,8 @@ +@@ -61,14 +60,14 @@ + pnmsmooth pnmtile pnmtoddif pnmtofits \ + pnmtoplainpnm pnmtops pnmtorast \ + pnmtosgi pnmtosir pnmtoxwd \ +- rasttopnm sgitopnm sirtopnm xwdtopnm zeisstopnm ++ rasttopnm sgitopnm sirtopnm zeisstopnm + MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear + + # We don't include programs that have special library dependencies in the + # merge scheme, because we don't want those dependencies to prevent us + # from building all the other programs. + +-NOMERGEBINARIES = ++NOMERGEBINARIES = xwdtopnm + ifneq ($(PNGHDR_DIR),NONE) + ifneq ($(PNGLIB_DIR),NONE) + NOMERGEBINARIES += pnmtopng pngtopnm +@@ -105,6 +104,8 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o -+LIBSOBJECTS = libpnm1.so libpnm2.so libpnm3.so libpnm4.so ++LIBSOBJECTS = $(patsubst %.o, %.so, $(LIBOBJECTS)) +LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a MANUALS1 = $(BINARIES) $(SCRIPTS) MANUALS3 = libpnm -@@ -113,10 +114,8 @@ +@@ -116,10 +117,12 @@ .PHONY: all all: $(BINARIES) @@ -27,10 +44,14 @@ PHONY: merge merge: $(MERGENAME) $(NOMERGEBINARIES) - $(MAKE) -C jbig all ++ ++xwdtopnm: %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) ++ $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ ++ $(LIBSHHOPT) $(CDEBUG) ifeq ($(TIFFLIB_DIR),$(TIFFDIR)) # We're using the internal Tiff library, so make sure it's built -@@ -127,18 +126,18 @@ +@@ -130,18 +133,18 @@ endif # The Tiff library references math functions. @@ -52,9 +73,9 @@ - $(CDEBUG) + $(LIBSHHOPT) $(CDEBUG) - rletopnm pnmtorle: %: %.o $(NETPBMLIBS) $(LIBOPT) - $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ -@@ -165,22 +164,20 @@ + ifeq ($(URTLIB_DIR),$(URTDIR)) + # We're using the internal URT library, so make sure it's built +@@ -178,22 +181,20 @@ # backward compatibility: program used to be gemtopbm rm -f $(INSTALLBINARIES)/gemtopbm ln -s $(INSTALLBINARIES)/gemtopnm$(EXE) $(INSTALLBINARIES)/gemtopbm diff -urN /usr/ports/graphics/netpbm/patches/patch-bg graphics/netpbm/patches/patch-bg --- /usr/ports/graphics/netpbm/patches/patch-bg Mon May 22 21:46:13 2000 +++ graphics/netpbm/patches/patch-bg Sat Jun 3 00:00:00 2000 @@ -1,30 +1,30 @@ ---- ppm/Makefile.orig Tue May 16 10:30:30 2000 -+++ ppm/Makefile Sat May 20 00:00:00 2000 +--- ppm/Makefile.orig Fri Jun 2 01:22:16 2000 ++++ ppm/Makefile Sat Jun 3 00:00:00 2000 @@ -3,8 +3,7 @@ LIBROOT = ppm LIBPPM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) -MAJ = 9 --MIN = 1 +-MIN = 3 +SOVER = 1 PGMDIR = $(SRCDIR)/pgm LIBPGM = libpgm.$(NETPBMLIBSUFFIX) @@ -24,7 +23,7 @@ PORTBINARIES = bmptoppm eyuvtoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \ - mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \ + leaftoppm mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \ pjtoppm \ - ppm3d ppmbrighten ppmchange ppmcolormask \ + ppm3d ppmbrighten ppmchange \ ppmdim ppmdist ppmdither \ ppmflash ppmhist ppmmake ppmmix ppmnorm \ ppmquant ppmrelief ppmshift ppmspread ppmtoacad \ -@@ -34,12 +33,13 @@ - ppmtotga ppmtouil ppmtoxpm ppmtoyuv \ +@@ -35,12 +34,13 @@ + ppmtotga ppmtouil ppmtowinicon ppmtoxpm ppmtoyuv \ ppmtoyuvsplit ppmtv \ qrttoppm rawtoppm rgb3toppm sldtoppm spctoppm \ -- sputoppm tgatoppm ximtoppm xpmtoppm xvminitoppm \ -+ sputoppm xpmtoppm xvminitoppm \ +- sputoppm tgatoppm winicontoppm ximtoppm xpmtoppm xvminitoppm \ ++ sputoppm winicontoppm xpmtoppm xvminitoppm \ yuvtoppm yuvsplittoppm # We don't build vidtoppm by default, because it requires special libraries @@ -34,7 +34,7 @@ ifneq ($(JPEGLIB_DIR), NONE) ifneq ($(JPEGHDR_DIR), NONE) NOMERGEBINARIES += ppmtojpeg -@@ -48,7 +48,7 @@ +@@ -49,7 +49,7 @@ MERGEBINARIES = $(PORTBINARIES) $(MATHBINARIES) @@ -43,16 +43,16 @@ BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES) SCRIPTS = ppmquantall ppmshadow ppmfade -@@ -57,6 +57,8 @@ +@@ -58,6 +58,8 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o -+LIBSOBJECTS = libppm1.so libppm2.so libppm3.so libppm4.so libppm5.so bitio.so ++LIBSOBJECTS = $(patsubst %.o, %.so, $(LIBOBJECTS)) +LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a MANUALS1 = $(BINARIES) $(SCRIPTS) MANUALS3 = libppm -@@ -64,18 +66,24 @@ +@@ -65,18 +67,24 @@ MERGENAME= ppmmerge @@ -82,7 +82,7 @@ # And libraries. $(PBMDIR)/$(LIBPBM): FORCE -@@ -88,19 +96,19 @@ +@@ -89,19 +97,19 @@ .PHONY: install.merge install.merge: install.merge.common diff -urN /usr/ports/graphics/netpbm/patches/patch-bt graphics/netpbm/patches/patch-bt --- /usr/ports/graphics/netpbm/patches/patch-bt Thu Jan 1 09:00:00 1970 +++ graphics/netpbm/patches/patch-bt Sat Jun 3 00:00:00 2000 @@ -0,0 +1,27 @@ +--- pnm/xwdtopnm.c.orig Wed May 24 14:37:34 2000 ++++ pnm/xwdtopnm.c Sat Jun 3 00:00:00 2000 +@@ -879,13 +879,23 @@ + */ + unsigned int option_def_index; + ++ /* Create the OptStruct structure describing our options */ ++ #define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\ ++ option_def[option_def_index].shortName = (shortvalue); \ ++ option_def[option_def_index].longName = (longvalue); \ ++ option_def[option_def_index].type = (typevalue); \ ++ option_def[option_def_index].arg = (outputvalue); \ ++ option_def[option_def_index].flags = (flagvalue); \ ++ option_def_index++; \ ++ } + option_def_index = 0; /* incremented by OPTENTRY */ + OPTENTRY(0, "debug", OPT_FLAG, &cmdline_p->debug, 0); ++ option_def[option_def_index].type = OPT_END; + + /* Set the defaults */ + cmdline_p->debug = 0; + +- pm_optParseOptions(&argc, argv, option_def, 0); ++ optParseOptions(&argc, argv, option_def, 0); + /* Uses and sets argc, argv, and all of *cmdline_p. */ + + if (argc - 1 == 0) diff -urN /usr/ports/graphics/netpbm/pkg/PLIST graphics/netpbm/pkg/PLIST --- /usr/ports/graphics/netpbm/pkg/PLIST Fri Jun 2 19:13:06 2000 +++ graphics/netpbm/pkg/PLIST Sat Jun 3 00:00:00 2000 @@ -19,6 +19,7 @@ bin/ilbmtoppm bin/imgtoppm bin/jpegtopnm +bin/leaftoppm bin/lispmtopgm bin/macptopbm bin/mdatopbm @@ -73,6 +74,7 @@ bin/pgmnorm bin/pgmoil bin/pgmramp +bin/pgmslice bin/pgmtexture bin/pgmtofs bin/pgmtolispm @@ -83,6 +85,7 @@ bin/picttoppm bin/pjtoppm bin/pktopbm +bin/pngtopnm bin/pnmalias bin/pnmarith bin/pnmcat @@ -115,6 +118,7 @@ bin/pnmtoddif bin/pnmtofits bin/pnmtoplainpnm +bin/pnmtopng bin/pnmtops bin/pnmtorast bin/pnmtosgi @@ -155,6 +159,7 @@ bin/ppmtoicr bin/ppmtoilbm bin/ppmtojpeg +bin/ppmtoleaf bin/ppmtomap bin/ppmtomitsu bin/ppmtopcx @@ -168,6 +173,7 @@ bin/ppmtosixel bin/ppmtotga bin/ppmtouil +bin/ppmtowinicon bin/ppmtoxpm bin/ppmtoyuv bin/ppmtoyuvsplit @@ -188,6 +194,7 @@ bin/sputoppm bin/tgatoppm bin/tifftopnm +bin/winicontoppm bin/xbmtopbm bin/ximtoppm bin/xpmtoppm >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000603003748.6A4EC37B891>