diff options
Diffstat (limited to 'misc/astrolog')
-rw-r--r-- | misc/astrolog/Makefile | 65 | ||||
-rw-r--r-- | misc/astrolog/distinfo | 40 | ||||
-rw-r--r-- | misc/astrolog/files/patch-astrolog.c | 94 | ||||
-rw-r--r-- | misc/astrolog/files/patch-astrolog.dat | 55 | ||||
-rw-r--r-- | misc/astrolog/files/patch-astrolog.h | 51 | ||||
-rw-r--r-- | misc/astrolog/files/patch-charts1.c | 101 | ||||
-rw-r--r-- | misc/astrolog/files/patch-general.c | 47 | ||||
-rw-r--r-- | misc/astrolog/files/patch-intrpalt.c | 32 | ||||
-rw-r--r-- | misc/astrolog/files/patch-io.c | 51 | ||||
-rw-r--r-- | misc/astrolog/files/patch-makefile | 28 | ||||
-rw-r--r-- | misc/astrolog/files/patch-src-sweodef.h | 17 | ||||
-rw-r--r-- | misc/astrolog/files/patch-xcharts0.c | 20 | ||||
-rw-r--r-- | misc/astrolog/files/pkg-message.in | 8 | ||||
-rw-r--r-- | misc/astrolog/pkg-descr | 23 | ||||
-rw-r--r-- | misc/astrolog/pkg-install | 7 | ||||
-rw-r--r-- | misc/astrolog/pkg-plist | 57 |
16 files changed, 0 insertions, 696 deletions
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile deleted file mode 100644 index 1e0e70ddb8c5..000000000000 --- a/misc/astrolog/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# Created by: faulkner@cactus.org -# $FreeBSD$ - -PORTNAME= astrolog -PORTVERSION= 5.41g -PORTREVISION= 3 -CATEGORIES= misc astro -MASTER_SITES= ftp://ftp.astro.com/pub/swisseph/ephe/archive_gzip/:ephe \ - ftp://ftp.astro.com/pub/swisseph/:libswe \ - http://astrolog.offline.ee/astrolog/changed/:dist -DISTFILES= a541gsrc.tar.gz:dist ${EPHE} \ - swe_unix_src_2.04.tar.gz:libswe - -MAINTAINER= ports@FreeBSD.org -COMMENT= Astrology program for X11 and alpha-numeric terminals - -# Swiss Ephemeris GPLv2 licensed, see -# http://www.astro.com/ftp/swisseph/LICENSE.TXT -LICENSE= GPLv2+ - -BROKEN= unfetchable -DEPRECATED= Unfetchable, unmaintained -EXPIRATION_DATE= 2019-10-16 - -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 - -DIST_SUBDIR= astrolog -ALL_TARGET= astrolog -MAKEFILE= makefile -NO_WRKSUBDIR= yes - -PORTDOCS= helpfile.540 readme.541 changes.txt - -SUB_FILES= pkg-message - -OPTIONS_DEFINE= X11 DOCS -OPTIONS_DEFAULT=X11 - -X11_USE= XORG=x11 -X11_MAKE_ARGS= -DX11 - -post-extract: - ${RM} ${WRKSRC}/swe[a-z]* - -do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/lib/astrolog - cd ${WRKSRC} && \ - ${INSTALL_DATA} fixstars.ast *.se1 ${STAGEDIR}${PREFIX}/lib/astrolog - cd ${WRKSRC}; \ - ${INSTALL_DATA} astrolog.dat ${STAGEDIR}${PREFIX}/lib/astrolog/astrolog.dat-dist - cd ${WRKSRC} && ${INSTALL_PROGRAM} astrolog ${STAGEDIR}${PREFIX}/bin - -do-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ - -.include <bsd.port.mk> diff --git a/misc/astrolog/distinfo b/misc/astrolog/distinfo deleted file mode 100644 index 8c61f71c377b..000000000000 --- a/misc/astrolog/distinfo +++ /dev/null @@ -1,40 +0,0 @@ -SHA256 (astrolog/a541gsrc.tar.gz) = 38b625e21688cac692d1951bdd8109ead8431a7b56cc7eea2a75bf26c30843a3 -SIZE (astrolog/a541gsrc.tar.gz) = 659319 -SHA256 (astrolog/sweph_00.tar.gz) = 63d3f6d1291cf46c67cfb38263cf467b1a47f830ce77d0d9da127318177c8542 -SIZE (astrolog/sweph_00.tar.gz) = 1893101 -SHA256 (astrolog/sweph_06.tar.gz) = 02173a544f34b2ae7c2d342a9570b143e976ca667531ab2259c253ca41be06c7 -SIZE (astrolog/sweph_06.tar.gz) = 1884308 -SHA256 (astrolog/sweph_12.tar.gz) = ae0eee8ad3c2c7e41acfe153736b74cfbf0f14f39663318f83b5f0cb6e234dbb -SIZE (astrolog/sweph_12.tar.gz) = 1873046 -SHA256 (astrolog/sweph_18.tar.gz) = c0d5f80ffdd84d76ae387d4036e34ba3252b63aaddfa16697c193d53367e4c80 -SIZE (astrolog/sweph_18.tar.gz) = 1870419 -SHA256 (astrolog/sweph_24.tar.gz) = 88bd3729ee8f2c4e081ab1aa24a1f12503d12d85a384f6504416e186f1c73f99 -SIZE (astrolog/sweph_24.tar.gz) = 1874417 -SHA256 (astrolog/sweph_30.tar.gz) = 1c8eba994e006d4cf3acd0defd5deddfc42da944d5d6ba9b128fc6251316116e -SIZE (astrolog/sweph_30.tar.gz) = 1879878 -SHA256 (astrolog/sweph_36.tar.gz) = f3f9de06503741eef51727edd47d7b06951c41532fb7ed0570f6a670bfb28b87 -SIZE (astrolog/sweph_36.tar.gz) = 1893808 -SHA256 (astrolog/sweph_42.tar.gz) = 823b13005b8a41b91f7cfd68b426fb0a7fb450a82074285c9ad31f4b4352ee05 -SIZE (astrolog/sweph_42.tar.gz) = 1904297 -SHA256 (astrolog/sweph_48.tar.gz) = 60a588552b112ad187349157140e263a269ed99d1889a2d0e8ac9371290189cc -SIZE (astrolog/sweph_48.tar.gz) = 1913510 -SHA256 (astrolog/swephm06.tar.gz) = b96b688988106d56faed375a5fbda5aa0b98bdf7b0fad8143d71c3ed17337d6c -SIZE (astrolog/swephm06.tar.gz) = 1902643 -SHA256 (astrolog/swephm12.tar.gz) = eaaef299f282a7582d9d14f67fb08515a69f5183b411bd502de7044b1fd0ff48 -SIZE (astrolog/swephm12.tar.gz) = 1916191 -SHA256 (astrolog/swephm18.tar.gz) = 844d97b2560e3126a963ea759af1134c5f4bcf773874de5c73cd2ef8b8249448 -SIZE (astrolog/swephm18.tar.gz) = 1927838 -SHA256 (astrolog/swephm24.tar.gz) = faafd2a2c3d8fbab072c2ee84c4bd4948f1e46f5516c0a3b8dc5cd0934e95c80 -SIZE (astrolog/swephm24.tar.gz) = 1938376 -SHA256 (astrolog/swephm30.tar.gz) = 1d953360e8246dbe0feba33d0dcbe05fa4a06b88067fc7e1b682282efb0c2091 -SIZE (astrolog/swephm30.tar.gz) = 1947884 -SHA256 (astrolog/swephm36.tar.gz) = 1d396aafb1337a9876166066413134e944f9863e2f7beae661d58776175a051b -SIZE (astrolog/swephm36.tar.gz) = 1961147 -SHA256 (astrolog/swephm42.tar.gz) = f38fd39b0d2c24d06df95fd2f9e34bd9da7a71499aefdf27f19186cb09d16884 -SIZE (astrolog/swephm42.tar.gz) = 1978380 -SHA256 (astrolog/swephm48.tar.gz) = 4a0df4ba944bb598264b264c958347cca425ba5c395a8b831feee8d3d2a0df1f -SIZE (astrolog/swephm48.tar.gz) = 1989578 -SHA256 (astrolog/swephm54.tar.gz) = b9ca01c39bfd80f24cac183836d86fef227c63c36b1ae0c11dafd79685966b14 -SIZE (astrolog/swephm54.tar.gz) = 2001462 -SHA256 (astrolog/swe_unix_src_2.04.tar.gz) = 3c1702e0e25ca3567b7e65991f50927ba182af47086dfd72fdd2e92bace6810a -SIZE (astrolog/swe_unix_src_2.04.tar.gz) = 2573319 diff --git a/misc/astrolog/files/patch-astrolog.c b/misc/astrolog/files/patch-astrolog.c deleted file mode 100644 index d0fec280a4c3..000000000000 --- a/misc/astrolog/files/patch-astrolog.c +++ /dev/null @@ -1,94 +0,0 @@ -diff --git astrolog.c astrolog.c -index 5a26c68..8294d3e 100644 ---- astrolog.c -+++ astrolog.c -@@ -38,6 +38,7 @@ - ** Modifications from version 5.40 to 5.41 are by Alois Treindl. - */ - -+#include <ctype.h> - #include "astrolog.h" - - -@@ -255,7 +256,7 @@ byte **argv; - byte *pch = szLine; - - /* Split the entered line up into its individual switch strings. */ -- while (*pch >= ' ' || *pch == chTab) { -+ while (!iscntrl((_char)*pch) || *pch == chTab) { - if (*pch == ' ' || *pch == chTab) { - if (fSpace) - /* Skip over the current run of spaces between strings. */ -@@ -1470,8 +1471,18 @@ byte **argv; - 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); -@@ -1556,13 +1567,39 @@ byte **argv; - return fFalse; - } - ciCore.nam = SzPersist(argv[1]); -+ if (CchSz(ciCore.nam) > 29) /* see charts1.c */ -+ ciCore.nam[29] = chNull; -+ for (pch = ciCore.nam; *pch; pch++) { -+ if (*pch == '"') /* see io.c */ -+ *pch = '\''; -+ else if (iscntrl((_char)*pch)) /* see xgeneral.c */ -+ *pch = ' '; -+ } - ciCore.loc = SzPersist(argv[2]); -+ if (CchSz(ciCore.loc) > 29) /* see charts1.c */ -+ ciCore.loc[29] = chNull; -+ for (pch = ciCore.loc; *pch; pch++) { -+ if (*pch == '"') /* see io.c */ -+ *pch = '\''; -+ else if (iscntrl((_char)*pch)) /* see xgeneral.c */ -+ *pch = ' '; -+ } - 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); -@@ -2213,7 +2250,7 @@ byte **argv; - #ifdef SWITCHES - void main(argc, argv) - int argc; --byte **argv; -+char **argv; - { - #else - void main() diff --git a/misc/astrolog/files/patch-astrolog.dat b/misc/astrolog/files/patch-astrolog.dat deleted file mode 100644 index 99343b298f50..000000000000 --- a/misc/astrolog/files/patch-astrolog.dat +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 -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 26:43:00E 58:23:00N ; Default longitude and latitude - - -Yz 0 ; Time minute addition to be used when "now" charts are off. ---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 9 ; Wheel chart text rows [Change "4" to desired wheel rows ] - :I 80 ; Text screen columns [Change "80" to desired columns ] ---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: diff --git a/misc/astrolog/files/patch-astrolog.h b/misc/astrolog/files/patch-astrolog.h deleted file mode 100644 index 87e4a811c345..000000000000 --- a/misc/astrolog/files/patch-astrolog.h +++ /dev/null @@ -1,51 +0,0 @@ ---- 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 */ - /* 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 */ -@@ -138,9 +140,13 @@ - */ - - #ifndef PC -+#ifndef DEFAULT_DIR - #define DEFAULT_DIR "~/astrolog" - #define EPHE_DIR "~/astrolog/ephe" - #else -+#define EPHE_DIR DEFAULT_DIR -+#endif -+#else - #define DEFAULT_DIR "C:\\ASTROLOG" - #define EPHE_DIR DEFAULT_DIR - #endif -@@ -292,6 +298,8 @@ - #define ISG - #include <X11/Xlib.h> - #include <X11/Xutil.h> -+#else -+#include <sys/types.h> - #endif - #ifdef WIN - #define ISG -@@ -1068,9 +1076,9 @@ - */ - - #define byte unsigned char --#define word unsigned short --#define dword unsigned long --#define word4 long -+#define word u_int16_t -+#define dword u_int32_t -+#define word4 int32_t - #define real double - #define _char unsigned char - #define _int unsigned int diff --git a/misc/astrolog/files/patch-charts1.c b/misc/astrolog/files/patch-charts1.c deleted file mode 100644 index 00d14230adb0..000000000000 --- a/misc/astrolog/files/patch-charts1.c +++ /dev/null @@ -1,101 +0,0 @@ ---- 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); - 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; - - 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 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-general.c b/misc/astrolog/files/patch-general.c deleted file mode 100644 index faaf547d22bc..000000000000 --- a/misc/astrolog/files/patch-general.c +++ /dev/null @@ -1,47 +0,0 @@ ---- 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; - { -- dword curtimer; -+ time_t curtimer; - int min, sec; - real hr; - diff --git a/misc/astrolog/files/patch-intrpalt.c b/misc/astrolog/files/patch-intrpalt.c deleted file mode 100644 index 257ba71d26e3..000000000000 --- a/misc/astrolog/files/patch-intrpalt.c +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 deleted file mode 100644 index e987c27e991d..000000000000 --- a/misc/astrolog/files/patch-io.c +++ /dev/null @@ -1,51 +0,0 @@ ---- 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" - #include <string.h> - /* -@@ -141,12 +142,12 @@ - } - - loop { -- while (!feof(file) && (ch = getc(file)) < ' ') -+ while (!feof(file) && iscntrl((_char)(ch = getc(file)))) - ; - if (feof(file)) - break; - for (szLine[0] = ch, i = 1; i < cchSzMax && !feof(file) && -- (szLine[i] = getc(file)) >= ' '; i++) -+ !iscntrl((_char)(szLine[i] = getc(file))); i++) - ; - szLine[i] = chNull; - argc = NParseCommandLine(szLine, argv); -@@ -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) { -- while (getc(file) >= ' ') -+ while (!iscntrl((_char)getc(file))) - ; - if ((ch = getc(file)) != 'H') - i = cuspHi; diff --git a/misc/astrolog/files/patch-makefile b/misc/astrolog/files/patch-makefile deleted file mode 100644 index 929ff56752e7..000000000000 --- a/misc/astrolog/files/patch-makefile +++ /dev/null @@ -1,28 +0,0 @@ ---- makefile.orig 2002-04-27 22:48:52.000000000 +0400 -+++ makefile 2012-11-21 12:12:08.000000000 +0400 -@@ -17,6 +17,7 @@ - # edited, is compile each source file, and link them together with the math - # library, and if applicable, the main X library. - # -+.PATH: src - NAME = astrolog - OBJ = astrolog.o data.o data2.o general.o io.o\ - calc.o matrix.o charts0.o charts1.o charts2.o charts3.o\ -@@ -28,9 +29,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 += -Isrc -DX11 -I${LOCALBASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\" -+.else -+LIBS = -lm -+CFLAGS += -Isrc -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\" -+.endif - # --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-src-sweodef.h b/misc/astrolog/files/patch-src-sweodef.h deleted file mode 100644 index 1402803bba6f..000000000000 --- a/misc/astrolog/files/patch-src-sweodef.h +++ /dev/null @@ -1,17 +0,0 @@ ---- src/sweodef.h.orig 2012-11-21 12:36:17.000000000 +0400 -+++ src/sweodef.h 2012-11-21 12:37:03.000000000 +0400 -@@ -197,10 +197,10 @@ - typedef unsigned int UINT2; /* unsigned 16 bits */ - # define ABS4 labs /* abs function for long */ - #else -- typedef int int32; -- typedef long long int64; -- typedef unsigned int uint32; -- typedef short int16; -+ typedef int32_t int32; -+ typedef int64_t int64; -+ typedef uint32_t uint32; -+ typedef int16_t int16; - typedef double REAL8; /* real with at least 64 bit precision */ - typedef int INT4; /* signed integer with at least 32 bit precision */ - typedef unsigned int UINT4; diff --git a/misc/astrolog/files/patch-xcharts0.c b/misc/astrolog/files/patch-xcharts0.c deleted file mode 100644 index 03f2a0a2ec90..000000000000 --- a/misc/astrolog/files/patch-xcharts0.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/files/pkg-message.in b/misc/astrolog/files/pkg-message.in deleted file mode 100644 index f95036a2b305..000000000000 --- a/misc/astrolog/files/pkg-message.in +++ /dev/null @@ -1,8 +0,0 @@ -[ -{ type: install - message: <<EOM -See the file %%PREFIX%%/share/doc/astrolog/helpfile.540 for help -and tune %%PREFIX%%/lib/astrolog/astrolog.dat -EOM -} -] diff --git a/misc/astrolog/pkg-descr b/misc/astrolog/pkg-descr deleted file mode 100644 index a56e5691dc0d..000000000000 --- a/misc/astrolog/pkg-descr +++ /dev/null @@ -1,23 +0,0 @@ -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! - - -WWW: http://astrolog.offline.ee/astrolog/ diff --git a/misc/astrolog/pkg-install b/misc/astrolog/pkg-install deleted file mode 100644 index 6b7e94ea2635..000000000000 --- a/misc/astrolog/pkg-install +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# installation script for astrolog -if [ "$2" != "POST-INSTALL" ]; then - exit 0 -fi -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 deleted file mode 100644 index fb5353ab7b01..000000000000 --- a/misc/astrolog/pkg-plist +++ /dev/null @@ -1,57 +0,0 @@ -bin/astrolog -@sample lib/astrolog/astrolog.dat-dist lib/astrolog/astrolog.dat -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 |