pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/xephem
Module Name: pkgsrc
Committed By: gdt
Date: Sun Jun 28 00:44:26 UTC 2026
Modified Files:
pkgsrc/x11/xephem: Makefile distinfo
Added Files:
pkgsrc/x11/xephem/patches: patch-GUI_xephem_Makefile
patch-GUI_xephem_compiler.c patch-GUI_xephem_gallerymenu.c
patch-GUI_xephem_homeio.c patch-GUI_xephem_indimenu.c
patch-GUI_xephem_mainmenu.c patch-GUI_xephem_marsmenu.c
patch-GUI_xephem_saveres.c patch-GUI_xephem_sites.c
patch-GUI_xephem_skyip.c patch-GUI_xephem_skyviewmenu.c
patch-GUI_xephem_tools_xedb_xedb.c patch-GUI_xephem_xmisc.c
Removed Files:
pkgsrc/x11/xephem/patches: patch-aa patch-compiler.c
patch-gallerymenu.c patch-homeio.c patch-indimenu.c
patch-mainmenu.c patch-marsmenu.c patch-saveres.c patch-sites.c
patch-skyip.c patch-skyviewmenu.c patch-tools_xedb_xedb.c
patch-xmisc.c
Log Message:
x11/xephem: Pivot from WRKSRC to BUILD_DIRS
WRKSRC implies that the build does not look outside of it, but that's
not true. Instead, make WRKSRC top level, and instead invoke make in
(singleton) BUILD_DIRS.
This is a huge commit textually, but it's just a pivot in how the
subdir is used, adding BUILD_DIRS to paths, and renaming all the
patches.
NFCI; this should produce the same binary. Works on netbsd-10 amd64
in "look at sky view, didn't crash, not blank" testing.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/x11/xephem/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/xephem/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xephem/patches/patch-GUI_xephem_Makefile \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_compiler.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_gallerymenu.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_homeio.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_indimenu.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_mainmenu.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_marsmenu.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_saveres.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_sites.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyip.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyviewmenu.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_tools_xedb_xedb.c \
pkgsrc/x11/xephem/patches/patch-GUI_xephem_xmisc.c
cvs rdiff -u -r1.11 -r0 pkgsrc/x11/xephem/patches/patch-aa
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xephem/patches/patch-compiler.c \
pkgsrc/x11/xephem/patches/patch-gallerymenu.c \
pkgsrc/x11/xephem/patches/patch-homeio.c \
pkgsrc/x11/xephem/patches/patch-indimenu.c \
pkgsrc/x11/xephem/patches/patch-mainmenu.c \
pkgsrc/x11/xephem/patches/patch-marsmenu.c \
pkgsrc/x11/xephem/patches/patch-saveres.c \
pkgsrc/x11/xephem/patches/patch-sites.c \
pkgsrc/x11/xephem/patches/patch-skyip.c \
pkgsrc/x11/xephem/patches/patch-skyviewmenu.c \
pkgsrc/x11/xephem/patches/patch-tools_xedb_xedb.c \
pkgsrc/x11/xephem/patches/patch-xmisc.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.83 pkgsrc/x11/xephem/Makefile:1.84
--- pkgsrc/x11/xephem/Makefile:1.83 Sun Jun 28 00:37:42 2026
+++ pkgsrc/x11/xephem/Makefile Sun Jun 28 00:44:25 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2026/06/28 00:37:42 gdt Exp $
+# $NetBSD: Makefile,v 1.84 2026/06/28 00:44:25 gdt Exp $
VERSION= 4.2.0
PKGREVISION= 1
@@ -13,17 +13,15 @@ HOMEPAGE= https://github.com/XEphem/XEph
COMMENT= Interactive astronomical ephemeris program
LICENSE= mit
-# There are ctype(3) problems.
-# \todo Grab patch from https://github.com/XEphem/XEphem/pull/126
+# There are still ctype(3) problems.
+# \todo Redo patch from https://github.com/XEphem/XEphem/pull/126
# old-school makefile with no synchronization
# (not reported upstream because a bug report today would be disrespectful)
MAKE_JOBS_SAFE= no
-# \todo Fix this WRKSRC line (move subdir to BUILD_DIRS), because
-# while the build is done in that dir, files not in that subdir are
-# used in the build -- which breaks mkpatches.
-WRKSRC= ${WRKDIR}/${DISTNAME}/GUI/xephem
+WRKSRC= ${WRKDIR}/${DISTNAME}
+BUILD_DIRS= GUI/xephem
USE_TOOLS+= gmake pax perl:run
@@ -33,7 +31,7 @@ MAKE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q}
LDFLAGS.SunOS+= -lnsl -lsocket
# \todo Evaluate and perhaps modernize this section.
-REPLACE_PERL+= auxil/*.pl
+REPLACE_PERL+= ${BUILD_DIRS}/auxil/*.pl
REPLACE_INTERPRETER+= perl
REPLACE.perl.old= .*/bin/perl
@@ -46,14 +44,14 @@ INSTALLATION_DIRS= bin lib/X11/app-defau
# xephem looks for app-defaults in hardcoded/wrong places
SUBST_CLASSES+= ad
SUBST_VARS.ad= PREFIX
-SUBST_FILES.ad= tools/xedb/xedb.c
+SUBST_FILES.ad= ${BUILD_DIRS}/tools/xedb/xedb.c
SUBST_STAGE.ad= post-configure
SUBST_MESSAGE.ad= Fixing path to x11 app-defaults in 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_FILES.homeio= ${BUILD_DIRS}/homeio.c
SUBST_STAGE.homeio= post-configure
SUBST_MESSAGE.homeio= Fixing path to x11 app-defaults in homeio.c.
@@ -61,10 +59,10 @@ 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
+ ${INSTALL_PROGRAM} ${WRKSRC}/${BUILD_DIRS}/xephem ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/${BUILD_DIRS}/xephem.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/xephem.1
${INSTALL_DATA} ${WRKDIR}/XEphem ${DESTDIR}${PREFIX}/lib/X11/app-defaults
- cd ${WRKSRC}; pax -rw auxil catalogs fifos fits gallery help lo \
+ cd ${WRKSRC}/${BUILD_DIRS}; pax -rw auxil catalogs fifos fits gallery help lo \
${DESTDIR}${PREFIX}/share/xephem
${RM} -f ${DESTDIR}${PREFIX}/share/xephem/*/._*
${CHOWN} -R ${SHAREOWN} ${DESTDIR}${PREFIX}/share/xephem
Index: pkgsrc/x11/xephem/distinfo
diff -u pkgsrc/x11/xephem/distinfo:1.20 pkgsrc/x11/xephem/distinfo:1.21
--- pkgsrc/x11/xephem/distinfo:1.20 Sat Jun 27 20:07:53 2026
+++ pkgsrc/x11/xephem/distinfo Sun Jun 28 00:44:25 2026
@@ -1,18 +1,18 @@
-$NetBSD: distinfo,v 1.20 2026/06/27 20:07:53 gdt Exp $
+$NetBSD: distinfo,v 1.21 2026/06/28 00:44:25 gdt Exp $
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-compiler.c) = 6503330c37bc79fa9be3d5ee1754020fb237f2d1
-SHA1 (patch-gallerymenu.c) = b1aeff4f641df6fb9e222c62954177146baadf3c
-SHA1 (patch-homeio.c) = b2891558c607b1e0a57a5a786b8e399c5f9102e8
-SHA1 (patch-indimenu.c) = 1f3cad50a8a3d039a2986dd3d9632671a42f3c6c
-SHA1 (patch-mainmenu.c) = 63ce07c5edc9233da3b7e9c810d486687049011c
-SHA1 (patch-marsmenu.c) = 164f486d1f22f9c354f026689fad487112260848
-SHA1 (patch-saveres.c) = eb7028c69bfe63817a90e825ec5d7ad10dd96c8f
-SHA1 (patch-sites.c) = 97828621e29d438d2ba6fcf426183c5cf76b1a60
-SHA1 (patch-skyip.c) = ea6a140647f1ff0756ba81db2f9499f3eac10a87
-SHA1 (patch-skyviewmenu.c) = a5eea432918629aba89005b6139b330762de97d8
-SHA1 (patch-tools_xedb_xedb.c) = 3f1310401f5eb49d35f90a25f99d7bccc05cd79d
-SHA1 (patch-xmisc.c) = 7c5190ecce8919cffe06ad68719b6ca289fd13df
+SHA1 (patch-GUI_xephem_Makefile) = 4f89c84f08872f6c284e6c486c1e41bc35be7f62
+SHA1 (patch-GUI_xephem_compiler.c) = a2672b6121e178b210c8c50f44463a5736ed882f
+SHA1 (patch-GUI_xephem_gallerymenu.c) = 93bba67ed1fa0e59ad0494a3e1e208a7868e362c
+SHA1 (patch-GUI_xephem_homeio.c) = a0ede09206e13484335a5d039615e7bb884d4b6c
+SHA1 (patch-GUI_xephem_indimenu.c) = c27bdb68e5dced751f108b54b3b63983fd849121
+SHA1 (patch-GUI_xephem_mainmenu.c) = 283677708450f3be8cda7aec817bede314e69616
+SHA1 (patch-GUI_xephem_marsmenu.c) = e319707c91842b6513a767b2c4ddf2f8f6aac7f8
+SHA1 (patch-GUI_xephem_saveres.c) = 34901b4cd16f689872ce174e20020adaf26fe9d4
+SHA1 (patch-GUI_xephem_sites.c) = f2d522b6c162192879db32b9c2fbe605c5a45b56
+SHA1 (patch-GUI_xephem_skyip.c) = 4814cb9a274ffde6af07b003f02c22e716986737
+SHA1 (patch-GUI_xephem_skyviewmenu.c) = 3da04bc3af6b12613acd5940335d0060ca34ccf2
+SHA1 (patch-GUI_xephem_tools_xedb_xedb.c) = 7b4e7af2e29e211d459efde4ec2479d7114e3ac8
+SHA1 (patch-GUI_xephem_xmisc.c) = 6a7dc92483b417f394e049cab77feff4d6289dfb
Added files:
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_Makefile
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_Makefile:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_Makefile Sun Jun 28 00:44:25 2026
@@ -0,0 +1,32 @@
+$NetBSD: patch-GUI_xephem_Makefile,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/Makefile.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/Makefile
+@@ -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) $(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)
+
+ xephem.1: xephem.man
+ nroff -man $? > $@
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_compiler.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_compiler.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_compiler.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-GUI_xephem_compiler.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/compiler.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/compiler.c
+@@ -212,7 +212,7 @@ next_token ()
+ int tok = ERR; /* just something illegal */
+ char c;
+
+- while (isspace(c = *cexpr))
++ while (isspace((unsigned char)(c = *cexpr)))
+ cexpr++;
+ lcexpr = cexpr++;
+
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_gallerymenu.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_gallerymenu.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_gallerymenu.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-GUI_xephem_gallerymenu.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/gallerymenu.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/gallerymenu.c
+@@ -661,7 +661,7 @@ trimws (char *s)
+ {
+ char *s0;
+
+- while (isspace(*s))
++ while (isspace((unsigned char)*s))
+ s++;
+ s0 = s;
+
+@@ -670,7 +670,7 @@ trimws (char *s)
+
+ do
+ *s-- = '\0';
+- while (s >= s0 && isspace(*s));
++ while (s >= s0 && isspace((unsigned char)*s));
+
+ return (s0);
+ }
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_homeio.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_homeio.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_homeio.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,59 @@
+$NetBSD: patch-GUI_xephem_homeio.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/homeio.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/homeio.c
+@@ -11,6 +11,9 @@
+ #include <time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#if defined(__STDC__)
++#include <errno.h>
++#endif
+
+ #include "xephem.h"
+
+@@ -192,31 +195,11 @@ tempfilename (char *buf, char *name, cha
+ char *
+ getShareDir()
+ {
+- static char *basedir;
+-
+- if (!basedir) {
+- char *th = getenv ("TELHOME");
+- if (th) {
+- basedir = malloc (strlen(th) + 10);
+- if (basedir) {
+- (void) sprintf (basedir, "%s/xephem", th);
+- if (existsh(basedir) < 0) {
+- (void) sprintf (basedir, "%s/archive", th);
+- if (existsh(basedir) < 0) {
+- free (basedir);
+- basedir = NULL;
+- }
+- }
+- }
+- }
+- if (!basedir) {
+- char *homebase = expand_home (getXRes ("ShareDir", "."));
+- basedir = strcpy(malloc(strlen(homebase)+1), homebase);
+- }
+- }
+-
+- return (basedir);
+-
++ /*
++ * pkgsrc: just use pkgsrc version, for now, because a twisty maze
++ * of Xt calls wrongly returns "." for no apparent reason
++ */
++ return("@SHAREDIR@");
+ }
+
+ /* return a string for whatever is in errno right now.
+@@ -227,7 +210,6 @@ syserrstr ()
+ {
+ #if defined(__STDC__)
+ /* some older gcc don't have strerror */
+-#include <errno.h>
+ return (strerror (errno));
+ #else
+ #if defined(VMS)
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_indimenu.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_indimenu.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_indimenu.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-GUI_xephem_indimenu.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/indimenu.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/indimenu.c
+@@ -2520,7 +2520,7 @@ handleOneBLOB (XMLEle *root, IBLOB *bp,
+
+ /* rig up a file name from the timestamp and format */
+ for (i = 0, tsp = bvp->timestamp; *tsp != '\0'; tsp++)
+- if (isdigit(*tsp))
++ if (isdigit((unsigned char)*tsp))
+ fn[i++] = *tsp;
+ fn[i] = '\0';
+ strcat (fn, bp->format);
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_mainmenu.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_mainmenu.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_mainmenu.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-GUI_xephem_mainmenu.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/mainmenu.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/mainmenu.c
+@@ -2241,7 +2241,7 @@ Field *fp;
+ char *txt0, *txt;
+
+ get_xmstring (fp->pb_w, XmNlabelString, &txt0);
+- for (txt = txt0; *txt && !isdigit(*txt); txt++)
++ for (txt = txt0; *txt && !isdigit((unsigned char)*txt); txt++)
+ continue;
+ set_xmstring (prompt_w, XmNtextString, txt);
+ XtFree (txt0);
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_marsmenu.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_marsmenu.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_marsmenu.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-GUI_xephem_marsmenu.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/marsmenu.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/marsmenu.c
+@@ -998,7 +998,7 @@ m_create_mfform()
+ int j;
+
+ /* widget name is first word in type */
+- for (j = 0; isalpha(mfsp->type[j]); j++)
++ for (j = 0; isalpha((unsigned char)mfsp->type[j]); j++)
+ buf[j] = mfsp->type[j];
+ buf[j] = '\0';
+
+@@ -2222,7 +2222,7 @@ char *name;
+ {
+ int l;
+
+- for (l = strlen(name)-1; l >= 0 && isspace(name[l]); --l)
++ for (l = strlen(name)-1; l >= 0 && isspace((unsigned char)name[l]); --l)
+ name[l] = '\0';
+ }
+
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_saveres.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_saveres.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_saveres.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,17 @@
+$NetBSD: patch-GUI_xephem_saveres.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/saveres.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/saveres.c
+@@ -1785,10 +1785,10 @@ char *from;
+ {
+ char *lastnwsp; /* last non w/s char in to not counting '\0' */
+
+- while (isspace(*from))
++ while (isspace((unsigned char)*from))
+ from++;
+ for (lastnwsp = NULL; (*to = *from) != '\0'; to++, from++)
+- if (!isspace(*to))
++ if (!isspace((unsigned char)*to))
+ lastnwsp = to;
+ if (lastnwsp)
+ *++lastnwsp = '\0';
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_sites.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_sites.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_sites.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,25 @@
+$NetBSD: patch-GUI_xephem_sites.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/sites.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/sites.c
+@@ -183,9 +183,9 @@ int maxn;
+ * n is an index, not a count.
+ */
+ for (n = fl-1; n >= maxn-4; ) {
+- while (n > 0 && isalnum(full[n]))
++ while (n > 0 && isalnum((unsigned char)full[n]))
+ n--;
+- while (n > 0 && (ispunct(full[n]) || isspace(full[n])))
++ while (n > 0 && (ispunct((unsigned char)full[n]) || isspace((unsigned char)full[n])))
+ n--;
+ }
+ (void) sprintf (ab, "%.*s...", n+1, full);
+@@ -654,7 +654,7 @@ read_file (FILE *fp)
+
+ /* strip trailing blanks off name */
+ for (l = strlen (name); --l >= 0; )
+- if (isspace(name[l]))
++ if (isspace((unsigned char)name[l]))
+ name[l] = '\0';
+ else
+ break;
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyip.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyip.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyip.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-GUI_xephem_skyip.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/skyip.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/skyip.c
+@@ -2573,8 +2573,8 @@ char msg[];
+
+ /* relax need for user to type in upper case */
+ for (bp = kw; *bp; bp++)
+- if (islower(*bp))
+- *bp = toupper(*bp);
++ if (islower((unsigned char)*bp))
++ *bp = toupper((unsigned char)*bp);
+
+ /* get from FITS header and copy to our value field */
+ if (getStringFITS (&fim, kw, valu) == 0) {
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyviewmenu.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyviewmenu.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_skyviewmenu.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-GUI_xephem_skyviewmenu.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/skyviewmenu.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/skyviewmenu.c
+@@ -9703,7 +9703,7 @@ int d; /* diam of object we are labelin
+ if (sv_ggc && chk_greeklabel (name, &gl, &g)) {
+ XTextExtents (sv_gf, &g, 1, &dir, &asc, &des, &xcs);
+ gw = xcs.width;
+- if (isdigit(name[4+gl])) {
++ if (isdigit((unsigned char)name[4+gl])) {
+ /* don't crowd the superscript */
+ XTextExtents (sv_pf, name+gl+4, 1, &dir, &asc, &des, &xcs);
+ gw += 1;
+@@ -9802,7 +9802,7 @@ char *gcodep; /* code to use for drawing
+
+ /* find length of potentionally greek portion */
+ for (gl = 0; ; gl++)
+- if (!isalpha(name[4+gl]))
++ if (!isalpha((unsigned char)name[4+gl]))
+ break;
+ if (gl < 2) /* shortest greek name is 2 chars */
+ return (0);
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_tools_xedb_xedb.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_tools_xedb_xedb.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_tools_xedb_xedb.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-GUI_xephem_tools_xedb_xedb.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/tools/xedb/xedb.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/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);
Index: pkgsrc/x11/xephem/patches/patch-GUI_xephem_xmisc.c
diff -u /dev/null pkgsrc/x11/xephem/patches/patch-GUI_xephem_xmisc.c:1.1
--- /dev/null Sun Jun 28 00:44:26 2026
+++ pkgsrc/x11/xephem/patches/patch-GUI_xephem_xmisc.c Sun Jun 28 00:44:25 2026
@@ -0,0 +1,13 @@
+$NetBSD: patch-GUI_xephem_xmisc.c,v 1.1 2026/06/28 00:44:25 gdt Exp $
+
+--- GUI/xephem/xmisc.c.orig 2024-02-13 14:35:36.000000000 +0000
++++ GUI/xephem/xmisc.c
+@@ -1130,7 +1130,7 @@ strtolower (char *str)
+
+ /* actually faster to /not/ call isupper() first */
+ do
+- *s = tolower (*s);
++ *s = tolower ((unsigned char)*s);
+ while (*s++);
+
+ return (str);
Home |
Main Index |
Thread Index |
Old Index