author: Andrey A. Chernov <ache@FreeBSD.org> 2012-02-26 09:20:16 +0000
committer: Andrey A. Chernov <ache@FreeBSD.org> 2012-02-26 09:20:16 +0000
commit: 98228699b13906cd02467a4c9cc7b1c3d992492c (patch)
tree: 940a3940b168ce923e21fc4a7bc9ad883e20d176 /misc/astrolog
parent: 649db06f7d1f67939744ec7529740ffab527c8c5 (diff)
download: ports-98228699b13906cd02467a4c9cc7b1c3d992492c.tar.gz
ports-98228699b13906cd02467a4c9cc7b1c3d992492c.zip
14 files changed, 412 insertions, 233 deletions
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 27fcee327444..646d85596d33 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,6 +1,4 @@
 # New ports collection makefile for:    astrolog
-# See some useful stuff at:
-# http://rpkalf2.mach.uni-karlsruhe.de/~ferber/astrolog/
 #
 # Date created:         31 July 1995
 # Whom:                 faulkner@cactus.org
@@ -9,46 +7,44 @@
 #
 
 PORTNAME=	astrolog
-PORTVERSION=	5.40
-PORTREVISION=	12
-CATEGORIES=	misc
-MASTER_SITES=	http://www.astrolog.org/ftp/ephem/:ephem \
-		http://www.astrolog.org/ftp/:dist
-DISTFILES=	${EXTRACT_ONLY}:dist ${EPHEM}:ephem
-EXTRACT_ONLY=	ast54unx.shr
+PORTVERSION=    5.41g
+CATEGORIES=     misc astro
+MASTER_SITES=   ftp://ftp.astro.com/pub/swisseph/ephe/archive_gzip/:ephe \
+		http://astrolog.offline.ee/astrolog/changed/:dist
+DISTFILES=      a541gsrc.tar.gz:dist ${EPHE}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An astrology program for X11 and alpha-numeric terminals
 
-EPHEM=		ephemall.zip
+# Swiss Ephemeris GPLv2 licensed, see
+# http://www.astro.com/ftp/swisseph/LICENSE.TXT
+LICENSE=        GPLv2 # (or later)
+
+EPHE=           sweph_00.tar.gz:ephe sweph_06.tar.gz:ephe \
+		sweph_12.tar.gz:ephe sweph_18.tar.gz:ephe \
+		sweph_24.tar.gz:ephe sweph_30.tar.gz:ephe \
+		sweph_36.tar.gz:ephe sweph_42.tar.gz:ephe \
+		sweph_48.tar.gz:ephe swephm06.tar.gz:ephe \
+		swephm12.tar.gz:ephe swephm18.tar.gz:ephe \
+		swephm24.tar.gz:ephe swephm30.tar.gz:ephe \
+		swephm36.tar.gz:ephe swephm42.tar.gz:ephe \
+		swephm48.tar.gz:ephe swephm54.tar.gz:ephe
 
-USE_ZIP=	yes
-USE_DOS2UNIX=	ephem/EPHINDEX.TXT
 .if !defined(WITHOUT_X11)
 USE_XORG=	x11
 MAKE_ARGS=	-DX11
 .endif
-EXTRACT_CMD=	${SH}
-EXTRACT_BEFORE_ARGS=	# empty
-EXTRACT_AFTER_ARGS=	# empty
 DIST_SUBDIR=	astrolog
 ALL_TARGET=	astrolog
+MAKEFILE=       makefile
 NO_WRKSUBDIR=	yes
 
-DOCS=		Helpfile.540 Update.540 README.540
-
-post-extract:
-	-@${MKDIR} ${WRKDIR}/ephem
-	${UNZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EPHEM} -d ${WRKDIR}/ephem
-
-post-patch:
-	@${REINPLACE_CMD} -e "s@malloc.h@stdlib.h@g" \
-		${WRKSRC}/astrolog.h ${WRKSRC}/placalc.h
+DOCS=           helpfile.540 readme.541 changes.txt
 
 do-install:
 	-@${MKDIR} ${PREFIX}/lib/astrolog
-	cd ${WRKDIR}/ephem && \
-		${INSTALL_DATA} * ${PREFIX}/lib/astrolog
+	cd ${WRKDIR} && \
+		${INSTALL_DATA} fixstars.ast *.se1 ${PREFIX}/lib/astrolog
 	cd ${WRKSRC}; \
 		${INSTALL_DATA} astrolog.dat ${PREFIX}/lib/astrolog/astrolog.dat-dist; \
 		if [ ! -f ${PREFIX}/lib/astrolog/astrolog.dat ] ; then \
@@ -62,7 +58,7 @@ do-install:
 .endfor
 .endif
 	@${ECHO_MSG}
-	@${ECHO_MSG} "See the file ${PREFIX}/share/doc/astrolog/Helpfile.540 for help"
+	@${ECHO_MSG} "See the file ${PREFIX}/share/doc/astrolog/helpfile.540 for help"
 	@${ECHO_MSG} "and tune ${PREFIX}/lib/astrolog/astrolog.dat"
 
 .include <bsd.port.mk>
diff --git a/misc/astrolog/distinfo b/misc/astrolog/distinfo
index 2023c1f3d6f3..83b3b3c18cde 100644
--- a/misc/astrolog/distinfo
+++ b/misc/astrolog/distinfo
@@ -1,4 +1,38 @@
-SHA256 (astrolog/ast54unx.shr) = 6700d393a421c16076d1aad37f171fde6293f1c062ec6a6ee07a884182287736
-SIZE (astrolog/ast54unx.shr) = 1465432
-SHA256 (astrolog/ephemall.zip) = d1a6de1de067af81c17500fbce52861f3e2a0a6925ecf599e55397d6f9684910
-SIZE (astrolog/ephemall.zip) = 4604012
+SHA256 (astrolog/a541gsrc.tar.gz) = 38b625e21688cac692d1951bdd8109ead8431a7b56cc7eea2a75bf26c30843a3
+SIZE (astrolog/a541gsrc.tar.gz) = 659319
+SHA256 (astrolog/sweph_00.tar.gz) = 5c92fe5a8b33f451efe1431807dbd58cdfa511fd43af6a36d99c2cda185d4be8
+SIZE (astrolog/sweph_00.tar.gz) = 1892855
+SHA256 (astrolog/sweph_06.tar.gz) = b79128887f741917a84104ade31f930c20c9eada9aab2eb2f22b9abecf154f1a
+SIZE (astrolog/sweph_06.tar.gz) = 1884410
+SHA256 (astrolog/sweph_12.tar.gz) = d8d3912239c7f4b8afaea75d23c4a15d35e21cd383e2fb23f737418be1bf66c3
+SIZE (astrolog/sweph_12.tar.gz) = 1872906
+SHA256 (astrolog/sweph_18.tar.gz) = 2ea2b8fe1176d8566c9cff95dabbe9f27a6db5151a83a6a530a411dfdb43ede7
+SIZE (astrolog/sweph_18.tar.gz) = 1870027
+SHA256 (astrolog/sweph_24.tar.gz) = ec8769ed640e375904f83de81c71bcc4462db5caceed10efa813d5d464f6ad13
+SIZE (astrolog/sweph_24.tar.gz) = 1874290
+SHA256 (astrolog/sweph_30.tar.gz) = be7e6109faa23f5ff237b6ef45673e820ee7f23b6c3469f89381334984fa7ba2
+SIZE (astrolog/sweph_30.tar.gz) = 1879741
+SHA256 (astrolog/sweph_36.tar.gz) = d5f142c2c23bb2f4dc9826be5f50b3f5cfdc67b5222ee258885e8c2282d866f9
+SIZE (astrolog/sweph_36.tar.gz) = 1893658
+SHA256 (astrolog/sweph_42.tar.gz) = 2126a94bf9c04b5a6cfd82d2a27e2fe0c66889b0efbc9557c0d4e23065bf7073
+SIZE (astrolog/sweph_42.tar.gz) = 1903555
+SHA256 (astrolog/sweph_48.tar.gz) = 23b9cd4b89cbe6550471a68dc1674f0a8a3d6aed147943e44316d92f9d8bc824
+SIZE (astrolog/sweph_48.tar.gz) = 1912650
+SHA256 (astrolog/swephm06.tar.gz) = bf7fee33065204e2a676ba2224e0d248466029bb5bc4acd153c1b7066a0edd21
+SIZE (astrolog/swephm06.tar.gz) = 1902083
+SHA256 (astrolog/swephm12.tar.gz) = 70fcc3e5393b577dd19720694667eea6b0a24b8ad73fa27dfc480e6db67538bd
+SIZE (astrolog/swephm12.tar.gz) = 1915169
+SHA256 (astrolog/swephm18.tar.gz) = 1f9d279f978441664b52d01b07b68a38efb1144a355247ced6f82998581c0964
+SIZE (astrolog/swephm18.tar.gz) = 1926855
+SHA256 (astrolog/swephm24.tar.gz) = 88af9264bd49712b683317dd4eec653c38d2cc97e50ccb0490e495d09a76b5ff
+SIZE (astrolog/swephm24.tar.gz) = 1937055
+SHA256 (astrolog/swephm30.tar.gz) = 6395da1633d95540b77553fb3511d0a51acbadae1a764a367e3f1ba1e780ed40
+SIZE (astrolog/swephm30.tar.gz) = 1946903
+SHA256 (astrolog/swephm36.tar.gz) = cbdeae45cf875537ad523b3f2429dffae5bff227ffda64ebc5f1de402e2c481e
+SIZE (astrolog/swephm36.tar.gz) = 1959958
+SHA256 (astrolog/swephm42.tar.gz) = 7d2b577f7034176bb499f902ed7e98ee80758691633f1fb0a4f8b026d9fb64a2
+SIZE (astrolog/swephm42.tar.gz) = 1977310
+SHA256 (astrolog/swephm48.tar.gz) = 03dadea99521fbbccbc90e6c3f5315986ec308a3973ab294e75e6d89cbc7289e
+SIZE (astrolog/swephm48.tar.gz) = 1988548
+SHA256 (astrolog/swephm54.tar.gz) = 500b2ed7940ee593c7c361270ee808a74ab3940c24656b2b84c92e8578322748
+SIZE (astrolog/swephm54.tar.gz) = 2000428
diff --git a/misc/astrolog/files/patch-aa b/misc/astrolog/files/patch-aa
index 0598b081ba64..b6ff3e3fe81a 100644
--- a/misc/astrolog/files/patch-aa
+++ b/misc/astrolog/files/patch-aa
@@ -1,11 +1,10 @@
---- Makefile.orig	Wed Dec 23 23:29:57 1998
-+++ Makefile	Thu Jan 26 06:18:04 2006
-@@ -23,8 +23,13 @@
-  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
+--- makefile.orig	2002-04-27 22:48:52.000000000 +0400
++++ makefile	2012-02-25 22:50:00.000000000 +0400
+@@ -28,9 +28,15 @@
+ # LIBS = -lm -lX11
+ # with Debian Linux and X windows worked 
+ # LIBS = -lm -L/usr/X11R6/lib -lX11
+-LIBS= -lm
 +.if defined(X11)
 +LIBS = -L${LOCALBASE}/lib -lX11 -lm
 +CFLAGS += -DX11 -I${LOCALBASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\"
@@ -13,6 +12,9 @@
 +LIBS = -lm
 +CFLAGS += -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\"
 +.endif
- 
- astrolog:: $(OBJ)
- 	cc -o $(NAME) $(OBJ) $(LIBS)
+ #
+-CFLAGS = -O -DHPUX_SOURCE
++#CFLAGS = -O -DHPUX_SOURCE
+ #
+ # CFLAGS from 5.41 original sources
+ # CFLAGS = -g -Aa -DHPUX_SOURCE
diff --git a/misc/astrolog/files/patch-ab b/misc/astrolog/files/patch-ab
index d9cf300d1f0b..87e4a811c345 100644
--- a/misc/astrolog/files/patch-ab
+++ b/misc/astrolog/files/patch-ab
@@ -1,55 +1,33 @@
---- astrolog.h.orig	1998-12-23 23:29:05.000000000 +0000
-+++ astrolog.h	2011-11-30 16:32:47.000000000 +0000
-@@ -52,7 +52,7 @@
- 
- /*#define MAC /* Comment out this #define if you're not compiling for a Mac. */
- 
--#define X11 /* Comment out this #define if you don't have X windows, or */
-+/*#define X11 /* Comment out this #define if you don't have X windows, or */
-             /* else have them and don't wish to compile in X graphics.  */
- 
- /*#define WIN /* Comment out this #define if you don't have MS Windows, or */
-@@ -69,9 +69,11 @@
+--- astrolog.h.orig	2002-04-27 22:50:39.000000000 +0400
++++ astrolog.h	2012-02-25 21:25:04.000000000 +0400
+@@ -72,9 +72,11 @@
  /*#define MACG /* Comment out this #define if you don't have a Mac, or else  */
               /* have one and don't wish to compile in Mac screen graphics. */
  
+-/*#define MOUSE /* Comment out this #define if you don't have a mouse, or    */
 +#if defined(X11) || defined(WIN) || defined(MSG) || defined(BGI) || defined(MACG)
- #define MOUSE /* Comment out this #define if you don't have a mouse, or    */
++#define MOUSE /* Comment out this #define if you don't have a mouse, or    */
                /* don't wish to compile in mouse tracking features. This is */
                /* only valid if X11, WIN, MSG, BGI, or MACG above are set.  */
 +#endif
  
  #define TIME /* Comment out this #define if your compiler can't take the  */
               /* calls to the 'time' or 'localtime' functions as in time.h */
-@@ -86,7 +88,7 @@
-              /* '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   */
-+#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,7 +133,9 @@
+@@ -138,9 +140,13 @@
  */
  
  #ifndef PC
 +#ifndef DEFAULT_DIR
  #define DEFAULT_DIR "~/astrolog"
-+#endif
+ #define EPHE_DIR "~/astrolog/ephe"
  #else
++#define EPHE_DIR DEFAULT_DIR
++#endif
++#else
  #define DEFAULT_DIR "C:\\ASTROLOG"
+ #define EPHE_DIR DEFAULT_DIR
  #endif
-@@ -271,7 +275,7 @@
- #endif
- #include <math.h>
- #ifdef PC
--#include <malloc.h>
-+#include <stdlib.h>
- #endif
- #ifdef TIME
- #include <time.h>
-@@ -281,6 +285,8 @@
+@@ -292,6 +298,8 @@
  #define ISG
  #include <X11/Xlib.h>
  #include <X11/Xutil.h>
@@ -58,7 +36,7 @@
  #endif
  #ifdef WIN
  #define ISG
-@@ -1046,9 +1052,9 @@
+@@ -1068,9 +1076,9 @@
  */
  
  #define byte  unsigned char
@@ -70,4 +48,4 @@
 +#define word4 int32_t
  #define real  double
  #define _char unsigned char
- #define _int  unsigned int
-\ No newline at end of file
+ #define _int  unsigned int
diff --git a/misc/astrolog/files/patch-ad b/misc/astrolog/files/patch-ad
index a8ab61ef23c3..faaf547d22bc 100644
--- a/misc/astrolog/files/patch-ad
+++ b/misc/astrolog/files/patch-ad
@@ -1,6 +1,42 @@
---- general.c.bak	Wed Dec 23 23:29:21 1998
-+++ general.c	Fri May 25 20:59:09 2001
-@@ -922,7 +922,7 @@
+--- general.c.orig	2002-04-27 22:33:57.000000000 +0400
++++ general.c	2012-02-26 11:13:09.000000000 +0400
+@@ -900,14 +900,32 @@
+ 
+ /* Return a string containing the given time zone, given as a real value     */
+ /* having the hours before GMT in the integer part and minutes fractionally. */
++/* Seconds are printed when needed.                                          */
+ 
+ byte *SzZone(zon)
+ real zon;
+ {
+-  static byte szZon[7];
++  static byte szZon[10];
++  int hr, min, sec;
++  real rMin;
+ 
+-  sprintf(szZon, "%c%d:%02d", zon > 0.0 ? '-' : '+', (int)RAbs(zon),
+-    (int)(RFract(RAbs(zon))*100.0+rRound/60.0));
++  hr = NFloor(RAbs(zon));
++  rMin = RFract(RAbs(zon)) * 100.0;
++  min = (int)(rMin + rRound / 600.0);
++  rFractal = RFract(rMin);
++  if (rFractal > rOne)
++    rFractal = rSmall;
++  sec = (int)(60.0*rFractal + rRound);
++  while (min >= 60) {
++    min -= 60;
++    hr++;
++  }
++  while (hr >= 24)
++    hr -= 24;
++  if (sec == 0)
++    sprintf(szZon, "%c%d:%02d", zon > 0.0 ? '-' : '+', hr, min);
++  else
++    sprintf(szZon, "%c%d:%02d:%02d", zon > 0.0 ? '-' : '+', hr, min, sec);
+   return szZon;
+ }
+ 
+@@ -970,7 +988,7 @@
  int *mon, *day, *yea;
  real *tim, zon;
  {
diff --git a/misc/astrolog/files/patch-astrolog.dat b/misc/astrolog/files/patch-astrolog.dat
index 6cc3a8163402..79b374cf6f68 100644
--- a/misc/astrolog/files/patch-astrolog.dat
+++ b/misc/astrolog/files/patch-astrolog.dat
@@ -1,24 +1,68 @@
---- astrolog.dat.orig	1998-12-23 23:29:33.000000000 +0300
-+++ astrolog.dat	2010-03-23 12:41:51.000000000 +0300
-@@ -1,7 +1,7 @@
- @0308  ; Astrolog (5.40) default settings file astrolog.dat
+--- astrolog.dat.orig	2002-05-18 22:28:32.000000000 +0400
++++ astrolog.dat	2012-02-26 09:47:59.000000000 +0400
+@@ -1,25 +1,25 @@
+ @0308  ; Astrolog (5.41G) default settings file astrolog.dat
  
 --z0 0             ; Default Daylight time setting   [0 standard, 1 daylight]
---z +8:00          ; Default time zone               [hours before GMT      ]
+--z -2:00          ; Default time zone               [hours before GMT      ]
 +-z0 current       ; Default Daylight time setting   [0 standard, 1 daylight]
 +-z current        ; Default time zone               [hours before GMT      ]
- -zl 122W20 47N36  ; Default longitude and latitude
+ -zl  26:43:00E 58:23:00N  ; Default longitude and latitude
  
  -Yz 0   ; Time minute addition to be used when "now" charts are off.
-@@ -14,9 +14,9 @@
- _k      ; Ansi color text           ["=k" is color, "_k" is normal     ]
- :d 12   ; Searching divisions       [Change "12" to desired divisions  ]
- _b0     ; Print zodiac seconds      ["_b0" to minute, "=b0" to second  ]
--_b      ; Use ephemeris files       ["=b" uses them, "_b" doesn't      ]
-+=b      ; Use ephemeris files       ["=b" uses them, "_b" doesn't      ]
+--n      ; Uncomment this line to start with the chart for "now".
++;-n      ; Uncomment this line to start with the chart for "now".
+ 
+ _s      ; Zodiac selection          ["_s" is tropical, "=s" is sidereal]
+ :s 0    ; Zodiac offset value       [Change "0" to desired offset      ]
+--A 5    ; Number of aspects         [Change "5" to desired number      ]
++-A 11   ; Number of aspects         [Change "5" to desired number      ]
+ -c 0    ; House system              [Change "0" to desired system      ]
+-=k      ; Ansi color text           ["=k" is color, "_k" is normal     ]
++_k      ; Ansi color text           ["=k" is color, "_k" is normal     ]
+ :d 48   ; Searching divisions       [Change "12" to desired divisions  ]
+-_b0     ; Print zodiac seconds      ["_b0" to minute, "=b0" to second  ]
++=b0     ; Print zodiac seconds      ["_b0" to minute, "=b0" to second  ]
+ =b      ; Use ephemeris files       ["=b" uses them, "_b" doesn't      ]
  =C      ; Show house cusp objects   ["_C" hides them, "=C" shows them  ]
 -:w 4    ; Wheel chart text rows     [Change "4" to desired wheel rows  ]
-+:w 6    ; Wheel chart text rows     [Change "4" to desired wheel rows  ]
++:w 9    ; Wheel chart text rows     [Change "4" to desired wheel rows  ]
  :I 80   ; Text screen columns       [Change "80" to desired columns    ]
- -YQ 0   ; Text screen scroll limit  [Change "24" or set to "0" for none]
- _Yd     ; European date format      ["_Yd" is MDY, "=Yd" is DMY        ]
+--YQ 24  ; Text screen scroll limit  [Change "24" or set to "0" for none]
+-=Yd     ; European date format      ["_Yd" is MDY, "=Yd" is DMY        ]
++-YQ 0   ; Text screen scroll limit  [Change "24" or set to "0" for none]
++_Yd     ; European date format      ["_Yd" is MDY, "=Yd" is DMY        ]
+ =Yt     ; European time format      ["_Yt" is AM/PM, "=Yt" is 24 hour  ]
+ =YC     ; Smart cusp displays       ["=YC" is smart, "_YC" is normal   ]
+ =Y8     ; Clip text to end of line  ["=Y8" clips, "_Y8" doesn't clip   ]
+@@ -49,14 +49,14 @@
+ _YH       ; Circumpolar flip of MC. "=YH" flips,"_YH" doesn't.
+ =Ym       ; Month alternat. format. "=Ym" alternat., "_Ym" original.
+ =YZ       ; NESW local horizon. "_YZ" original ENWS.
+-=YD       ; Dispositors' glyphs on the wheel. "=YD" on, "_YD" off.
++_YD       ; Dispositors' glyphs on the wheel. "=YD" on, "_YD" off.
+ 
+ 
+ ; DEFAULT RESTRICTIONS:
+ 
+ -YR 1 10     0 0 0 0 0 0 0 0 0 0      ; Planets
+--YR 11 20    1 1 1 1 1 0 1 0 1 1      ; Minor planets
+--YR 21 32    0 1 1 0 1 1 0 1 1 0 1 1  ; House cusps
++-YR 11 20    0 1 1 1 1 0 0 0 1 1      ; Minor planets
++-YR 21 32    0 1 1 1 1 1 1 1 1 0 1 1  ; House cusps
+ -YR 33 41    1 1 1 1 1 1 1 1 1        ; Uranians
+ 
+ ; DEFAULT TRANSIT RESTRICTIONS:
+@@ -78,9 +78,9 @@
+ 
+ ; DEFAULT ASPECT ORBS:
+ 
+--YAo 1 5     7.0 6.0 6.0 6.0 6.0          ; Major aspects
+--YAo 6 11    3.0 3.0 3.0 3.0 2.0 2.0      ; Minor aspects
+--YAo 12 18   1.0 1.0 1.0 1.0 1.0 1.0 1.0  ; Obscure aspects
++-YAo 1 5     3.5 3.0 3.0 3.0 3.0          ; Major aspects
++-YAo 6 11    1.5 1.5 1.5 1.5 1.0 1.0      ; Minor aspects
++-YAo 12 18   0.75 0.75 0.75 0.75 0.75 0.75 0.75  ; Obscure aspects
+ 
+ ; DEFAULT MAX PLANET ASPECT ORBS:
+ 
diff --git a/misc/astrolog/files/patch-charts1.c b/misc/astrolog/files/patch-charts1.c
index f4542943a6fd..00d14230adb0 100644
--- a/misc/astrolog/files/patch-charts1.c
+++ b/misc/astrolog/files/patch-charts1.c
@@ -1,29 +1,101 @@
---- charts1.c.orig	1998-12-23 23:29:14.000000000 +0300
-+++ charts1.c	2012-02-25 19:40:41.000000000 +0400
-@@ -53,7 +53,7 @@
-   char sz[cchSzDef];
-   int day, fNam, fLoc;
+--- charts1.c.orig	2002-04-27 22:32:58.000000000 +0400
++++ charts1.c	2012-02-26 10:14:28.000000000 +0400
+@@ -66,7 +66,7 @@
+     ciMain = ciCore;
+   }
  
 -  fNam = *ciMain.nam > chNull; fLoc = *ciMain.loc > chNull;
 +  fNam = *ciMain.nam != chNull; fLoc = *ciMain.loc != chNull;
    AnsiColor(kWhite);
-   sprintf(sz, "%s %s chart ", szAppName, szVersionCore); PrintSz(sz);
-   if (fNoTimeOrSpace)
-@@ -83,7 +83,7 @@
-   real rT;
+   if (us.nRel == rcDual) {
+     sprintf(sz, "%s %s  dual chart ", szAppName, szVersionCore); PrintSz(sz);
+@@ -92,8 +92,12 @@
+     if (us.nRel == rcMidpoint) {
+     sprintf(sz, " %s\n", SzLocation(Lon, Lat)); PrintSz(sz);
+     } else {
+-      sprintf(sz, "%c%s%s%s\n", fLoc && !fNam ? '\n' : ' ', ciMain.loc,
+-        fLoc ? " " : "", SzLocation(Lon, Lat)); PrintSz(sz);
++      if (fLoc)
++	sprintf(sz, "\n%s %s\n", ciMain.loc, SzLocation(Lon, Lat));
++      else
++	sprintf(sz, "%c%s%s%s\n", fLoc && !fNam ? '\n' : ' ', ciMain.loc,
++	  fLoc ? " " : "", SzLocation(Lon, Lat));
++      PrintSz(sz);
+     }
+   }
+   if (us.fHorizon) {
+@@ -157,8 +161,12 @@
+     sprintf(sz, "%c%c%c %s %s (%cT %s GMT)", chDay3(day),
+       SzDate(Mon, Day, Yea, 3), SzTim(Tim), ChDst(Dst),
+       SzZone(Zon)); PrintSz(sz);
+-    sprintf(sz, "%c%s%s%s\n", fLoc && !fNam ? '\n' : ' ', ciMain.loc,
+-      fLoc ? " " : "", SzLocation(Lon, Lat)); PrintSz(sz);
++    if (fLoc)
++      sprintf(sz, "\n%s %s\n", ciMain.loc, SzLocation(Lon, Lat));
++    else
++      sprintf(sz, "%c%s%s%s\n", fLoc && !fNam ? '\n' : ' ', ciMain.loc,
++	fLoc ? " " : "", SzLocation(Lon, Lat));
++    PrintSz(sz);
+     ciMain = ciT;
+   }
+ }
+@@ -464,7 +472,7 @@
+   sprintf(sz, "%c%c%c: ", chObj3(i3)); PrintSz(sz);
+   PrintZodiac(planet[i3]);
+   if (ac == acGC || ac == acC || ac == acMR || ac == acK) {
+-    PrintSz(" to ");
++    sprintf(sz, "\n%-11s to ", " "); PrintSz(sz);
+     AnsiColor(kObjA[i4]);
+     sprintf(sz, "%c%c%c: ", chObj3(i4)); PrintSz(sz);
+     PrintZodiac(planet[i4]);
+@@ -610,7 +618,7 @@
+ void PrintWheelCenter(irow)
+ int irow;
+ {
+-  byte sz[cchSzDef], szT[8];
++  byte sz[cchSzDef], szT[9];
+   int cch, nT;
  
-   CreateElemTable(&et);
--  fNam = *ciMain.nam > chNull; fLoc = *ciMain.loc > chNull;
-+  fNam = *ciMain.nam != chNull; fLoc = *ciMain.loc != chNull;
- 
-   PrintHeader();    /* Show time and date of the chart being displayed. */
- 
-@@ -493,7 +493,7 @@
+   if (*ciMain.nam == chNull && *ciMain.loc == chNull)    /* Try to center */
+@@ -635,25 +643,26 @@
+     sprintf(sz, "%s", ciMain.loc);
+     break;
+   case 4:
+-    nT = (int)(RFract(RAbs(Zon))*100.0+rRound);
+-    sprintf(sz, "%cT %c%02d:%02d, %s", ChDst(Dst),
+-      Zon > 0.0 ? '-' : '+', (int)RAbs(Zon), nT, SzLocation(Lon, Lat));
++    sprintf(sz, "%cT %s GMT", ChDst(Dst), SzZone(Zon));
+     break;
    case 5:
++    sprintf(sz, "%s", SzLocation(Lon, Lat));
++    break;
++  case 6:
      nT = us.fEuroTime; us.fEuroTime = fTrue;
      sprintf(szT, "%s", SzTim(DegToDec(DFromR(is.RA)*(24.0/rDegMax))));
 -    sprintf(sz, "UT: %s, Sid.T: %s", SzTim(Tim+Zon-Dst), szT);
 +    sprintf(sz, "UT: %s, Sid.T: %s", SzTim(DegToDec(DecToDeg(Tim)+DecToDeg(Zon-Dst))), szT);
      us.fEuroTime = nT;
      break;
-   case 6:
+-  case 6:
++  case 7:
+     sprintf(sz, "%s Houses", szSystem[us.nHouseSystem]);
+     break;
+-  case 7:
++  case 8:
+     sprintf(sz, "%s / %s", us.fSidereal ? "Sidereal" : "Tropical",
+       us.objCenter == oSun ? "Heliocentric" :
+       (us.objCenter == oEar ? "Geocentric" : szObjName[us.objCenter]));
+     break;
+-  case 8:
++  case 9:
+     sprintf(sz, "Julian Day = %12.4f", JulianDayFromTime(is.T));
+     break;
+   default:
+@@ -849,6 +858,7 @@
+     sprintf(sz, "%c%c%c:%3d", chObj3(i), co[i]); PrintSz(sz);
+     j++;
+   }
++  AnsiColor(kDefault);
+   PrintL();
+ }
+ 
diff --git a/misc/astrolog/files/patch-intrpalt.c b/misc/astrolog/files/patch-intrpalt.c
new file mode 100644
index 000000000000..257ba71d26e3
--- /dev/null
+++ b/misc/astrolog/files/patch-intrpalt.c
@@ -0,0 +1,32 @@
+--- intrpalt.c.bak	2002-04-27 22:35:18.000000000 +0400
++++ intrpalt.c	2012-02-25 22:34:56.000000000 +0400
+@@ -71,7 +71,8 @@
+ byte *szHouseFile(i)
+ int i;
+ {
+-  byte szFileName[16], szFileNumber[8];
++  static byte szFileName[16];
++  byte szFileNumber[8];
+ 
+   sprintf (szFileNumber, "%i", i);
+   sprintf (szFileName, "house");
+@@ -85,7 +86,8 @@
+ int i;
+ bool trflag;
+ {
+-  byte szFileName[16], szFileNumber[8];
++  static byte szFileName[16];
++  byte szFileNumber[8];
+ 
+   sprintf (szFileNumber, "%i", i);
+   if (i < 10)
+@@ -104,7 +106,8 @@
+ int i;
+ bool trflag;
+ {
+-  byte szFileName[16], szFileNumber[8];
++  static byte szFileName[16];
++  byte szFileNumber[8];
+ 
+   sprintf (szFileNumber, "%i", i);
+   if (i < 10)
diff --git a/misc/astrolog/files/patch-io.c b/misc/astrolog/files/patch-io.c
index 4c882681c1ac..e987c27e991d 100644
--- a/misc/astrolog/files/patch-io.c
+++ b/misc/astrolog/files/patch-io.c
@@ -1,14 +1,14 @@
---- io.c.orig	1998-12-23 23:29:21.000000000 +0300
-+++ io.c	2007-06-26 15:35:03.000000000 +0400
-@@ -35,6 +35,7 @@
- ** Last code change made 12/20/1998.
+--- io.c.orig	2002-04-27 22:35:30.000000000 +0400
++++ io.c	2012-02-26 11:44:42.000000000 +0400
+@@ -38,6 +38,7 @@
+ ** Modifications from version 5.40 to 5.41 are by Alois Treindl.
  */
  
 +#include <ctype.h>
  #include "astrolog.h"
- 
- 
-@@ -139,12 +140,12 @@
+ #include <string.h>
+ /*
+@@ -141,12 +142,12 @@
    }
  
    loop {
@@ -23,7 +23,24 @@
        ;
      szLine[i] = chNull;
      argc = NParseCommandLine(szLine, argv);
-@@ -675,7 +676,7 @@
+@@ -432,7 +433,7 @@
+ /* so we have to distinguish them from new strings with two dots. VA.    */
+ 
+   newstyle = fTrue;
+-  if (pm == pmTim || pm == pmLon || pm == pmLat) {
++  if (pm == pmTim || pm == pmLon || pm == pmLat || pm == pmZon) {
+     havedot = 0; dot1 = 0; dot2 = 0;
+     for (i = 0; i < cch; i++) {
+       chdot = sz[i];
+@@ -453,6 +454,7 @@
+ /* it to the old style.                                              */
+ 
+     if (newstyle) {
++      memset(minutes, chNull, sizeof(minutes));
+       for (i = dot1+1; i < cch; i++) {
+         j = i - (dot1 + 1);
+         if (sz[i] >= '.' && sz[i] <= '9' && sz[i] != '/')
+@@ -724,7 +726,7 @@
        /* them. Be prepared to skip over them in old files for compatibility. */
  
        if (i == oVtx) {
diff --git a/misc/astrolog/files/patch-placalc.c b/misc/astrolog/files/patch-placalc.c
deleted file mode 100644
index 28ca306f6cfc..000000000000
--- a/misc/astrolog/files/patch-placalc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- placalc.c.orig	2011-05-11 16:19:54.000000000 +0000
-+++ placalc.c	2011-05-11 16:20:31.000000000 +0000
-@@ -900,7 +900,7 @@
-   static double last_j0_outer = HUGE8;
-   static double last_j0_chiron = HUGE8;
-   static double last_j0_aster = HUGE8;
--  static long icoord[6][5][3], chicoord[6][3], ascoord[6][4][3];
-+  static word4 icoord[6][5][3], chicoord[6][3], ascoord[6][4][3];
-   REAL8 j0, jd, jfrac;
-   REAL8 l[6], r[6], z[6];
-   int n, order, p;
diff --git a/misc/astrolog/files/patch-xcharts0.c b/misc/astrolog/files/patch-xcharts0.c
new file mode 100644
index 000000000000..03f2a0a2ec90
--- /dev/null
+++ b/misc/astrolog/files/patch-xcharts0.c
@@ -0,0 +1,20 @@
+--- xcharts0.c.bak	2002-05-18 22:28:56.000000000 +0400
++++ xcharts0.c	2012-02-26 10:00:57.000000000 +0400
+@@ -200,7 +200,7 @@
+       SzDate(Mon, Day, Yea, fTrue));
+     DrawPrint(sz, gi.kiOn, fFalse);
+     DrawPrint(SzTim(Tim), gi.kiOn, fTrue);
+-    sprintf(sz, " (%cT %s GMT)", ChDst(Dst), SzZone(Zon));
++    sprintf(sz, " %cT %s GMT", ChDst(Dst), SzZone(Zon));
+     DrawPrint(sz, gi.kiOn, fFalse);
+   }
+   if (*ciMain.loc && us.nRel != rcMidpoint)
+@@ -278,7 +278,7 @@
+       SzDate(Mon, Day, Yea, fTrue));
+     DrawPrint(sz, kYellow, fFalse);
+     DrawPrint(SzTim(Tim), kYellow, fTrue);
+-    sprintf(sz, " (%cT %s GMT)", ChDst(Dst), SzZone(Zon));
++    sprintf(sz, " %cT %s GMT", ChDst(Dst), SzZone(Zon));
+     DrawPrint(sz, kYellow, fFalse);
+     if (us.nRel != rcProgress) {  
+       if (*ciMain.loc)
diff --git a/misc/astrolog/pkg-descr b/misc/astrolog/pkg-descr
index ae5120d73a5f..a56e5691dc0d 100644
--- a/misc/astrolog/pkg-descr
+++ b/misc/astrolog/pkg-descr
@@ -20,4 +20,4 @@ graphic files in PostScript, Windows
 metafile, and bitmap formats, and more!
 
 
-WWW: http://www.astrolog.org/astrolog.htm
+WWW: http://astrolog.offline.ee/astrolog/
diff --git a/misc/astrolog/pkg-install b/misc/astrolog/pkg-install
index d71f59155fe4..6b7e94ea2635 100644
--- a/misc/astrolog/pkg-install
+++ b/misc/astrolog/pkg-install
@@ -3,5 +3,5 @@
 if [ "$2" != "POST-INSTALL" ]; then
   exit 0
 fi
-echo "See the file ${PKG_PREFIX}/share/doc/astrolog/Helpfile.540 for help"
+echo "See the file ${PKG_PREFIX}/share/doc/astrolog/helpfile.540 for help"
 echo "and tune ${PKG_PREFIX}/lib/astrolog/astrolog.dat"
diff --git a/misc/astrolog/pkg-plist b/misc/astrolog/pkg-plist
index b79a4c6bb444..a43edfb771d2 100644
--- a/misc/astrolog/pkg-plist
+++ b/misc/astrolog/pkg-plist
@@ -1,105 +1,64 @@
 bin/astrolog
-lib/astrolog/CHI_0
-lib/astrolog/CHI_1
-lib/astrolog/CHI_10
-lib/astrolog/CHI_11
-lib/astrolog/CHI_12
-lib/astrolog/CHI_13
-lib/astrolog/CHI_14
-lib/astrolog/CHI_15
-lib/astrolog/CHI_16
-lib/astrolog/CHI_17
-lib/astrolog/CHI_18
-lib/astrolog/CHI_19
-lib/astrolog/CHI_2
-lib/astrolog/CHI_20
-lib/astrolog/CHI_21
-lib/astrolog/CHI_22
-lib/astrolog/CHI_23
-lib/astrolog/CHI_24
-lib/astrolog/CHI_25
-lib/astrolog/CHI_26
-lib/astrolog/CHI_27
-lib/astrolog/CHI_28
-lib/astrolog/CHI_3
-lib/astrolog/CHI_4
-lib/astrolog/CHI_5
-lib/astrolog/CHI_6
-lib/astrolog/CHI_7
-lib/astrolog/CHI_8
-lib/astrolog/CHI_9
-lib/astrolog/CHI_M1
-lib/astrolog/CHI_M2
-lib/astrolog/CPJV_0
-lib/astrolog/CPJV_1
-lib/astrolog/CPJV_10
-lib/astrolog/CPJV_11
-lib/astrolog/CPJV_12
-lib/astrolog/CPJV_13
-lib/astrolog/CPJV_14
-lib/astrolog/CPJV_15
-lib/astrolog/CPJV_16
-lib/astrolog/CPJV_17
-lib/astrolog/CPJV_18
-lib/astrolog/CPJV_19
-lib/astrolog/CPJV_2
-lib/astrolog/CPJV_20
-lib/astrolog/CPJV_21
-lib/astrolog/CPJV_22
-lib/astrolog/CPJV_23
-lib/astrolog/CPJV_24
-lib/astrolog/CPJV_25
-lib/astrolog/CPJV_26
-lib/astrolog/CPJV_27
-lib/astrolog/CPJV_28
-lib/astrolog/CPJV_29
-lib/astrolog/CPJV_3
-lib/astrolog/CPJV_4
-lib/astrolog/CPJV_5
-lib/astrolog/CPJV_6
-lib/astrolog/CPJV_7
-lib/astrolog/CPJV_8
-lib/astrolog/CPJV_9
-lib/astrolog/CPJV_M1
-lib/astrolog/CPJV_M2
-lib/astrolog/EPHINDEX.TXT
-lib/astrolog/LRZ5_0
-lib/astrolog/LRZ5_1
-lib/astrolog/LRZ5_10
-lib/astrolog/LRZ5_11
-lib/astrolog/LRZ5_12
-lib/astrolog/LRZ5_13
-lib/astrolog/LRZ5_14
-lib/astrolog/LRZ5_15
-lib/astrolog/LRZ5_16
-lib/astrolog/LRZ5_17
-lib/astrolog/LRZ5_18
-lib/astrolog/LRZ5_19
-lib/astrolog/LRZ5_2
-lib/astrolog/LRZ5_20
-lib/astrolog/LRZ5_21
-lib/astrolog/LRZ5_22
-lib/astrolog/LRZ5_23
-lib/astrolog/LRZ5_24
-lib/astrolog/LRZ5_25
-lib/astrolog/LRZ5_26
-lib/astrolog/LRZ5_27
-lib/astrolog/LRZ5_28
-lib/astrolog/LRZ5_29
-lib/astrolog/LRZ5_3
-lib/astrolog/LRZ5_4
-lib/astrolog/LRZ5_5
-lib/astrolog/LRZ5_6
-lib/astrolog/LRZ5_7
-lib/astrolog/LRZ5_8
-lib/astrolog/LRZ5_9
-lib/astrolog/LRZ5_M1
-lib/astrolog/LRZ5_M2
 @unexec if [ -f %D/lib/astrolog/astrolog.dat ] && cmp -s %D/lib/astrolog/astrolog.dat %D/lib/astrolog/astrolog.dat-dist; then rm -f %D/lib/astrolog/astrolog.dat; fi
 lib/astrolog/astrolog.dat-dist
 @exec if [ ! -f %D/lib/astrolog/astrolog.dat ] ; then cp -p %D/%F %B/astrolog.dat; fi
-%%PORTDOCS%%%%DOCSDIR%%/Helpfile.540
-%%PORTDOCS%%%%DOCSDIR%%/README.540
-%%PORTDOCS%%%%DOCSDIR%%/Update.540
+lib/astrolog/fixstars.ast
+lib/astrolog/seas_00.se1
+lib/astrolog/seas_06.se1
+lib/astrolog/seas_12.se1
+lib/astrolog/seas_18.se1
+lib/astrolog/seas_24.se1
+lib/astrolog/seas_30.se1
+lib/astrolog/seas_36.se1
+lib/astrolog/seas_42.se1
+lib/astrolog/seas_48.se1
+lib/astrolog/seasm06.se1
+lib/astrolog/seasm12.se1
+lib/astrolog/seasm18.se1
+lib/astrolog/seasm24.se1
+lib/astrolog/seasm30.se1
+lib/astrolog/seasm36.se1
+lib/astrolog/seasm42.se1
+lib/astrolog/seasm48.se1
+lib/astrolog/seasm54.se1
+lib/astrolog/semo_00.se1
+lib/astrolog/semo_06.se1
+lib/astrolog/semo_12.se1
+lib/astrolog/semo_18.se1
+lib/astrolog/semo_24.se1
+lib/astrolog/semo_30.se1
+lib/astrolog/semo_36.se1
+lib/astrolog/semo_42.se1
+lib/astrolog/semo_48.se1
+lib/astrolog/semom06.se1
+lib/astrolog/semom12.se1
+lib/astrolog/semom18.se1
+lib/astrolog/semom24.se1
+lib/astrolog/semom30.se1
+lib/astrolog/semom36.se1
+lib/astrolog/semom42.se1
+lib/astrolog/semom48.se1
+lib/astrolog/semom54.se1
+lib/astrolog/sepl_00.se1
+lib/astrolog/sepl_06.se1
+lib/astrolog/sepl_12.se1
+lib/astrolog/sepl_18.se1
+lib/astrolog/sepl_24.se1
+lib/astrolog/sepl_30.se1
+lib/astrolog/sepl_36.se1
+lib/astrolog/sepl_42.se1
+lib/astrolog/sepl_48.se1
+lib/astrolog/seplm06.se1
+lib/astrolog/seplm12.se1
+lib/astrolog/seplm18.se1
+lib/astrolog/seplm24.se1
+lib/astrolog/seplm30.se1
+lib/astrolog/seplm36.se1
+lib/astrolog/seplm42.se1
+lib/astrolog/seplm48.se1
+lib/astrolog/seplm54.se1
+%%PORTDOCS%%%%DOCSDIR%%/changes.txt
+%%PORTDOCS%%%%DOCSDIR%%/helpfile.540
+%%PORTDOCS%%%%DOCSDIR%%/readme.541
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry lib/astrolog
author	Andrey A. Chernov <ache@FreeBSD.org>	2012-02-26 09:20:16 +0000
committer	Andrey A. Chernov <ache@FreeBSD.org>	2012-02-26 09:20:16 +0000
commit	98228699b13906cd02467a4c9cc7b1c3d992492c (patch)
tree	940a3940b168ce923e21fc4a7bc9ad883e20d176 /misc/astrolog
parent	649db06f7d1f67939744ec7529740ffab527c8c5 (diff)
download	ports-98228699b13906cd02467a4c9cc7b1c3d992492c.tar.gz ports-98228699b13906cd02467a4c9cc7b1c3d992492c.zip