Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

5 files changed, 29 insertions, 30 deletions

diff --git a/audio/cdplay/Makefile b/audio/cdplay/Makefile
index 0129a5099dba..58d09c944902 100644
--- a/audio/cdplay/Makefile
+++ b/audio/cdplay/Makefile
@@ -26,7 +26,7 @@ post-patch:
 		-e 's/^OPTIMISE=.*$$/OPTIMISE=/'\
 		${WRKSRC}/Makefile
 
-pre-patch:
+post-extract:
 	@${GUNZIP_CMD} ${WRKSRC}/cdplay.1.gz
 
 do-install:
diff --git a/audio/cdplay/files/patch-cd.c b/audio/cdplay/files/patch-cd.c
index e70d3ce1094f..18fb70325166 100644
--- a/audio/cdplay/files/patch-cd.c
+++ b/audio/cdplay/files/patch-cd.c
@@ -1,6 +1,6 @@
---- cd.c.orig	Mon May 19 15:44:40 2003
-+++ cd.c	Mon May 19 15:53:44 2003
-@@ -98,8 +98,16 @@
+--- cd.c.orig	1997-10-24 15:38:25 UTC
++++ cd.c
+@@ -98,8 +98,16 @@ void play_track(int track)
    cd_play.end_s=cdinfo.s_sec[cdinfo.l_track-1];
    cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1];
    
@@ -19,7 +19,7 @@
  }
  
  /* Skips one track forward */
-@@ -111,7 +119,7 @@
+@@ -111,7 +119,7 @@ void next(void)
  /* Quess */
  void prev(void)
  {
@@ -28,7 +28,7 @@
      play_track(cdinfo.c_track-1);
    else play_track(cdinfo.c_track);
  }
-@@ -141,17 +149,59 @@
+@@ -141,17 +149,59 @@ void cdpause(void)
    }
  }
  
@@ -92,7 +92,7 @@
      cd_play.start_m=cdinfo.c_seca/60;
    }
    cd_play.start_f=1;
-@@ -160,19 +210,25 @@
+@@ -160,19 +210,25 @@ void ff(void)
    cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1];
  
    if(ioctl(cd_fd,CDIOCPLAYMSF,(char *) &cd_play)<0) per();
@@ -122,7 +122,7 @@
      cd_play.start_m=cdinfo.c_seca/60;
    }
    cd_play.start_f=1;
-@@ -181,6 +237,7 @@
+@@ -181,6 +237,7 @@ void rew(void)
    cd_play.end_f=cdinfo.s_frame[cdinfo.l_track-1];
  
    if(ioctl(cd_fd,CDIOCPLAYMSF,(char *) &cd_play)<0) per();
@@ -130,7 +130,7 @@
  }
  
  /* Spit cd out */
-@@ -192,6 +249,7 @@
+@@ -192,6 +249,7 @@ void eject(void)
      per();
    close(cd_fd);
    cdinfo.eject=1;
diff --git a/audio/cdplay/files/patch-cdplay.1 b/audio/cdplay/files/patch-cdplay.1
index 4f08b88aa716..c35918430495 100644
--- a/audio/cdplay/files/patch-cdplay.1
+++ b/audio/cdplay/files/patch-cdplay.1
@@ -1,7 +1,6 @@
-diff -ur ../cdplay-0.92.orig/cdplay.1 ./cdplay.1
---- ../cdplay-0.92.orig/cdplay.1	Fri Nov  7 20:13:21 1997
-+++ ./cdplay.1	Sat Jun 27 00:29:34 1998
-@@ -35,15 +35,14 @@
+--- cdplay.1.orig	1997-11-08 01:13:21 UTC
++++ cdplay.1
+@@ -35,15 +35,14 @@ cdplay \- play CD's with nice interface 
  ]
  .SH DESCRIPTION
  .B cdplay
@@ -20,7 +19,7 @@ diff -ur ../cdplay-0.92.orig/cdplay.1 ./cdplay.1
  .TP
  .BR -h
  Display a brief help message.
-@@ -59,6 +58,9 @@
+@@ -59,6 +58,9 @@ Stop. Stops cd and sets current track to
  Space
  Pause. If cd is already on pause continues.
  .TP
@@ -30,7 +29,7 @@ diff -ur ../cdplay-0.92.orig/cdplay.1 ./cdplay.1
  \'e\'
  Eject. Spits the disc out of your drive.
  .TP
-@@ -79,14 +81,18 @@
+@@ -79,14 +81,18 @@ Skip to track [num]. NOTE! works only fo
  .TP
  \'q\'
  Quit. Exit the program.
diff --git a/audio/cdplay/files/patch-cdplay.h b/audio/cdplay/files/patch-cdplay.h
index c8b3b8b3859f..abccf6bc0899 100644
--- a/audio/cdplay/files/patch-cdplay.h
+++ b/audio/cdplay/files/patch-cdplay.h
@@ -1,6 +1,6 @@
---- ./cdplay.h.orig	Mon May 19 15:44:41 2003
-+++ ./cdplay.h	Mon May 19 15:55:12 2003
-@@ -71,8 +71,9 @@
+--- cdplay.h.orig	1997-11-17 07:21:55 UTC
++++ cdplay.h
+@@ -71,8 +71,9 @@ void next(void);
  void prev(void);
  void stop(void);
  void cdpause(void);
@@ -12,7 +12,7 @@
  void eject(void);
  
  /* Terminal related functions */
-@@ -90,6 +91,7 @@
+@@ -90,6 +91,7 @@ void hs_cont(void);
  void hs_winch(void);
  void do_exit(int);
  void do_stop(void);
diff --git a/audio/cdplay/files/patch-main.c b/audio/cdplay/files/patch-main.c
index b37036c209f9..f9bb8d845181 100644
--- a/audio/cdplay/files/patch-main.c
+++ b/audio/cdplay/files/patch-main.c
@@ -1,6 +1,6 @@
---- ./main.c.orig	Mon May 19 15:44:41 2003
-+++ ./main.c	Mon May 19 15:55:24 2003
-@@ -35,11 +35,14 @@
+--- main.c.orig	1997-11-17 09:26:26 UTC
++++ main.c
+@@ -35,11 +35,14 @@ extern struct termios old_ttyattr;
  int main(int argc, char **argv)
  {
    char cmd[1];
@@ -16,7 +16,7 @@
    if(argc>1 && !strcmp(argv[1],"-d"))
      cd_device=argv[2];
    else if(argc>1)
-@@ -68,19 +71,20 @@
+@@ -68,19 +71,20 @@ int main(int argc, char **argv)
  
    while(1){
      if(select(1,&rset,(fd_set *) 0,(fd_set *) 0,&stime)>0) {
@@ -43,12 +43,10 @@
      }
      update_cdinfo();
      move_up(5);
-@@ -90,6 +94,36 @@
-   }
-     
+@@ -92,6 +96,36 @@ int main(int argc, char **argv)
      exit(0);
-+}
-+
+ }
+ 
 +void getcommand(char *command, int *repetivity)
 +{
 +  static char stored_command;
@@ -77,6 +75,8 @@
 +  }
 +  stored_command='\0';
 +  return;
- }
- 
++}
++
  void hs_cont(void)
+ {
+   init_term();