6 files changed, 6 insertions, 47 deletions

diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 5d4d160ddea1..161c6e1fcae6 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	netpbm
 PORTVERSION=	10.21
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/graphics/netpbm/files/patch-converter-other-Makefile b/graphics/netpbm/files/patch-converter-other-Makefile
deleted file mode 100644
index 229d64de3fae..000000000000
--- a/graphics/netpbm/files/patch-converter-other-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- converter/other/Makefile.orig	Fri Jul 11 05:23:53 2003
-+++ converter/other/Makefile	Tue Mar 30 06:59:13 2004
-@@ -7,6 +7,8 @@
- 
- include $(BUILDDIR)/Makefile.config
- 
-+LADD += -lm
-+
- SUBDIRS = jbig pnmtopalm
- ifneq ($(BUILD_FIASCO), N)
-   SUBDIRS += fiasco
diff --git a/graphics/netpbm/files/patch-converter-other-jbig-Makefile b/graphics/netpbm/files/patch-converter-other-jbig-Makefile
deleted file mode 100644
index 2e0f37f2d0a9..000000000000
--- a/graphics/netpbm/files/patch-converter-other-jbig-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- converter/other/jbig/Makefile.orig	Sat Sep 13 04:43:39 2003
-+++ converter/other/jbig/Makefile	Tue Mar 30 07:04:32 2004
-@@ -7,6 +7,8 @@
- 
- include $(BUILDDIR)/Makefile.config
- 
-+LADD += -lm
-+
- LIBJBIG_OBJECTS = jbig.o jbig_tab.o
- 
- INCLUDES =
diff --git a/graphics/netpbm/files/patch-converter-other-pnmtopalm-Makefile b/graphics/netpbm/files/patch-converter-other-pnmtopalm-Makefile
deleted file mode 100644
index 8dbe9b5bf064..000000000000
--- a/graphics/netpbm/files/patch-converter-other-pnmtopalm-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- converter/other/pnmtopalm/Makefile.orig	Sat Sep 13 04:43:54 2003
-+++ converter/other/pnmtopalm/Makefile	Tue Mar 30 07:05:24 2004
-@@ -7,6 +7,8 @@
- 
- include $(BUILDDIR)/Makefile.config
- 
-+LADD += -lm
-+
- BINARIES = palmtopnm pnmtopalm
- SCRIPTS =
- OBJECTS = $(BINARIES:%=%.o) palmcolormap.o
diff --git a/graphics/netpbm/files/patch-converter-pbm-pbmtoppa-Makefile b/graphics/netpbm/files/patch-converter-pbm-pbmtoppa-Makefile
deleted file mode 100644
index f91e314733f0..000000000000
--- a/graphics/netpbm/files/patch-converter-pbm-pbmtoppa-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- converter/pbm/pbmtoppa/Makefile.orig	Fri Jun  6 04:54:07 2003
-+++ converter/pbm/pbmtoppa/Makefile	Tue Mar 30 06:53:38 2004
-@@ -7,6 +7,8 @@
- 
- include $(BUILDDIR)/Makefile.config
- 
-+LADD += -lm
-+
- all: pbmtoppa
- 
- BINARIES = pbmtoppa
diff --git a/graphics/netpbm/files/patch-lib-Makefile b/graphics/netpbm/files/patch-lib-Makefile
index e83390e31881..4a2aab34c6b9 100644
--- a/graphics/netpbm/files/patch-lib-Makefile
+++ b/graphics/netpbm/files/patch-lib-Makefile
@@ -1,5 +1,5 @@
 --- lib/Makefile.orig	Thu Mar 18 19:09:21 2004
-+++ lib/Makefile	Tue Mar 30 06:34:58 2004
++++ lib/Makefile	Sun Apr  4 08:05:19 2004
 @@ -34,6 +34,8 @@
  # Library objects to be linked but not built by Makefile.common:
  LIBOBJECTS_X = util/shhopt.o util/nstring.o
@@ -26,7 +26,7 @@
  
  ifeq ($(NETPBMLIBTYPE),irixshared)
  # The libxxx.so link is needed to link the executables.
-@@ -104,11 +109,8 @@
+@@ -104,12 +109,9 @@
  # The $(SONAME) link is needed only to test the programs without
  # installing the libraries (in that case, you also need to direct the 
  # dynamic linker to the source directories, e.g. set LD_LIBRARY_PATH).
@@ -35,11 +35,13 @@
 -	$(SYMLINK) $< $@
 -libnetpbm.$(NETPBMLIBSUFFIX).$(MAJ).$(MIN): $(LIBOBJECTS) $(LIBOBJECTS_X)
 -	$(LD) $(LDSHLIB) -o $@ $(LIBOBJECTS) $(LIBOBJECTS_X) \
+-          $(SHLIB_CLIB) $(LADD)
 +$(SONAME): $(SHLIBOBJECTS) $(LIBOBJECTS_X)
 +	$(LD) $(LDSHLIB) -o $@ $(SHLIBOBJECTS) $(LIBOBJECTS_X) \
-           $(SHLIB_CLIB) $(LADD)
++          $(SHLIB_CLIB) $(MATHLIB) $(LADD)
  endif
  
+ ifeq ($(NETPBMLIBTYPE),dll)
 @@ -186,13 +188,10 @@
  .PHONY: install.lib
  ifeq ($(NETPBMLIBTYPE),unixshared)