Install all ephemeris files now

Minor tweaks

4 files changed, 113 insertions, 22 deletions

diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index e628a8d8dc07..e08361ef5bbf 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -10,18 +10,18 @@
 
 PORTNAME=	astrolog
 PORTVERSION=	5.40
-PORTREVISION=	3
-CATEGORIES=	misc
-MASTER_SITES=	http://www.astrolog.org/ftp/ephem/ \
-		http://www.astrolog.org/ftp/ \
-		ftp://ftp.kiarchive.ru/pub/unix/magick/astrology/astrolog/
+PORTREVISION=	4
+CATEGORIES=	misc astro
+MASTER_SITES=	http://www.astrolog.org/ftp/ephem/:ephem \
+		http://www.astrolog.org/ftp/:dist
 EXTRACT_ONLY=	ast54unx.shr
-EPHEM=		LRZ5_24 CHI_24 CPJV_24
-DISTFILES=	${EXTRACT_ONLY} ${EPHEM}
+EPHEM=		ephemall.zip
+DISTFILES=	${EXTRACT_ONLY}:dist ${EPHEM}:ephem
 
 MAINTAINER=	ache@FreeBSD.org
 COMMENT=	An astrology program for X11 and alpha-numeric terminals
 
+EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 MAKE_ARGS=	-DX11
@@ -33,14 +33,18 @@ DIST_SUBDIR=	astrolog
 ALL_TARGET=	astrolog
 NO_WRKSUBDIR=	yes
 
+post-extract:
+	-@${MKDIR} ${WRKDIR}/ephem
+	${UNZIP_CMD} -a -qo ${_DISTDIR}/${EPHEM} -d ${WRKDIR}/ephem
+
 post-patch:
 	@${REINPLACE_CMD} -e "s@malloc.h@stdlib.h@g" \
 		${WRKSRC}/astrolog.h ${WRKSRC}/placalc.h
 
 do-install:
 	-@${MKDIR} ${PREFIX}/lib/astrolog
-	cd ${DISTDIR}/${DIST_SUBDIR} && \
-		${INSTALL_DATA} ${EPHEM} ${PREFIX}/lib/astrolog
+	cd ${WRKDIR}/ephem && \
+		${INSTALL_DATA} * ${PREFIX}/lib/astrolog
 	cd ${WRKSRC}; \
 		${INSTALL_DATA} astrolog.dat ${PREFIX}/lib/astrolog/astrolog.dat-dist; \
 		if [ ! -f ${PREFIX}/lib/astrolog/astrolog.dat ] ; then \
diff --git a/misc/astrolog/distinfo b/misc/astrolog/distinfo
index 7e858f80f5c5..da54bc8a9818 100644
--- a/misc/astrolog/distinfo
+++ b/misc/astrolog/distinfo
@@ -1,12 +1,6 @@
 MD5 (astrolog/ast54unx.shr) = 3d604e013d8a7e2134bc637f17bb2857
 SHA256 (astrolog/ast54unx.shr) = 6700d393a421c16076d1aad37f171fde6293f1c062ec6a6ee07a884182287736
 SIZE (astrolog/ast54unx.shr) = 1465432
-MD5 (astrolog/LRZ5_24) = a02e13225eadbe4771edaa1a85c7a3bc
-SHA256 (astrolog/LRZ5_24) = eae89f4dcfcf82eed314b08e4e5ba913734cadab432536105f7c0f5cf9e187bb
-SIZE (astrolog/LRZ5_24) = 75000
-MD5 (astrolog/CHI_24) = b2b2643270155c0947ec8a36c24ce9d7
-SHA256 (astrolog/CHI_24) = 807bfdddbdbb3e50b8a78334a8c8199fa26b4ca215e9d8417634a9a0b9754f33
-SIZE (astrolog/CHI_24) = 15000
-MD5 (astrolog/CPJV_24) = 858e401a8fbf19dda777eb432e176698
-SHA256 (astrolog/CPJV_24) = ebed6ad7d1388d9aeee28152996ab7c780b781845cfbc9b97db26c6383fc280e
-SIZE (astrolog/CPJV_24) = 60000
+MD5 (astrolog/ephemall.zip) = 19b5033b4720a4e0c700f4cb5803604f
+SHA256 (astrolog/ephemall.zip) = d1a6de1de067af81c17500fbce52861f3e2a0a6925ecf599e55397d6f9684910
+SIZE (astrolog/ephemall.zip) = 4604012
diff --git a/misc/astrolog/pkg-install b/misc/astrolog/pkg-install
index 89b4e2f026af..d71f59155fe4 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.530 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 adeb1cea3035..e8a9c3fe0d08 100644
--- a/misc/astrolog/pkg-plist
+++ b/misc/astrolog/pkg-plist
@@ -1,9 +1,102 @@
 bin/astrolog
-lib/astrolog/astrolog.dat-dist
-lib/astrolog/astrolog.dat
-lib/astrolog/LRZ5_24
+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
+lib/astrolog/astrolog.dat
+lib/astrolog/astrolog.dat-dist
 share/doc/astrolog/Helpfile.540
 share/doc/astrolog/README.540
 share/doc/astrolog/Update.540