5 files changed, 35 insertions, 38 deletions

diff --git a/audio/playmidi/files/patch-Configure b/audio/playmidi/files/patch-Configure
index 4e764cf74af6..c7b9844dbf81 100644
--- a/audio/playmidi/files/patch-Configure
+++ b/audio/playmidi/files/patch-Configure
@@ -1,6 +1,6 @@
---- Configure.orig	Mon May 12 06:26:36 1997
-+++ Configure	Tue Aug 15 22:51:15 2000
-@@ -8,7 +8,7 @@
+--- Configure.orig	1997-05-11 21:26:36 UTC
++++ Configure
+@@ -8,7 +8,7 @@ fmmode=0
  mididevno=-1
  play=PLAY_MIDI
  gus1=/dos/ultrasnd/midi
diff --git a/audio/playmidi/files/patch-Makefile b/audio/playmidi/files/patch-Makefile
index d08757d1c3ae..7cacb2da2d0e 100644
--- a/audio/playmidi/files/patch-Makefile
+++ b/audio/playmidi/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	1998-10-01 04:39:18.000000000 +0200
-+++ Makefile	2014-02-16 11:55:45.713871624 +0100
+--- Makefile.orig	1998-10-01 02:39:18 UTC
++++ Makefile
 @@ -12,39 +12,40 @@
  
  # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt
@@ -54,7 +54,7 @@
  
  OBJECTS = playmidi.o readmidi.o playevents.o \
  	  patchload.o emumidi.o io_ncurses.o
-@@ -58,7 +59,7 @@
+@@ -58,7 +59,7 @@ SOBJECTS= playmidi.o readmidi.o playeven
  GOBJECTS= playmidi.o readmidi.o playevents.o \
  	  patchload.o emumidi.o io_gtk.o
  
@@ -63,7 +63,7 @@
  
  config:
  playmidi.h: playmidi.h-dist
-@@ -73,64 +74,70 @@
+@@ -73,64 +74,70 @@ io_xaw.o: io_xaw.c
  io_svgalib.o: io_svgalib.c
  	$(CC) $(CFLAGS) $(INCVGA) -c io_svgalib.c -o io_svgalib.o
  
@@ -97,24 +97,24 @@
  
  $(INSTALLDIR)/splaymidi: splaymidi
 -	$(INSTALL) splaymidi $(INSTALLDIR)
-+	${BSD_INSTALL_PROGRAM} splaymidi $(INSTALLDIR)
- 
+-
 -/etc/std.o3:
 -	cp -i std.o3 /etc
++	${BSD_INSTALL_PROGRAM} splaymidi $(INSTALLDIR)
+ 
+-/etc/drums.o3:
+-	cp -i drums.o3 /etc
 +$(MIDI)/std.o3:
 +	${BSD_INSTALL_DATA} std.o3 $(MIDI)       
 +  
 +$(MIDI)/drums.o3:
 +	${BSD_INSTALL_DATA} drums.o3 $(MIDI)
  
--/etc/drums.o3:
--	cp -i drums.o3 /etc
+-/etc/std.sb:
+-	cp -i std.sb /etc
 +$(MIDI)/std.sb:
 +	${BSD_INSTALL_DATA} std.sb $(MIDI)       
  
--/etc/std.sb:
--	cp -i std.sb /etc
--
 -/etc/drums.sb:
 -	cp -i drums.sb /etc
 +$(MIDI)/drums.sb:
@@ -122,38 +122,35 @@
  
  $(XAPPDEFAULTS)/XPlaymidi:
 -	cp -i XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
--
++	${BSD_INSTALL_DATA} XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
+ 
 -install: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
 -	 $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
 -	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
--
--install.novga: $(INSTALLDIR)/playmidi \
--	 $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
--	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
-+	${BSD_INSTALL_DATA} XPlaymidi.ad $(XAPPDEFAULTS)/XPlaymidi
- 
--install.noX11: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
--	 /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
 +dirs:
 +	-@mkdir -p $(MIDI)
  
--install.Xonly: $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
+-install.novga: $(INSTALLDIR)/playmidi \
+-	 $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
 -	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
--
--install.lame: $(INSTALLDIR)/playmidi \
--	 /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
 +install: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
 +	 $(INSTALLDIR)/xplaymidi $(MIDI)/std.o3 $(MIDI)/drums.o3 \
 +	 $(MIDI)/std.sb $(MIDI)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
-+
+ 
+-install.noX11: $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
+-	 /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
 +install.novga: dirs $(INSTALLDIR)/playmidi \
 +	 $(INSTALLDIR)/xplaymidi $(MIDI)/std.o3 $(MIDI)/drums.o3 \
 +	 $(MIDI)/std.sb $(MIDI)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
-+
+ 
+-install.Xonly: $(INSTALLDIR)/xplaymidi /etc/std.o3 /etc/drums.o3 \
+-	 /etc/std.sb /etc/drums.sb $(XAPPDEFAULTS)/XPlaymidi
 +install.noX11: dirs $(INSTALLDIR)/playmidi $(INSTALLDIR)/splaymidi \
 +	 $(MIDI)/std.o3 $(MIDI)/drums.o3 \
 +	 $(MIDI)/std.sb $(MIDI)/drums.sb
-+
+ 
+-install.lame: $(INSTALLDIR)/playmidi \
+-	 /etc/std.o3 /etc/drums.o3 /etc/std.sb /etc/drums.sb
 +install.Xonly: dirs $(INSTALLDIR)/xplaymidi \
 +	 $(MIDI)/std.o3 $(MIDI)/drums.o3 \
 +	 $(MIDI)/std.sb $(MIDI)/drums.sb $(XAPPDEFAULTS)/XPlaymidi
@@ -168,7 +165,7 @@
  
  clean:
  	rm -f *.o playmidi splaymidi xplaymidi a.out toy seq2mid beat
-@@ -138,22 +145,3 @@
+@@ -138,22 +145,3 @@ clean:
  distclean: clean
  	rm -f .depend  *~ *.bak playmidi.h config.sed
  
diff --git a/audio/playmidi/files/patch-emumidi.h b/audio/playmidi/files/patch-emumidi.h
index 39df7639dc57..5b1d23638c0c 100644
--- a/audio/playmidi/files/patch-emumidi.h
+++ b/audio/playmidi/files/patch-emumidi.h
@@ -1,5 +1,5 @@
---- emumidi.h.orig	Sun May 11 23:26:36 1997
-+++ emumidi.h	Mon Nov 17 22:05:20 2003
+--- emumidi.h.orig	1997-05-11 21:26:36 UTC
++++ emumidi.h
 @@ -17,7 +17,6 @@
  #ifdef linux
  #include <linux/ultrasound.h>
diff --git a/audio/playmidi/files/patch-patchload.c b/audio/playmidi/files/patch-patchload.c
index 904a15095111..1d08763abd57 100644
--- a/audio/playmidi/files/patch-patchload.c
+++ b/audio/playmidi/files/patch-patchload.c
@@ -1,5 +1,5 @@
---- patchload.c.orig	Sat Feb  7 17:22:51 1998
-+++ patchload.c	Mon Nov 17 22:10:07 2003
+--- patchload.c.orig	1998-02-07 16:22:51 UTC
++++ patchload.c
 @@ -19,7 +19,6 @@
  #ifdef linux
  #include <linux/ultrasound.h>
@@ -8,7 +8,7 @@
  #endif
  #include <sys/stat.h>
  #include <fcntl.h>
-@@ -93,7 +92,6 @@
+@@ -93,7 +92,6 @@ int pgm;
  
      if (pgm < 0) {
  	use8bit = force8bit;
diff --git a/audio/playmidi/files/patch-playmidi_h-dist b/audio/playmidi/files/patch-playmidi.h-dist
index 53ef556a7e4b..5fbe13926c45 100644
--- a/audio/playmidi/files/patch-playmidi_h-dist
+++ b/audio/playmidi/files/patch-playmidi.h-dist
@@ -1,5 +1,5 @@
---- playmidi.h-dist.orig	Mon May 12 06:26:36 1997
-+++ playmidi.h-dist	Tue Aug 15 23:02:27 2000
+--- playmidi.h-dist.orig	1997-05-11 21:26:36 UTC
++++ playmidi.h-dist
 @@ -35,10 +35,10 @@
  #define MAXTRKS		128
  /* where to find fm patch libraries */