head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.100
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.98
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.96
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.94
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.92
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.90
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.88
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.86
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.84
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.82
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.80
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.78
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.76
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.74
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.72
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.70
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.68
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.66
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.64
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.62
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.60
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.58
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.56
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.52
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.32
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.54
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.50
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.48
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.46
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.44
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.42
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.40
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.38
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.36
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.34
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.30
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.28
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.26
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.24
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.22
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.20
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.18
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.16
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.14
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.12
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.10
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.8
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.6
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.4
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.2
	pkgsrc-2013Q4-base:1.1;
locks; strict;
comment	@// @;


1.1
date	2013.10.27.21.21.26;	author dholland;	state Exp;
branches;
next	;
commitid	lyZqbsIMqmZ6DYax;


desc
@@


1.1
log
@Update to 1.6.1. Reset PKGREVISION from 38 (!).
Upstream changes: 5+ years of development; try these links:
   http://www.shatters.net/celestia/161changes.txt
   http://www.shatters.net/celestia/features/160-features.html
   http://www.shatters.net/celestia/151changes.txt
   http://www.shatters.net/celestia/150-feature-summary.html

Restrictions:
   1. The Lua support still does not build, and given that I had to
      patch it to compile at all with Lua disabled it may not work all
      that well this way.
   2. The optional KDE (kde3) build is almost certainly broken; I will
      get to this in a few days if nobody beats me to it.
@
text
@$NetBSD$

Fix build with lua switched off.
(This is probably not the right place to switch it off, but it does
build this way.)

--- src/celengine/cmdparser.cpp~	2011-06-05 16:11:09.000000000 +0000
+++ src/celengine/cmdparser.cpp
@@@@ -797,10 +797,14 @@@@ int parseRenderFlags(string s)
         {
             string name = tokenizer.getNameValue();
 
+#ifdef CELX
             if (CelxLua::RenderFlagMap.count(name) == 0)
                 cerr << "Unknown render flag: " << name << "\n";
             else
                 flags |= CelxLua::RenderFlagMap[name];
+#else
+	    cerr << "Unknown render flag: " << name << "\n";
+#endif
 
             ttype = tokenizer.nextToken();
             if (ttype == Tokenizer::TokenBar)
@@@@ -826,10 +830,14 @@@@ int parseLabelFlags(string s)
         {
             string name = tokenizer.getNameValue();
 
+#ifdef CELX
             if (CelxLua::LabelFlagMap.count(name) == 0)
                 cerr << "Unknown label flag: " << name << "\n";
             else
                 flags |= CelxLua::LabelFlagMap[name];
+#else
+	    cerr << "Unknown label flag: " << name << "\n";
+#endif
 
             ttype = tokenizer.nextToken();
             if (ttype == Tokenizer::TokenBar)
@@@@ -856,10 +864,14 @@@@ int parseOrbitFlags(string s)
             string name = tokenizer.getNameValue();
             name[0] = toupper(name[0]);
 
+#ifdef CELX
             if (CelxLua::BodyTypeMap.count(name) == 0)
                 cerr << "Unknown orbit flag: " << name << "\n";
             else
                 flags |= CelxLua::BodyTypeMap[name];
+#else
+	    cerr << "Unknown orbit flag: " << name << "\n";
+#endif
 
             ttype = tokenizer.nextToken();
             if (ttype == Tokenizer::TokenBar)
@