cpet
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to celestia-1.6.2.2.

This commit is contained in:
ajacoutot 2021-01-27 18:40:54 +00:00
parent e746bf2289
commit 4944e3f9f8
23 changed files with 130 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
astro/celestia/Makefile
View File

@ -1,54 +1,60 @@
# $OpenBSD: Makefile,v 1.50 2019/12/29 23:56:58 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.51 2021/01/27 18:40:54 ajacoutot Exp $
COMMENT= free space simulator and planetarium
COMMENT= free space simulator and planetarium
DISTNAME= celestia-1.6.1
REVISION= 19
GH_ACCOUNT= CelestiaProject
GH_PROJECT= Celestia
GH_TAGNAME= 1.6.2.2
PKGNAME= celestia-${GH_TAGNAME}
CATEGORIES= astro x11
CATEGORIES= astro x11
HOMEPAGE= https://celestia.space/
HOMEPAGE= https://celestia.space/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
PERMIT_PACKAGE= Yes
PERMIT_PACKAGE= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=celestia/}
WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 X11-xcb Xau Xcomposite
WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender Xxf86vm atk-1.0 c cairo drm expat ffi fontconfig
WANTLIB += freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0
WANTLIB += gio-2.0 glapi glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB += gtk-x11-2.0 gtkglext-x11-1.0 harfbuzz iconv intl jpeg
WANTLIB += lua5.1 m ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png theora xcb xcb-dri2 xcb-dri3 xcb-glx
WANTLIB += xcb-present xcb-render xcb-shm xcb-sync xcb-xfixes
WANTLIB += xshmfence z
WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 X11-xcb Xcomposite Xcursor
WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
WANTLIB += atk-1.0 c cairo drm expat ffi fontconfig freetype fribidi
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gdkglext-x11-1.0 gio-2.0
WANTLIB += glapi glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gtk-x11-2.0
WANTLIB += gtkglext-x11-1.0 harfbuzz iconv intl jpeg m ogg pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png theora
WANTLIB += xcb xcb-dri2 xcb-dri3 xcb-glx xcb-present xcb-render
WANTLIB += xcb-shm xcb-sync xcb-xfixes xshmfence z
WANTLIB += ${MODLUA_WANTLIB}
COMPILER= base-clang ports-gcc base-gcc
COMPILER= base-clang ports-gcc base-gcc
MODULES= lang/lua
MODULES= lang/lua
BUILD_DEPENDS= devel/gettext,-tools
LIB_DEPENDS= devel/gettext,-runtime \
multimedia/libtheora \
x11/gtkglext \
${MODLUA_LIB_DEPENDS}
RUN_DEPENDS= devel/desktop-file-utils
USE_GMAKE= Yes
USE_GMAKE= Yes
BUILD_DEPENDS= devel/gettext,-tools
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lGL" \
LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
LIB_DEPENDS= multimedia/libtheora \
x11/gtkglext \
${MODLUA_LIB_DEPENDS}
CONFIGURE_ARGS= --with-gtk \
--with-lua \
--enable-cairo \
--enable-theora
RUN_DEPENDS= devel/desktop-file-utils
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.16
CONFIGURE_STYLE= autoreconf
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lGL" \
LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
CONFIGURE_ARGS= --with-gtk \
--with-lua \
--enable-cairo \
--enable-theora
pre-configure:
${SUBST_CMD} ${WRKSRC}/src/celestia/celestiacore.cpp

4
astro/celestia/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (celestia-1.6.1.tar.gz) = 01VwzLlED8C9PnPrm0w+ikwl865EShPRF1BT+hbcNMQ=
SIZE (celestia-1.6.1.tar.gz) = 52600436
SHA256 (Celestia-1.6.2.2.tar.gz) = 1NO8zxBKm+r0vttY5AcXJVW2cRO7/z4BNNSoMddHQZs=
SIZE (Celestia-1.6.2.2.tar.gz) = 50087772

12
astro/celestia/patches/patch-configure
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-configure,v 1.5 2011/07/09 01:41:13 ajacoutot Exp $
--- configure.orig Sun Jun 5 20:33:27 2011
+++ configure Sat Jul 9 03:25:52 2011
@@ -17922,8 +17922,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-CFLAGS="$CFLAGS -ffast-math -fexpensive-optimizations"
-CXXFLAGS="$CXXFLAGS -ffast-math -fexpensive-optimizations"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include debugging code" >&5
$as_echo_n "checking whether to include debugging code... " >&6; }

15
astro/celestia/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-configure_ac,v 1.1 2021/01/27 18:40:54 ajacoutot Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -95,9 +95,6 @@ dnl
dnl Compilation options
dnl
-CFLAGS="$CFLAGS -ffast-math -fexpensive-optimizations"
-CXXFLAGS="$CXXFLAGS -ffast-math -fexpensive-optimizations"
-
AC_MSG_CHECKING([whether to include debugging code])
AC_ARG_ENABLE([debug],
AC_HELP_STRING([--enable-debug],

10
astro/celestia/patches/patch-src_celengine_astro_cpp
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-src_celengine_astro_cpp,v 1.3 2009/07/20 10:35:20 ajacoutot Exp $
--- src/celengine/astro.cpp.orig Mon Jul 20 11:59:23 2009
+++ src/celengine/astro.cpp Mon Jul 20 11:59:41 2009
@@ -522,7 +522,7 @@ const char* astro::Date::toCStr(Format format) const
$OpenBSD: patch-src_celengine_astro_cpp,v 1.4 2021/01/27 18:40:54 ajacoutot Exp $
Index: src/celengine/astro.cpp
--- src/celengine/astro.cpp.orig
+++ src/celengine/astro.cpp
@@ -525,7 +525,7 @@ const char* astro::Date::toCStr(Format format) const
cal_time.tm_sec = (int)seconds;
cal_time.tm_wday = wday;
cal_time.tm_gmtoff = utc_offset;

13
astro/celestia/patches/patch-src_celengine_frametree_h
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_celengine_frametree_h,v 1.1 2018/11/12 16:08:02 naddy Exp $
Index: src/celengine/frametree.h
--- src/celengine/frametree.h.orig
+++ src/celengine/frametree.h
@@ -13,6 +13,7 @@
#ifndef _CELENGINE_FRAMETREE_H_
#define _CELENGINE_FRAMETREE_H_
+#include <cstddef>
#include <vector>
class Star;

30
astro/celestia/patches/patch-src_celengine_image_cpp
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-src_celengine_image_cpp,v 1.4 2018/11/12 16:08:02 naddy Exp $
mips platforms already have 'mips' defined, resulting in:
error: expected ',' or '...' before numeric constant
Index: src/celengine/image.cpp
--- src/celengine/image.cpp.orig
+++ src/celengine/image.cpp
@@ -46,6 +46,8 @@ extern "C" {
#endif
}
+#include <cstring>
+
#endif // JPEG_SUPPORT
#ifdef PNG_SUPPORT // PNG_SUPPORT
@@ -143,10 +145,10 @@ static int calcMipLevelSize(int fmt, int w, int h, int
}
-Image::Image(int fmt, int w, int h, int mips) :
+Image::Image(int fmt, int w, int h, int mipsen) :
width(w),
height(h),
- mipLevels(mips),
+ mipLevels(mipsen),
format(fmt),
pixels(NULL)
{

12
astro/celestia/patches/patch-src_celengine_image_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_celengine_image_h,v 1.1 2012/12/22 18:35:24 jasper Exp $
--- src/celengine/image.h.orig Sat Dec 22 18:02:35 2012
+++ src/celengine/image.h Sat Dec 22 18:02:42 2012
@@ -22,7 +22,7 @@
class Image
{
public:
- Image(int fmt, int w, int h, int mips = 1);
+ Image(int fmt, int w, int h, int mipsen = 1);
~Image();
int getWidth() const;

4
astro/celestia/patches/patch-src_celengine_parseobject_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_celengine_parseobject_cpp,v 1.1 2019/06/15 18:47:47 cwen Exp $
$OpenBSD: patch-src_celengine_parseobject_cpp,v 1.2 2021/01/27 18:40:54 ajacoutot Exp $
ports-gcc fix for:
parseobject.cpp:280:10: error: converting to 'bool' from 'std::nullptr_t'
@ -7,7 +7,7 @@ requires direct-initialization
Index: src/celengine/parseobject.cpp
--- src/celengine/parseobject.cpp.orig
+++ src/celengine/parseobject.cpp
@@ -277,7 +277,7 @@ ParseStringList(Hash* table,
@@ -278,7 +278,7 @@ ParseStringList(Hash* table,
{
Value* v = table->getValue(propertyName);
if (v == NULL)

13
astro/celestia/patches/patch-src_celengine_texture_cpp
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_celengine_texture_cpp,v 1.1 2018/11/12 16:08:02 naddy Exp $
Index: src/celengine/texture.cpp
--- src/celengine/texture.cpp.orig
+++ src/celengine/texture.cpp
@@ -27,6 +27,7 @@
#include <fstream>
#include <cstdlib>
#include <cstdio>
+#include <cstring>
#include <cassert>
#ifndef _WIN32

14
astro/celestia/patches/patch-src_celestia_celestiacore_cpp
View File

@ -1,17 +1,9 @@
$OpenBSD: patch-src_celestia_celestiacore_cpp,v 1.6 2018/04/10 06:32:41 jasper Exp $
$OpenBSD: patch-src_celestia_celestiacore_cpp,v 1.7 2021/01/27 18:40:54 ajacoutot Exp $
Index: src/celestia/celestiacore.cpp
--- src/celestia/celestiacore.cpp.orig
+++ src/celestia/celestiacore.cpp
@@ -439,7 +439,7 @@ void CelestiaCore::activateFavorite(FavoritesEntry& fa
sim->setTime(fav.jd);
sim->setObserverPosition(fav.position);
sim->setObserverOrientation(fav.orientation);
- if (fav.fov != NULL)
+ if (fav.fov != 0)
{
sim->getActiveObserver()->setFOV(fav.fov);
setZoomFromFOV();
@@ -4103,7 +4103,7 @@ bool CelestiaCore::initSimulation(const string* config
@@ -4134,7 +4134,7 @@ bool CelestiaCore::initSimulation(const string* config
}
else
{

23
astro/celestia/patches/patch-src_celestia_favorites_cpp
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-src_celestia_favorites_cpp,v 1.1 2018/04/10 06:32:41 jasper Exp $
Index: src/celestia/favorites.cpp
--- src/celestia/favorites.cpp.orig
+++ src/celestia/favorites.cpp
@@ -80,7 +80,7 @@ FavoritesList* ReadFavoritesList(istream& in)
// Get fov
if (!favParams->getNumber("fov", fav->fov))
- fav->fov = NULL;
+ fav->fov = 0;
// Get time
fav->jd = 0.0;
@@ -137,7 +137,7 @@ void WriteFavoritesList(FavoritesList& favorites, ostr
out << "\tangle " << angle << '\n';
out << setprecision(16);
out << "\ttime " << fav->jd << '\n';
- if (fav->fov != NULL)
+ if (fav->fov != 0)
out << "\tfov " << fav->fov << '\n';
out << "\tselection \"" << fav->selectionName << "\"\n";
out << "\tcoordsys \"";

19
astro/celestia/patches/patch-src_celestia_gtk_data_celestia_desktop
View File

@ -1,9 +1,12 @@
$OpenBSD: patch-src_celestia_gtk_data_celestia_desktop,v 1.1 2009/06/13 12:07:36 ajacoutot Exp $
--- src/celestia/gtk/data/celestia.desktop.orig Sat Jun 13 13:50:50 2009
+++ src/celestia/gtk/data/celestia.desktop Sat Jun 13 13:51:03 2009
@@ -9,4 +9,4 @@ Terminal=false
Name=Celestia
Comment=Space Simulator
StartupNotify=true
-Categories=Astronomy;Science;Application;
$OpenBSD: patch-src_celestia_gtk_data_celestia_desktop,v 1.2 2021/01/27 18:40:54 ajacoutot Exp $
Index: src/celestia/gtk/data/celestia.desktop
--- src/celestia/gtk/data/celestia.desktop.orig
+++ src/celestia/gtk/data/celestia.desktop
@@ -9,5 +9,5 @@ Terminal=false
Name=Celestia (Gtk+)
GenericName=Space Simulator
Comment=Explore the Universe in this detailed space simulation
-StartupNotify=true
+Categories=Astronomy;Science;Application;Education
Categories=Astronomy;Education;Application;

11
astro/celestia/patches/patch-src_celestia_imagecapture_cpp
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_celestia_imagecapture_cpp,v 1.1 2011/07/08 20:38:01 naddy Exp $
--- src/celestia/imagecapture.cpp.orig Tue Jul 5 18:11:09 2011
+++ src/celestia/imagecapture.cpp Tue Jul 5 18:11:26 2011
@@ -29,6 +29,7 @@ extern "C" {
#include "../celestia/Celestia.app.skel/Contents/Frameworks/Headers/png.h"
#else
#include "png.h"
+#include <zlib.h>
#endif
// Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng

3
astro/celestia/patches/patch-src_celestia_windatepicker_cpp
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-src_celestia_windatepicker_cpp,v 1.1 2009/11/17 23:12:16 ajacoutot Exp $
$OpenBSD: patch-src_celestia_windatepicker_cpp,v 1.2 2021/01/27 18:40:54 ajacoutot Exp $
--- src/celestia/windatepicker.cpp.orig Tue Nov 17 15:25:29 2009
+++ src/celestia/windatepicker.cpp Tue Nov 17 15:25:38 2009
@@ -162,7 +162,7 @@ DatePicker::redraw(HDC hdc)

22
astro/celestia/patches/patch-src_celestia_wineclipses_cpp
View File

@ -1,25 +1,27 @@
$OpenBSD: patch-src_celestia_wineclipses_cpp,v 1.1 2009/11/17 23:12:16 ajacoutot Exp $
--- src/celestia/wineclipses.cpp.orig Tue Nov 17 15:25:44 2009
+++ src/celestia/wineclipses.cpp Tue Nov 17 15:26:05 2009
@@ -65,7 +65,7 @@ bool InitEclipseFinderColumns(HWND listView)
$OpenBSD: patch-src_celestia_wineclipses_cpp,v 1.2 2021/01/27 18:40:54 ajacoutot Exp $
Index: src/celestia/wineclipses.cpp
--- src/celestia/wineclipses.cpp.orig
+++ src/celestia/wineclipses.cpp
@@ -71,7 +71,7 @@ bool InitEclipseFinderColumns(HWND listView)
columns[3].cx = 55;
columns[4].pszText = _("Duration");
columns[4].pszText = const_cast<wchar_t*>(header4.c_str());
columns[4].cx = 55;
- bind_textdomain_codeset("celestia", "UTF8");
+ bind_textdomain_codeset("celestia", "UTF-8");
for (i = 0; i < nColumns; i++)
{
@@ -146,7 +146,7 @@ void EclipseFinderDisplayItem(LPNMLVDISPINFOA nm)
_(MonthNames[startDate.month - 1]),
startDate.year);
nm->item.pszText = callbackScratch;
@@ -146,7 +146,7 @@ void EclipseFinderDisplayItem(LPNMLVDISPINFOW nm)
startDate.day,
CurrentCPToWide(_(MonthNames[startDate.month - 1])).c_str(),
startDate.year);
- bind_textdomain_codeset("celestia", "UTF8");
+ bind_textdomain_codeset("celestia", "UTF-8");
}
break;
@@ -321,7 +321,7 @@ BOOL APIENTRY EclipseFinderProc(HWND hDlg,
@@ -318,7 +318,7 @@ BOOL APIENTRY EclipseFinderProc(HWND hDlg,
SendDlgItemMessage(hDlg, IDC_ECLIPSETARGET, CB_ADDSTRING, 0, (LPARAM)_("Pluto"));
SendDlgItemMessage(hDlg, IDC_ECLIPSETARGET, CB_SETCURSEL, 0, 0);
efd->strPlaneteToFindOn = "Earth";

10
astro/celestia/patches/patch-src_celestia_winmain_cpp
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-src_celestia_winmain_cpp,v 1.2 2011/07/09 01:41:13 ajacoutot Exp $
--- src/celestia/winmain.cpp.orig Sun Jun 5 18:11:13 2011
+++ src/celestia/winmain.cpp Sat Jul 9 03:23:48 2011
@@ -1385,7 +1385,7 @@ BOOL APIENTRY SelectDisplayModeProc(HWND hDlg,
$OpenBSD: patch-src_celestia_winmain_cpp,v 1.3 2021/01/27 18:40:54 ajacoutot Exp $
Index: src/celestia/winmain.cpp
--- src/celestia/winmain.cpp.orig
+++ src/celestia/winmain.cpp
@@ -1388,7 +1388,7 @@ BOOL APIENTRY SelectDisplayModeProc(HWND hDlg,
bind_textdomain_codeset("celestia", CurrentCP());
SendMessage(hwnd, CB_INSERTSTRING, -1,
reinterpret_cast<LPARAM>(_("Windowed Mode")));

12
astro/celestia/patches/patch-src_celestia_winstarbrowser_cpp
View File

@ -1,9 +1,11 @@
$OpenBSD: patch-src_celestia_winstarbrowser_cpp,v 1.1 2009/11/17 23:12:16 ajacoutot Exp $
--- src/celestia/winstarbrowser.cpp.orig Tue Nov 17 15:26:31 2009
+++ src/celestia/winstarbrowser.cpp Tue Nov 17 15:26:41 2009
@@ -78,7 +78,7 @@ bool InitStarBrowserColumns(HWND listView)
$OpenBSD: patch-src_celestia_winstarbrowser_cpp,v 1.2 2021/01/27 18:40:54 ajacoutot Exp $
Index: src/celestia/winstarbrowser.cpp
--- src/celestia/winstarbrowser.cpp.orig
+++ src/celestia/winstarbrowser.cpp
@@ -83,7 +83,7 @@ bool InitStarBrowserColumns(HWND listView)
columns[3].fmt = LVCFMT_RIGHT;
columns[4].pszText = _("Type");
columns[4].pszText = const_cast<wchar_t*>(header4.c_str());
- bind_textdomain_codeset("celestia", "UTF8");
+ bind_textdomain_codeset("celestia", "UTF-8");

3
astro/celestia/patches/patch-src_celestia_wintime_cpp
View File

@ -1,4 +1,5 @@
$OpenBSD: patch-src_celestia_wintime_cpp,v 1.1 2009/11/17 23:12:16 ajacoutot Exp $
$OpenBSD: patch-src_celestia_wintime_cpp,v 1.2 2021/01/27 18:40:54 ajacoutot Exp $
--- src/celestia/wintime.cpp.orig Tue Nov 17 15:26:46 2009
+++ src/celestia/wintime.cpp Tue Nov 17 15:26:56 2009
@@ -96,7 +96,7 @@ SetTimeDialog::init(HWND _hDlg)

11
astro/celestia/patches/patch-src_celmath_intersect_h
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_celmath_intersect_h,v 1.1 2017/04/23 11:09:51 espie Exp $
--- src/celmath/intersect.h.orig Sun Apr 23 12:13:51 2017
+++ src/celmath/intersect.h Sun Apr 23 12:14:45 2017
@@ -15,6 +15,7 @@
#include "ray.h"
#include "sphere.h"
#include "ellipsoid.h"
+#include <celmath/mathlib.h>
template<class T> bool testIntersection(const Ray3<T>& ray,

13
astro/celestia/patches/patch-src_celutil_basictypes_h
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-src_celutil_basictypes_h,v 1.1 2017/04/23 11:09:51 espie Exp $
--- src/celutil/basictypes.h.orig Sun Apr 23 12:19:41 2017
+++ src/celutil/basictypes.h Sun Apr 23 12:20:10 2017
@@ -31,7 +31,9 @@ typedef unsigned __int64 uint64;
#include <limits>
typedef int64_t int64;
typedef uint64_t uint64;
+#ifndef INT64_MAX
#define INT64_MAX 9223372036854775807LL
+#endif
#ifndef UINT64_MAX
#define UINT64_MAX 0xffffffffffffffffULL
#endif

19
astro/celestia/patches/patch-src_celutil_unixdirectory_cpp
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-src_celutil_unixdirectory_cpp,v 1.3 2012/08/19 22:30:37 ajacoutot Exp $
--- src/celutil/unixdirectory.cpp.orig Mon Jun 22 17:44:24 2009
+++ src/celutil/unixdirectory.cpp Mon Jul 20 11:55:18 2009
@@ -7,11 +7,19 @@
$OpenBSD: patch-src_celutil_unixdirectory_cpp,v 1.4 2021/01/27 18:40:54 ajacoutot Exp $
Index: src/celutil/unixdirectory.cpp
--- src/celutil/unixdirectory.cpp.orig
+++ src/celutil/unixdirectory.cpp
@@ -7,12 +7,20 @@
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
@ -11,6 +13,7 @@ $OpenBSD: patch-src_celutil_unixdirectory_cpp,v 1.3 2012/08/19 22:30:37 ajacouto
+
#include <sys/types.h>
#include <sys/stat.h>
#include <pwd.h>
#include <unistd.h>
#include <dirent.h>
+#ifdef NO_WORDEXP
@ -18,10 +21,10 @@ $OpenBSD: patch-src_celutil_unixdirectory_cpp,v 1.3 2012/08/19 22:30:37 ajacouto
+#else
#include <wordexp.h>
+#endif
#include <cstdlib>
#include "directory.h"
using namespace std;
@@ -107,6 +115,19 @@ bool IsDirectory(const std::string& filename)
@@ -110,6 +118,19 @@ bool IsDirectory(const std::string& filename)
std::string WordExp(const std::string& filename)
{
@ -41,9 +44,11 @@ $OpenBSD: patch-src_celutil_unixdirectory_cpp,v 1.3 2012/08/19 22:30:37 ajacouto
#ifndef WORDEXP_PROBLEM
wordexp_t result;
std::string expanded;
@@ -133,4 +154,5 @@ std::string WordExp(const std::string& filename)
@@ -139,6 +160,7 @@ std::string WordExp(const std::string& filename)
std::string expanded = filename;
#endif
return expanded;
+#endif
}
string HomeDir()

8
astro/celestia/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2018/06/27 21:03:34 espie Exp $
@comment $OpenBSD: PLIST,v 1.10 2021/01/27 18:40:54 ajacoutot Exp $
@bin bin/celestia
share/applications/celestia.desktop
share/celestia/
@ -85,6 +85,7 @@ share/celestia/data/visualbins.stc
share/celestia/data/world-capitals.ssc
share/celestia/demo.cel
share/celestia/demo_be.cel
share/celestia/demo_bg.cel
share/celestia/demo_de.cel
share/celestia/demo_es.cel
share/celestia/demo_fr.cel
@ -94,6 +95,7 @@ share/celestia/demo_ja.cel
share/celestia/demo_ko.cel
share/celestia/demo_lt.cel
share/celestia/demo_lv.cel
share/celestia/demo_nb.cel
share/celestia/demo_nl.cel
share/celestia/demo_no.cel
share/celestia/demo_pl.cel
@ -234,6 +236,7 @@ share/celestia/guide_it.cel
share/celestia/guide_ja.cel
share/celestia/guide_ko.cel
share/celestia/guide_lt.cel
share/celestia/guide_nb.cel
share/celestia/guide_nl.cel
share/celestia/guide_pl.cel
share/celestia/guide_pt.cel
@ -379,6 +382,7 @@ share/celestia/start_ja.cel
share/celestia/start_ko.cel
share/celestia/start_lt.cel
share/celestia/start_lv.cel
share/celestia/start_nb.cel
share/celestia/start_nl.cel
share/celestia/start_pl.cel
share/celestia/start_pt.cel
@ -578,6 +582,8 @@ share/locale/lt/LC_MESSAGES/celestia.mo
share/locale/lt/LC_MESSAGES/celestia_constellations.mo
share/locale/lv/LC_MESSAGES/celestia.mo
share/locale/lv/LC_MESSAGES/celestia_constellations.mo
share/locale/nb/LC_MESSAGES/celestia.mo
share/locale/nb/LC_MESSAGES/celestia_constellations.mo
share/locale/nl/LC_MESSAGES/celestia.mo
share/locale/nl/LC_MESSAGES/celestia_constellations.mo
share/locale/no/LC_MESSAGES/celestia.mo