diff --git a/graphics/netpbm/patches/patch-aa b/graphics/netpbm/patches/patch-aa
index 0962448517f..a877bba956b 100644
--- a/graphics/netpbm/patches/patch-aa
+++ b/graphics/netpbm/patches/patch-aa
@@ -1,11 +1,17 @@
---- Makefile.orig	Wed Jan 26 12:47:35 1994
-+++ Makefile	Mon Jan 11 00:17:07 1999
-@@ -21,7 +21,7 @@
+--- Makefile.orig	Wed Jan 26 06:47:35 1994
++++ Makefile	Tue Jun  1 09:25:33 1999
+@@ -16,12 +16,12 @@
+ # gcc can't compile pnmconvol - dunno why.  And on some systems you can't
+ # use the -ansi flag, it gives compilation errors in <math.h>.
+ #CC =		cc
+-CC =		gcc
++#CC =		gcc
+ #CC =		gcc -fcombine-regs -fpcc-struct-return
  #CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
  
  # CONFIGURE: cc flags go here.
 -CFLAGS =	-O
-+CFLAGS =	-O2
++#CFLAGS =	-O2
  #CFLAGS =	-g
  #CFLAGS =	-g -O
  
diff --git a/graphics/netpbm/patches/patch-ab b/graphics/netpbm/patches/patch-ab
index f70459585ed..bf6e575ef25 100644
--- a/graphics/netpbm/patches/patch-ab
+++ b/graphics/netpbm/patches/patch-ab
@@ -9,7 +9,7 @@
  extern void exit();
  extern long time();
  extern int write();
-+#endif /* NetBSD */
++#endif /* OpenBSD */
  #endif
  
  /* CONFIGURE: On most BSD systems, malloc() gets declared in stdlib.h, on
diff --git a/graphics/netpbm/patches/patch-ac b/graphics/netpbm/patches/patch-ac
index 2083960914b..78172af42ce 100644
--- a/graphics/netpbm/patches/patch-ac
+++ b/graphics/netpbm/patches/patch-ac
@@ -1,15 +1,15 @@
---- pbm/Makefile.orig	Sat Nov 20 15:59:20 1993
-+++ pbm/Makefile	Mon Jan 11 00:18:43 1999
+--- pbm/Makefile.orig	Sat Nov 20 09:59:20 1993
++++ pbm/Makefile	Tue Jun  1 09:26:48 1999
 @@ -10,28 +10,31 @@
  # implied warranty.
  
  # Default values, usually overridden by top-level Makefile.
 -CC =		cc
-+CC =		gcc
++#CC =		gcc
  #CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
  #CFLAGS =	-O
 -CFLAGS =	-g
-+CFLAGS =	-O2
++#CFLAGS =	-O2
  #CFLAGS =	-g -O
  TIFFDEF =       -DLIBTIFF
  #LDFLAGS =	-s
diff --git a/graphics/netpbm/patches/patch-ah b/graphics/netpbm/patches/patch-ah
index 8e2e1f3d78e..3ee69a192d4 100644
--- a/graphics/netpbm/patches/patch-ah
+++ b/graphics/netpbm/patches/patch-ah
@@ -1,6 +1,15 @@
---- pgm/Makefile.orig	Fri Jan 28 11:14:02 1994
-+++ pgm/Makefile	Mon Jan 11 00:18:46 1999
-@@ -18,14 +18,16 @@
+--- pgm/Makefile.orig	Fri Jan 28 05:14:02 1994
++++ pgm/Makefile	Tue Jun  1 09:27:43 1999
+@@ -11,21 +11,23 @@
+ 
+ # Default values, usually overridden by top-level Makefile.
+ #CC =		cc
+-CC =		gcc
++#CC =		gcc
+ #CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
+-CFLAGS =	-O
++#CFLAGS =	-O2
+ #CFLAGS =	-g
  #CFLAGS =	-g -O
  LDFLAGS =	-s
  #LDFLAGS =	
diff --git a/graphics/netpbm/patches/patch-aj b/graphics/netpbm/patches/patch-aj
index 508a56c8e7e..58e86053b33 100644
--- a/graphics/netpbm/patches/patch-aj
+++ b/graphics/netpbm/patches/patch-aj
@@ -1,16 +1,16 @@
---- pnm/Makefile.orig	Mon Jan 31 17:47:32 1994
-+++ pnm/Makefile	Mon Jan 11 00:18:48 1999
+--- pnm/Makefile.orig	Mon Jan 31 11:47:32 1994
++++ pnm/Makefile	Tue Jun  1 09:28:32 1999
 @@ -10,27 +10,29 @@
  # implied warranty.
  
  # Default values, usually overridden by top-level Makefile.
 -#CC =		cc
 -CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
-+CC =		gcc
++#CC =		gcc
 +#CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
  #CFLAGS =	-O
 -CFLAGS =	-g
-+CFLAGS =	-O2
++#CFLAGS =	-O2
  #CFLAGS =	-g -O
  TIFFDEF =	-DLIBTIFF
 -TIFFINC =       -I../libtiff
diff --git a/graphics/netpbm/patches/patch-ax b/graphics/netpbm/patches/patch-ax
index ff07e102b41..c4935057c8a 100644
--- a/graphics/netpbm/patches/patch-ax
+++ b/graphics/netpbm/patches/patch-ax
@@ -1,16 +1,16 @@
---- ppm/Makefile.orig	Mon Jan 31 17:44:34 1994
-+++ ppm/Makefile	Mon Jan 11 00:18:52 1999
-@@ -10,22 +10,24 @@
+--- ppm/Makefile.orig	Mon Jan 31 11:44:34 1994
++++ ppm/Makefile	Tue Jun  1 09:29:54 1999
+@@ -10,22 +10,23 @@
  # implied warranty.
  
  # Default values, usually overridden by top-level Makefile.
 -#CC =		cc
 -CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
-+CC =		gcc
-+#CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
- #CFLAGS =	-O
+-#CFLAGS =	-O
 -CFLAGS =	-g
-+CFLAGS =	-O2
++#CC =		gcc
++#CC =		gcc -ansi -pedantic -fcombine-regs -fpcc-struct-return
++#CFLAGS =	-O2
  #CFLAGS =	-g -O
 -#LDFLAGS =	-s
 -LDFLAGS =	
@@ -35,7 +35,7 @@
  
  PGMDIR =	../pgm
  INCLUDEPGM =	-I$(PGMDIR)
-@@ -43,6 +45,7 @@
+@@ -43,6 +44,7 @@
  INCLUDE =	-I.. $(INCLUDEPGM) $(INCLUDEPBM)
  ALLCFLAGS =	$(CFLAGS) $(INCLUDE)
  LIBPPM =	libppm.a
@@ -43,7 +43,7 @@
  
  PORTBINARIES =	bmptoppm gouldtoppm hpcdtoppm ilbmtoppm imgtoppm \
  		mtvtoppm pcxtoppm pgmtoppm pi1toppm picttoppm \
-@@ -85,21 +88,21 @@
+@@ -85,21 +87,21 @@
  MANUALS5 =	ppm
  
  
@@ -73,7 +73,7 @@
  
  merge:		ppmmerge
  ppmmerge:	ppmmerge.c $(OBJECTS) $(LIBPPM) $(LIBPGM) $(LIBPBM)
-@@ -132,15 +135,15 @@
+@@ -132,15 +134,15 @@
  
  
  # Rule for plain programs.
@@ -92,7 +92,7 @@
  	$(CC) $(ALLCFLAGS) "-Dmain=$*_main" -c $*.c
  
  # And libraries.
-@@ -155,16 +158,16 @@
+@@ -155,16 +157,16 @@
  	libppm5.o bitio.o
  	-ranlib $(LIBPPM)
  
@@ -114,7 +114,7 @@
  	$(CC) $(ALLCFLAGS) -c libppm5.c
  bitio.o:	../pbmplus.h bitio.c
  	$(CC) $(ALLCFLAGS) -c bitio.c
-@@ -235,4 +238,4 @@
+@@ -235,4 +237,4 @@
  yuvsplittoppm yuvsplittoppm.o:	yuvsplittoppm.c
  
  clean: