Upgrade to 5.30

7 files changed, 98 insertions, 96 deletions

diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index c1e4e4495313..3ed658c770f6 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -1,72 +1,62 @@
 # New ports collection makefile for:    astrolog
 #
-# http://www-rpk.mach.uni-karlsruhe.de/~ferber/astrolog/
+# http://rpkalf2.mach.uni-karlsruhe.de/~ferber/astrolog/
 # http://www.magitech.com/~cruiser1/astrolog.htm
 #
-# Version required:     5.20
+# Version required:     5.30
 # Date created:         31 July 1995
 # Whom:                 faulkner@cactus.org
 #
-# $Id: Makefile,v 1.5 1996/11/11 05:49:12 obrien Exp $
+# $Id: Makefile,v 1.6 1996/12/03 04:07:24 asami Exp $
 #
 
-DISTNAME=       astrolog-5.20
-CATEGORIES=     misc x11
-MASTER_SITES=   http://www-rpk.mach.uni-karlsruhe.de/~ferber/astrolog/ \
-		ftp://ftp.relcom.ru/unix/magick/astrology/astrolog/
-DISTFILES=      ${EXTRACT_ONLY} ${EPHEM:S/$/.gz/}
+PKGNAME=        astrolog-5.30
+DISTNAME=       ast53src
+EXTRACT_SUFX=   .zip
+CATEGORIES=     misc
+MASTER_SITES=   http://rpkalf2.mach.uni-karlsruhe.de/~ferber/astrolog/
+DISTFILES=      ${EXTRACT_ONLY} ast53dos.zip
 EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=     ache@FreeBSD.ORG
 
+BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
+
+EXTRACT_CMD=    unzip
+EXTRACT_ARGS=   -oqLaa
 DIST_SUBDIR=    astrolog
-WRKSRC=         ${WRKDIR}/${DISTNAME}/src
+MAKEFILE=       makefile.unx
+ALL_TARGET=     astrolog
+NO_WRKSUBDIR=   Yes
 
-EPHEM=          lrz5_24 chi_24 cpjv_24
+EPHEM=          LRZ5_24 CHI_24 CPJV_24
+MISC=           helpfile.530 update.530
 
 post-extract:
-	cd ${WRKSRC}/..; \
-		for i in ${EPHEM}; do \
-			zcat ${DISTDIR}/${DIST_SUBDIR}/$$i.gz > \
-				`echo $$i | tr '[:lower:]' '[:upper:]'`; \
-		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
+	cd ${WRKSRC} && \
+		unzip -oq ${DISTDIR}/${DIST_SUBDIR}/ast53dos.zip ${EPHEM}
+	cd ${WRKSRC} && \
+		unzip -oqLaa ${DISTDIR}/${DIST_SUBDIR}/ast53dos.zip ${MISC}
 
 do-install:
-	-@mkdir ${PREFIX}/lib/astrolog
-	cd ${WRKSRC}/..; \
-		${INSTALL} -c -m ${SHAREMODE} -o ${SHAREOWN} -g ${SHAREGRP} \
-			LRZ5_* CHI_* CPJV_* ${PREFIX}/lib/astrolog
-	cd ${WRKSRC}/..; \
+	-@${MKDIR} ${PREFIX}/lib/astrolog
+	cd ${WRKSRC} && ${INSTALL_DATA} ${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; \
+			${INSTALL_DATA} astrolog.dat ${PREFIX}/lib/astrolog/astrolog.dat-dist; \
 		else \
-			${INSTALL} -c -m 644 -o ${SHAREOWN} -g ${SHAREGRP} \
-				astrolog.dat ${PREFIX}/lib/astrolog; \
+			${INSTALL_DATA} 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
+	cd ${WRKSRC} && ${INSTALL_PROGRAM} astrolog ${PREFIX}/bin
+	-@${MKDIR} ${PREFIX}/share/doc/astrolog
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} helpfile.530 ${PREFIX}/share/doc/astrolog/Helpfile.530
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} update.530 ${PREFIX}/share/doc/astrolog/Update.530
+	cd ${WRKSRC} && \
+		${INSTALL_DATA} readme.530 ${PREFIX}/share/doc/astrolog/Readme.530
 	@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"
+	@echo "See the file ${PREFIX}/share/doc/astrolog/Helpfile.530 for help"
+	@echo "and tune ${PREFIX}/lib/astrolog/astrolog.dat"
 
 .include <bsd.port.mk>
diff --git a/misc/astrolog/distinfo b/misc/astrolog/distinfo
index eff75efb1be7..e006f39a704d 100644
--- a/misc/astrolog/distinfo
+++ b/misc/astrolog/distinfo
@@ -1,4 +1,2 @@
-MD5 (astrolog/astrolog-5.20.tar.gz) = 61bb72e84dc2c437cfe1243d4003771d
-MD5 (astrolog/lrz5_24.gz) = cfd2f6b7a17d8c91783cd16bb266bba7
-MD5 (astrolog/chi_24.gz) = 211022676a2e9a6306452d7300b72762
-MD5 (astrolog/cpjv_24.gz) = 173a499dc086c033a2cad4251d094b34
+MD5 (astrolog/ast53src.zip) = e1977a0602145c9add31ba2c8af16c17
+MD5 (astrolog/ast53dos.zip) = c126ada589b36b700d32cfcb5664aae9
diff --git a/misc/astrolog/files/patch-aa b/misc/astrolog/files/patch-aa
index d1d5204ecfa7..99458400a36b 100644
--- a/misc/astrolog/files/patch-aa
+++ b/misc/astrolog/files/patch-aa
@@ -1,22 +1,21 @@
-*** makefile.unx.orig	Thu Jun 20 22:40:37 1996
---- makefile.unx	Sun Jul 14 06:51:53 1996
+*** makefile.unx.bak	Sun Sep 29 23:27:00 1996
+--- makefile.unx	Tue Jan 14 01:06:55 1997
 ***************
-*** 30,38 ****
-  
+*** 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 -L/usr/X11R6/lib -lX11 -lm -L. -laaf
-! CFLAGS = -O3 -I. -DHAVE_LIBAAF -DHAVE_STRCHR -DHAVE_STRDUP
-! CC = gcc
-  
-  all: astrolog
-  
---- 30,37 ----
-  
+! 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 = -L${X11BASE}/lib -lX11 -lm
 ! CFLAGS += -I${X11BASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\"
   
-  all: astrolog
-  
+  astrolog:: $(OBJ)
+  	cc -o $(NAME) $(OBJ) $(LIBS)
diff --git a/misc/astrolog/files/patch-ab b/misc/astrolog/files/patch-ab
index 3318e65cd62f..4dec816cdb81 100644
--- a/misc/astrolog/files/patch-ab
+++ b/misc/astrolog/files/patch-ab
@@ -1,8 +1,41 @@
-*** astrolog.h.orig	Thu Jun 20 22:40:36 1996
---- astrolog.h	Mon Jul 15 23:29:41 1996
+*** astrolog.h.bak	Sun Sep 29 23:27:00 1996
+--- astrolog.h	Tue Jan 14 01:16:37 1997
 ***************
-*** 127,133 ****
---- 127,135 ----
+*** 47,61 ****
+  ** the X11 graphics can be disabled even if you are running X windows.
+  */
+  
+! #define PC /* Comment out this #define if you have a Unix, Mac, or other */
+             /* system that isn't a generic PC running DOS or MS Windows.  */
+  
+  /*#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 */
+              /* 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 */
+              /* else have them but want to compile a DOS version instead. */
+  
+  /*#define MSG /* Comment out this #define if you don't have access to the     */
+--- 47,61 ----
+  ** the X11 graphics can be disabled even if you are running X windows.
+  */
+  
+! /*#define PC /* Comment out this #define if you have a Unix, Mac, or other */
+             /* system that isn't a generic PC running DOS or MS Windows.  */
+  
+  /*#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 */
+              /* 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 */
+              /* else have them but want to compile a DOS version instead. */
+  
+  /*#define MSG /* Comment out this #define if you don't have access to the     */
+***************
+*** 131,137 ****
+--- 131,139 ----
   */
   
   #ifndef PC
@@ -12,20 +45,3 @@
   #else
   #define DEFAULT_DIR "C:\\ASTROLOG"
   #endif
-***************
-*** 251,257 ****
-  #define chJW   (char)('|')
-  #define chJE   (char)('|')
-  #define chDeg0 (char)(' ')
-! #define chDeg1 (char)(us.fAnsi ? 176 : ':')   /* degree symbol */
-  
-  /*
-  ** One shouldn't ever need to change anything below this line to compile.
---- 253,259 ----
-  #define chJW   (char)('|')
-  #define chJE   (char)('|')
-  #define chDeg0 (char)(' ')
-! #define chDeg1 (char)(':')   /* degree symbol */
-  
-  /*
-  ** One shouldn't ever need to change anything below this line to compile.
diff --git a/misc/astrolog/pkg-descr b/misc/astrolog/pkg-descr
index 924cb0a0af18..3c1f53c0eed4 100644
--- a/misc/astrolog/pkg-descr
+++ b/misc/astrolog/pkg-descr
@@ -1,7 +1,7 @@
-Astrolog 5.20 is a many featured and
+* Astrolog 5.30 is a many featured and
 customizable astrology chart calculation
 program for DOS, Windows, Mac, and Unix,
-used in 25+ countries on six continents.
+used in 30+ countries on six continents.
 It is 100% freeware and requires no
 registration fee. :) The complete source
 code is available. Astrolog features:
diff --git a/misc/astrolog/pkg-install b/misc/astrolog/pkg-install
index 780ee4b924be..89b4e2f026af 100644
--- a/misc/astrolog/pkg-install
+++ b/misc/astrolog/pkg-install
@@ -3,6 +3,5 @@
 if [ "$2" != "POST-INSTALL" ]; then
   exit 0
 fi
-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"
+echo "See the file ${PKG_PREFIX}/share/doc/astrolog/Helpfile.530 for help"
+echo "and tune ${PKG_PREFIX}/lib/astrolog/astrolog.dat"
diff --git a/misc/astrolog/pkg-plist b/misc/astrolog/pkg-plist
index d4a21f03b87e..2ef7d9a18969 100644
--- a/misc/astrolog/pkg-plist
+++ b/misc/astrolog/pkg-plist
@@ -1,7 +1,7 @@
 bin/astrolog
-share/astrolog/helpfile.520
-share/astrolog/readme.520
-info/astrolog.info.gz
+share/doc/astrolog/Helpfile.530
+share/doc/astrolog/Readme.530
+share/doc/astrolog/Update.530
 lib/astrolog/astrolog.dat
 lib/astrolog/LRZ5_24
 lib/astrolog/CHI_24