8 files changed, 129 insertions, 50 deletions
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index bdf2e7e335c3..3b874d2ff55b 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,20 +1,70 @@
 # New ports collection makefile for:    astrolog
-# Version required:     5.0
+#
+# http://www-rpk.mach.uni-karlsruhe.de/~ferber/astrolog/
+# http://www.magitech.com/~cruiser1/astrolog.htm
+#
+# Version required:     5.20
 # Date created:         31 July 1995
 # Whom:                 faulkner@cactus.org
 #
-# $Id: Makefile,v 1.1.1.1 1995/08/26 05:59:21 asami Exp $
+# $Id: Makefile,v 1.2 1996/01/16 02:45:29 asami Exp $
 #
 
-DISTNAME=       ast50unx
-PKGNAME=	astrolog-5.0
-CATEGORIES+=	misc
-MASTER_SITES=	ftp://ftp.kiae.su/unix/magick/astrology/
-EXTRACT_SUFX=	.shar.gz
+DISTNAME=       astrolog-5.20
+DIST_SUBDIR=    astrolog
+EPHEM=          lrz5_24 chi_24 cpjv_24
+CATEGORIES+=    misc x11
+MASTER_SITES=   http://www-rpk.mach.uni-karlsruhe.de/~ferber/astrolog/ \
+		ftp://ftp.relcom.ru/unix/magick/astrology/astrolog/
+EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=      ${EXTRACT_ONLY} ${EPHEM:S/$/.gz/}
+
+WRKSRC=         ${WRKDIR}/${DISTNAME}/src
+
+MAINTAINER=     ache@FreeBSD.ORG
+
+post-extract:
+	cd ${WRKSRC}/..; \
+		for i in ${EPHEM}; do \
+			zcat ${DISTDIR}/$$i.gz > $$i; \
+		done
+
+post-patch:
+	cd ${WRKSRC}/../docs; \
+		sed 's/^@tpindex/@tindex/' < astrolog.texinfo > a.texinfo; \
+		mv a.texinfo astrolog.texinfo
+
+post-build:
+	cd ${WRKSRC}/../docs; \
+		makeinfo --no-split astrolog.texinfo -o astrolog.info; \
+		gzip -f astrolog.info
 
-EXTRACT_CMD=	zcat
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	| tr -d "\r" |sh
-NO_WRKSUBDIR=	yes
+do-install:
+	-@mkdir ${PREFIX}/lib/astrolog
+	cd ${WRKSRC}/..; \
+		${INSTALL} -c -m ${SHAREMODE} -o ${SHAREOWN} -g ${SHAREGRP} \
+			${EPHEM} ${PREFIX}/lib/astrolog
+	cd ${WRKSRC}/..; \
+		if [ -f ${PREFIX}/lib/astrolog/astrolog.dat ] ; then \
+			${INSTALL} -c -m ${SHAREMODE} -o ${SHAREOWN} -g ${SHAREGRP} \
+				astrolog.dat ${PREFIX}/lib/astrolog/astrolog.dat-dist; \
+		else \
+			${INSTALL} -c -m 644 -o ${SHAREOWN} -g ${SHAREGRP} \
+				astrolog.dat ${PREFIX}/lib/astrolog; \
+		fi
+	cd ${WRKSRC}; \
+		${INSTALL} -c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} \
+			astrolog ${PREFIX}/bin
+	cd ${WRKSRC}/../docs; \
+		$(INSTALL) -c -m ${INFOMODE} -o $(INFOOWN) -g $(INFOGRP) \
+			astrolog.info.gz ${PREFIX}/info
+	-@mkdir ${PREFIX}/share/astrolog
+	cd ${WRKSRC}/..; \
+		${INSTALL} -c -m ${SHAREMODE} -o ${SHAREOWN} -g ${SHAREGRP} \
+			helpfile.520 readme.520 ${PREFIX}/share/astrolog
+	@echo
+	@echo "See the file ${PREFIX}/share/astrolog/helpfile.520 for help"
+	@echo "and tune ${PREFIX}/lib/astrolog/astrolog.dat,"
+	@echo "also look at ${PREFIX}/info/astrolog.info.gz"
 
 .include <bsd.port.mk>
diff --git a/misc/astrolog/distinfo b/misc/astrolog/distinfo
index 8507e058b5cd..267daf380672 100644
--- a/misc/astrolog/distinfo
+++ b/misc/astrolog/distinfo
@@ -1 +1,4 @@
-MD5 (ast50unx.shar.gz) = 412e62e63e723755119c2e17d3e75f14
+MD5 (astrolog-5.20.tar.gz) = 61bb72e84dc2c437cfe1243d4003771d
+MD5 (lrz5_24.gz) = cfd2f6b7a17d8c91783cd16bb266bba7
+MD5 (chi_24.gz) = 211022676a2e9a6306452d7300b72762
+MD5 (cpjv_24.gz) = 173a499dc086c033a2cad4251d094b34
diff --git a/misc/astrolog/files/patch-aa b/misc/astrolog/files/patch-aa
index 2c041e7b1cf0..d1d5204ecfa7 100644
--- a/misc/astrolog/files/patch-aa
+++ b/misc/astrolog/files/patch-aa
@@ -1,33 +1,22 @@
-*** ./Makefile.org	Mon Jul 31 14:01:23 1995
---- ./Makefile	Mon Jul 31 14:40:51 1995
+*** makefile.unx.orig	Thu Jun 20 22:40:37 1996
+--- makefile.unx	Sun Jul 14 06:51:53 1996
 ***************
-*** 22,31 ****
-   charts0.o charts1.o charts2.o charts3.o intrpret.o\
-   xdata.o xgeneral.o xdevice.o xcharts0.o xcharts1.o xcharts2.o xscreen.o
+*** 30,38 ****
+  
   # 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)
-  	strip $(NAME)
-  #
---- 22,39 ----
-   charts0.o charts1.o charts2.o charts3.o intrpret.o\
-   xdata.o xgeneral.o xdevice.o xcharts0.o xcharts1.o xcharts2.o xscreen.o
+  
+! LIBS = -lm -L/usr/X11R6/lib -lX11 -lm -L. -laaf
+! CFLAGS = -O3 -I. -DHAVE_LIBAAF -DHAVE_STRCHR -DHAVE_STRDUP
+! CC = gcc
+  
+  all: astrolog
+  
+--- 30,37 ----
+  
   # If you don't have X windows, delete the "-lX11" part from the line below:
-! LIBS = -lm -L/usr/X11R6/lib -lX11
-! CFLAGS += -I/usr/X11R6/include
-  
-+ all:	astrolog
-+ 
-  astrolog:: $(OBJ)
-	cc -o $(NAME) -I/usr/X11R6/include $(OBJ) $(LIBS)
-  	strip $(NAME)
-+ 
-+ install:
-+ 	/usr/bin/install -c astrolog ${PREFIX}/bin
-+ 	-mkdir -p ${PREFIX}/share/astrolog
-+ 	/usr/bin/install -c Helpfile.500 ${PREFIX}/share/astrolog
-+ 	@echo "See the file ${PREFIX}/share/astrolog/Helpfile.500 for help.
-  #
+  
+! LIBS = -L${X11BASE}/lib -lX11 -lm
+! CFLAGS += -I${X11BASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\"
+  
+  all: astrolog
+  
diff --git a/misc/astrolog/files/patch-ab b/misc/astrolog/files/patch-ab
new file mode 100644
index 000000000000..3450dc7db714
--- /dev/null
+++ b/misc/astrolog/files/patch-ab
@@ -0,0 +1,14 @@
+*** astrolog.h.bak	Thu Jun 20 22:40:36 1996
+--- astrolog.h	Sun Jul 14 06:51:53 1996
+***************
+*** 127,133 ****
+--- 127,135 ----
+  */
+  
+  #ifndef PC
++ #ifndef DEFAULT_DIR
+  #define DEFAULT_DIR "~/astrolog"
++ #endif
+  #else
+  #define DEFAULT_DIR "C:\\ASTROLOG"
+  #endif
diff --git a/misc/astrolog/pkg-comment b/misc/astrolog/pkg-comment
index 1db989ab31da..7902813bb857 100644
--- a/misc/astrolog/pkg-comment
+++ b/misc/astrolog/pkg-comment
@@ -1 +1 @@
-An astrology program for X and ascii, version 5.0
+An astrology program for X11 and alpha-numeric terminals
diff --git a/misc/astrolog/pkg-descr b/misc/astrolog/pkg-descr
index b579d9275e8f..924cb0a0af18 100644
--- a/misc/astrolog/pkg-descr
+++ b/misc/astrolog/pkg-descr
@@ -1,5 +1,20 @@
-Astrolog is a high precision astrological tool with X support.
-
-This is version 5.0.
-
-faulkner@cactus.org
+Astrolog 5.20 is a many featured and
+customizable astrology chart calculation
+program for DOS, Windows, Mac, and Unix,
+used in 25+ 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-install b/misc/astrolog/pkg-install
index 81ed65c97ed1..780ee4b924be 100644
--- a/misc/astrolog/pkg-install
+++ b/misc/astrolog/pkg-install
@@ -3,4 +3,6 @@
 if [ "$2" != "POST-INSTALL" ]; then
   exit 0
 fi
-echo "See the file ${PKG_PREFIX}/share/astrolog/Helpfile.500 for help."
+echo "See the file ${PKG_PREFIX}/share/astrolog/helpfile.520 for help"
+echo "and tune ${PKG_PREFIX}/lib/astrolog/astrolog.dat,"
+echo "also look at ${PKG_PREFIX}/info/astrolog.info.gz"
diff --git a/misc/astrolog/pkg-plist b/misc/astrolog/pkg-plist
index e4859b7d5824..214ecf6f2f2e 100644
--- a/misc/astrolog/pkg-plist
+++ b/misc/astrolog/pkg-plist
@@ -1,2 +1,8 @@
 bin/astrolog
-share/astrolog/Helpfile.500
+share/astrolog/helpfile.520
+share/astrolog/readme.520
+info/astrolog.info.gz
+lib/astrolog/astrolog.dat
+lib/astrolog/lrz5_24
+lib/astrolog/chi_24
+lib/astrolog/cpjv_24