update to astrolog-7.10, based on a diff from Evandro Rathke taking maintainer

This commit is contained in:
sthen 2021-02-05 11:58:32 +00:00
parent 0c0c3f3a71
commit 8591e3e7f2
7 changed files with 120 additions and 91 deletions

View File

@ -1,55 +1,41 @@
# $OpenBSD: Makefile,v 1.31 2019/07/14 00:39:38 naddy Exp $
# $OpenBSD: Makefile,v 1.32 2021/02/05 11:58:32 sthen Exp $
COMMENT= astrology program for X11 and alpha-numeric terminals
COMMENT= astrology program for X11 and text-based user interfaces
DISTNAME= ast71src
PKGNAME= astrolog-7.10
V= 5.40
DISTNAME= ast54unx
PKGNAME= astrolog-${V}
REVISION= 2
CATEGORIES= misc
HOMEPAGE= http://www.astrolog.org/astrolog.htm
HOMEPAGE= https://www.astrolog.org/astrolog.htm
MASTER_SITES= http://www.astrolog.org/ftp/ephem/ \
http://www.astrolog.org/ftp/ \
ftp://ftp.kiarchive.ru/pub/unix/magick/astrology/astrolog/
EXTRACT_ONLY= ${DISTNAME}.shr
EPHEM= LRZ5_24 CHI_24 CPJV_24
DISTFILES= ${EXTRACT_ONLY} ${EPHEM}
MAINTAINER= Evandro Rathke <erathke@gmail.com>
PERMIT_PACKAGE= Yes
WANTLIB= X11 c m xcb
# Software: GPLv2, Ephemeris: may be used by GPLv2 software, see
# https://www.astro.com/swisseph/swephinfo_e.htm
WANTLIB += X11 c m
EXTRACT_CASES= *.shr) ${_PERL_FIX_SHAR} ${FULLDISTDIR}/$$archive | /bin/sh;;
DIST_SUBDIR= astrolog
ALL_TARGET= astrolog
MASTER_SITES= https://www.astrolog.org/ftp/
DISTFILES= ${DISTNAME}.zip \
${DISTNAME}-{ephem/}astephem.zip
UNZIP= unzip -a
WRKDIST= ${WRKDIR}
CXXFLAGS+= -DDEFAULT_DIR='\"${PREFIX}/share/astrolog\"' \
-I"${X11BASE}/include"
LIBS= -L"${X11BASE}/lib" -lm -lX11
ALL_TARGET= astrolog
MAKE_FLAGS= LIBS="${LIBS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
NO_TEST= Yes
_V= ${V:S/.//}
SUBST_VARS= _V
do-install:
-@${INSTALL_DATA_DIR} ${PREFIX}/lib/astrolog
cd ${FULLDISTDIR} && \
${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; \
else \
${INSTALL_DATA} astrolog.dat ${PREFIX}/lib/astrolog; \
fi
cd ${WRKSRC} && ${INSTALL_PROGRAM} astrolog ${PREFIX}/bin
-@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/astrolog
cd ${WRKSRC} && \
${INSTALL_DATA} Helpfile.${_V} ${PREFIX}/share/doc/astrolog
cd ${WRKSRC} && \
${INSTALL_DATA} Update.${_V} ${PREFIX}/share/doc/astrolog
cd ${WRKSRC} && \
${INSTALL_DATA} README.${_V} ${PREFIX}/share/doc/astrolog
${INSTALL_PROGRAM} ${WRKBUILD}/astrolog ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc/,}astrolog
${INSTALL_DATA} ${WRKSRC}/*.{as,se1,txt} ${PREFIX}/share/astrolog
${INSTALL_DATA} ${WRKSRC}/*.htm ${PREFIX}/share/doc/astrolog
.include <bsd.port.mk>

View File

@ -1,8 +1,4 @@
SHA256 (astrolog/CHI_24) = gHv93b27PlC4p4M0qMgZn6JrTKIV6dhBdjSpoLl1TzM=
SHA256 (astrolog/CPJV_24) = 6+1q19E4jZru4oFSmWq3x4C3gYRc+8m5fbJsY4P8KA4=
SHA256 (astrolog/LRZ5_24) = 6uifTc/Pgu7TFLCOTlupE3NMratDJTYQX3wPXPnhh7s=
SHA256 (astrolog/ast54unx.shr) = ZwDTk6QhwWB20arTfxcf3mKT8cBi7Gpu4HqIQYIodzY=
SIZE (astrolog/CHI_24) = 15000
SIZE (astrolog/CPJV_24) = 60000
SIZE (astrolog/LRZ5_24) = 75000
SIZE (astrolog/ast54unx.shr) = 1465432
SHA256 (ast71src-astephem.zip) = K+n3bHBllKHIhT3sdrFs2PbY3VSR8SK859xkzef6pbE=
SHA256 (ast71src.zip) = h/KgCAXJcMSRX6rBQoHbGUlH1I+guzn62i/jjtebsdc=
SIZE (ast71src-astephem.zip) = 34584754
SIZE (ast71src.zip) = 3607260

View File

@ -1,14 +1,17 @@
$OpenBSD: patch-Makefile,v 1.1 2007/10/26 22:00:31 ajacoutot Exp $
--- Makefile.orig Fri Oct 26 23:52:30 2007
+++ Makefile Fri Oct 26 23:52:33 2007
@@ -23,8 +23,8 @@ OBJ = astrolog.o data.o data2.o general.o io.o\
charts0.o charts1.o charts2.o charts3.o intrpret.o\
xdata.o xgeneral.o xdevice.o xcharts0.o xcharts1.o xcharts2.o xscreen.o
$OpenBSD: patch-Makefile,v 1.2 2021/02/05 11:58:32 sthen Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -26,9 +26,7 @@ OBJ = astrolog.o atlas.o calc.o charts0.o charts1.o ch
# If you don't have X windows, delete the "-lX11" part from the line below:
-LIBS = -lm -lX11
-CFLAGS = -O
+LIBS = -L${X11BASE}/lib -lX11 -lm
+CFLAGS += -I${X11BASE}/include -DDEFAULT_DIR=\"${PREFIX}/lib/astrolog\"
# If not compiling with GNUC, delete the "-ldl" part from the line below:
LIBS = -lm -lX11 -ldl
-CPPFLAGS = -O -Wno-write-strings -Wno-narrowing -Wno-comment
+CPPFLAGS = -Wno-write-strings -Wno-narrowing -Wno-comment
astrolog:: $(OBJ)
cc -o $(NAME) $(OBJ) $(LIBS)
- cc -o $(NAME) $(OBJ) $(LIBS)
- strip $(NAME)
-#
+ $(CC) -o $(NAME) $(OBJ) $(LIBS)

View File

@ -1,12 +1,18 @@
--- astrolog.h.orig Sun Jan 11 21:19:47 2009
+++ astrolog.h Sun Jan 11 21:19:48 2009
@@ -131,7 +131,9 @@
$OpenBSD: patch-astrolog_h,v 1.3 2021/02/05 11:58:32 sthen Exp $
Index: astrolog.h
--- astrolog.h.orig
+++ astrolog.h
@@ -159,10 +159,12 @@
** specified within the default settings file or in the program itself.
*/
#ifndef PC
+#ifndef DEFAULT_DIR
#ifndef PC
#define DEFAULT_DIR "~/astrolog"
+#endif
#else
#define DEFAULT_DIR "C:\\ASTROLOG"
#define DEFAULT_DIR "C:\\Astrolog"
+#endif
#endif
// Change this string to directory path program should look in for the
// astrolog.as default file, if one is not in the current directory or

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-placalc_h,v 1.1 2014/11/30 05:41:34 brad Exp $
Don't use malloc.h header on OpenBSD.
--- placalc.h.orig Thu Nov 20 00:36:12 2014
+++ placalc.h Thu Nov 20 01:01:14 2014
@@ -123,7 +123,9 @@ auto-dectection of MSDOS (TURBO_C or MS_C) or HPUNIX
#if HPUNIX
#ifndef MAC
#ifndef NeXT
+#ifndef __OpenBSD__
#include <malloc.h>
+#endif
#endif
#endif /* MAC */
typedef double REAL8; /* real with at least 64 bit precision */

View File

@ -1,2 +0,0 @@
See the file ${PREFIX}/share/doc/astrolog/Helpfile.${_V} for help
and tune ${PREFIX}/lib/astrolog/astrolog.dat.

View File

@ -1,11 +1,67 @@
@comment $OpenBSD: PLIST,v 1.5 2009/01/15 15:32:24 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.6 2021/02/05 11:58:32 sthen Exp $
@bin bin/astrolog
lib/astrolog/
lib/astrolog/CHI_24
lib/astrolog/CPJV_24
lib/astrolog/LRZ5_24
lib/astrolog/astrolog.dat
share/astrolog/
share/astrolog/astrolog.as
share/astrolog/atlas.as
share/astrolog/se_index.txt
share/astrolog/seas_00.se1
share/astrolog/seas_06.se1
share/astrolog/seas_12.se1
share/astrolog/seas_18.se1
share/astrolog/seas_24.se1
share/astrolog/seas_30.se1
share/astrolog/seas_36.se1
share/astrolog/seas_42.se1
share/astrolog/seas_48.se1
share/astrolog/seasm06.se1
share/astrolog/seasm12.se1
share/astrolog/seasm18.se1
share/astrolog/seasm24.se1
share/astrolog/seasm30.se1
share/astrolog/seasm36.se1
share/astrolog/seasm42.se1
share/astrolog/seasm48.se1
share/astrolog/seasm54.se1
share/astrolog/sefstars.txt
share/astrolog/semo_00.se1
share/astrolog/semo_06.se1
share/astrolog/semo_12.se1
share/astrolog/semo_18.se1
share/astrolog/semo_24.se1
share/astrolog/semo_30.se1
share/astrolog/semo_36.se1
share/astrolog/semo_42.se1
share/astrolog/semo_48.se1
share/astrolog/semom06.se1
share/astrolog/semom12.se1
share/astrolog/semom18.se1
share/astrolog/semom24.se1
share/astrolog/semom30.se1
share/astrolog/semom36.se1
share/astrolog/semom42.se1
share/astrolog/semom48.se1
share/astrolog/semom54.se1
share/astrolog/seorbel.txt
share/astrolog/sepl_00.se1
share/astrolog/sepl_06.se1
share/astrolog/sepl_12.se1
share/astrolog/sepl_18.se1
share/astrolog/sepl_24.se1
share/astrolog/sepl_30.se1
share/astrolog/sepl_36.se1
share/astrolog/sepl_42.se1
share/astrolog/sepl_48.se1
share/astrolog/seplm06.se1
share/astrolog/seplm12.se1
share/astrolog/seplm18.se1
share/astrolog/seplm24.se1
share/astrolog/seplm30.se1
share/astrolog/seplm36.se1
share/astrolog/seplm42.se1
share/astrolog/seplm48.se1
share/astrolog/seplm54.se1
share/astrolog/timezone.as
share/doc/astrolog/
share/doc/astrolog/Helpfile.${_V}
share/doc/astrolog/README.${_V}
share/doc/astrolog/Update.${_V}
share/doc/astrolog/astrolog.htm
share/doc/astrolog/changes.htm
share/doc/astrolog/license.htm