diff -r f012bbb2a542 -r 35f87223d24d netpbm/netpbm.patch
--- a/netpbm/netpbm.patch	Fri Jan 09 01:40:36 2009 +0100
+++ b/netpbm/netpbm.patch	Fri Jan 09 01:41:46 2009 +0100
@@ -62,3 +62,64 @@
  pm_ungamma709(float const brightness) {
  
      /* These are the same parameters as in pm_gamma, above */
+Index: converter/other/Makefile
+--- converter/other/Makefile.orig	2005-02-05 18:48:28.000000000 +0100
++++ converter/other/Makefile	2009-01-09 00:54:13.704466003 +0100
+@@ -111,29 +111,29 @@
+ endif
+ 
+ tifftopnm pnmtotiff pnmtotiffcmyk: %: %.o $(NETPBMLIB) $(LIBOPT)
+-	$(LD) $(LDFLAGS) -o $@ $@.o \
++	$(LD) -o $@ $@.o \
+ 	  `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(TIFFLIB) $(TIFFLIB_EXTRALIBS)` \
+-	   $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
++	   $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
+ 
+ pngtopnm: %: %.o $(NETPBMLIB) $(LIBOPT)
+-	$(LD) $(LDFLAGS) -o $@ $@.o \
++	$(LD) -o $@ $@.o \
+ 	  `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \
+-	  $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
++	  $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
+ 
+ pnmtopng: %: %.o pngtxt.o $(NETPBMLIB) $(LIBOPT)
+-	$(LD) $(LDFLAGS) -o $@ $@.o pngtxt.o \
++	$(LD) -o $@ $@.o pngtxt.o \
+ 	  `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(PNGLIB) $(ZLIB)` \
+-	  $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
++	  $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
+ 
+ jpegtopnm: %: %.o jpegdatasource.o exif.o $(NETPBMLIB) $(LIBOPT)
+-	$(LD) $(LDFLAGS) -o $@ $< jpegdatasource.o exif.o \
++	$(LD) -o $@ $< jpegdatasource.o exif.o \
+ 	  `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \
+-	  $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 
++	  $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD) 
+ 
+ pnmtojpeg: %: %.o $(NETPBMLIB) $(LIBOPT)
+-	$(LD) $(LDFLAGS) -o $@ $@.o \
++	$(LD) -o $@ $@.o \
+ 	  `$(LIBOPT) $(NETPBMLIB) $(LIBOPTR) $(JPEGLIB)` \
+-	  $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
++	  $(LDFLAGS) $(MATHLIB) $(LDLIBS) $(RPATH) $(LADD)
+ 
+ # If URTLIB is BUNDLED_URTLIB, then we're responsible for building it, which
+ # means it needs to be a dependency:
+@@ -142,13 +142,13 @@
+ endif
+ 
+ rletopnm pnmtorle: %: %.o $(NETPBMLIB) $(URTLIBDEP) $(LIBOPT)
+-	$(LD) $(LDFLAGS) -o $@ $@.o \
+-	  `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(MATHLIB) $(LDLIBS) \
++	$(LD) -o $@ $@.o \
++	  `$(LIBOPT) $(NETPBMLIB) $(URTLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \
+ 	   $(RPATH) $(LADD)
+ 
+ pnmtorast rasttopnm: %: %.o rast.o $(NETPBMLIB) $(LIBOPT)
+-	$(LD) $(LDFLAGS) -o $@ $@.o rast.o \
+-	  `$(LIBOPT) $(NETPBMLIB)` $(MATHLIB) $(LDLIBS) \
++	$(LD) -o $@ $@.o rast.o \
++	  `$(LIBOPT) $(NETPBMLIB)` $(LDFLAGS) $(MATHLIB) $(LDLIBS) \
+ 	   $(RPATH) $(LADD)
+ 
+ install.bin: install.bin.local