diff --git a/graphics/mpeg-lib/patches/patch-af b/graphics/mpeg-lib/patches/patch-24bit_c
similarity index 58%
rename from graphics/mpeg-lib/patches/patch-af
rename to graphics/mpeg-lib/patches/patch-24bit_c
index 917c22dd171..79fb22b17a3 100644
--- a/graphics/mpeg-lib/patches/patch-af
+++ b/graphics/mpeg-lib/patches/patch-24bit_c
@@ -1,5 +1,6 @@
---- 24bit.c.orig	Fri Dec 24 01:37:17 1999
-+++ 24bit.c	Fri Dec 24 01:40:16 1999
+$OpenBSD: patch-24bit_c,v 1.1 2004/06/22 03:07:17 brad Exp $
+--- 24bit.c.orig	1999-07-23 21:59:25.000000000 -0600
++++ 24bit.c	2004-06-21 20:01:38.000000000 -0600
 @@ -26,11 +26,13 @@
   */
  
diff --git a/graphics/mpeg-lib/patches/patch-ag b/graphics/mpeg-lib/patches/patch-2x2_c
similarity index 52%
rename from graphics/mpeg-lib/patches/patch-ag
rename to graphics/mpeg-lib/patches/patch-2x2_c
index 931a79851b5..67368195576 100644
--- a/graphics/mpeg-lib/patches/patch-ag
+++ b/graphics/mpeg-lib/patches/patch-2x2_c
@@ -1,5 +1,6 @@
---- 2x2.c.orig	Fri Dec 24 01:40:29 1999
-+++ 2x2.c	Fri Dec 24 01:40:52 1999
+$OpenBSD: patch-2x2_c,v 1.1 2004/06/22 03:07:17 brad Exp $
+--- 2x2.c.orig	1999-07-23 22:06:22.000000000 -0600
++++ 2x2.c	2004-06-21 20:01:38.000000000 -0600
 @@ -21,7 +21,9 @@
  
  #include <config.h>
diff --git a/graphics/mpeg-lib/patches/patch-aa b/graphics/mpeg-lib/patches/patch-Makefile_in
similarity index 83%
rename from graphics/mpeg-lib/patches/patch-aa
rename to graphics/mpeg-lib/patches/patch-Makefile_in
index c8fd33d6e95..fcefbb94b94 100644
--- a/graphics/mpeg-lib/patches/patch-aa
+++ b/graphics/mpeg-lib/patches/patch-Makefile_in
@@ -1,6 +1,7 @@
---- Makefile.in.orig	Thu Nov 26 11:03:29 1998
-+++ Makefile.in	Mon Oct 16 15:29:06 2000
-@@ -15,11 +15,13 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2004/06/22 03:07:17 brad Exp $
+--- Makefile.in.orig	1998-11-26 09:03:29.000000000 -0700
++++ Makefile.in	2004-06-21 20:04:38.000000000 -0600
+@@ -15,11 +15,13 @@ CFLAGS        = $(OPTIMIZE) $(EXTRA_CFLA
  CPPFLAGS      = $(INCLUDE_DIRS) $(DEFINES)
  
  # Installation directories (and install program)
@@ -15,7 +16,7 @@
  
  # Other miscellaneous programs
  AR            = @AR@
-@@ -37,23 +39,29 @@
+@@ -37,23 +39,29 @@ DITHER_SRC    = fs2.c fs2fast.c fs4.c hy
  		mono.c ordered.c ordered2.c mb_ordered.c
  LIBSRC        = @libsrc@
  LIBOBJ        = @libobj@
@@ -39,7 +40,7 @@
  		$(CC) -c $(CFLAGS) $(CPPFLAGS) $<
  
 +.c.so:
-+		$(CC) -c $(CFLAGS) $(CPPFLAGS) $(PICFLAG) -DPIC $< -o $@
++		$(CC) -c $(CFLAGS) $(CPPFLAGS) $(PICFLAG) $< -o $@
  
 -# Library/cleanup targets: 
  
@@ -48,7 +49,7 @@
  
  lib:		$(LIBRARY)
  
-@@ -63,17 +71,24 @@
+@@ -63,17 +71,24 @@ $(LIBRARY):	$(LIBOBJ)
  		$(AR) $(ARFLAGS) $(LIBRARY) $(LIBOBJ)
  		$(RANLIB) $(LIBRARY)
  
diff --git a/graphics/mpeg-lib/patches/patch-aj b/graphics/mpeg-lib/patches/patch-aj
deleted file mode 100644
index 2e006a53e5c..00000000000
--- a/graphics/mpeg-lib/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
---- gdith.c.orig	Sun Jan  2 00:46:44 2000
-+++ gdith.c	Sun Jan  2 00:46:54 2000
-@@ -21,7 +21,9 @@
- 
- 
- #include <config.h>
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include "mpeg.h"
- #include "dither.h"
diff --git a/graphics/mpeg-lib/patches/patch-ao b/graphics/mpeg-lib/patches/patch-ao
deleted file mode 100644
index e5aa64ac6b1..00000000000
--- a/graphics/mpeg-lib/patches/patch-ao
+++ /dev/null
@@ -1,12 +0,0 @@
---- mono.c.orig	Sat Jan  8 13:54:02 2000
-+++ mono.c	Sat Jan  8 13:54:11 2000
-@@ -24,7 +24,9 @@
-  */
- 
- #include <config.h>
-+#ifdef HAVE_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include "video.h"
- #include "proto.h"
diff --git a/graphics/mpeg-lib/patches/patch-ad b/graphics/mpeg-lib/patches/patch-configure
similarity index 52%
rename from graphics/mpeg-lib/patches/patch-ad
rename to graphics/mpeg-lib/patches/patch-configure
index c25780bb866..b7fb7ae9c02 100644
--- a/graphics/mpeg-lib/patches/patch-ad
+++ b/graphics/mpeg-lib/patches/patch-configure
@@ -1,6 +1,7 @@
---- configure.orig	Sun Aug  8 20:36:05 1999
-+++ configure	Thu Sep 14 06:42:14 2000
-@@ -1285,7 +1285,7 @@
+$OpenBSD: patch-configure,v 1.1 2004/06/22 03:07:17 brad Exp $
+--- configure.orig	1999-08-08 18:36:05.000000000 -0600
++++ configure	2004-06-21 20:01:38.000000000 -0600
+@@ -1285,7 +1285,7 @@ EOF
  
  fi
  
diff --git a/graphics/mpeg-lib/patches/patch-ah b/graphics/mpeg-lib/patches/patch-fs2_c
similarity index 59%
rename from graphics/mpeg-lib/patches/patch-ah
rename to graphics/mpeg-lib/patches/patch-fs2_c
index e548e2de63d..f16dd5709c7 100644
--- a/graphics/mpeg-lib/patches/patch-ah
+++ b/graphics/mpeg-lib/patches/patch-fs2_c
@@ -1,5 +1,6 @@
---- fs2.c.orig	Fri Dec 24 01:41:39 1999
-+++ fs2.c	Fri Dec 24 01:42:08 1999
+$OpenBSD: patch-fs2_c,v 1.1 2004/06/22 03:07:17 brad Exp $
+--- fs2.c.orig	1999-07-23 21:40:17.000000000 -0600
++++ fs2.c	2004-06-21 20:01:38.000000000 -0600
 @@ -19,7 +19,9 @@
   * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
   */
diff --git a/graphics/mpeg-lib/patches/patch-ak b/graphics/mpeg-lib/patches/patch-fs2fast_c
similarity index 57%
rename from graphics/mpeg-lib/patches/patch-ak
rename to graphics/mpeg-lib/patches/patch-fs2fast_c
index 4fcb9813e9a..f2c84d0ae77 100644
--- a/graphics/mpeg-lib/patches/patch-ak
+++ b/graphics/mpeg-lib/patches/patch-fs2fast_c
@@ -1,5 +1,6 @@
---- fs2fast.c.orig	Sat Jan  8 13:49:10 2000
-+++ fs2fast.c	Sat Jan  8 13:50:15 2000
+$OpenBSD: patch-fs2fast_c,v 1.1 2004/06/22 03:07:17 brad Exp $
+--- fs2fast.c.orig	1999-07-23 21:59:24.000000000 -0600
++++ fs2fast.c	2004-06-21 20:01:38.000000000 -0600
 @@ -19,7 +19,9 @@
   * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
   */
diff --git a/graphics/mpeg-lib/patches/patch-al b/graphics/mpeg-lib/patches/patch-fs4_c
similarity index 57%
rename from graphics/mpeg-lib/patches/patch-al
rename to graphics/mpeg-lib/patches/patch-fs4_c
index 15f1137443a..c8d6f31c2b4 100644
--- a/graphics/mpeg-lib/patches/patch-al
+++ b/graphics/mpeg-lib/patches/patch-fs4_c
@@ -1,5 +1,6 @@
---- fs4.c.orig	Sat Jan  8 13:50:55 2000
-+++ fs4.c	Sat Jan  8 13:51:03 2000
+$OpenBSD: patch-fs4_c,v 1.1 2004/06/22 03:07:17 brad Exp $
+--- fs4.c.orig	1999-07-23 21:59:24.000000000 -0600
++++ fs4.c	2004-06-21 20:01:38.000000000 -0600
 @@ -21,7 +21,9 @@
  /* This file contains C code to do YCrCb -> colormap space. */
  
diff --git a/graphics/mpeg-lib/patches/patch-gdith_c b/graphics/mpeg-lib/patches/patch-gdith_c
new file mode 100644
index 00000000000..0014ecf9a9b
--- /dev/null
+++ b/graphics/mpeg-lib/patches/patch-gdith_c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-gdith_c,v 1.1 2004/06/22 03:07:17 brad Exp $
+--- gdith.c.orig	1999-07-23 22:04:42.000000000 -0600
++++ gdith.c	2004-06-21 20:01:38.000000000 -0600
+@@ -21,7 +21,9 @@
+ 
+ 
+ #include <config.h>
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include "mpeg.h"
+ #include "dither.h"
diff --git a/graphics/mpeg-lib/patches/patch-ar b/graphics/mpeg-lib/patches/patch-hybrid_c
similarity index 56%
rename from graphics/mpeg-lib/patches/patch-ar
rename to graphics/mpeg-lib/patches/patch-hybrid_c
index ad99b7413b2..11908a934ca 100644
--- a/graphics/mpeg-lib/patches/patch-ar
+++ b/graphics/mpeg-lib/patches/patch-hybrid_c
@@ -1,5 +1,6 @@
---- mb_ordered.c.orig	Sat Jan  8 13:56:05 2000
-+++ mb_ordered.c	Sat Jan  8 13:56:16 2000
+$OpenBSD: patch-hybrid_c,v 1.1 2004/06/22 03:07:17 brad Exp $
+--- hybrid.c.orig	1999-07-23 21:50:51.000000000 -0600
++++ hybrid.c	2004-06-21 20:01:38.000000000 -0600
 @@ -21,7 +21,9 @@
  /* This file contains C code to implement an ordered dither. */
  
diff --git a/graphics/mpeg-lib/patches/patch-an b/graphics/mpeg-lib/patches/patch-hybriderr_c
similarity index 53%
rename from graphics/mpeg-lib/patches/patch-an
rename to graphics/mpeg-lib/patches/patch-hybriderr_c
index 97520e2de0e..663d037e224 100644
--- a/graphics/mpeg-lib/patches/patch-an
+++ b/graphics/mpeg-lib/patches/patch-hybriderr_c
@@ -1,5 +1,6 @@
---- hybriderr.c.orig	Sat Jan  8 13:52:19 2000
-+++ hybriderr.c	Sat Jan  8 13:53:02 2000
+$OpenBSD: patch-hybriderr_c,v 1.1 2004/06/22 03:07:17 brad Exp $
+--- hybriderr.c.orig	1999-07-31 18:05:24.000000000 -0600
++++ hybriderr.c	2004-06-21 20:01:38.000000000 -0600
 @@ -23,8 +23,10 @@
  */
  
diff --git a/graphics/mpeg-lib/patches/patch-am b/graphics/mpeg-lib/patches/patch-mb_ordered_c
similarity index 55%
rename from graphics/mpeg-lib/patches/patch-am
rename to graphics/mpeg-lib/patches/patch-mb_ordered_c
index df1f8da7d5f..92461a8cfaf 100644
--- a/graphics/mpeg-lib/patches/patch-am
+++ b/graphics/mpeg-lib/patches/patch-mb_ordered_c
@@ -1,5 +1,6 @@
---- hybrid.c.orig	Sat Jan  8 13:51:39 2000
-+++ hybrid.c	Sat Jan  8 13:51:51 2000
+$OpenBSD: patch-mb_ordered_c,v 1.1 2004/06/22 03:07:18 brad Exp $
+--- mb_ordered.c.orig	1999-07-23 21:53:08.000000000 -0600
++++ mb_ordered.c	2004-06-21 20:01:39.000000000 -0600
 @@ -21,7 +21,9 @@
  /* This file contains C code to implement an ordered dither. */
  
diff --git a/graphics/mpeg-lib/patches/patch-mono_c b/graphics/mpeg-lib/patches/patch-mono_c
new file mode 100644
index 00000000000..f6ca3893825
--- /dev/null
+++ b/graphics/mpeg-lib/patches/patch-mono_c
@@ -0,0 +1,13 @@
+$OpenBSD: patch-mono_c,v 1.1 2004/06/22 03:07:18 brad Exp $
+--- mono.c.orig	1999-07-23 21:59:22.000000000 -0600
++++ mono.c	2004-06-21 20:01:38.000000000 -0600
+@@ -24,7 +24,9 @@
+  */
+ 
+ #include <config.h>
++#ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include "video.h"
+ #include "proto.h"
diff --git a/graphics/mpeg-lib/patches/patch-aq b/graphics/mpeg-lib/patches/patch-ordered2_c
similarity index 56%
rename from graphics/mpeg-lib/patches/patch-aq
rename to graphics/mpeg-lib/patches/patch-ordered2_c
index ee14ef7f07c..b237b4e2ccb 100644
--- a/graphics/mpeg-lib/patches/patch-aq
+++ b/graphics/mpeg-lib/patches/patch-ordered2_c
@@ -1,5 +1,6 @@
---- ordered2.c.orig	Sat Jan  8 14:04:07 2000
-+++ ordered2.c	Sat Jan  8 14:04:17 2000
+$OpenBSD: patch-ordered2_c,v 1.1 2004/06/22 03:07:18 brad Exp $
+--- ordered2.c.orig	1999-07-23 21:54:01.000000000 -0600
++++ ordered2.c	2004-06-21 20:01:39.000000000 -0600
 @@ -21,7 +21,9 @@
  /* This file contains C code to implement an ordered dither. */
  
diff --git a/graphics/mpeg-lib/patches/patch-ap b/graphics/mpeg-lib/patches/patch-ordered_c
similarity index 56%
rename from graphics/mpeg-lib/patches/patch-ap
rename to graphics/mpeg-lib/patches/patch-ordered_c
index 3ca4a0b28cf..aeab92beee1 100644
--- a/graphics/mpeg-lib/patches/patch-ap
+++ b/graphics/mpeg-lib/patches/patch-ordered_c
@@ -1,5 +1,6 @@
---- ordered.c.orig	Sat Jan  8 14:03:02 2000
-+++ ordered.c	Sat Jan  8 14:03:38 2000
+$OpenBSD: patch-ordered_c,v 1.1 2004/06/22 03:07:18 brad Exp $
+--- ordered.c.orig	1999-07-23 21:53:40.000000000 -0600
++++ ordered.c	2004-06-21 20:01:38.000000000 -0600
 @@ -21,7 +21,9 @@
  /* This file contains C code to implement an ordered dither. */
  
diff --git a/graphics/mpeg-lib/patches/patch-ae b/graphics/mpeg-lib/patches/patch-video_c
similarity index 67%
rename from graphics/mpeg-lib/patches/patch-ae
rename to graphics/mpeg-lib/patches/patch-video_c
index 46ca534d63a..820e380fe5a 100644
--- a/graphics/mpeg-lib/patches/patch-ae
+++ b/graphics/mpeg-lib/patches/patch-video_c
@@ -1,5 +1,6 @@
---- video.c.orig	Sat Jul 24 00:00:51 1999
-+++ video.c	Thu Dec 23 22:41:32 1999
+$OpenBSD: patch-video_c,v 1.1 2004/06/22 03:07:18 brad Exp $
+--- video.c.orig	1999-07-23 22:00:51.000000000 -0600
++++ video.c	2004-06-21 20:01:38.000000000 -0600
 @@ -49,6 +49,10 @@
  #include "proto.h"
  #include "my_dmalloc.h"
@@ -11,7 +12,7 @@
  /* Declarations of functions. */
  static void ReconIMBlock(VidStream *,int);
  static void ReconPMBlock(VidStream *,int,int,int,int);
-@@ -445,7 +449,9 @@
+@@ -445,7 +449,9 @@ mpegVidRsrc(time_stamp, vid_stream)
    static int num_calls = 0;
    unsigned int data;
    int i, status;
diff --git a/graphics/mpeg-lib/patches/patch-ai b/graphics/mpeg-lib/patches/patch-wrapper_c
similarity index 58%
rename from graphics/mpeg-lib/patches/patch-ai
rename to graphics/mpeg-lib/patches/patch-wrapper_c
index 1437790d787..46b63fd8cbe 100644
--- a/graphics/mpeg-lib/patches/patch-ai
+++ b/graphics/mpeg-lib/patches/patch-wrapper_c
@@ -1,5 +1,6 @@
---- wrapper.c.orig	Sun Jan  2 00:45:18 2000
-+++ wrapper.c	Sun Jan  2 00:45:53 2000
+$OpenBSD: patch-wrapper_c,v 1.1 2004/06/22 03:07:18 brad Exp $
+--- wrapper.c.orig	1999-08-08 18:22:14.000000000 -0600
++++ wrapper.c	2004-06-21 20:01:38.000000000 -0600
 @@ -44,7 +44,9 @@
  ---------------------------------------------------------------------------- */