Update to 9.1

PR:		18437
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

1 files changed, 42 insertions, 47 deletions

diff --git a/graphics/netpbm/files/patch-bf b/graphics/netpbm/files/patch-bf
index 533a0a58da51..72be1e8e6322 100644
--- a/graphics/netpbm/files/patch-bf
+++ b/graphics/netpbm/files/patch-bf
@@ -1,43 +1,47 @@
---- pnm/Makefile.orig	Tue Apr  4 04:38:37 2000
-+++ pnm/Makefile	Sat Apr 15 08:00:00 2000
-@@ -32,6 +32,8 @@
+--- pnm/Makefile.orig	Sat May  6 19:03:54 2000
++++ pnm/Makefile	Mon May  8 00:00:00 2000
+@@ -3,7 +3,7 @@
  
+ LIBROOT = pnm
+ LIBPNM = lib$(LIBROOT).$(NETPBMLIBSUFFIX)
+-MAJ = 9
++MAJ = 1
+ MIN = 0
+ 
+ PPMDIR = $(SRCDIR)/ppm
+@@ -36,6 +36,8 @@
+ # The order of these libraries is important for static library build
  NETPBMLIBS = $(LIBPNM) \
-            $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) $(PPMDIR)/$(LIBPPM)
+            $(PPMDIR)/$(LIBPPM) $(PGMDIR)/$(LIBPGM) $(PBMDIR)/$(LIBPBM) 
 +NETPBMLD = -L. -lpnm \
-+           -L$(PBMDIR) -lpbm -L$(PGMDIR) -lpgm -L$(PPMDIR) -lppm
- LIBLIBS =  $(PBMDIR)/$(LIBPBM) $(PGMDIR)/$(LIBPGM) $(PPMDIR)/$(LIBPPM)
++           -L$(PPMDIR) -lppm -L$(PGMDIR) -lpgm -L$(PBMDIR) -lpbm
+ LIBLIBS =  $(PPMDIR)/$(LIBPPM) $(PGMDIR)/$(LIBPGM) $(PBMDIR)/$(LIBPBM) 
  
  ifeq ($(JPEGLIB_DIR),NONE)
-@@ -89,6 +91,7 @@
+@@ -102,6 +104,8 @@
  MERGE_OBJECTS = $(patsubst %,%.o2, $(PORTBINARIES) $(MATHBINARIES))
  
  LIBOBJECTS = libpnm1.o libpnm2.o libpnm3.o libpnm4.o
 +LIBSOBJECTS = libpnm1.so libpnm2.so libpnm3.so libpnm4.so
++LIBOBJECTS_X = $(SRCDIR)/shhopt/libshhopt.a
  
  MANUALS1 = $(BINARIES) $(SCRIPTS)
  MANUALS3 = libpnm
-@@ -103,45 +106,49 @@
- PHONY: merge
- merge:    $(MERGENAME) $(NOMERGEBINARIES)
- 
--tifftopnm pnmtotiff:  %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so 
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) -L$(TIFFLIB_DIR) -ltiff \
--	  $(JPEGLD) $(CDEBUG)
-+tifftopnm: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so 
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \
-+	  -lm -L$(TIFFLIB_DIR) -ltiff $(JPEGLD) $(CDEBUG)
+@@ -126,27 +130,28 @@
  
--pnmtotiffcmyk: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so
+ # The Tiff library references math functions.
+ tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o \
+-  $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX)
 -	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) -lm -L$(TIFFLIB_DIR) -ltiff \
-+pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.so
+-	  $(JPEGLD) $(CDEBUG)
++  $(NETPBMLIBS) $(TIFFLIB_DIR)/libtiff.$(LIBTIFFSUFFIX) $(LIBOBJECTS_X)
 +	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) -lm -L$(TIFFLIB_DIR) -ltiff \
- 	  $(JPEGLD) $(CDEBUG)
++	  $(LIBOBJECTS_X) $(JPEGLD) $(CDEBUG)
  
  # Rules for plain programs.
  $(PORTBINARIES): %: %.o $(NETPBMLIBS) 
 -	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG) 
++	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) $(CDEBUG)
  
  # Rule for math-dependent programs.
  $(MATHBINARIES): %: %.o $(NETPBMLIBS)
@@ -49,34 +53,25 @@
 +	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
  	  -L$(PNGLIB_DIR) -lpng -lz -lm $(CDEBUG)
  
- jpegtopnm: %: %.o $(NETPBMLIBS)
--	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(JPEGLD) -lm $(CDEBUG)
-+	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) ../shhopt/libshhopt.a \
-+	  $(JPEGLD) -lm $(CDEBUG)
- 
- # Rule for objects.
- $(OBJECTS) $(LIBOBJECTS): %.o: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) -o $@ $<
+-jpegtopnm: %: %.o $(NETPBMLIBS)
+-	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) $(JPEGLD)  $(CDEBUG)
++jpegtopnm: %: %.o $(NETPBMLIBS) $(LIBOBJECTS_X)
++	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
++	  $(LIBOBJECTS_X) $(JPEGLD) $(CDEBUG)
  
-+$(LIBSOBJECTS): %.so: %.c
-+	$(CC) -c -fpic -DPIC $(CFLAGS) $(INCLUDE) -o $@ $<
-+
- $(MERGE_OBJECTS): %.o2: %.c
- 	$(CC) -c $(CFLAGS) $(INCLUDE) "-Dmain=$*_main" -o $@ $<
+ rletopnm pnmtorle: %: %.o $(NETPBMLIBS)
+-	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLIBS) \
++	$(LD) $(LDFLAGS) -o $@ $@.o $(NETPBMLD) \
+ 	  -L$(URTLIB_DIR) -lrle $(CDEBUG)
  
  # And libraries.
- $(PBMDIR)/$(LIBPBM): FORCE
--	cd $(PBMDIR) ; make $(LIBPBM)
-+	cd $(PBMDIR) ; $(MAKE) $(LIBPBM)
- $(PGMDIR)/$(LIBPGM): FORCE
--	cd $(PGMDIR) ; make $(LIBPGM)
-+	cd $(PGMDIR) ; $(MAKE) $(LIBPGM)
- $(PPMDIR)/$(LIBPPM): FORCE
--	cd $(PPMDIR) ; make $(LIBPPM)
-+	cd $(PPMDIR) ; $(MAKE) $(LIBPPM)
- $(TIFFDIR)/$(LIBTIFF): FORCE
--	cd $(TIFFDIR) ; make $(LIBTIFF)
-+	cd $(TIFFDIR) ; $(MAKE) $(LIBTIFF)
+@@ -173,6 +178,9 @@
  
- include $(SRCDIR)/Makefile.common
+ .PHONY: install.lib
+ install.lib: install.lib.common
++
++$(SRCDIR)/shhopt/libshhopt.a:
++	cd ../shhopt; $(MAKE) libshhopt.a
  
+ .PHONY: clean
+ clean: