diff options
Diffstat (limited to 'graphics/netpbm/files/patch-bf')
| -rw-r--r-- | graphics/netpbm/files/patch-bf | 45 |
1 files changed, 24 insertions, 21 deletions
diff --git a/graphics/netpbm/files/patch-bf b/graphics/netpbm/files/patch-bf index 7aa5bdb109cb..4cf9c2a05bb3 100644 --- a/graphics/netpbm/files/patch-bf +++ b/graphics/netpbm/files/patch-bf @@ -1,25 +1,27 @@ ---- pnm/Makefile.orig Fri Jul 7 15:24:20 2000 -+++ pnm/Makefile Sat Jul 15 00:00:00 2000 -@@ -3,8 +3,7 @@ - - LIBROOT = pnm - LIBPNM = lib$(LIBROOT).$(NETPBMLIBSUFFIX) --MAJ = 9 --MIN = 5 -+SOVER = 1 +--- pnm/Makefile.orig Fri Aug 4 08:46:27 2000 ++++ pnm/Makefile Sat Aug 5 00:00:00 2000 +@@ -47,6 +47,8 @@ + JPEGLD = -L$(JPEGLIB_DIR) -ljpeg + endif - PPMDIR = $(SRCDIR)/ppm - LIBPPM = libppm.$(NETPBMLIBSUFFIX) -@@ -55,20 +54,21 @@ ++SOVER = 1 ++ + # 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 +@@ -54,21 +56,23 @@ + # This package is so big, it's useful even when some parts won't # build. - PORTBINARIES = fitstopnm gemtopnm giftopnm \ +-PORTBINARIES = fitstopnm gemtopnm giftopnm pamcut pamtopnm \ - pnmalias pnmarith pnmcat pnmcomp pnmconvol pnmcrop \ - pnmcut pnmdepth pnmenlarge pnmfile pnmflip pnmhisteq \ +- pnmhistmap pnminterp pnminvert pnmpad pnmpaste \ +- pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \ ++PORTBINARIES = fitstopnm gemtopnm giftopnm \ + pnmalias pnmarith pnmcat pnmcomp pnmconvol \ + pnmdepth pnmenlarge pnmflip pnmhisteq \ - pnmhistmap pnminterp pnminvert pnmpad pnmpaste \ -- pnmsmooth pnmsplit pnmtile pnmtoddif pnmtofits \ ++ pnmhistmap pnminvert pnmpad pnmpaste \ + pnmsmooth pnmtile pnmtoddif pnmtofits \ pnmtoplainpnm pnmtops pnmtorast \ - pnmtosgi pnmtosir pnmtoxwd pstopnm \ @@ -27,7 +29,8 @@ + pnmtosgi pnmtosir pnmtoxwd \ + rasttopnm sgitopnm sirtopnm zeisstopnm MATHBINARIES = pnmgamma pnmnlfilt pnmrotate pnmscale pnmshear -+SHHOPTBINARIES = pnmcrop pnmcut pnmfile pnmsplit pstopnm xwdtopnm ++SHHOPTBINARIES = pamcut pamtopnm pnmcrop pnmcut pnmfile pnminterp \ ++ 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 @@ -38,16 +41,16 @@ ifneq ($(PNGHDR_DIR),NONE) ifneq ($(PNGLIB_DIR),NONE) NOMERGEBINARIES += pnmtopng pngtopnm -@@ -105,6 +105,8 @@ +@@ -105,6 +109,8 @@ MERGE_OBJECTS = $(patsubst %,%.o2, $(MERGEBINARIES)) - LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o + LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o libpam.o +SHLIBOBJECTS = $(patsubst %.o, %.lo, $(LIBOBJECTS)) +LIBSHHOPT = $(SRCDIR)/shhopt/libshhopt.a MANUALS1 = $(BINARIES) $(SCRIPTS) MANUALS3 = libpnm -@@ -116,12 +118,12 @@ +@@ -116,12 +122,12 @@ .PHONY: all all: $(BINARIES) @@ -64,7 +67,7 @@ ifeq ($(TIFFLIB_DIR),$(TIFFDIR)) # We're using the internal Tiff library, so make sure it's built -@@ -132,18 +134,18 @@ +@@ -132,18 +138,18 @@ endif # The Tiff library references math functions. @@ -88,7 +91,7 @@ ifeq ($(URTLIB_DIR),$(URTDIR)) # We're using the internal URT library, so make sure it's built -@@ -180,25 +182,20 @@ +@@ -180,25 +186,20 @@ # backward compatibility: program used to be gemtopbm rm -f $(INSTALLBINARIES)/gemtopbm ln -s $(INSTALLBINARIES)/gemtopnm$(EXE) $(INSTALLBINARIES)/gemtopbm |