Switch to new distribution scheme

5 files changed, 41 insertions, 55 deletions

diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index bf50ac3cf27b..3805c780855d 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -7,39 +7,31 @@
 # Date created:         31 July 1995
 # Whom:                 faulkner@cactus.org
 #
-# $Id: Makefile,v 1.7 1997/01/13 22:56:39 ache Exp $
+# $Id: Makefile,v 1.8 1997/01/24 10:20:50 asami Exp $
 #
 
-DISTNAME=       ast53src
+DISTNAME=       ast53unx
 PKGNAME=        astrolog-5.30
 CATEGORIES=     misc
-MASTER_SITES=   http://rpkalf2.mach.uni-karlsruhe.de/~ferber/astrolog/
-DISTFILES=      ${EXTRACT_ONLY} ast53dos.zip
+MASTER_SITES=   http://www.astrolog.org/ftp/ephem/ \
+		http://www.astrolog.org/ftp/ \
+		ftp://ftp.relcom.ru/unix/magick/astrology/astrolog/
+EXTRACT_ONLY=   ${DISTNAME}.shr
+EPHEM=          LRZ5_24 CHI_24 CPJV_24
+DISTFILES=      ${EXTRACT_ONLY} ${EPHEM}
 
 MAINTAINER=     ache@FreeBSD.ORG
 
-BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
-
-EXTRACT_ONLY=   ${DISTNAME}.zip
-EXTRACT_CMD=    unzip
-EXTRACT_ARGS=   -oqLaa
+EXTRACT_CMD=    /bin/sh
+EXTRACT_ARGS=
 DIST_SUBDIR=    astrolog
-MAKEFILE=       makefile.unx
 ALL_TARGET=     astrolog
 NO_WRKSUBDIR=   Yes
 
-EPHEM=          LRZ5_24 CHI_24 CPJV_24
-MISC=           helpfile.530 update.530
-
-post-extract:
-	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_DATA} ${EPHEM} ${PREFIX}/lib/astrolog
+	cd ${DISTDIR}/${DIST_SUBDIR} && \
+		${INSTALL_DATA} ${EPHEM} ${PREFIX}/lib/astrolog
 	cd ${WRKSRC} && \
 		if [ -f ${PREFIX}/lib/astrolog/astrolog.dat ] ; then \
 			${INSTALL_DATA} astrolog.dat ${PREFIX}/lib/astrolog/astrolog.dat-dist; \
@@ -49,11 +41,11 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_PROGRAM} astrolog ${PREFIX}/bin
 	-@${MKDIR} ${PREFIX}/share/doc/astrolog
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} helpfile.530 ${PREFIX}/share/doc/astrolog/Helpfile.530
+		${INSTALL_DATA} Helpfile.530 ${PREFIX}/share/doc/astrolog
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} update.530 ${PREFIX}/share/doc/astrolog/Update.530
+		${INSTALL_DATA} Update.530 ${PREFIX}/share/doc/astrolog
 	cd ${WRKSRC} && \
-		${INSTALL_DATA} readme.530 ${PREFIX}/share/doc/astrolog/Readme.530
+		${INSTALL_DATA} README.530 ${PREFIX}/share/doc/astrolog
 	@echo
 	@echo "See the file ${PREFIX}/share/doc/astrolog/Helpfile.530 for help"
 	@echo "and tune ${PREFIX}/lib/astrolog/astrolog.dat"
diff --git a/misc/astrolog/distinfo b/misc/astrolog/distinfo
index e006f39a704d..dc2a4298e5fd 100644
--- a/misc/astrolog/distinfo
+++ b/misc/astrolog/distinfo
@@ -1,2 +1,4 @@
-MD5 (astrolog/ast53src.zip) = e1977a0602145c9add31ba2c8af16c17
-MD5 (astrolog/ast53dos.zip) = c126ada589b36b700d32cfcb5664aae9
+MD5 (astrolog/ast53unx.shr) = 3be257b0bbd25afe53acc6838d09af0b
+MD5 (astrolog/LRZ5_24) = a02e13225eadbe4771edaa1a85c7a3bc
+MD5 (astrolog/CHI_24) = b2b2643270155c0947ec8a36c24ce9d7
+MD5 (astrolog/CPJV_24) = 858e401a8fbf19dda777eb432e176698
diff --git a/misc/astrolog/files/patch-aa b/misc/astrolog/files/patch-aa
index 99458400a36b..4af7e5601af5 100644
--- a/misc/astrolog/files/patch-aa
+++ b/misc/astrolog/files/patch-aa
@@ -1,5 +1,5 @@
 *** makefile.unx.bak	Sun Sep 29 23:27:00 1996
---- makefile.unx	Tue Jan 14 01:06:55 1997
+--- Makefile	Tue Jan 14 01:06:55 1997
 ***************
 *** 23,30 ****
    charts0.o charts1.o charts2.o charts3.o intrpret.o\
diff --git a/misc/astrolog/files/patch-ab b/misc/astrolog/files/patch-ab
index 4dec816cdb81..8da349f1e688 100644
--- a/misc/astrolog/files/patch-ab
+++ b/misc/astrolog/files/patch-ab
@@ -1,38 +1,30 @@
-*** astrolog.h.bak	Sun Sep 29 23:27:00 1996
---- astrolog.h	Tue Jan 14 01:16:37 1997
+*** astrolog.h.orig	Sun Feb  2 23:06:03 1997
+--- astrolog.h	Thu May 29 05:06:03 1997
 ***************
-*** 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. */
+*** 82,92 ****
+  #define ENVIRON /* Comment out this #define if your system doesn't have  */
+                  /* environment variables or can't compile calls to them. */
   
-! /*#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 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 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 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. */
   
-  /*#define MAC /* Comment out this #define if you're not compiling for a Mac. */
+--- 82,92 ----
+  #define ENVIRON /* Comment out this #define if your system doesn't have  */
+                  /* environment variables or can't compile calls to them. */
   
-! #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 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 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 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. */
   
-  /*#define MSG /* Comment out this #define if you don't have access to the     */
 ***************
 *** 131,137 ****
 --- 131,139 ----
diff --git a/misc/astrolog/pkg-plist b/misc/astrolog/pkg-plist
index 2ef7d9a18969..dfd8a9e59c61 100644
--- a/misc/astrolog/pkg-plist
+++ b/misc/astrolog/pkg-plist
@@ -1,6 +1,6 @@
 bin/astrolog
 share/doc/astrolog/Helpfile.530
-share/doc/astrolog/Readme.530
+share/doc/astrolog/README.530
 share/doc/astrolog/Update.530
 lib/astrolog/astrolog.dat
 lib/astrolog/LRZ5_24