Update of astrolog to 5.40. The changes, far too numerous to list here,

are described in great detail in the file Update.540 installed in
${PREFIX}/share/doc/astrolog/.

6 files changed, 59 insertions, 98 deletions

diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 5e8f47ae582..5eeeff09974 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2001/04/09 11:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/04/20 23:27:38 jtb Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/08/10 22:31:15 fenner Exp
 #
 
-DISTNAME=       ast53unx
-PKGNAME=        astrolog-5.30
+DISTNAME=       ast54unx
+PKGNAME=        astrolog-5.40
 CATEGORIES=     misc
 MASTER_SITES=   http://www.astrolog.org/ftp/ephem/ \
 		http://www.astrolog.org/ftp/ \
@@ -36,13 +36,13 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} astrolog ${PREFIX}/bin
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/astrolog
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} Helpfile.530 ${PREFIX}/share/doc/astrolog
+		${INSTALL_DATA} Helpfile.540 ${PREFIX}/share/doc/astrolog
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} Update.530 ${PREFIX}/share/doc/astrolog
+		${INSTALL_DATA} Update.540 ${PREFIX}/share/doc/astrolog
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} README.530 ${PREFIX}/share/doc/astrolog
+		${INSTALL_DATA} README.540 ${PREFIX}/share/doc/astrolog
 	@${ECHO}
-	@${ECHO} "See the file ${PREFIX}/share/doc/astrolog/Helpfile.530 for"
+	@${ECHO} "See the file ${PREFIX}/share/doc/astrolog/Helpfile.540 for"
 	@${ECHO} "help and tune ${PREFIX}/lib/astrolog/astrolog.dat"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/astrolog/distinfo b/misc/astrolog/distinfo
index bdf483c864d..daf5de8111c 100644
--- a/misc/astrolog/distinfo
+++ b/misc/astrolog/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:52:08 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/20 23:27:38 jtb Exp $
 
-SHA1 (astrolog/ast53unx.shr) = 45db30019e11d2a00d934ec055e86cff9ee2dd07
-Size (astrolog/ast53unx.shr) = 1455135 bytes
+SHA1 (astrolog/ast54unx.shr) = 8511f7cdee0a559779f30d838e55e44585775840
+Size (astrolog/ast54unx.shr) = 1465432 bytes
 SHA1 (astrolog/LRZ5_24) = 9c0006c445c2da31d25a202992dff96cfee12ed2
 Size (astrolog/LRZ5_24) = 75000 bytes
 SHA1 (astrolog/CHI_24) = 62a65ebdc73aa2f55f2baab2d98cb925712e910a
 Size (astrolog/CHI_24) = 15000 bytes
 SHA1 (astrolog/CPJV_24) = e9ecc057a1aa7a8423fad31b9e6c9cfdf4316b63
 Size (astrolog/CPJV_24) = 60000 bytes
-SHA1 (patch-aa) = 22f92b4c56e0e72b94df00fccbf39f856507e612
-SHA1 (patch-ab) = 07d267465a1ca3c0211115006054e638075c1b78
+SHA1 (patch-aa) = aa3c6f09b6ba7d1c74465762567cac9c9d7240ce
+SHA1 (patch-ab) = 05cdba66d45c28407e7b2b4a634943218db9ca7c
diff --git a/misc/astrolog/patches/patch-aa b/misc/astrolog/patches/patch-aa
index 9736a86a79e..ea9ef007aec 100644
--- a/misc/astrolog/patches/patch-aa
+++ b/misc/astrolog/patches/patch-aa
@@ -1,23 +1,19 @@
-$NetBSD: patch-aa,v 1.3 2000/09/26 02:20:09 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2001/04/20 23:27:38 jtb Exp $
 
-*** makefile.unx.bak	Sun Sep 29 23:27:00 1996
---- Makefile	Tue Jan 14 01:06:55 1997
-***************
-*** 23,30 ****
-   charts0.o charts1.o charts2.o charts3.o intrpret.o\
-   xdata.o xgeneral.o xdevice.o xcharts0.o xcharts1.o xcharts2.o xscreen.o
-  # If you don't have X windows, delete the "-lX11" part from the line below:
-! LIBS = -lm -lX11
-! CFLAGS = -O
-  
-  astrolog:: $(OBJ)
-  	cc -o $(NAME) $(OBJ) $(LIBS)
---- 23,30 ----
-   charts0.o charts1.o charts2.o charts3.o intrpret.o\
-   xdata.o xgeneral.o xdevice.o xcharts0.o xcharts1.o xcharts2.o xscreen.o
-  # If you don't have X windows, delete the "-lX11" part from the line below:
-! LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lX11 -lm
-! CFLAGS += -I${X11BASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\"
-  
-  astrolog:: $(OBJ)
-  	cc -o $(NAME) $(OBJ) $(LIBS)
+--- Makefile.orig	Sat Apr 21 00:15:30 2001
++++ Makefile
+@@ -23,10 +23,10 @@
+  charts0.o charts1.o charts2.o charts3.o intrpret.o\
+  xdata.o xgeneral.o xdevice.o xcharts0.o xcharts1.o xcharts2.o xscreen.o
+ # If you don't have X windows, delete the "-lX11" part from the line below:
+-LIBS = -lm -lX11
+-CFLAGS = -O
++LIBS = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib -lX11 -lm
++CFLAGS += -I${X11BASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\"
+ 
+ astrolog:: $(OBJ)
+-	cc -o $(NAME) $(OBJ) $(LIBS)
+-	strip $(NAME)
++	$(CC) -o $(NAME) $(OBJ) $(LIBS)
++#	strip $(NAME)
+ #
diff --git a/misc/astrolog/patches/patch-ab b/misc/astrolog/patches/patch-ab
index 391d94fde68..c86bf9234b1 100644
--- a/misc/astrolog/patches/patch-ab
+++ b/misc/astrolog/patches/patch-ab
@@ -1,41 +1,14 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:10:09 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/04/20 23:27:38 jtb Exp $
 
-*** astrolog.h.orig	Sun Feb  2 23:06:03 1997
---- astrolog.h	Thu May 29 05:06:03 1997
-***************
-*** 82,92 ****
-  #define ENVIRON /* Comment out this #define if your system doesn't have  */
-                  /* environment variables or can't compile calls to them. */
-  
-! #define ATOF /* Comment out this #define if you have a system in which  */
-               /* 'atof' and related functions aren't defined in stdio.h, */
-               /* such as most PC's, Linux, VMS compilers, and NeXT's.    */
-  
-! /*#define PROTO /* Comment out this #define if you have an older compiler   */
-                /* which doesn't allow full Ansi function prototypes. This  */
-                /* is for programmers only and has no effect on executable. */
-  
---- 82,92 ----
-  #define ENVIRON /* Comment out this #define if your system doesn't have  */
-                  /* environment variables or can't compile calls to them. */
-  
-! /*#define ATOF /* Comment out this #define if you have a system in which  */
-               /* 'atof' and related functions aren't defined in stdio.h, */
-               /* such as most PC's, Linux, VMS compilers, and NeXT's.    */
-  
-! #define PROTO /* Comment out this #define if you have an older compiler   */
-                /* which doesn't allow full Ansi function prototypes. This  */
-                /* is for programmers only and has no effect on executable. */
-  
-***************
-*** 131,137 ****
---- 131,139 ----
-  */
-  
-  #ifndef PC
-+ #ifndef DEFAULT_DIR
-  #define DEFAULT_DIR "~/astrolog"
-+ #endif
-  #else
-  #define DEFAULT_DIR "C:\\ASTROLOG"
-  #endif
+--- astrolog.h.orig	Wed Dec 23 23:29:00 1998
++++ astrolog.h
+@@ -131,7 +131,9 @@
+ */
+ 
+ #ifndef PC
++#ifndef DEFAULT_DIR
+ #define DEFAULT_DIR "~/astrolog"
++#endif
+ #else
+ #define DEFAULT_DIR "C:\\ASTROLOG"
+ #endif
diff --git a/misc/astrolog/pkg/DESCR b/misc/astrolog/pkg/DESCR
index 3c1f53c0eed..22cf090561e 100644
--- a/misc/astrolog/pkg/DESCR
+++ b/misc/astrolog/pkg/DESCR
@@ -1,20 +1,12 @@
-* Astrolog 5.30 is a many featured and
-customizable astrology chart calculation
-program for DOS, Windows, Mac, and Unix,
-used in 30+ countries on six continents.
-It is 100% freeware and requires no
-registration fee. :) The complete source
-code is available. Astrolog features:
-wheels, aspects, midpoints, relationship
-charts, transits, progressions, some
-interpretations, astro-graphy, local
-horizon, constellations, planet orbits,
-dispositors, various influence charts,
-biorhythms, different zodiacs, central
-planets, 14 house systems, 8400 year
-ephemeris, asteroids, Uranians, fixed
-stars, Arabic parts, script files and
-macros, interactive PC & MS/X11 Windows
-graphics, smooth animation of charts,
-graphic files in PostScript, Windows
-metafile, and bitmap formats, and more!
+Astrolog is a many featured and customizable astrology chart
+calculation program for DOS, Windows, Mac, and Unix, used in 30+
+countries on six continents.  It is 100% freeware and requires no
+registration fee. :) The complete source code is available. Astrolog
+features: wheels, aspects, midpoints, relationship charts, transits,
+progressions, some interpretations, astro-graphy, local horizon,
+constellations, planet orbits, dispositors, various influence charts,
+biorhythms, different zodiacs, central planets, 14 house systems, 8400
+year ephemeris, asteroids, Uranians, fixed stars, Arabic parts, script
+files and macros, interactive PC & MS/X11 Windows graphics, smooth
+animation of charts, graphic files in PostScript, Windows metafile,
+and bitmap formats, and more!
diff --git a/misc/astrolog/pkg/PLIST b/misc/astrolog/pkg/PLIST
index e65fe5e38f4..07276740b84 100644
--- a/misc/astrolog/pkg/PLIST
+++ b/misc/astrolog/pkg/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 1997/11/06 10:01:01 agc Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/04/20 23:27:38 jtb Exp $
 bin/astrolog
-share/doc/astrolog/Helpfile.530
-share/doc/astrolog/README.530
-share/doc/astrolog/Update.530
+share/doc/astrolog/Helpfile.540
+share/doc/astrolog/README.540
+share/doc/astrolog/Update.540
 @dirrm share/doc/astrolog
 lib/astrolog/astrolog.dat
 lib/astrolog/LRZ5_24