Cleanup patches, a* categories.

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

With hat:	portmgr
Sponsored by:	Absolight

5 files changed, 23 insertions, 23 deletions

diff --git a/astro/sunclock/files/patch-readpng.c b/astro/sunclock/files/patch-readpng.c
index 1481473bc696..9b3ce86736c2 100644
--- a/astro/sunclock/files/patch-readpng.c
+++ b/astro/sunclock/files/patch-readpng.c
@@ -1,6 +1,6 @@
---- readpng.c.orig	2005-10-23 21:36:29.000000000 +0200
-+++ readpng.c	2010-03-29 14:14:22.000000000 +0200
-@@ -57,7 +57,7 @@
+--- readpng.c.orig	2005-10-23 19:36:29 UTC
++++ readpng.c
+@@ -57,7 +57,7 @@ TestPNG(char *file)  /* gets called a LO
      fread(header, 1, 8, fp);
      fclose(fp);
  
diff --git a/astro/sunclock/files/patch-sunclock.c b/astro/sunclock/files/patch-sunclock.c
index c3e9135f0983..c103f3cea252 100644
--- a/astro/sunclock/files/patch-sunclock.c
+++ b/astro/sunclock/files/patch-sunclock.c
@@ -1,4 +1,4 @@
---- sunclock.c
+--- sunclock.c.orig	2008-08-07 12:40:24 UTC
 +++ sunclock.c
 @@ -113,7 +113,6 @@
  #include <stdlib.h>
@@ -16,7 +16,7 @@
  #ifdef NEW_CTIME
  extern char *   timezone();
  #endif
-@@ -2197,8 +2195,8 @@
+@@ -2197,8 +2195,8 @@ struct Sundata * Context;
  
          if (!Context->mark1.city) return;
  
@@ -27,7 +27,7 @@
  
          /* Get local time at given location */
          setTZ(Context->mark1.city);
-@@ -2335,20 +2333,11 @@
+@@ -2335,20 +2333,11 @@ struct Sundata * Context;
          char            s[128];
          char            slat[20], slon[20], slatp[20], slonp[20];
          double          dist;
@@ -50,7 +50,7 @@
  
          if (!Context->wintype) {
                  char num[80];
-@@ -2696,7 +2685,7 @@
+@@ -2696,7 +2685,7 @@ int build;
  
          Context->bits = 0;
          Context->flags.update = 4;
@@ -59,7 +59,7 @@
          Context->projtime = -1L;
          Context->roottime = -1L;
          Context->animtime = -1L;
-@@ -3918,7 +3907,7 @@
+@@ -3918,7 +3907,7 @@ struct Sundata * Context;
  
          if (button_pressed) return;
  
@@ -68,7 +68,7 @@
  
  	erase_obj = 1;
  	if (Context->flags.colorlevel == MONOCHROME ||
-@@ -3926,10 +3915,10 @@
+@@ -3926,10 +3915,10 @@ struct Sundata * Context;
              drawSunAndMoon(Context);
          erase_obj = 0;
  
@@ -81,7 +81,7 @@
                &Context->moondec, &Context->moonlon, 
                &junk,  &junk, &junk, &junk, &junk, &junk );
  	Context->moonlon = fixangle(Context->moonlon+180.0) - 180.0;
-@@ -3946,10 +3935,10 @@
+@@ -3946,10 +3935,10 @@ struct Sundata * Context;
             update the illuminated area on the screen.   */
  
          if (Context->projtime < 0 || 
@@ -94,7 +94,7 @@
                  Context->noon = noon;
                  Context->fnoon = fnoon;
                  moveNightArea(Context);
-@@ -4557,8 +4546,8 @@
+@@ -4557,8 +4546,8 @@ int dy[5] = { 0, 1, -1, 0, 0};
       hw = Context->geom.height;
       if (do_root == 2) hw += Context->hstrip;
  
@@ -105,7 +105,7 @@
       else
          if (do_root == 2 && mode==0 && rootpix) update = 0;
  
-@@ -4569,7 +4558,7 @@
+@@ -4569,7 +4558,7 @@ int dy[5] = { 0, 1, -1, 0, 0};
          XSetForeground(dpy, Context->gdata->wingc, 
                           Context->gdata->pixel[ROOTCOLOR]);
          XFillRectangle(dpy, rootpix, Context->gdata->wingc, 0, 0, wr, hr);
@@ -114,7 +114,7 @@
          if (random_rootpos) {
             rootdx = (double)(random() % 10001)/10000.0;
             rootdy = (double)(random() % 10001)/10000.0;
-@@ -5542,7 +5531,7 @@
+@@ -5542,7 +5531,7 @@ KeySym  keysym;
               Context->flags.update = 2;
               break;
             case XK_w: 
@@ -123,7 +123,7 @@
               if (do_menu) do_menu = -1;
               if (do_filesel) do_filesel = -1;
               if (do_zoom) do_zoom = -1;
-@@ -5958,9 +5947,9 @@
+@@ -5958,9 +5947,9 @@ struct Sundata * Context;
                drawImageToRootWindow(Context, 0);
  	   XFlush(dpy);
  	   if (Context->flags.animate) {
diff --git a/astro/sunclock/files/patch-sunclock.h b/astro/sunclock/files/patch-sunclock.h
index 5c74ebaf16ea..1136c9a724e0 100644
--- a/astro/sunclock/files/patch-sunclock.h
+++ b/astro/sunclock/files/patch-sunclock.h
@@ -1,8 +1,8 @@
---- sunclock.h.orig	Sat Jul 21 11:49:41 2001
-+++ sunclock.h	Sat Dec  8 21:28:41 2001
-@@ -224,7 +224,7 @@
-         unsigned char * daypixel;       /* pointer to day pixels */
+--- sunclock.h.orig	2006-10-14 14:25:18 UTC
++++ sunclock.h
+@@ -238,7 +238,7 @@ typedef struct Sundata {
          unsigned char * nightpixel;     /* pointer to night pixels */
+         Pixel           *vmfpixels;     /* list of additional vmf pixels */
          int             ncolors;        /* number of colors in day pixels */
 -	long		time;		/* time - real or fake, see flags */
 +	time_t		footime;		/* time - real or fake, see flags */
diff --git a/astro/sunclock/files/patch-tildepath.c b/astro/sunclock/files/patch-tildepath.c
index ba98770cd368..4be22d0792b3 100644
--- a/astro/sunclock/files/patch-tildepath.c
+++ b/astro/sunclock/files/patch-tildepath.c
@@ -1,6 +1,6 @@
---- tildepath.c.orig	Fri Aug 24 07:06:53 2001
-+++ tildepath.c	Fri Aug 24 07:06:59 2001
-@@ -38,7 +38,6 @@
+--- tildepath.c.orig	2000-09-01 15:34:51 UTC
++++ tildepath.c
+@@ -38,7 +38,6 @@ T* AUTHOR
  #include <stdio.h>
  #include <stdlib.h>
  #include <pwd.h>
diff --git a/astro/sunclock/files/patch-widgets.c b/astro/sunclock/files/patch-widgets.c
index e15c78a91f13..82bb0345b739 100644
--- a/astro/sunclock/files/patch-widgets.c
+++ b/astro/sunclock/files/patch-widgets.c
@@ -1,5 +1,5 @@
---- widgets.c.orig	2011-07-09 18:51:18.000000000 +0900
-+++ widgets.c	2012-08-14 04:13:36.000000000 +0900
+--- widgets.c.orig	2011-07-09 09:51:18 UTC
++++ widgets.c
 @@ -1,6 +1,5 @@
  #include <unistd.h>
  #include <sys/types.h>