pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/x11/xephem




To: pkgsrc-changes%NetBSD.org@localhost

Subject: CVS commit: pkgsrc/x11/xephem

From: "Greg Troxel" <gdt%netbsd.org@localhost>

Date: Sat, 31 Jan 2026 18:05:28 +0000


Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Jan 31 18:05:27 UTC 2026

Modified Files:
        pkgsrc/x11/xephem: Makefile PLIST distinfo
        pkgsrc/x11/xephem/patches: patch-aa
Added Files:
        pkgsrc/x11/xephem/patches: patch-tools_xedb_xedb.c

Log Message:
x11/xephem: Update to 4.2.0

* 4.2.0

    Elwood himself has contributed a new option that lets you switch XEphem from giving your telescope J2000 coordinates to giving it equinox-of-date coordinates.
    Sky View: the mouse wheel now zooms the view in and out.
    Sky View: DSS image download has been fixed by upgrading to HTTPS, and the window should no longer awkwardly resize once the image arrives.
    Data » Download: added the URL of the Celestrak “visual.txt” file.
    Data » Download: replaced “ftp.lowell.edu” with modern HTTPS.
    Data » Field Stars: François Meyer added support for the ucac5 catalog.
    The precession formula has been updated to the one from the 2000 Astronomical Almanac.
    A couple of compilation problems on modern Mac machines have been fixed.
    XEphem now uses more modern SSL setup routines if the code detects it’s being compiled against OpenSSL ≥1.1.
    Closing the INDI window with your window manager’s “Close” button no longer crashes XEphem.
    All references to “celestrak.com” have been changed to their new hostname “celestrak.org”.
    A few other small fixes.

* 4.1.0: SSL support plus updates to planetary moons, Pluto, and ∆T

    Downloads of Minor Planet Center files and of Earth weather maps have both been fixed, thanks to new SSL support. Thank you, Lutz Mändle!
    The files for the moons of Mars, Jupiter, Saturn, and Uranus that expired at the end of 2020 have been updated through 2040. Thanks you, IMCCE!
    Updates from the Astronomical Almanac 2020:
        Pluto’s long-term orbital elements.
        The ∆T table now runs through 2018.

* 4.0.2: Updated World Magnetic Model; better compilation

    Updated to the 2020-2025 World Magnetic Model.
    Fixed Halifax time zone, which was an hour off.
    Stop trying to link against `-lXp`, which X Windows no longer offers.
    Tell Linux folks to compile against their native Motif libraries.
    Remove pre-compiled Linux `libXm.a`: incompatible with modern X Windows.
    First release from the GitHub repository.

* 4.0.1: Final release from clearskyinstitute.com

    Tweaked "versionmenu.c" to fix a compiler error.
    Final release from the www.clearskyinstitute.com website.

* 4.0.0: First release under MIT License

    This release preserves the state of the source code when the author Elwood Downey posted it to the XEphem web site on the day he donated it to the community by offering it under the MIT License. 
Thank you, Elwood!


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/x11/xephem/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/xephem/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/xephem/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/xephem/patches/patch-aa
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xephem/patches/patch-tools_xedb_xedb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xephem/Makefile
diff -u pkgsrc/x11/xephem/Makefile:1.75 pkgsrc/x11/xephem/Makefile:1.76
--- pkgsrc/x11/xephem/Makefile:1.75     Mon Jun 23 01:23:36 2025
+++ pkgsrc/x11/xephem/Makefile  Sat Jan 31 18:05:27 2026
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.75 2025/06/23 01:23:36 zafer Exp $
+# $NetBSD: Makefile,v 1.76 2026/01/31 18:05:27 gdt Exp $
 
-DISTNAME=      xephem-3.7.7
+VERSION=       4.2.0
+DISTNAME=      XEphem-${VERSION}
+PKGNAME=       xephem-${VERSION}
 CATEGORIES=    x11
-# New MASTER_SITES is:
-# https://github.com/XEphem/XEphem/archive/refs/tags/4.2.0.tar.gz
-MASTER_SITES=  #http://97.74.56.125/free/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=XEphem/}
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    gdt%NetBSD.org@localhost
-HOMEPAGE=      https://www.clearskyinstitute.com/
-#HOMEPAGE+=    https://github.com/XEphem/XEphem
+HOMEPAGE=      https://github.com/XEphem/XEphem
 COMMENT=       Interactive astronomical ephemeris program
-# 4.2.0 appears to be mit-license
-LICENSE=       xephem-license
+LICENSE=       mit
 
-# Pending adjustment of license wording to clarify the copyright
-# holder's intent, permission has been granted to distribute the
-# distfile and binary packages without functional changes.
+# License was previously xephem-licenes (boutique, almost free). Do not
+# delete this comment; I will do so eventually when licensing is 100%
+# resolved.
 #
 # From: "Elwood C. Downey" <ecdowney%clearskyinstitute.com@localhost>
 # Subject: Re: license terms, tarball mirroring, binary packages
@@ -28,17 +27,21 @@ LICENSE=    xephem-license
 # from the original tarball (including possible changes for porting but
 # not changes in functionality).
 
-# uses built libpng without synchronization
-MAKE_JOBS_SAFE=        no
+# old-school makefile with no synchronization
+# (not reported upstream because a bug report today would be disrespectful)
+MAKE_JOBS_SAFE=                no
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}/GUI/xephem
-USE_TOOLS+=    gmake pax perl:run
-REPLACE_PERL+= auxil/*.pl
+WRKSRC=                        ${WRKDIR}/${DISTNAME}/GUI/xephem
+USE_TOOLS+=            gmake pax perl:run
 
-LIBS.SunOS+=           -lnsl -lsocket
 X11_LDFLAGS+=          ${LIBS}
 MAKE_ENV+=             X11_LDFLAGS=${X11_LDFLAGS:Q}
 
+LIBS.SunOS+=           -lnsl -lsocket
+
+# \todo Evaluate and perhaps modernize this section.
+REPLACE_PERL+=         auxil/*.pl
+
 REPLACE_INTERPRETER+=  perl
 REPLACE.perl.old=      .*/bin/perl
 REPLACE.perl.new=      ${PREFIX}/bin/perl
@@ -47,10 +50,26 @@ REPLACE_FILES.perl= auxil/astorb2edb.pl 
 INSTALLATION_DIRS=     bin lib/X11/app-defaults share/xephem/tools \
                        ${PKGMANDIR}/man1
 
+# xephem looks for app-defaults in hardcoded/wrong places
+SUBST_CLASSES+=                ad
+SUBST_SED.ad=          -e "s,@PREFIX@,${PREFIX},"
+SUBST_FILES.ad=                tools/xedb/xedb.c
+SUBST_STAGE.ad=                post-configure
+SUBST_MESSAGE.ad=      Fixing path to x11 app-defaultsin xedb.c.
+
+# \todo Make this respect user ShareDir config also.
+SUBST_CLASSES+=                homeio
+SUBST_SED.homeio=      -e "s,@SHAREDIR@,${PREFIX}/share/xephem,"
+SUBST_FILES.homeio=    homeio.c
+SUBST_STAGE.homeio=    post-configure
+SUBST_MESSAGE.homeio=  Fixing path to x11 app-defaults in homeio.c.
+
+post-extract:
+       ${SED} s,@PREFIX@,${PREFIX}, ${FILESDIR}/XEphem.ad > ${WRKDIR}/XEphem
+
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/xephem ${DESTDIR}${PREFIX}/bin
        ${INSTALL_MAN} ${WRKSRC}/xephem.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xephem.1
-       ${SED} s,@PREFIX@,${PREFIX}, ${FILESDIR}/XEphem.ad > ${WRKDIR}/XEphem
        ${INSTALL_DATA} ${WRKDIR}/XEphem ${DESTDIR}${PREFIX}/lib/X11/app-defaults
        cd ${WRKSRC}; pax -rw auxil catalogs fifos fits gallery help lo \
                ${DESTDIR}${PREFIX}/share/xephem

Index: pkgsrc/x11/xephem/PLIST
diff -u pkgsrc/x11/xephem/PLIST:1.12 pkgsrc/x11/xephem/PLIST:1.13
--- pkgsrc/x11/xephem/PLIST:1.12        Wed Dec  7 16:19:33 2011
+++ pkgsrc/x11/xephem/PLIST     Sat Jan 31 18:05:27 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2011/12/07 16:19:33 drochner Exp $
+@comment $NetBSD: PLIST,v 1.13 2026/01/31 18:05:27 gdt Exp $
 bin/xephem
 lib/X11/app-defaults/XEphem
 man/man1/xephem.1
@@ -12,10 +12,12 @@ share/xephem/auxil/classicfigs.csf
 share/xephem/auxil/dearth.gif
 share/xephem/auxil/favorites.fav
 share/xephem/auxil/jupiter.1020
+share/xephem/auxil/jupiter.2040
 share/xephem/auxil/jupiter.9910
 share/xephem/auxil/jupitermap.gif
 share/xephem/auxil/logo.gif
 share/xephem/auxil/mars.1020
+share/xephem/auxil/mars.2040
 share/xephem/auxil/mars.9910
 share/xephem/auxil/mars_db
 share/xephem/auxil/marsmap.jpg
@@ -30,9 +32,11 @@ share/xephem/auxil/saturn16.gif
 share/xephem/auxil/saturn20.gif
 share/xephem/auxil/saturn24.gif
 share/xephem/auxil/saturne.1020
+share/xephem/auxil/saturne.2040
 share/xephem/auxil/saturne.9910
 share/xephem/auxil/starcensus.txt
 share/xephem/auxil/uranus.1020
+share/xephem/auxil/uranus.2040
 share/xephem/auxil/uranus.9910
 share/xephem/auxil/wmm.cof
 share/xephem/auxil/xephem_sites

Index: pkgsrc/x11/xephem/distinfo
diff -u pkgsrc/x11/xephem/distinfo:1.17 pkgsrc/x11/xephem/distinfo:1.18
--- pkgsrc/x11/xephem/distinfo:1.17     Tue Oct 26 11:34:38 2021
+++ pkgsrc/x11/xephem/distinfo  Sat Jan 31 18:05:27 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.17 2021/10/26 11:34:38 nia Exp $
+$NetBSD: distinfo,v 1.18 2026/01/31 18:05:27 gdt Exp $
 
-BLAKE2s (xephem-3.7.7.tar.gz) = f1b7772df786a320b7ce87dce032b95f9f73a400cb310cad2782fb54b4c8ec22
-SHA512 (xephem-3.7.7.tar.gz) = d9cfecf0ce8aa495f66fcf6772ca7df0638cef8b9f18d9d6cbf013846a7575786ae9b5c515abc2058783baa7610320c893ddbc6f68bae28c65661a1c73b88634
-Size (xephem-3.7.7.tar.gz) = 18128523 bytes
-SHA1 (patch-aa) = 50da33421f5773483e7b6078bf01369c74681596
-SHA1 (patch-ab) = 16f179076e80797c6708b80287e5402dd269ff69
+BLAKE2s (XEphem-4.2.0.tar.gz) = 28bfc97fcd86769c3e9926695e9c77ac19da95c2f5d162ad63bc928cb875b77a
+SHA512 (XEphem-4.2.0.tar.gz) = 97756bc299821e95cbc06facc3091795feb245db033193fdf587bcfd7a83142a15552a1f8aa53c040c87cb75021424b94bbed5a747fb9783f5a0cac6fb4ddb3e
+Size (XEphem-4.2.0.tar.gz) = 17317398 bytes
+SHA1 (patch-aa) = f72467338392d2cfc6f9bfde07c3c4f1e0f259d0
+SHA1 (patch-homeio.c) = 351bce4a3d4ac6e89ca9c873269f20725dc984d3
+SHA1 (patch-tools_xedb_xedb.c) = 3f1310401f5eb49d35f90a25f99d7bccc05cd79d

Index: pkgsrc/x11/xephem/patches/patch-aa
diff -u pkgsrc/x11/xephem/patches/patch-aa:1.10 pkgsrc/x11/xephem/patches/patch-aa:1.11
--- pkgsrc/x11/xephem/patches/patch-aa:1.10     Sat Jun 18 21:32:10 2016
+++ pkgsrc/x11/xephem/patches/patch-aa  Sat Jan 31 18:05:27 2026
@@ -1,17 +1,32 @@
-$NetBSD: patch-aa,v 1.10 2016/06/18 21:32:10 jakllsch Exp $
+$NetBSD: patch-aa,v 1.11 2026/01/31 18:05:27 gdt Exp $
 
---- Makefile.orig      2015-08-09 21:36:50.000000000 +0000
+--- Makefile.orig      2024-02-13 14:35:36.000000000 +0000
 +++ Makefile
-@@ -32,9 +32,9 @@ endif
- # for linux and Apple OS X
+@@ -30,16 +30,10 @@ endif
+ 
+ # For Linux and Apple OS X
+ 
+-UNAME_S = $(shell uname -s)
+-ifeq ($(UNAME_S),Darwin)
+-  PLATI = -I/usr/local/opt/openssl@3/include -I/opt/X11/include
+-  PLATL = -L/usr/local/opt/openssl@3/lib -L/opt/X11/lib
+-endif
+-
  CC = gcc
  CLDFLAGS = -g
--CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) -I/opt/X11/include
--LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) -L/opt/X11/lib
--XLIBS = -lXm -lXp -lXt -lXext -lXmu -lX11
-+CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I/usr/X11R6/include
-+LDFLAGS = $(LIBLNK) $(CLDFLAGS) $(X11_LDFLAGS)
-+XLIBS = $(MOTIFLIB) -lXt -lXext -lXmu -lX11
- LIBS = $(XLIBS) $(LIBLIB) -lm
+-CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall -I$(MOTIFI) $(PLATI)
+-LDFLAGS = $(LIBLNK) $(CLDFLAGS) -L$(MOTIFL) $(PLATL)
++CFLAGS = $(LIBINC) $(CLDFLAGS) -O2 -Wall
++XE_LDFLAGS = $(LIBLNK) $(CLDFLAGS) $(LDFLAGS)
+ XLIBS = -lXm -lXt -lXext -lXmu -lX11
+ LIBS = $(XLIBS) $(LIBLIB) -lm -lssl
+ 
+@@ -195,7 +189,7 @@ OBJS =                     \
+ all: libs xephem xephem.1
+ 
+ xephem: $(INCS) $(OBJS)
+-      $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
++      $(CC) $(XE_LDFLAGS) -o $@ $(OBJS) $(LIBS)
  
- # static linking on Apple using X11 libs from ports
+ xephem.1: xephem.man
+       nroff -man $? > $@

Added files:

Index: pkgsrc/x11/xephem/patches/patch-tools_xedb_xedb.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-tools_xedb_xedb.c:1.1
--- /dev/null   Sat Jan 31 18:05:28 2026
+++ pkgsrc/x11/xephem/patches/patch-tools_xedb_xedb.c   Sat Jan 31 18:05:27 2026
@@ -0,0 +1,26 @@
+$NetBSD: patch-tools_xedb_xedb.c,v 1.1 2026/01/31 18:05:27 gdt Exp $
+
+While xedb doesn't seem to be used, patch wrong hardcoded path to app
+defaults, in conjuction with a SUBST.
+
+Not reported upstream until there is more clarity about this change,
+and also about future maintenance.
+
+--- tools/xedb/xedb.c.orig     2024-02-13 14:35:36.000000000 +0000
++++ tools/xedb/xedb.c
+@@ -188,13 +188,8 @@ findResFile (char path[])
+           return (found);
+       }
+ 
+-      /* try some common system places */
+-      sprintf (path, "/usr/X11R6/lib/X11/app-defaults/XEphem");
+-      if ((fp = fopen (path, "r")) != NULL) {
+-          fclose (fp);
+-          return (0);
+-      }
+-      sprintf (path, "/usr/lib/X11/app-defaults/XEphem");
++      /* Use pkgsrc's configured prefix, only. */
++      sprintf (path, "@PREFIX@/lib/X11/app-defaults/XEphem");
+       if ((fp = fopen (path, "r")) != NULL) {
+           fclose (fp);
+           return (0);





Prev by Date: CVS commit: pkgsrc/doc

Next by Date: CVS commit: pkgsrc/doc

Previous by Thread: CVS commit: pkgsrc/doc

Next by Thread: CVS commit: pkgsrc/doc

Indexes:

reverse Date

reverse Thread

Old Index



Home | Main Index | Thread Index | Old Index