CVS commit: pkgsrc/misc/celestia

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Jan 16 03:03:57 UTC 2023

Modified Files:
        pkgsrc/misc/celestia: distinfo options.mk
Added Files:
        pkgsrc/misc/celestia/patches: patch-src_celengine_body.h

Log Message:
misc/celestia: #undef "sun" for use as an identifier, because solaris.

While here, change glut -> freeglut in non-default build options,
since graphics/glut no longer exists.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/misc/celestia/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/celestia/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/celestia/patches/patch-src_celengine_body.h

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

Modified files:

Index: pkgsrc/misc/celestia/distinfo
diff -u pkgsrc/misc/celestia/distinfo:1.29 pkgsrc/misc/celestia/distinfo:1.30
--- pkgsrc/misc/celestia/distinfo:1.29  Tue Oct 26 10:58:59 2021
+++ pkgsrc/misc/celestia/distinfo       Mon Jan 16 03:03:57 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2021/10/26 10:58:59 nia Exp $
+$NetBSD: distinfo,v 1.30 2023/01/16 03:03:57 dholland Exp $
 
 BLAKE2s (celestia-1.6.1.tar.gz) = d25b3f41db4de388fe36f42f3d4e96c1b630822da5c1e64fe69bdea45225027f
 SHA512 (celestia-1.6.1.tar.gz) = 5b1221e97ee03f7def317e5e29c5100ebe714a4a3aeb8b9818dc9445e4282b6f87026ab35c7b3d5eb02fa6dbb33693977999d14d9648fc4e6d1947abe32a413f
@@ -15,6 +15,7 @@ SHA1 (patch-am) = 9d6be1a9b879fb2af30ac4
 SHA1 (patch-ap) = ceefba961e9467b9cac12f347740494a05efffe0
 SHA1 (patch-aq) = fdc7b7f0ff04672f93af144f41e09751b4de0c1a
 SHA1 (patch-src_celengine_astro.cpp) = 0331128a2a01259958afd5e806a51d5b0e75769a
+SHA1 (patch-src_celengine_body.h) = 0ba0733aba554fe02340b09754e98bfdd0ed865b
 SHA1 (patch-src_celengine_cmdparser.cpp) = b1c54d0b5c6af92606cdf9f23b73c1a8662a1acb
 SHA1 (patch-src_celengine_command.cpp) = 5f1466541f4153651425f597f45f852c93af8b7f
 SHA1 (patch-src_celengine_frametree.h) = 899bd5f958864ed26addc2a87ef61d97806cf37c

Index: pkgsrc/misc/celestia/options.mk
diff -u pkgsrc/misc/celestia/options.mk:1.10 pkgsrc/misc/celestia/options.mk:1.11
--- pkgsrc/misc/celestia/options.mk:1.10        Tue Jun 30 15:38:44 2020
+++ pkgsrc/misc/celestia/options.mk     Mon Jan 16 03:03:57 2023
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2020/06/30 15:38:44 nia Exp $
+# $NetBSD: options.mk,v 1.11 2023/01/16 03:03:57 dholland Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.celestia
 PKG_SUPPORTED_OPTIONS=         lua
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=      --without-lua
 
 .if !empty(PKG_OPTIONS:Mglut)
 CONFIGURE_ARGS+=       --with-glut
-.  include "../../graphics/glut/buildlink3.mk"
+.  include "../../graphics/freeglut/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk)

Added files:

Index: pkgsrc/misc/celestia/patches/patch-src_celengine_body.h
diff -u /dev/null pkgsrc/misc/celestia/patches/patch-src_celengine_body.h:1.1
--- /dev/null   Mon Jan 16 03:03:57 2023
+++ pkgsrc/misc/celestia/patches/patch-src_celengine_body.h     Mon Jan 16 03:03:57 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_celengine_body.h,v 1.1 2023/01/16 03:03:57 dholland Exp $
+
+#undef sun before using it as an identifier, because Solaris.
+
+--- src/celengine/body.h~      2011-06-05 16:11:09.000000000 +0000
++++ src/celengine/body.h
+@@ -24,6 +24,8 @@
+ #include <celengine/rotation.h>
+ #include <celengine/timeline.h>
+ 
++#undef sun
++
+ class ReferenceFrame;
+ class Body;
+ class FrameTree;