head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.100 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.98 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.96 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.94 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.92 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.90 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.88 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.86 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.84 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.82 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.80 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.78 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.76 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.74 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.72 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.70 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.68 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.66 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.64 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.62 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.60 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.58 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.56 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.52 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.32 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.54 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.50 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.48 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.46 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.44 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.42 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.40 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.38 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.36 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.34 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.30 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.28 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.26 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.24 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.22 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.20 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.18 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.16 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.14 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.12 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.10 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.8 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.6 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.4 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.2 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.2.0.10 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.8 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.6 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.4 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.2 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.1.0.50 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.48 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.46 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.44 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.42 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.40 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.38 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.36 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.34 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.32 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.30 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.28 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.26 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.24 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.22 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.20 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.18 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.16 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.14 pkgsrc-2008Q1:1.1.0.12 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.10 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.8 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.6 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.4 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.2 pkgsrc-2006Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2013.10.27.21.21.26; author dholland; state Exp; branches; next 1.2; commitid lyZqbsIMqmZ6DYax; 1.2 date 2012.07.03.17.40.36; author joerg; state Exp; branches; next 1.1; 1.1 date 2006.12.12.19.31.37; author joerg; state Exp; branches; next ; desc @@ 1.3 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: patch-am,v 1.2 2012/07/03 17:40:36 joerg Exp $ - dragonfly doesn't have wordexp.h - use glob.h instead of wordexp.h when not using wordexp.h --- src/celutil/unixdirectory.cpp.orig 2011-06-05 16:11:15.000000000 +0000 +++ src/celutil/unixdirectory.cpp @@@@ -11,20 +11,30 @@@@ #include #include #include -#include -#include "directory.h" - -using namespace std; +#if defined(__DragonFly__) +#define NO_WORDEXP +#endif #ifdef TARGET_OS_MAC #ifdef QT_CORE_LIB // Crash on Mac OS X / Qt4 version when calling wordfree. // This seems to happen only with Leopard. -#define WORDEXP_PROBLEM +#define NO_WORDEXP +#endif #endif + +#ifdef NO_WORDEXP +#include +#else +#include #endif +#include "directory.h" + +using namespace std; + + class UnixDirectory : public Directory { public: @@@@ -107,7 +117,7 @@@@ bool IsDirectory(const std::string& file std::string WordExp(const std::string& filename) { -#ifndef WORDEXP_PROBLEM +#ifndef NO_WORDEXP wordexp_t result; std::string expanded; @@@@ -130,7 +140,17 @@@@ std::string WordExp(const std::string& f expanded = result.we_wordv[0]; wordfree(&result); #else - std::string expanded = filename; + glob_t g; + std::string expanded; + glob(filename.c_str(), GLOB_NOSORT | GLOB_TILDE, NULL, &g); + if (g.gl_matchc != 1) { + globfree(&g); + return filename; + } else { + expanded = g.gl_pathv[0]; + globfree(&g); + return expanded; + } #endif return expanded; } @ 1.2 log @Don't use references to temporary objects. @ text @d1 1 a1 1 $NetBSD: patch-am,v 1.1 2006/12/12 19:31:37 joerg Exp $ d3 4 a6 1 --- src/celutil/unixdirectory.cpp.orig 2005-03-05 13:56:14.000000000 +0000 d8 8 a15 3 @@@@ -7,11 +7,19 @@@@ // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. d20 9 a29 4 #include #include #include #include d33 12 a44 3 #include +#endif #include "directory.h" d46 6 a51 3 using namespace std; @@@@ -98,6 +106,19 @@@@ bool IsDirectory(const std::string& file } d53 5 a57 2 std::string WordExp(const std::string& filename) { +#ifdef NO_WORDEXP d69 1 a69 7 +#else wordexp_t result; std::string expanded; @@@@ -121,4 +142,5 @@@@ std::string WordExp(const std::string& f wordfree(&result); a70 1 +#endif @ 1.1 log @On DragonFly, fall back to glob(3) as wordexp(3) doesn't exist. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- src/celutil/unixdirectory.cpp.orig 2006-12-12 16:52:18.000000000 +0000 @