Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

8 files changed, 24 insertions, 24 deletions

diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile
index 330a6bdeb48e..2771a86a4226 100644
--- a/astro/boinc-astropulse/Makefile
+++ b/astro/boinc-astropulse/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool pkgconfig tar:xz
-WRKSRC=		${WRKDIR}/${DISTNAME}/client
+WRKSRC_SUBDIR=		client
 
 CPPFLAGS+=	-I${LOCALBASE}/include/boinc -I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/astro/boinc-astropulse/files/patch-client__Makefile.am b/astro/boinc-astropulse/files/patch-Makefile.am
index ff5a32b8fd46..9083bb5b2dda 100644
--- a/astro/boinc-astropulse/files/patch-client__Makefile.am
+++ b/astro/boinc-astropulse/files/patch-Makefile.am
@@ -1,6 +1,6 @@
---- Makefile.am	(revision 633)
-+++ Makefile.am	(working copy)
-@@ -31,7 +31,7 @@
+--- Makefile.am.orig	2009-06-11 17:35:16 UTC
++++ Makefile.am
+@@ -31,7 +31,7 @@ if ENABLE_GUI
       GUI_C_FLAGS = $(CLIENT_C_FLAGS) $(GRAPHICS_CFLAGS)
       GUI_LD_FLAGS = $(CLIENT_LD_FLAGS)
       GUI_LD_ADD = -L$(BOINCDIR)/api -L$(BOINCDIR)/lib $(BOINC_LIBS) $(GRAPHICS_LIBS_RAW) $(APP_LIBS)
diff --git a/astro/boinc-astropulse/files/patch-client__ap_client_main.cpp b/astro/boinc-astropulse/files/patch-ap__client__main.cpp
index 6c21d7b9330a..8c8b3d28a70f 100644
--- a/astro/boinc-astropulse/files/patch-client__ap_client_main.cpp
+++ b/astro/boinc-astropulse/files/patch-ap__client__main.cpp
@@ -1,6 +1,6 @@
---- ap_client_main.cpp.orig	2012-08-14 02:07:20.000000000 +0200
-+++ ap_client_main.cpp	2013-08-06 18:41:38.000000000 +0200
-@@ -1288,7 +1288,6 @@
+--- ap_client_main.cpp.orig	2012-08-14 00:07:20 UTC
++++ ap_client_main.cpp
+@@ -1288,7 +1288,6 @@ void Science::mainloop() {
                 * used to inform the core client GUI of the % complete.
                 */
                boinc_fraction_done(state.frac_done);
diff --git a/astro/boinc-astropulse/files/patch-client__ap_fileio.cpp b/astro/boinc-astropulse/files/patch-ap__fileio.cpp
index 7a0929cb3dad..649bf4b31e33 100644
--- a/astro/boinc-astropulse/files/patch-client__ap_fileio.cpp
+++ b/astro/boinc-astropulse/files/patch-ap__fileio.cpp
@@ -1,5 +1,5 @@
---- ap_fileio.cpp.orig	2012-02-28 00:01:04.000000000 +0100
-+++ ap_fileio.cpp	2013-08-05 22:45:10.000000000 +0200
+--- ap_fileio.cpp.orig	2012-02-27 23:01:04 UTC
++++ ap_fileio.cpp
 @@ -22,6 +22,7 @@
  #include "windows.h"
  #endif
diff --git a/astro/boinc-astropulse/files/patch-client__ap_fold.cpp b/astro/boinc-astropulse/files/patch-ap__fold.cpp
index 1b37fa85c797..23d13a925dfd 100644
--- a/astro/boinc-astropulse/files/patch-client__ap_fold.cpp
+++ b/astro/boinc-astropulse/files/patch-ap__fold.cpp
@@ -1,6 +1,6 @@
---- ap_fold.cpp.orig	2009-04-01 02:11:24.000000000 +0200
-+++ ap_fold.cpp	2013-08-06 18:42:02.000000000 +0200
-@@ -283,7 +283,6 @@
+--- ap_fold.cpp.orig	2009-04-01 00:11:24 UTC
++++ ap_fold.cpp
+@@ -283,7 +283,6 @@ int Science::ffa(float *data, int num_su
         * used to inform the core client GUI of the % complete.
         */
        boinc_fraction_done(state.frac_done);
diff --git a/astro/boinc-astropulse/files/patch-client__ap_remove_radar.cpp b/astro/boinc-astropulse/files/patch-ap__remove__radar.cpp
index 102c63b9839b..ee531cec87f4 100644
--- a/astro/boinc-astropulse/files/patch-client__ap_remove_radar.cpp
+++ b/astro/boinc-astropulse/files/patch-ap__remove__radar.cpp
@@ -1,5 +1,5 @@
---- ap_remove_radar.cpp.orig	2012-01-26 07:53:16.000000000 +0100
-+++ ap_remove_radar.cpp	2012-08-12 00:14:40.000000000 +0200
+--- ap_remove_radar.cpp.orig	2012-01-26 06:53:16 UTC
++++ ap_remove_radar.cpp
 @@ -1,5 +1,4 @@
  #include "astropulse.h"
 -#include "ap_graphics.h"
diff --git a/astro/boinc-astropulse/files/patch-client__configure.ac b/astro/boinc-astropulse/files/patch-configure.ac
index e91d5942cc49..f02cac4fe642 100644
--- a/astro/boinc-astropulse/files/patch-client__configure.ac
+++ b/astro/boinc-astropulse/files/patch-configure.ac
@@ -1,8 +1,8 @@
---- configure.ac.orig	2009-06-11 19:35:16.000000000 +0200
-+++ configure.ac	2010-11-28 11:40:22.000000000 +0100
-@@ -7,17 +7,9 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(astropulse, 5.06)
+--- configure.ac.orig	2012-08-14 00:07:20 UTC
++++ configure.ac
+@@ -10,17 +10,9 @@ AC_INIT(astropulse, 6.01)
+ dnl tell libtool the location of the m4 macros
+ AC_CONFIG_MACRO_DIR([m4])
  
 -svnrev="`svn info | grep Revision:`"
 -
@@ -20,7 +20,7 @@
  
  
  echo "--- Configuring Astropulse $AC_PACKAGE_VERSION ---"
-@@ -262,9 +254,7 @@
+@@ -267,9 +259,7 @@ dnl AC_CHECK_LIB([z], [uncompress])
  dnl AC_CHECK_LIB([stdc++], [main])
  SAH_GRX_LIBS
  AC_LANG(C++)
@@ -30,7 +30,7 @@
  AC_CACHE_SAVE
  
  if test "${ac_cv_cxx_compiler_gnu}" = "yes" ; then
-@@ -378,7 +368,7 @@
+@@ -383,7 +373,7 @@ AM_CONDITIONAL(ENABLE_CLIENT, [test "${e
  AM_CONDITIONAL(ENABLE_GUI, [test "${enable_graphics}" = yes])
  AM_CONDITIONAL(LINUX, [test -n "`echo ${target} | grep linux`"])
  AM_CONDITIONAL(I386, [test -n "`echo ${target} | grep i.86`"])
diff --git a/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4 b/astro/boinc-astropulse/files/patch-m4_sah__check__boinc.m4
index d1996c0de03d..6cbf7ca91f6f 100644
--- a/astro/boinc-astropulse/files/patch-client__m4__sah_check_boinc.m4
+++ b/astro/boinc-astropulse/files/patch-m4_sah__check__boinc.m4
@@ -1,6 +1,6 @@
---- m4/sah_check_boinc.m4.orig	2010-03-23 22:00:23.000000000 +0100
-+++ m4/sah_check_boinc.m4	2011-03-13 16:32:29.000000000 +0100
-@@ -30,7 +30,7 @@
+--- m4/sah_check_boinc.m4.orig	2010-03-23 21:00:23 UTC
++++ m4/sah_check_boinc.m4
+@@ -30,7 +30,7 @@ AC_DEFUN([SAH_CHECK_BOINC],[
  	cd $thisdir
  	break
        else