head 1.2; access; symbols; locks; strict; comment @ * @; 1.2 date 2026.06.28.00.51.58; author gdt; state Exp; branches; next 1.1; commitid Xu5otFB9D8606vLG; 1.1 date 2026.06.28.00.44.25; author gdt; state Exp; branches; next ; commitid krbxq7yUzi8U2vLG; desc @@ 1.2 log @x11/xephem: Grab 3 more files of upstream pull request 126 Files outside of the old WRKSRC were not picked up by mkpatches. Restore patch comments lost in BUILD_DIRS pivot. @ text @$NetBSD: patch-GUI_xephem_tools_xedb_xedb.c,v 1.1 2026/06/28 00:44:25 gdt Exp $ Use pkgsrc path, not upstream defaults. Not filed upstream because it is a pkgsrc accomodation. --- 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); @ 1.1 log @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. @ text @d1 5 a5 1 $NetBSD$ @