Cleanup patches, a* categories.

Rename them to follow the make makepatch naming, and regenerate them.

With hat:	portmgr
Sponsored by:	Absolight

13 files changed, 68 insertions, 76 deletions

diff --git a/audio/xmcd/files/patch-Imakefile b/audio/xmcd/files/patch-Imakefile
index 68b33fc1577f..14172b03cc15 100644
--- a/audio/xmcd/files/patch-Imakefile
+++ b/audio/xmcd/files/patch-Imakefile
@@ -1,6 +1,6 @@
---- Imakefile.orig	Mon Nov  4 06:44:33 2002
-+++ Imakefile	Mon Nov  4 05:02:09 2002
-@@ -77,5 +77,5 @@
+--- Imakefile.orig	2004-04-21 19:27:01 UTC
++++ Imakefile
+@@ -77,5 +77,5 @@ MANSUFFIX=ManSuffix
   */
  install::
  	@BINDIR=$(BINDIR) LIBDIR=$(LIBDIR) MANDIR=$(MANDIR) \
diff --git a/audio/xmcd/files/patch-cda_d__Imakefile b/audio/xmcd/files/patch-cda__d_Imakefile
index cd6ab3e3730c..260e485956f2 100644
--- a/audio/xmcd/files/patch-cda_d__Imakefile
+++ b/audio/xmcd/files/patch-cda__d_Imakefile
@@ -1,6 +1,6 @@
---- cda_d/Imakefile.orig	Thu Apr 22 03:27:23 2004
-+++ cda_d/Imakefile	Fri Feb  2 04:44:17 2007
-@@ -145,7 +145,7 @@
+--- cda_d/Imakefile.orig	2004-04-21 19:27:23 UTC
++++ cda_d/Imakefile
+@@ -145,7 +145,7 @@ INCLUDES=-I..
  /*
   * Add needed libraries
   */
@@ -9,7 +9,7 @@
  LOCAL_LIBDIR= -L/usr/freeware/lib32 -L/usr/local/lib
  VORBLIB= -lvorbisenc -lvorbis -logg
  FLACLIB= -lFLAC
-@@ -193,7 +193,7 @@
+@@ -193,7 +193,7 @@ LOCAL_LIBRARIES=-L/usr/5lib -lcurses
  LOCAL_LIBRARIES=-lncurses
  #else
  #if defined(FreeBSDArchitecture)
@@ -18,7 +18,7 @@
  .if exists(/usr/include/camlib.h)
  LOCAL_LIBRARIES+= -lcam
  .endif
-@@ -231,6 +231,7 @@
+@@ -231,6 +231,7 @@ LOCAL_LIBRARIES=-lcurses
  #endif	/* LinuxArchitecture OpenBSDArchitecture */
  #endif	/* SunArchitecture */
  
diff --git a/audio/xmcd/files/patch-cdda__d_Imakefile b/audio/xmcd/files/patch-cdda__d_Imakefile
new file mode 100644
index 000000000000..22be17d5067d
--- /dev/null
+++ b/audio/xmcd/files/patch-cdda__d_Imakefile
@@ -0,0 +1,15 @@
+--- cdda_d/Imakefile.orig	2004-04-21 19:27:03 UTC
++++ cdda_d/Imakefile
+@@ -143,6 +143,12 @@ DEFINES+= -DHAS_ALSA
+ endif
+ #endif
+ 
++#if defined(FreeBSDArchitecture)
++/* The following is BSD-make specific */
++.if exists(/usr/include/camlib.h)
++DEFINES+= -DFREEBSD_CAM -DHAS_SETEUID
++.endif
++#endif
+ 
+ /*
+  * POSIX threads stuff
diff --git a/audio/xmcd/files/patch-cdda_d__if_flac.c b/audio/xmcd/files/patch-cdda__d_if__flac.c
index 3dcc0de9352c..cd21d7b22b0d 100644
--- a/audio/xmcd/files/patch-cdda_d__if_flac.c
+++ b/audio/xmcd/files/patch-cdda__d_if__flac.c
@@ -1,5 +1,5 @@
---- cdda_d/if_flac.c.orig	2008-04-06 21:14:40.000000000 +0200
-+++ cdda_d/if_flac.c	2008-04-06 22:11:17.000000000 +0200
+--- cdda_d/if_flac.c.orig	2004-04-21 19:27:05 UTC
++++ cdda_d/if_flac.c
 @@ -57,7 +57,6 @@ typedef float			FLAC__real;
  #include <FLAC/format.h>
  #include <FLAC/metadata.h>
diff --git a/audio/xmcd/files/patch-cdda_d__pthr.c b/audio/xmcd/files/patch-cdda__d_pthr.c
index f58eb6bfb074..47327b814498 100644
--- a/audio/xmcd/files/patch-cdda_d__pthr.c
+++ b/audio/xmcd/files/patch-cdda__d_pthr.c
@@ -1,6 +1,6 @@
---- cdda_d/pthr.c.orig	Mon Apr  5 17:41:11 2004
-+++ cdda_d/pthr.c	Sun Apr 11 01:15:11 2004
-@@ -35,6 +35,7 @@
+--- cdda_d/pthr.c.orig	2004-04-21 19:27:03 UTC
++++ cdda_d/pthr.c
+@@ -35,6 +35,7 @@ static char *_pthr_c_ident_ = "@(#)pthr.
  
  #ifdef CDDA_PTHREADS
  
@@ -8,7 +8,7 @@
  #include "cdda_d/pthr.h"
  
  /*
-@@ -889,6 +890,7 @@
+@@ -889,6 +890,7 @@ cdda_pthr_play(di_dev_t *devp, curstat_t
  	pthr_sem[DATA].v = 0;
  
  #ifndef __VMS	/* VMS has no real fork, so this does not apply */
@@ -16,11 +16,11 @@
  	/* Register fork handler */
  	if ((ret = pthread_atfork(NULL, NULL, cdda_pthr_atfork)) != 0) {
  		(void) sprintf(errbuf,
-@@ -899,6 +901,7 @@
- 		cd->i->state = CDSTAT_COMPLETED;
+@@ -900,6 +902,7 @@ cdda_pthr_play(di_dev_t *devp, curstat_t
  		return FALSE;
  	}
-+#endif
  #endif
++#endif
  
  	/* Ignore SIGPIPE */
+ 	opipe = util_signal(SIGPIPE, SIG_IGN);
diff --git a/audio/xmcd/files/patch-cdda_d__Imakefile b/audio/xmcd/files/patch-cdda_d__Imakefile
deleted file mode 100644
index 031d2e2f247e..000000000000
--- a/audio/xmcd/files/patch-cdda_d__Imakefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- cdda_d/Imakefile.orig	Fri Jun  7 13:33:15 2002
-+++ cdda_d/Imakefile	Fri Jun  7 13:33:21 2002
-@@ -76,6 +76,12 @@
- #endif  /* Linux Sun AIX Ultrix USL SVR4 */
- #endif
- 
-+#if defined(FreeBSDArchitecture)
-+/* The following is BSD-make specific */
-+.if exists(/usr/include/camlib.h)
-+DEFINES+= -DFREEBSD_CAM -DHAS_SETEUID
-+.endif
-+#endif
- 
- /*
-  * Add local include path
diff --git a/audio/xmcd/files/patch-cddb_d__Imakefile b/audio/xmcd/files/patch-cddb__d_Imakefile
index 041fa90ca7b9..c70eb9850d6e 100644
--- a/audio/xmcd/files/patch-cddb_d__Imakefile
+++ b/audio/xmcd/files/patch-cddb__d_Imakefile
@@ -1,6 +1,6 @@
---- cddb_d/Imakefile.orig      Thu May 31 12:53:57 2007
-+++ cddb_d/Imakefile   Thu May 31 12:53:00 2007
-@@ -225,7 +225,7 @@
+--- cddb_d/Imakefile.orig	2004-04-21 19:27:05 UTC
++++ cddb_d/Imakefile
+@@ -225,7 +225,7 @@ KOBJ=	cddbkey1.o
  /*
   * Build rule for the CD Information Library
   */
@@ -8,4 +8,4 @@
 +NormalLibraryTarget(cddblocal,$(OBJS))
  NormalLibraryTarget(cddbkey1,$(KOBJ))
  DependTarget()
-
+ 
diff --git a/audio/xmcd/files/patch-install.sh b/audio/xmcd/files/patch-install.sh
index 14a554f47255..ba2bc500a9d2 100644
--- a/audio/xmcd/files/patch-install.sh
+++ b/audio/xmcd/files/patch-install.sh
@@ -1,4 +1,4 @@
---- install.sh.orig	2004-04-21 19:27:01.000000000 +0000
+--- install.sh.orig	2004-04-21 19:27:01 UTC
 +++ install.sh
 @@ -625,7 +625,7 @@ if [ "$OS_SYS" = A/UX ]
  then
diff --git a/audio/xmcd/files/patch-libdi__d_config.sh b/audio/xmcd/files/patch-libdi__d_config.sh
new file mode 100644
index 000000000000..2b3dde885470
--- /dev/null
+++ b/audio/xmcd/files/patch-libdi__d_config.sh
@@ -0,0 +1,11 @@
+--- libdi_d/config.sh.orig	2004-04-21 19:27:07 UTC
++++ libdi_d/config.sh
+@@ -744,7 +744,7 @@ ask_nonscsi_config()
+ 
+ 	if [ -z "$IOCDEF" -o "$IOCDEF" = 0 ]
+ 	then
+-		IOCDEF=1
++		IOCDEF=2
+ 	fi
+ 
+ 	while :
diff --git a/audio/xmcd/files/patch-libdi_d__config.sh b/audio/xmcd/files/patch-libdi_d__config.sh
deleted file mode 100644
index c05e0b73d47a..000000000000
--- a/audio/xmcd/files/patch-libdi_d__config.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libdi_d/config.sh.orig	Wed Apr 21 15:27:07 2004
-+++ libdi_d/config.sh	Sun Mar 12 23:40:59 2006
-@@ -744,7 +744,7 @@
- 
- 	if [ -z "$IOCDEF" -o "$IOCDEF" = 0 ]
- 	then
--		IOCDEF=1
-+		IOCDEF=2
- 	fi
- 
- 	while :
diff --git a/audio/xmcd/files/patch-util__d_Imakefile b/audio/xmcd/files/patch-util__d_Imakefile
new file mode 100644
index 000000000000..f7bb9cb2966a
--- /dev/null
+++ b/audio/xmcd/files/patch-util__d_Imakefile
@@ -0,0 +1,11 @@
+--- util_d/Imakefile.orig	2004-04-21 19:27:24 UTC
++++ util_d/Imakefile
+@@ -43,7 +43,7 @@
+  * #include "Motif.tmpl"
+  * #include "Motif.rules"
+  */
+-LOCAL_LIBRARIES= XmClientLibs
++LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
+ 
+ 
+ /**** Optional defines:  Change as you see fit. *****************************
diff --git a/audio/xmcd/files/patch-util_d__Imakefile b/audio/xmcd/files/patch-util_d__Imakefile
deleted file mode 100644
index 60031439f5a9..000000000000
--- a/audio/xmcd/files/patch-util_d__Imakefile
+++ /dev/null
@@ -1,19 +0,0 @@
-*** util_d/Imakefile.orig	Wed May 16 15:59:16 2001
---- util_d/Imakefile	Sat Jul  7 03:15:11 2001
-***************
-*** 43,49 ****
-   * #include "Motif.tmpl"
-   * #include "Motif.rules"
-   */
-! LOCAL_LIBRARIES= XmClientLibs
-  
-  
-  /**** Optional defines:  Change as you see fit. *****************************
---- 43,49 ----
-   * #include "Motif.tmpl"
-   * #include "Motif.rules"
-   */
-! LOCAL_LIBRARIES= ${MOTIFLIB} XawClientLibs
-  
-  
-  /**** Optional defines:  Change as you see fit. *****************************
diff --git a/audio/xmcd/files/patch-xmcd_d__Imakefile b/audio/xmcd/files/patch-xmcd__d_Imakefile
index fc4f797ce280..16a810b9fa20 100644
--- a/audio/xmcd/files/patch-xmcd_d__Imakefile
+++ b/audio/xmcd/files/patch-xmcd__d_Imakefile
@@ -1,16 +1,16 @@
---- xmcd_d/Imakefile.orig	Mon Nov  4 06:44:44 2002
-+++ xmcd_d/Imakefile	Mon Nov  4 04:44:28 2002
+--- xmcd_d/Imakefile.orig	2004-04-21 19:27:12 UTC
++++ xmcd_d/Imakefile
 @@ -44,7 +44,7 @@
   * #include "Motif.rules"
   */
-
+ 
 -CDDBLIB= -L../cddb_d -lcddb
 +CDDBLIB= -L../cddb_d -lcddblocal
  LOCAL_LIBDIR= -L/usr/freeware/lib32 -L/usr/local/lib
  VORBLIB= -lvorbisenc -lvorbis -logg
  FLACLIB= -lFLAC
-@@ -82,7 +82,7 @@
- #endif	/* OSF1 */
+@@ -84,7 +84,7 @@ SYS_LIBRARIES= $(CDDBLIB) $(ENCLIBS) -lm
+ #endif	/* Sun5 */
  #endif	/* Linux */
  
 -LOCAL_LIBRARIES= XmClientLibs
@@ -18,11 +18,11 @@
  
  #if defined(FreeBSDArchitecture)
  .if exists(/usr/include/camlib.h)
-@@ -137,6 +137,7 @@
- #endif	/* Linux Sun AIX Ultrix USL SVR4 */
- #endif	/* BSD OSF1 sony_news Sun4 */
+@@ -157,6 +157,7 @@ DEFINES=
+ #endif	/* BSD/OS */
+ #endif	/* Linux */
  
 +MANSUFFIX=1
  
  /*
-  * Add local include path
+  * POSIX threads stuff