aboutsummaryrefslogtreecommitdiff
path: root/graphics/netpbm
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2000-04-07 21:54:04 +0000
committerJeremy Lea <reg@FreeBSD.org>2000-04-07 21:54:04 +0000
commit9e5e1575635c6aa3ad470b24036c05598c9d4512 (patch)
treedb477e80251b7bdf4ef147e4632122fbce1ac6c6 /graphics/netpbm
parenta1467a993a6cef1070ceb330cb337b1dfbe16f40 (diff)
downloadports-9e5e1575635c6aa3ad470b24036c05598c9d4512.tar.gz
ports-9e5e1575635c6aa3ad470b24036c05598c9d4512.zip
Notes
Diffstat (limited to 'graphics/netpbm')
-rw-r--r--graphics/netpbm/Makefile9
-rw-r--r--graphics/netpbm/distinfo2
-rw-r--r--graphics/netpbm/files/patch-ba24
-rw-r--r--graphics/netpbm/files/patch-bb40
-rw-r--r--graphics/netpbm/files/patch-bc24
-rw-r--r--graphics/netpbm/files/patch-bd19
-rw-r--r--graphics/netpbm/files/patch-be16
-rw-r--r--graphics/netpbm/files/patch-bf30
-rw-r--r--graphics/netpbm/files/patch-bg59
-rw-r--r--graphics/netpbm/pkg-plist4
10 files changed, 128 insertions, 99 deletions
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 07645243929d..72e97695f751 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: netpbm
-# Version required: 8.3
+# Version required: 8.4
# Date created: ?
# Whom: jmz (original)
#
# $FreeBSD$
#
-DISTNAME= netpbm-8.3
+DISTNAME= netpbm-8.4
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/convert
@@ -15,6 +15,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
+ jpeg.9:${PORTSDIR}/graphics/jpeg \
png.3:${PORTSDIR}/graphics/png
USE_GMAKE= yes
@@ -52,12 +53,14 @@ MAN1= anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 bmptoppm.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
+ xwdtopnm.1 ybmtopbm.1 yuvsplittoppm.1 yuvtoppm.1 zeisstopnm.1 \
+ sbigtopgm.1 eyuvtoppm.1 ppmtoeyuv.1 ppmlabel.1 ppmfade.1
MAN3= libpbm.3 libpgm.3 libpnm.3 libppm.3
MAN5= pbm.5 pgm.5 pnm.5 ppm.5
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
diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo
index 42c21bb4b6a6..995ec8236263 100644
--- a/graphics/netpbm/distinfo
+++ b/graphics/netpbm/distinfo
@@ -1 +1 @@
-MD5 (netpbm-8.3.tgz) = 829f9e3f38850ddbe64a975c89d6cb7b
+MD5 (netpbm-8.4.tgz) = e20d941cd36bc3af737f7c3cf79a8169
diff --git a/graphics/netpbm/files/patch-ba b/graphics/netpbm/files/patch-ba
index 243def017254..9ecb6166ec66 100644
--- a/graphics/netpbm/files/patch-ba
+++ b/graphics/netpbm/files/patch-ba
@@ -1,6 +1,15 @@
--- Makefile.orig Sat Mar 25 02:47:02 2000
+++ Makefile Sat Apr 1 12:00:00 2000
-@@ -56,7 +56,10 @@
+@@ -30,7 +30,7 @@
+ SRCDIR = .
+ include $(SRCDIR)/Makefile.config
+
+-SUBDIRS = pbm pgm ppm pnm ppmtompeg
++SUBDIRS = pbm pgm ppm pnm
+
+ # Note that the Tiff library, from the libtiff subdirectory, only gets built
+ # if you specify the homegrown libtiff as $(TIFFLIB), in which case it is
+@@ -57,7 +57,10 @@
./stamp-date
.PHONY: install
@@ -11,7 +20,18 @@
+install-merge: install.merge install.lib install.man install.hdr
.PHONY: merge
- merge:
+ merge: compile.h
+@@ -72,8 +75,8 @@
+ ( echo install.bin.$$i ; cd $$i ; $(MAKE) install.bin ); \
+ done
+
+-.PHONY: install-merge
+-install-merge:
++.PHONY: install.merge
++install.merge:
+ -mkdir -p $(INSTALLBINARIES)
+ for i in $(SUBDIRS) ; do \
+ ( echo install.merge.$$i ; cd $$i ; $(MAKE) install.merge ); \
@@ -97,6 +100,13 @@
-mkdir -p $(INSTALLMANUALS5)
for i in $(SUBDIRS) ; do \
diff --git a/graphics/netpbm/files/patch-bb b/graphics/netpbm/files/patch-bb
index aca32a5d5961..2ea9b23cd8fd 100644
--- a/graphics/netpbm/files/patch-bb
+++ b/graphics/netpbm/files/patch-bb
@@ -1,18 +1,24 @@
--- Makefile.common.orig Sat Mar 25 02:46:12 2000
+++ Makefile.common Sat Apr 1 12:00:00 2000
-@@ -51,26 +51,22 @@
- .PHONY: install.merge
+@@ -56,31 +56,27 @@
install.merge: $(MERGENAME) $(NOMERGEBINARIES) install.script
cd $(INSTALLBINARIES) ; rm -f $(BINARIES)
-- cp $< $(INSTALLBINARIES)
+ ifneq ($(MERGENAME)x,x)
+- cp $(MERGENAME) $(INSTALLBINARIES)
+- strip $(INSTALLBINARIES)/$(MERGENAME)
+ ${BSD_INSTALL_PROGRAM} $(MERGENAME) $(INSTALLBINARIES)
cd $(INSTALLBINARIES) ; \
- for i in $(BINARIES) ; do ln $(MERGENAME) $$i ; done
-- rm -f $(INSTALLBINARIES)/$(MERGENAME)
+ for i in $(BINARIES) $(MERGE_ALIASES) ; \
+- do ln -s $(MERGENAME) $$i ; \
++ do ln -sf $(MERGENAME) $$i ; \
+ done
+ endif
+ ifneq ($(NOMERGEBINARIES)x,x)
cd $(INSTALLBINARIES) ; rm -f $(NOMERGEBINARIES)
- cp $(NOMERGEBINARIES) $(INSTALLBINARIES)
- cd $(INSTALLBINARIES) ; strip $(NOMERGEBINARIES)
+ ${BSD_INSTALL_PROGRAM} $(NOMERGEBINARIES) $(INSTALLBINARIES)
+ endif
.PHONY: install.bin.common
install.bin.common: $(BINARIES) install.script
@@ -31,7 +37,7 @@
endif
.PHONY: install.man
-@@ -95,13 +91,12 @@
+@@ -111,13 +107,13 @@
# prefer not to "install" them, but just to access the Netpbm source
# directory when you compile your programs.
cd $(INSTALLHDRS) ; rm -f $(INTERFACE_HEADERS)
@@ -40,26 +46,26 @@
-lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ).$(MIN)
- ln -sf lib$(LIBROOT).so.$(MAJ).$(MIN) $@
--lib$(LIBROOT).so.$(MAJ).$(MIN): $(LIBOBJECTS)
-- $(LD) $(LDSHLIB) -Wl,-soname,lib$(LIBROOT).so.$(MAJ) -o $@ \
-- $(LIBOBJECTS)
-+lib$(LIBROOT).so: lib$(LIBROOT).so.$(MAJ)
+-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): lib$(LIBROOT).a $(LIBSOBJECTS)
-+ $(LD) $(LDSHLIB) -Wl,-soname,$@ -o $@ $(LIBSOBJECTS)
++lib$(LIBROOT).so.$(MAJ): $(LIBSOBJECTS) $(LIBLIBS)
+ $(LD) $(LDSHLIB) -Wl,-soname,lib$(LIBROOT).so.$(MAJ) -o $@ \
+- $(LIBOBJECTS) $(LIBLIBS) -lc
++ $(LIBSOBJECTS) $(LIBLIBS)
lib$(LIBROOT).a: $(LIBOBJECTS)
-rm -f $@
-@@ -109,11 +104,11 @@
- -ranlib $@
+@@ -126,11 +122,11 @@
+
- .PHONY: install.lib
--install.lib: lib$(LIBROOT).so.$(MAJ).$(MIN)
+ .PHONY: install.lib.common
+-install.lib.common: lib$(LIBROOT).so.$(MAJ).$(MIN)
- cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).so.$(MAJ).*
- cp $< $(INSTALLLIBS)
- cd $(INSTALLLIBS) ; ln -sf $< lib$(LIBROOT).so
- cd $(INSTALLLIBS) ; ln -sf $< lib$(LIBROOT).so.$(MAJ)
-+install.lib: lib$(LIBROOT).so
++install.lib.common: lib$(LIBROOT).a lib$(LIBROOT).so
+ cd $(INSTALLLIBS) ; rm -f lib$(LIBROOT).*
+ ${BSD_INSTALL_DATA} lib$(LIBROOT).a $(INSTALLLIBS)
+ ${BSD_INSTALL_DATA} lib$(LIBROOT).so.$(MAJ) $(INSTALLLIBS)
diff --git a/graphics/netpbm/files/patch-bc b/graphics/netpbm/files/patch-bc
index de851b246519..a44c39fea28d 100644
--- a/graphics/netpbm/files/patch-bc
+++ b/graphics/netpbm/files/patch-bc
@@ -1,21 +1,21 @@
--- Makefile.config.orig Sat Mar 25 02:39:40 2000
+++ Makefile.config Sat Apr 1 12:00:00 2000
-@@ -30,12 +30,12 @@
+@@ -29,12 +29,12 @@
+ # The C compiler (including macro preprocessor)
#CC = cc
#CC = gcc
- #CC = gcc -fpcc-struct-return
--CC = gcc -pedantic -fpcc-struct-return
-+CC ?= gcc -pedantic -fpcc-struct-return
+-CC = gcc -fpcc-struct-return
++CC ?= gcc -fpcc-struct-return
# The linker
#LD = ld
#LD = cc
-LD = gcc
-+LD = ${CC}
++LD = ${CC}
# Normally the man pages are installed using "cp". But via this
# variable, you can use something else, for example a script that
-@@ -43,11 +43,11 @@
+@@ -42,11 +42,11 @@
# systems which use man pages in the "cat" format.
#MANCP = $(SRCDIR)/mantocat
@@ -30,16 +30,16 @@
AR= ar
RANLIB= ranlib
-@@ -55,7 +55,7 @@
+@@ -54,7 +54,7 @@
# C compiler options
#CFLAGS = -O2 -std1 $(CDEBUG)
--CFLAGS = -O2 -Wall -Wno-uninitialized $(CDEBUG)
-+CFLAGS ?= -O2 -Wall -Wno-uninitialized $(CDEBUG)
+-CFLAGS = -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
++CFLAGS ?= -pedantic -O2 -Wall -Wno-uninitialized $(CDEBUG)
# linker options. Eunice users may want to use -noshare so that
# the executables can run standalone.
-@@ -78,8 +78,10 @@
+@@ -81,8 +81,10 @@
#TIFFINC_DIR = /usr/local1/DEC/include
#TIFFLIB_DIR = /usr/local1/DEC/lib
@@ -52,7 +52,7 @@
# Put the location of your JPEG library here.
# If you want to build the jpeg converters or tiff
-@@ -101,16 +103,16 @@
+@@ -104,16 +106,16 @@
#JPEGHDR_DIR = /usr/local1/DEC/include
#JPEGLIB_DIR = NONE
#JPEGHDR_DIR = NONE
@@ -73,7 +73,7 @@
# The following variables are used only by 'make install' (and the
-@@ -121,7 +123,7 @@
+@@ -124,7 +126,7 @@
# you're spreading Netpbm across your system, use "/".
#INSTALL_PREFIX = /usr/local1/DEC/packages/netpbm
diff --git a/graphics/netpbm/files/patch-bd b/graphics/netpbm/files/patch-bd
index d0ebb5db94b5..6a78139afbe5 100644
--- a/graphics/netpbm/files/patch-bd
+++ b/graphics/netpbm/files/patch-bd
@@ -1,14 +1,23 @@
--- pbm/Makefile.orig Fri Mar 24 07:43:30 2000
+++ pbm/Makefile Sat Apr 1 12:00:00 2000
-@@ -13,6 +13,7 @@
- MIN = 2
+@@ -4,7 +4,7 @@
+ include $(SRCDIR)/Makefile.config
+
+-INCLUDE = -I$(SRCDIR)
++INCLUDE = -I$(SRCDIR) -I$(SRCDIR)/shhopt
+
+ # Shared library naming
+ LIBROOT = pbm
+@@ -14,6 +14,7 @@
+
+ LIBLIBS = $(SRCDIR)/shhopt/libshhopt.a
NETPBMLIBS = $(LIBPBM)
+NETPBMLD = -L. -lpbm
PORTBINARIES = atktopbm brushtopbm cmuwmtopbm g3topbm \
icontopbm gemtopbm macptopbm mgrtopbm \
-@@ -34,6 +35,7 @@
+@@ -35,6 +36,7 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(BINARIES))
LIBOBJECTS = libpbm1.o libpbm2.o libpbm3.o libpbm4.o libpbm5.o
@@ -16,7 +25,7 @@
MANUALS1 = $(BINARIES)
MANUALS3 = libpbm
-@@ -41,7 +43,7 @@
+@@ -42,7 +44,7 @@
MERGENAME = pbmmerge
@@ -25,7 +34,7 @@
.PHONY: all
all: $(BINARIES)
-@@ -51,15 +53,18 @@
+@@ -52,15 +54,18 @@
# Rules for plain programs.
$(PORTBINARIES): %: %.o $(NETPBMLIBS)
diff --git a/graphics/netpbm/files/patch-be b/graphics/netpbm/files/patch-be
index d957ab7463a0..97416720f17d 100644
--- a/graphics/netpbm/files/patch-be
+++ b/graphics/netpbm/files/patch-be
@@ -1,14 +1,18 @@
--- pgm/Makefile.orig Fri Mar 24 07:43:44 2000
+++ pgm/Makefile Sat Apr 1 12:00:00 2000
-@@ -13,6 +13,7 @@
- INCLUDE = -I$(SRCDIR) $(INCLUDEPBM)
+@@ -10,9 +10,10 @@
+ INCLUDEPBM = -I$(PBMDIR)
+ LIBPBM = libpbm.so
+
+-INCLUDE = -I$(SRCDIR) $(INCLUDEPBM)
++INCLUDE = -I$(SRCDIR) $(INCLUDEPBM) -I$(SRCDIR)/shhopt
NETPBMLIBS = $(LIBPGM) $(PBMDIR)/$(LIBPBM)
+NETPBMLD = -L. -lpgm -L$(PBMDIR) -lpbm
+ LIBLIBS = $(PBMDIR)/$(LIBPBM)
PORTBINARIES = asciitopgm bioradtopgm fstopgm hipstopgm \
- lispmtopgm pbmtopgm pgmbentley pgmenhance pgmhist \
-@@ -25,6 +26,7 @@
+@@ -26,6 +27,7 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(BINARIES))
LIBOBJECTS = libpgm1.o libpgm2.o
@@ -16,7 +20,7 @@
MANUALS1 = $(BINARIES)
MANUALS3 = libpgm
-@@ -41,22 +43,25 @@
+@@ -42,22 +44,25 @@
# Rules for plain programs.
$(PORTBINARIES): %: %.o $(NETPBMLIBS)
@@ -39,7 +43,7 @@
$(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
# And libraries.
- $(PBMDIR)/$(LIBPBM):
+ $(PBMDIR)/$(LIBPBM): FORCE
- cd $(PBMDIR) ; make $(LIBPBM)
+ cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
diff --git a/graphics/netpbm/files/patch-bf b/graphics/netpbm/files/patch-bf
index 293b10aad70d..5b0cd84e8dfd 100644
--- a/graphics/netpbm/files/patch-bf
+++ b/graphics/netpbm/files/patch-bf
@@ -1,15 +1,15 @@
--- pnm/Makefile.orig Sat Mar 25 02:27:50 2000
+++ pnm/Makefile Sat Apr 1 12:00:00 2000
-@@ -35,6 +35,8 @@
+@@ -32,6 +32,8 @@
NETPBMLIBS = $(LIBPNM) \
$(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) $(PPMDIR)/$(LIBPPM)
+NETPBMLD = -L. -lpnm \
+ -L$(PBMDIR) -lpbm -L$(PGMDIR) -lpgm -L$(PPMDIR) -lppm
+ LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) $(PPMDIR)/$(LIBPPM)
ifeq ($(JPEGLIB_DIR),NONE)
- JPEGLD =
-@@ -87,6 +89,7 @@
+@@ -89,6 +91,7 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o
@@ -17,10 +17,10 @@
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libpnm
-@@ -102,45 +105,48 @@
+@@ -104,44 +107,48 @@
merge: $(MERGENAME) $(NOMERGEBINARIES)
- tifftopnm pnmtotiff: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so
+ tifftopnm pnmtotiff: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so
- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) -L$(TIFFLIB_DIR) -ltiff \
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) -lm -L$(TIFFLIB_DIR) -ltiff \
$(JPEGLD) $(CDEBUG)
@@ -32,7 +32,7 @@
# Rules for plain programs.
$(PORTBINARIES): %: %.o $(NETPBMLIBS)
-- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
# Rule for math-dependent programs.
@@ -45,10 +45,10 @@
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
-L$(PNGLIB_DIR) -lpng -lz -lm $(CDEBUG)
- jpegtopnm: %: %.o $(NETPBMLIBS) $(SRCDIR)/shhopt/libshhopt.a
-- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(JPEGLD) -lm \
+ jpegtopnm: %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(JPEGLD) -lm $(CDEBUG)
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(JPEGLD) -lm \
- $(SRCDIR)/shhopt/libshhopt.a $(CDEBUG)
++ $(CDEBUG)
# Rule for objects.
$(OBJECTS) $(LIBOBJECTS): %.o: %.c
@@ -61,18 +61,18 @@
$(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
# And libraries.
- $(PBMDIR)/$(LIBPBM):
+ $(PBMDIR)/$(LIBPBM): FORCE
- cd $(PBMDIR) ; make $(LIBPBM)
+ cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
- $(PGMDIR)/$(LIBPGM):
+ $(PGMDIR)/$(LIBPGM): FORCE
- cd $(PGMDIR) ; make $(LIBPGM)
+ cd $(PGMDIR) ; $(MAKE) $(LIBPGM)
- $(PPMDIR)/$(LIBPPM):
+ $(PPMDIR)/$(LIBPPM): FORCE
- cd $(PPMDIR) ; make $(LIBPPM)
+ cd $(PPMDIR) ; $(MAKE) $(LIBPPM)
- $(TIFFDIR)/$(LIBTIFF):
+ $(TIFFDIR)/$(LIBTIFF): FORCE
- cd $(TIFFDIR) ; make $(LIBTIFF)
+ cd $(TIFFDIR) ; $(MAKE) $(LIBTIFF)
- $(SRCDIR)/shhopt/libshhopt.a:
- cd $(SRCDIR)/shhopt; $(MAKE) libshhopt.a
+ include $(SRCDIR)/Makefile.common
+
diff --git a/graphics/netpbm/files/patch-bg b/graphics/netpbm/files/patch-bg
index 6e895358b1ae..ff59be5a3c06 100644
--- a/graphics/netpbm/files/patch-bg
+++ b/graphics/netpbm/files/patch-bg
@@ -1,40 +1,22 @@
--- ppm/Makefile.orig Fri Mar 24 17:04:20 2000
+++ ppm/Makefile Sat Apr 1 12:00:00 2000
-@@ -16,7 +16,7 @@
-
- MERGENAME = ppmmerge
-
--INCLUDE= -I.. $(INCLUDEPGM) $(INCLUDEPBM) -I../shhopt
-+INCLUDE= -I$(SRCDIR) $(INCLUDEPGM) $(INCLUDEPBM) -I$(SRCDIR)/shhopt
-
- ifneq ($(JPEGHDR_DIR), NONE)
- INCLUDE+= -I$(JPEGHDR_DIR)
-@@ -29,6 +29,7 @@
+@@ -19,6 +19,7 @@
endif
NETPBMLIBS = $(LIBPPM) $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
+NETPBMLD = -L. -lppm -L$(PBMDIR) -lpbm -L$(PGMDIR) -lpgm
+ LIBLIBS = $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM)
- PORTBINARIES = bmptoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
- mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
-@@ -46,6 +47,7 @@
- sputoppm tgatoppm ximtoppm xpmtoppm xvminitoppm \
- yuvtoppm yuvsplittoppm
+ PORTBINARIES = bmptoppm eyuvtoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
+@@ -40,6 +41,7 @@
+ # We don't build vidtoppm by default, because it requires special libraries
+ # and there is no known requirement for vidtoppm.
+NOMERGEBINARIES =
ifneq ($(JPEGLIB_DIR), NONE)
ifneq ($(JPEGHDR_DIR), NONE)
NOMERGEBINARIES += ppmtojpeg
-@@ -53,7 +55,7 @@
- endif
-
- MATHBINARIES = ppmcie ppmforge ppmlabel ppmpat ppmqvga ppmtomap
--BINARIES = $(PORTBINARIES) $(NOMERGEBINARIES) $(MATHBINARIES)
-+BINARIES = $(PORTBINARIES) $(MATHBINARIES) $(NOMERGEBINARIES)
- SCRIPTS = ppmquantall ppmshadow
-
- OBJECTS = $(patsubst %, %.o, $(BINARIES))
-@@ -61,6 +63,7 @@
+@@ -55,6 +57,7 @@
MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
LIBOBJECTS = libppm1.o libppm2.o libppm3.o libppm4.o libppm5.o bitio.o
@@ -42,7 +24,7 @@
MANUALS1 = $(BINARIES) $(SCRIPTS)
MANUALS3 = libppm
-@@ -68,7 +71,7 @@
+@@ -62,7 +65,7 @@
MERGENAME= ppmmerge
@@ -51,21 +33,22 @@
.PHONY: all
all: $(BINARIES)
-@@ -77,26 +80,32 @@
-
+@@ -72,29 +75,32 @@
# Rules for plain programs.
--$(PORTBINARIES) ppmtojpeg: %: %.o $(NETPBMLIBS) ../shhopt/libshhopt.a
-- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) ../shhopt/libshhopt.a \
-- $(JPEGLD) $(CDEBUG)
-+$(PORTBINARIES): %: %.o $(NETPBMLIBS)
-+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
+ $(PORTBINARIES): %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
++ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
+ $(CDEBUG)
# Rule for math-dependent programs.
$(MATHBINARIES): %: %.o $(NETPBMLIBS)
- $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLIBS) $(CDEBUG)
+ $(LD) $(LDFLAGS) -o $@ $@.o -lm $(NETPBMLD) $(CDEBUG)
-+
+
+-ppmtojpeg: %: %.o $(NETPBMLIBS)
+- $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
+- -L $(JPEGLIB_DIR) -ljpeg $(CDEBUG)
+ppmtojpeg: %: %.o $(NETPBMLIBS) ../shhopt/libshhopt.a
+ $(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \
+ $(JPEGLD) $(CDEBUG)
@@ -81,12 +64,12 @@
$(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
# And libraries.
- $(PBMDIR)/$(LIBPBM):
+ $(PBMDIR)/$(LIBPBM): FORCE
- cd $(PBMDIR) ; make $(LIBPBM)
+ cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
- $(PGMDIR)/$(LIBPGM):
+ $(PGMDIR)/$(LIBPGM): FORCE
- cd $(PGMDIR) ; make $(LIBPGM)
+ cd $(PGMDIR) ; $(MAKE) $(LIBPGM)
- ../shhopt/libshhopt.a:
- cd ../shhopt; $(MAKE) libshhopt.a
+ .PHONY: install.bin
+ install.bin: install.bin.common
diff --git a/graphics/netpbm/pkg-plist b/graphics/netpbm/pkg-plist
index fc624b10efa8..bef287d6c90a 100644
--- a/graphics/netpbm/pkg-plist
+++ b/graphics/netpbm/pkg-plist
@@ -5,6 +5,7 @@ bin/bioradtopgm
bin/bmptoppm
bin/brushtopbm
bin/cmuwmtopbm
+bin/eyuvtoppm
bin/fitstopnm
bin/fstopgm
bin/g3topbm
@@ -98,6 +99,7 @@ bin/pnminvert
bin/pnmmargin
bin/pnmmerge
bin/pnmnlfilt
+bin/pnmnoraw
bin/pnmpad
bin/pnmpaste
bin/pnmrotate
@@ -123,6 +125,7 @@ bin/ppmcie
bin/ppmdim
bin/ppmdist
bin/ppmdither
+bin/ppmfade
bin/ppmflash
bin/ppmforge
bin/ppmhist
@@ -142,6 +145,7 @@ bin/ppmshift
bin/ppmspread
bin/ppmtoacad
bin/ppmtobmp
+bin/ppmtoeyuv
bin/ppmtogif
bin/ppmtoicr
bin/ppmtoilbm