mirror of
https://git.FreeBSD.org/ports.git
synced 2024-10-18 19:49:40 +00:00
- Fix compile error
- Fix typo in man page I've left the dependency since libjpeg is explictly used by this port. PR: 17851 Submitted by: tkato@prontomail.ne.jp
This commit is contained in:
parent
264246c263
commit
a7edfc5fa5
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=27409
@ -23,44 +23,46 @@ ALL_TARGET= merge
|
||||
INSTALL_TARGET= install-merge
|
||||
|
||||
MAN1= anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 bmptoppm.1 \
|
||||
brushtopbm.1 cmuwmtopbm.1 fitstopnm.1 fstopgm.1 g3topbm.1 gemtopbm.1 \
|
||||
giftopnm.1 gouldtoppm.1 hipstopgm.1 hpcdtoppm.1 icontopbm.1 \
|
||||
ilbmtoppm.1 imgtoppm.1 jpegtopnm.1 lispmtopgm.1 macptopbm.1 \
|
||||
mgrtopbm.1 mtvtoppm.1 pbmclean.1 pbmlife.1 pbmmake.1 pbmmask.1 \
|
||||
pbmpscale.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 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 pngtopnm.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 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 pnmtopng.1 pnmtops.1 \
|
||||
pnmtorast.1 pnmtosgi.1 pnmtosir.1 pnmtotiff.1 pnmtotiffcmyk.1 \
|
||||
pnmtoxwd.1 ppm3d.1 ppmbrighten.1 ppmchange.1 ppmcie.1 ppmdim.1 \
|
||||
ppmdist.1 ppmdither.1 ppmflash.1 ppmforge.1 ppmhist.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 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 psidtopgm.1 \
|
||||
pstopnm.1 qrttoppm.1 rasttopnm.1 rawtopgm.1 rawtoppm.1 rgb3toppm.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 \
|
||||
sbigtopgm.1 eyuvtoppm.1 ppmtoeyuv.1 ppmlabel.1 ppmfade.1
|
||||
brushtopbm.1 cmuwmtopbm.1 eyuvtoppm.1 fitstopnm.1 fstopgm.1 g3topbm.1 \
|
||||
gemtopbm.1 giftopnm.1 gouldtoppm.1 hipstopgm.1 hpcdtoppm.1 \
|
||||
icontopbm.1 ilbmtoppm.1 imgtoppm.1 jpegtopnm.1 lispmtopgm.1 \
|
||||
macptopbm.1 mgrtopbm.1 mtvtoppm.1 pbmclean.1 pbmlife.1 pbmmake.1 \
|
||||
pbmmask.1 pbmpscale.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 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 pngtopnm.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 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 \
|
||||
pnmtopng.1 pnmtops.1 pnmtorast.1 pnmtosgi.1 pnmtosir.1 pnmtotiff.1 \
|
||||
pnmtotiffcmyk.1 pnmtoxwd.1 ppm3d.1 ppmbrighten.1 ppmchange.1 ppmcie.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 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
|
||||
|
||||
post-extract:
|
||||
@find ${WRKSRC} -name Makefile.depend -delete
|
||||
|
||||
post-patch:
|
||||
@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/pbmplus.h
|
||||
@cd ${WRKSRC}; find * -name "Makefile.depend" -delete
|
||||
|
||||
post-install:
|
||||
${LDCONFIG} -m ${PREFIX}/lib
|
||||
|
@ -1,5 +1,14 @@
|
||||
--- Makefile.common.orig Sat Mar 25 02:46:12 2000
|
||||
+++ Makefile.common Sat Apr 1 12:00:00 2000
|
||||
--- Makefile.common.orig Tue Apr 4 04:54:35 2000
|
||||
+++ Makefile.common Sat Apr 8 12:00:00 2000
|
||||
@@ -47,7 +47,7 @@
|
||||
$(CC) $(CFLAGS) -Wno-implicit -c -o $@ $<
|
||||
|
||||
$(MERGENAME): $(MERGENAME).o $(MERGE_OBJECTS) $(NETPBMLIBS)
|
||||
- $(LD) $(LDFLAGS) -o $@ $< $(MERGE_OBJECTS) -lm $(NETPBMLIBS)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $< $(MERGE_OBJECTS) -lm $(NETPBMLD)
|
||||
|
||||
# Before Netpbm 8.4, we did hard links instead of symbolic. A user
|
||||
# requested symbolic, and I couldn't see a reason for hard (original reason
|
||||
@@ -56,31 +56,27 @@
|
||||
install.merge: $(MERGENAME) $(NOMERGEBINARIES) install.script
|
||||
cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
|
||||
@ -37,7 +46,7 @@
|
||||
endif
|
||||
|
||||
.PHONY: install.man
|
||||
@@ -111,13 +107,13 @@
|
||||
@@ -111,13 +107,12 @@
|
||||
# prefer not to "install" them, but just to access the Netpbm source
|
||||
# directory when you compile your programs.
|
||||
cd $(INSTALLHDRS) ; rm -f $(INTERFACE_HEADERS)
|
||||
@ -47,16 +56,16 @@
|
||||
-lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ).$(MIN)
|
||||
- ln -sf lib$(LIBROOT).so.$(MAJ).$(MIN) $@
|
||||
-lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBLIBS)
|
||||
+lib$(LIBROOT).so: lib$(LIBROOT).a lib$(LIBROOT).so.$(MAJ)
|
||||
+ ln -sf lib$(LIBROOT).so.$(MAJ) $@
|
||||
+lib$(LIBROOT).so.$(MAJ): $(LIBSOBJECTS) $(LIBLIBS)
|
||||
$(LD) $(LDSHLIB) -Wl,-soname,lib$(LIBROOT).so.$(MAJ) -o $@ \
|
||||
- $(LD) $(LDSHLIB) -Wl,-soname,lib$(LIBROOT).so.$(MAJ) -o $@ \
|
||||
- $(LIBOBJECTS) $(LIBLIBS) -lc
|
||||
+ $(LIBSOBJECTS) $(LIBLIBS)
|
||||
+lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ)
|
||||
+ ln -sf lib$(LIBROOT).so.$(MAJ) $@
|
||||
+lib$(LIBROOT).so.$(MAJ): lib$(LIBROOT).a $(LIBSOBJECTS) $(LIBLIBS)
|
||||
+ $(LD) $(LDSHLIB) -Wl,-soname,$@ -o $@ $(LIBSOBJECTS) $(LIBLIBS)
|
||||
|
||||
lib$(LIBROOT).a: $(LIBOBJECTS)
|
||||
-rm -f $@
|
||||
@@ -126,11 +122,11 @@
|
||||
@@ -126,11 +121,11 @@
|
||||
|
||||
|
||||
.PHONY: install.lib.common
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- pnm/Makefile.orig Sat Mar 25 02:27:50 2000
|
||||
+++ pnm/Makefile Sat Apr 1 12:00:00 2000
|
||||
--- pnm/Makefile.orig Tue Apr 4 04:38:37 2000
|
||||
+++ pnm/Makefile Sat Apr 8 12:00:00 2000
|
||||
@@ -32,6 +32,8 @@
|
||||
|
||||
NETPBMLIBS = $(LIBPNM) \
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
MANUALS1 = $(BINARIES) $(SCRIPTS)
|
||||
MANUALS3 = libpnm
|
||||
@@ -104,44 +107,48 @@
|
||||
@@ -104,44 +107,47 @@
|
||||
merge: $(MERGENAME) $(NOMERGEBINARIES)
|
||||
|
||||
tifftopnm pnmtotiff: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so
|
||||
@ -47,8 +47,7 @@
|
||||
|
||||
jpegtopnm: %: %.o $(NETPBMLIBS)
|
||||
- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(JPEGLD) -lm $(CDEBUG)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(JPEGLD) -lm \
|
||||
+ $(CDEBUG)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(JPEGLD) -lm $(CDEBUG)
|
||||
|
||||
# Rule for objects.
|
||||
$(OBJECTS) $(LIBOBJECTS): %.o: %.c
|
||||
|
@ -1,14 +1,22 @@
|
||||
--- ppm/Makefile.orig Fri Mar 24 17:04:20 2000
|
||||
+++ ppm/Makefile Sat Apr 1 12:00:00 2000
|
||||
@@ -19,6 +19,7 @@
|
||||
--- ppm/Makefile.orig Tue Apr 4 04:53:40 2000
|
||||
+++ ppm/Makefile Sat Apr 8 12:00:00 2000
|
||||
@@ -19,8 +19,15 @@
|
||||
endif
|
||||
|
||||
NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
|
||||
+NETPBMLD = -L. -lppm -L$(PBMDIR) -lpbm -L$(PGMDIR) -lpgm
|
||||
LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
|
||||
|
||||
+ifeq ($(JPEGLIB_DIR),NONE)
|
||||
+ JPEGLD =
|
||||
+else
|
||||
+ JPEGLD = -L$(JPEGLIB_DIR) -ljpeg
|
||||
+endif
|
||||
+
|
||||
PORTBINARIES = bmptoppm eyuvtoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
|
||||
@@ -40,6 +41,7 @@
|
||||
mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
|
||||
pjtoppm \
|
||||
@@ -40,6 +47,7 @@
|
||||
# We don't build vidtoppm by default, because it requires special libraries
|
||||
# and there is no known requirement for vidtoppm.
|
||||
|
||||
@ -16,7 +24,7 @@
|
||||
ifneq ($(JPEGLIB_DIR), NONE)
|
||||
ifneq ($(JPEGHDR_DIR), NONE)
|
||||
NOMERGEBINARIES += ppmtojpeg
|
||||
@@ -55,6 +57,7 @@
|
||||
@@ -55,6 +63,7 @@
|
||||
MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
|
||||
|
||||
LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o
|
||||
@ -24,7 +32,7 @@
|
||||
|
||||
MANUALS1 = $(BINARIES) $(SCRIPTS)
|
||||
MANUALS3 = libppm
|
||||
@@ -62,7 +65,7 @@
|
||||
@@ -62,7 +71,7 @@
|
||||
|
||||
MERGENAME= ppmmerge
|
||||
|
||||
@ -33,13 +41,13 @@
|
||||
|
||||
.PHONY: all
|
||||
all: $(BINARIES)
|
||||
@@ -72,29 +75,32 @@
|
||||
@@ -72,29 +81,31 @@
|
||||
|
||||
# Rules for plain programs.
|
||||
$(PORTBINARIES): %: %.o $(NETPBMLIBS)
|
||||
- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
|
||||
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
|
||||
$(CDEBUG)
|
||||
- $(CDEBUG)
|
||||
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
|
||||
|
||||
# Rule for math-dependent programs.
|
||||
$(MATHBINARIES): %: %.o $(NETPBMLIBS)
|
||||
|
13
graphics/netpbm/files/patch-bi
Normal file
13
graphics/netpbm/files/patch-bi
Normal file
@ -0,0 +1,13 @@
|
||||
--- pbm/pbmtog3.1.orig Mon Oct 4 18:10:48 1993
|
||||
+++ pbm/pbmtog3.1 Sat Apr 8 12:00:00 2000
|
||||
@@ -6,8 +6,8 @@
|
||||
.B pbmtog3
|
||||
.RI [ pbmfile ]
|
||||
.SH DESCRIPTION
|
||||
-Reads a portable bitmap as output.
|
||||
-Produces a Group 3 fax file as input.
|
||||
+Reads a portable bitmap as input.
|
||||
+Produces a Group 3 fax file as output.
|
||||
.IX "Group 3 fax"
|
||||
.IX fax
|
||||
.SH REFERENCES
|
14
graphics/netpbm/files/patch-bj
Normal file
14
graphics/netpbm/files/patch-bj
Normal file
@ -0,0 +1,14 @@
|
||||
--- ppm/eyuvtoppm.c.orig Fri Mar 31 07:09:32 2000
|
||||
+++ ppm/eyuvtoppm.c Sat Apr 8 12:00:00 2000
|
||||
@@ -40,8 +40,11 @@
|
||||
* HEADER FILES *
|
||||
*==============*/
|
||||
#include <stdio.h>
|
||||
+#ifdef __STDC__
|
||||
#include <stdlib.h>
|
||||
+#else
|
||||
#include <malloc.h>
|
||||
+#endif
|
||||
|
||||
typedef unsigned char uint8;
|
||||
|
Loading…
Reference in New Issue
Block a user