From e3433b69f0a4e5332ce9356e6e37afa4b430b22c Mon Sep 17 00:00:00 2001
From: "Andrey A. Chernov" <ache@FreeBSD.org>
Date: Fri, 25 May 2001 17:28:21 +0000
Subject: [PATCH] Add -z Current -z0 Current functionality. Misc cleanup.

---
 misc/astrolog/Makefile       |  4 ++--
 misc/astrolog/files/patch-ac | 46 ++++++++++++++++++++++++++++++++++++
 misc/astrolog/files/patch-ad | 11 +++++++++
 misc/astrolog/pkg-descr      |  5 +++-
 4 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 misc/astrolog/files/patch-ac
 create mode 100644 misc/astrolog/files/patch-ad

diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 6f228ab2b750..92523e08ced2 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,7 +1,6 @@
 # New ports collection makefile for:    astrolog
-#
+# See some useful stuff at:
 # http://rpkalf2.mach.uni-karlsruhe.de/~ferber/astrolog/
-# http://www.magitech.com/~cruiser1/astrolog.htm
 #
 # Date created:         31 July 1995
 # Whom:                 faulkner@cactus.org
@@ -11,6 +10,7 @@
 
 PORTNAME=	astrolog
 PORTVERSION=	5.40
+PORTREVISION=   1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.astrolog.org/ftp/ephem/ \
 		http://www.astrolog.org/ftp/ \
diff --git a/misc/astrolog/files/patch-ac b/misc/astrolog/files/patch-ac
new file mode 100644
index 000000000000..e3523ed21ebd
--- /dev/null
+++ b/misc/astrolog/files/patch-ac
@@ -0,0 +1,46 @@
+--- astrolog.c.orig	Wed Dec 23 23:29:16 1998
++++ astrolog.c	Fri May 25 21:07:58 2001
+@@ -1146,8 +1146,18 @@
+     case 'z':
+       if (ch1 == '0') {
+         if (argc <= 1 || RParseSz(argv[1], pmZon) == rLarge) {
+-          i = us.dstDef != 0.0;
+-          SwitchF(i);
++	  if (argc > 1 && strcasecmp(argv[1], "current") == 0) {
++	    time_t t;
++	    struct tm *tm;
++
++	    (void) time(&t);
++	    tm = localtime(&t);
++	    i = tm->tm_isdst != 0;
++	    argc--; argv++;
++	  } else {
++	    i = us.dstDef != 0.0;
++	    SwitchF(i);
++	  }
+           SS = us.dstDef = i ? 1.0 : 0.0;
+         } else {
+           SS = us.dstDef = RParseSz(argv[1], pmZon);
+@@ -1236,9 +1246,19 @@
+         argc -= 2; argv += 2;
+         break;
+       }
+-      if (argc <= 1 || RParseSz(argv[1], pmZon) == rLarge)
+-        ZZ -= 1.0;
+-      else {
++      if (argc <= 1 || RParseSz(argv[1], pmZon) == rLarge) {
++	if (argc > 1 && strcasecmp(argv[1], "current") == 0) {
++	  time_t t;
++	  struct tm *tm;
++
++	  (void) time(&t);
++	  tm = localtime(&t);
++	  ZZ = us.zonDef = (tm->tm_isdst ? 1 : 0) -
++			   (real)tm->tm_gmtoff/(60*60);
++          argc--; argv++;
++	} else
++	  ZZ -= 1.0;
++      } else {
+         ZZ = us.zonDef = RParseSz(argv[1], pmZon);
+         if (!FValidZon(us.zonDef)) {
+           ErrorValR("z", us.zonDef);
diff --git a/misc/astrolog/files/patch-ad b/misc/astrolog/files/patch-ad
new file mode 100644
index 000000000000..a8ab61ef23c3
--- /dev/null
+++ b/misc/astrolog/files/patch-ad
@@ -0,0 +1,11 @@
+--- general.c.bak	Wed Dec 23 23:29:21 1998
++++ general.c	Fri May 25 20:59:09 2001
+@@ -922,7 +922,7 @@
+ int *mon, *day, *yea;
+ real *tim, zon;
+ {
+-  dword curtimer;
++  time_t curtimer;
+   int min, sec;
+   real hr;
+ 
diff --git a/misc/astrolog/pkg-descr b/misc/astrolog/pkg-descr
index 3c1f53c0eed4..ae5120d73a5f 100644
--- a/misc/astrolog/pkg-descr
+++ b/misc/astrolog/pkg-descr
@@ -1,4 +1,4 @@
-* Astrolog 5.30 is a many featured and
+Astrolog is a many featured and
 customizable astrology chart calculation
 program for DOS, Windows, Mac, and Unix,
 used in 30+ countries on six continents.
@@ -18,3 +18,6 @@ macros, interactive PC & MS/X11 Windows
 graphics, smooth animation of charts,
 graphic files in PostScript, Windows
 metafile, and bitmap formats, and more!
+
+
+WWW: http://www.astrolog.org/astrolog.htm