xephem 4.0.0

8 files changed, 96 insertions, 15 deletions

diff --git a/science/xephem/BUILD b/science/xephem/BUILD
index 18c5489559..7e6334b9f5 100755
--- a/science/xephem/BUILD
+++ b/science/xephem/BUILD
@@ -1,8 +1 @@
-cd ./libastro                                                           &&
-make                                                                    &&
-cd ../libip                                                             &&
-make                                                                    &&
-cd ../liblilxml                                                         &&
-make                                                                    &&
-cd ../GUI/xephem                                                        &&
-make
+make -C GUI/xephem
diff --git a/science/xephem/DEPENDS b/science/xephem/DEPENDS
index ae7a2abae5..1761fe0a4f 100755
--- a/science/xephem/DEPENDS
+++ b/science/xephem/DEPENDS
@@ -1,2 +1,5 @@
+depends JPEG &&
 depends MOTIF &&
-depends groff
+depends groff &&
+depends libpng &&
+depends zlib
diff --git a/science/xephem/DETAILS b/science/xephem/DETAILS
index 7cdbd06b3a..2ab64f5b8d 100755
--- a/science/xephem/DETAILS
+++ b/science/xephem/DETAILS
@@ -1,12 +1,9 @@
            SPELL=xephem
-         VERSION=3.7
-          SOURCE=${SPELL}-$VERSION.tar.gz
-         SOURCE2=${SPELL}-3.5.2.pdf
+         VERSION=4.0.0
+          SOURCE=${SPELL}-$VERSION.tgz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-$VERSION
    SOURCE_URL[0]=http://www.clearskyinstitute.com/$SPELL/$SOURCE
-  SOURCE2_URL[0]=http://www.clearskyinstitute.com/cgi-bin/download/$SOURCE2
-    SOURCE_HASH=sha512:dd8f5154a0c81375c2d89508f469fc6cc42808abe59945d168d64df89eb17dfcbc63a6793ed278dfa85bdf2a14047c7bcf95134942d3200cfe676fa12288b274
-    SOURCE2_HASH=sha512:7760b56d1f10978fdcf053f75f54ee1188b8be8adf589d5cc354c20c327b4226eb9b303e7fbfd10b0e64cd274c535a8d3c3cddb0a885513792e6783425be4b14
+     SOURCE_HASH=sha512:529541b4ca0fa9fbf35b9c722e8aa6779f9e94e6e9f717701f94741b9d72b1e21ca5cafcdc73d2d60c31f1d6eeefa0006dfed06c600309574cc12707396cdec6
         WEB_SITE=http://www.clearskyinstitute.com/xephem/
          ENTERED=20030517
             DOCS="README"
diff --git a/science/xephem/HISTORY b/science/xephem/HISTORY
index 25c63b2db2..27854f33da 100644
--- a/science/xephem/HISTORY
+++ b/science/xephem/HISTORY
@@ -1,3 +1,9 @@
+2021-08-25 Ismael Luceno <ismael@sourcemage.org>
+	* BUILD, DETAILS, INSTALL: updated spell to 4.0.0
+	* PRE_BUILD, patches/unbundle.patch: unbundled zlib, libjpeg, libpng and motif
+	* patches/typos.patch: fixed typos causing build failure
+	* PRE_BUILD: fixed CFLAGS for libs
+
 2010-30-10 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: fixed MD5[0] to SOURCE_HASH
 
diff --git a/science/xephem/INSTALL b/science/xephem/INSTALL
index ac26f6a8ce..974f22006b 100755
--- a/science/xephem/INSTALL
+++ b/science/xephem/INSTALL
@@ -1,3 +1,4 @@
+cd GUI/xephem &&
 cp xephem "$INSTALL_ROOT"/usr/bin                                                      &&
 mkdir  -p  "$INSTALL_ROOT"/etc/xephem                                                  &&
 cp -R auxil catalogs fifos fits "$INSTALL_ROOT"/etc/xephem                             &&
diff --git a/science/xephem/PRE_BUILD b/science/xephem/PRE_BUILD
new file mode 100755
index 0000000000..b1c1a2cbcb
--- /dev/null
+++ b/science/xephem/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+rm -rf libz libjpegd libpng libXm &&
+sed -i '/^CFLAGS *=/{s/=/+=/;s/ -O[^ ]*//}' {libastro,libip,liblilxml}/Makefile
diff --git a/science/xephem/patches/typos.patch b/science/xephem/patches/typos.patch
new file mode 100644
index 0000000000..a50d2c213e
--- /dev/null
+++ b/science/xephem/patches/typos.patch
@@ -0,0 +1,22 @@
+diff --git a/GUI/xephem/versionmenu.c b/GUI/xephem/versionmenu.c
+index 6c062b1a69c7..a5b3b465d2cf 100644
+--- a/GUI/xephem/versionmenu.c
++++ b/GUI/xephem/versionmenu.c
+@@ -50,7 +50,7 @@ static char *msg[] = {
+ "Copyright (c) 2021 Elwood Charles Downey",
+ "",
+ "Permission is hereby granted, free of charge, to any person obtaining a copy",
+-"of this software and associated documentation files (the "Software"), to deal",
++"of this software and associated documentation files (the \"Software\"), to deal",
+ "in the Software without restriction, including without limitation the rights",
+ "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell",
+ "copies of the Software, and to permit persons to whom the Software is",
+@@ -59,7 +59,7 @@ static char *msg[] = {
+ "The above copyright notice and this permission notice shall be included in all",
+ "copies or substantial portions of the Software.",
+ "",
+-"THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
++"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR",
+ "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,",
+ "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE",
+ "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER",
diff --git a/science/xephem/patches/unbundle.patch b/science/xephem/patches/unbundle.patch
new file mode 100644
index 0000000000..d3a8617608
--- /dev/null
+++ b/science/xephem/patches/unbundle.patch
@@ -0,0 +1,54 @@
+Subject: Fix build system
+
+- unbundle libjpeg
+- unbundle libpng
+- unbundle zlib
+- remove dependency on libXp
+- don't override CFLAGS
+- remove MOTIFI/MOTIFL and /opt/X11 from flags
+
+diff --git a/GUI/xephem/Makefile b/GUI/xephem/Makefile
+index 07bb55e348a7..0c62de0bec28 100644
+--- a/GUI/xephem/Makefile
++++ b/GUI/xephem/Makefile
+@@ -10,9 +10,9 @@
+ # one executable, xephem.
+ 
+ # These -I and -L flags point to the supporting XEphem libraries
+-LIBINC = -I../../libastro -I../../libip -I../../liblilxml -I../../libjpegd -I../../libpng -I../../libz
+-LIBLNK = -L../../libastro -L../../libip -L../../liblilxml -L../../libjpegd -L../../libpng -L../../libz
+-LIBLIB = -lastro -lip -llilxml -ljpegd -lpng -lz
++LIBINC = -I../../libastro -I../../libip -I../../liblilxml
++LIBLNK = -L../../libastro -L../../libip -L../../liblilxml
++LIBLIB = -lastro -lip -llilxml -ljpeg -lpng -lz
+ 
+ # MOTIFI is the directory containing the Xm directory of include files.
+ # MOTIFL is the directory containing the libXm.a library.
+@@ -32,8 +32,8 @@ endif
+ # for linux and Apple OS X
+ CC = gcc
+ CLDFLAGS = -g
+-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include
+-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib
++CFLAGS += $(LIBINC) $(CLDFLAGS) -Wall
++LDFLAGS = $(LIBLNK) $(CLDFLAGS)
+-XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
++XLIBS = -lXm -lXt -lXext -lXmu -lX11
+ LIBS = $(XLIBS) $(LIBLIB) -lm
+ 
+@@ -195,12 +195,9 @@ xephem.1: xephem.man
+ 	nroff -man $? > $@
+ 
+ libs:
+-	cd ../../libastro; make
+-	cd ../../libip; make
+-	cd ../../libjpegd; make
+-	cd ../../liblilxml; make
+-	cd ../../libpng; make
+-	cd ../../libz; make
++	${MAKE} -C ../../libastro
++	${MAKE} -C ../../libip
++	${MAKE} -C ../../liblilxml
+ 
+ clean:
+ 	rm -fr *.o ../../lib*/*.[ao]