diff options
Diffstat (limited to 'graphics/netpbm/files/patch-bf')
| -rw-r--r-- | graphics/netpbm/files/patch-bf | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/graphics/netpbm/files/patch-bf b/graphics/netpbm/files/patch-bf index 1737b91fc4e5..01e74fd8d666 100644 --- a/graphics/netpbm/files/patch-bf +++ b/graphics/netpbm/files/patch-bf @@ -1,5 +1,5 @@ ---- pnm/Makefile.orig Sun Dec 3 07:48:46 2000 -+++ pnm/Makefile Fri Dec 8 00:00:00 2000 +--- pnm/Makefile.orig Mon Jan 8 03:54:37 2001 ++++ pnm/Makefile Sat Jan 13 00:00:00 2001 @@ -48,6 +48,8 @@ JPEGLD = -L$(JPEGLIB_DIR) -ljpeg endif @@ -9,7 +9,7 @@ # We tend to separate out the build targets so that we don't have # any more dependencies for a given target than it really needs. # That way, if there is a problem with a dependency, we can still -@@ -55,22 +57,23 @@ +@@ -55,22 +57,24 @@ # This package is so big, it's useful even when some parts won't # build. @@ -17,9 +17,9 @@ - pamfile pamtopnm \ - pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \ - pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhisteq \ -- pnmhistmap pnminterp pnminvert pnmpad pnmpaste \ +- pnmhistmap pnminterp pnminvert pnmmontage pnmpad pnmpaste \ - pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \ -+PORTBINARIES = fitstopnm gemtopnm giftopnm \ ++PORTBINARIES = fitstopnm gemtopnm \ + pnmalias pnmarith pnmcat pnmcomp pnmconvol \ + pnmdepth pnmenlarge pnmflip pnmhisteq \ + pnmhistmap pnminvert pnmpad pnmpaste \ @@ -31,8 +31,9 @@ + pnmtosgi pnmtosir pnmtoxwd \ + rasttopnm sgitopnm sirtopnm zeisstopnm +MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmshear -+SHHOPTBINARIES = pamchannel pamcut pamfile pamtopnm pnmcrop pnmcut \ -+ pnmfile pnminterp pnmsplit pstopnm xwdtopnm ++SHHOPTBINARIES = giftopnm pamchannel pamcut pamfile pamtopnm pnmcrop \ ++ pnmcut pnmfile pnminterp pnmmontage pnmsplit pstopnm \ ++ xwdtopnm # We don't include programs that have special library dependencies in the # merge scheme, because we don't want those dependencies to prevent us @@ -43,7 +44,7 @@ ifneq ($(PNGHDR_DIR),NONE) ifneq ($(PNGLIB_DIR),NONE) NOMERGEBINARIES += pnmtopng pngtopnm -@@ -107,6 +110,8 @@ +@@ -107,6 +111,8 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o @@ -52,9 +53,9 @@ MANUALS1 = $(BINARIES) $(SCRIPTS) MANUALS3 = libpnm -@@ -125,6 +130,14 @@ +@@ -127,6 +133,14 @@ $(MAKE) -C jbig all - $(MAKE) -C fiasco all + $(MAKE) -C pnmtopalm all +$(SHHOPTBINARIES): %: %.o $(NETPBMLIBS) $(LIBOPT) $(LIBSHHOPT) + $(LD) $(LDFLAGS) -o $@ $@.o `$(LIBOPT) $(NETPBMLIBS)` \ @@ -67,7 +68,7 @@ ifeq ($(TIFFLIB_DIR),$(TIFFDIR)) # We're using the internal Tiff library, so make sure it's built TIFFLIB_DEP = $(TIFFDIR)/$(LIBTIFF) -@@ -135,17 +148,18 @@ +@@ -137,17 +151,18 @@ # The Tiff library references math functions. tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \ @@ -90,10 +91,10 @@ ifeq ($(URTLIB_DIR),$(URTDIR)) # We're using the internal URT library, so make sure it's built -@@ -197,6 +211,9 @@ - install.man: install.man.common - $(MAKE) -C jbig install.man +@@ -202,6 +217,9 @@ $(MAKE) -C fiasco install.man + $(MAKE) -C jbig install.man + $(MAKE) -C pnmtopalm install.man + +$(SRCDIR)/shhopt/libshhopt.a: + cd ../shhopt; $(MAKE) libshhopt.a |