diff options
Diffstat (limited to 'misc/celestia')
-rw-r--r-- | misc/celestia/DESCR | 10 | ||||
-rw-r--r-- | misc/celestia/Makefile | 56 | ||||
-rw-r--r-- | misc/celestia/PLIST | 323 | ||||
-rw-r--r-- | misc/celestia/PLIST.gtk | 5 | ||||
-rw-r--r-- | misc/celestia/PLIST.kde | 56 | ||||
-rw-r--r-- | misc/celestia/distinfo | 20 | ||||
-rw-r--r-- | misc/celestia/options.mk | 38 | ||||
-rw-r--r-- | misc/celestia/patches/patch-aa | 88 | ||||
-rw-r--r-- | misc/celestia/patches/patch-ab | 17 | ||||
-rw-r--r-- | misc/celestia/patches/patch-ac | 22 | ||||
-rw-r--r-- | misc/celestia/patches/patch-ad | 90 | ||||
-rw-r--r-- | misc/celestia/patches/patch-ae | 21 | ||||
-rw-r--r-- | misc/celestia/patches/patch-af | 13 | ||||
-rw-r--r-- | misc/celestia/patches/patch-ag | 13 | ||||
-rw-r--r-- | misc/celestia/patches/patch-ah | 12 | ||||
-rw-r--r-- | misc/celestia/patches/patch-ai | 64 | ||||
-rw-r--r-- | misc/celestia/patches/patch-aj | 13 | ||||
-rw-r--r-- | misc/celestia/patches/patch-ak | 13 | ||||
-rw-r--r-- | misc/celestia/patches/patch-al | 13 | ||||
-rw-r--r-- | misc/celestia/patches/patch-am | 50 | ||||
-rw-r--r-- | misc/celestia/patches/patch-an | 13 | ||||
-rw-r--r-- | misc/celestia/patches/patch-ao | 13 |
22 files changed, 0 insertions, 963 deletions
diff --git a/misc/celestia/DESCR b/misc/celestia/DESCR deleted file mode 100644 index bf3e3371630..00000000000 --- a/misc/celestia/DESCR +++ /dev/null @@ -1,10 +0,0 @@ -Celestia is a free real-time space simulation that lets you experience our -universe in three dimensions. Unlike most planetarium software, Celestia -doesn't confine you to the surface of the Earth. You can travel throughout -the solar system, to any of over 100,000 stars, or even beyond the galaxy. -All travel in Celestia is seamless; the exponential zoom feature lets you -explore space across a huge range of scales, from galaxy clusters down to -spacecraft only a few meters across. A 'point-and-goto' interface makes it -simple to navigate through the universe to the object you want to visit. - -This is the base package with data and simple GLUT-driven display window. diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile deleted file mode 100644 index f74098486c9..00000000000 --- a/misc/celestia/Makefile +++ /dev/null @@ -1,56 +0,0 @@ -# $NetBSD: Makefile,v 1.16 2007/02/15 22:21:27 joerg Exp $ - -DISTNAME= celestia-1.4.1 -PKGREVISION= 4 -CATEGORIES= misc x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=celestia/} - -MAINTAINER= cesar_catrian@yahoo.com -HOMEPAGE= http://www.shatters.net/celestia/ -COMMENT= Free real-time 3D space simulator - -DISTINFO_FILE= ${.CURDIR}/../../misc/celestia/distinfo -PATCHDIR= ${.CURDIR}/../../misc/celestia/patches - -USE_DIRS+= xdg-1.3 -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake pkg-config -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-lua - -GCC_REQD+= 3.0 -CXXFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" - -EGDIR= ${PREFIX}/share/examples/celestia -CONF_FILES= ${EGDIR}/celestia.cfg.default ${PKG_SYSCONFDIR}/celestia.cfg - -.include "../../mk/bsd.prefs.mk" - -.if exists(${X11BASE}/include/X11/extensions/Xinerama.h) || ${X11_TYPE} != "native" -.include "../../x11/libXinerama/buildlink3.mk" -CONFIGURE_ARGS+= --with-xinerama -.endif - -.include "../../mk/pthread.buildlink3.mk" - -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -CONFIGURE_ARGS+= --disable-threading -.endif - -post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/celestia.cfg ${EGDIR}/celestia.cfg.default - -.include "options.mk" - -.include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../lang/lua/buildlink3.mk" -.include "../../x11/libXmu/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/misc/celestia/PLIST b/misc/celestia/PLIST deleted file mode 100644 index 548a5e3cf1b..00000000000 --- a/misc/celestia/PLIST +++ /dev/null @@ -1,323 +0,0 @@ -@comment $NetBSD: PLIST,v 1.5 2006/04/17 07:07:25 jlam Exp $ -bin/celestia -share/celestia/COPYING -share/celestia/controls.txt -share/celestia/data/asterisms.dat -share/celestia/data/asteroids.ssc -share/celestia/data/boundaries.dat -share/celestia/data/cassini.xyz -share/celestia/data/comets.ssc -share/celestia/data/deepsky.dsc -share/celestia/data/earth_locs.ssc -share/celestia/data/eros_locs.ssc -share/celestia/data/extrasolar.ssc -share/celestia/data/extrasolar.stc -share/celestia/data/galileo.xyz -share/celestia/data/gaspra_locs.ssc -share/celestia/data/hdxindex.dat -share/celestia/data/huygens.xyz -share/celestia/data/ida_locs.ssc -share/celestia/data/jupitermoons_locs.ssc -share/celestia/data/mars_locs.ssc -share/celestia/data/marsmoons_locs.ssc -share/celestia/data/merc_locs.ssc -share/celestia/data/moon_locs.ssc -share/celestia/data/nearstars.stc -share/celestia/data/neptunemoons_locs.ssc -share/celestia/data/outersys.ssc -share/celestia/data/revised.stc -share/celestia/data/ring_locs.ssc -share/celestia/data/saoxindex.dat -share/celestia/data/saturnmoons_locs.ssc -share/celestia/data/solarsys.ssc -share/celestia/data/spacecraft.ssc -share/celestia/data/spectbins.stc -share/celestia/data/starnames.dat -share/celestia/data/stars.dat -share/celestia/data/uranusmoons_locs.ssc -share/celestia/data/venus_locs.ssc -share/celestia/data/visualbins.stc -share/celestia/data/world-capitals.ssc -share/celestia/demo.cel -share/celestia/extras/apollo.ssc -share/celestia/extras/comets.ssc -share/celestia/extras/minormoons.ssc -share/celestia/extras/numberedmoons.ssc -share/celestia/extras/shroxclassic.ssc -share/celestia/extras/shroxmars.ssc -share/celestia/extras/skylab.ssc -share/celestia/fonts/clean12.txf -share/celestia/fonts/clean16.txf -share/celestia/fonts/cleanbold12.txf -share/celestia/fonts/cleanbold16.txf -share/celestia/fonts/default.txf -share/celestia/fonts/helv10.txf -share/celestia/fonts/helv12.txf -share/celestia/fonts/helv18.txf -share/celestia/fonts/helv24.txf -share/celestia/fonts/helvbold12.txf -share/celestia/fonts/helvbold18.txf -share/celestia/fonts/helvbold24.txf -share/celestia/fonts/sans10.txf -share/celestia/fonts/sans12.txf -share/celestia/fonts/sans14.txf -share/celestia/fonts/sans20.txf -share/celestia/fonts/sansbold10.txf -share/celestia/fonts/sansbold12.txf -share/celestia/fonts/sansbold14.txf -share/celestia/fonts/sansbold20.txf -share/celestia/guide.cel -share/celestia/models/S0.pts -share/celestia/models/SBa.pts -share/celestia/models/SBb.pts -share/celestia/models/SBc.pts -share/celestia/models/Sa.pts -share/celestia/models/Sb.pts -share/celestia/models/Sc.pts -share/celestia/models/amalthea.cmod -share/celestia/models/asteroid.cms -share/celestia/models/bacchus.cmod -share/celestia/models/borrelly.cms -share/celestia/models/castalia.cmod -share/celestia/models/deimos.cmod -share/celestia/models/epimetheus.cmod -share/celestia/models/eros.cmod -share/celestia/models/eros.cms -share/celestia/models/gaspra.cmod -share/celestia/models/geographos.cmod -share/celestia/models/golevka.cmod -share/celestia/models/halley.cmod -share/celestia/models/hyperion.cmod -share/celestia/models/hyperion.cms -share/celestia/models/ida.cmod -share/celestia/models/janus.cmod -share/celestia/models/kleopatra.cmod -share/celestia/models/ky26.cmod -share/celestia/models/larissa.cmod -share/celestia/models/pandora.cmod -share/celestia/models/phobos.cmod -share/celestia/models/phoebe.cmod -share/celestia/models/prometheus.cmod -share/celestia/models/proteus.cmod -share/celestia/models/proteus.cms -share/celestia/models/roughsphere.cms -share/celestia/models/toutatis.cmod -share/celestia/models/vesta.cmod -share/celestia/shaders/bumpdiffuse.vp -share/celestia/shaders/bumpdiffuse_arb.vp -share/celestia/shaders/bumpdiffuse_nv.fp -share/celestia/shaders/bumphaze.vp -share/celestia/shaders/bumphaze_arb.vp -share/celestia/shaders/diffuse.vp -share/celestia/shaders/diffuse2_arb.vp -share/celestia/shaders/diffuse_arb.vp -share/celestia/shaders/diffuse_nv.fp -share/celestia/shaders/diffuse_texoff.vp -share/celestia/shaders/diffuse_texoff2_arb.vp -share/celestia/shaders/diffuse_texoff_arb.vp -share/celestia/shaders/eclipse1_nv.fp -share/celestia/shaders/eclipse2_nv.fp -share/celestia/shaders/ell_galaxy_arb.vp -share/celestia/shaders/glossmap_arb.vp -share/celestia/shaders/haze.vp -share/celestia/shaders/haze2_arb.vp -share/celestia/shaders/haze_arb.vp -share/celestia/shaders/multishadow_arb.vp -share/celestia/shaders/night.vp -share/celestia/shaders/night2_arb.vp -share/celestia/shaders/night_arb.vp -share/celestia/shaders/rings.vp -share/celestia/shaders/rings_arb.vp -share/celestia/shaders/ringshadow.vp -share/celestia/shaders/ringshadow_arb.vp -share/celestia/shaders/shadow_on_rings_nv.fp -share/celestia/shaders/shadowtex.vp -share/celestia/shaders/shadowtex_arb.vp -share/celestia/shaders/simple.vp -share/celestia/shaders/simple_arb.vp -share/celestia/shaders/specular.vp -share/celestia/shaders/specular2_arb.vp -share/celestia/shaders/specular_arb.vp -share/celestia/shaders/star_arb.vp -share/celestia/shaders/texphong_alpha_arb.vp -share/celestia/shaders/texphong_alpha_nv.fp -share/celestia/shaders/texphong_arb.vp -share/celestia/shaders/texphong_nv.fp -share/celestia/splash/splash.png -share/celestia/start.cel -share/celestia/textures/flare.jpg -share/celestia/textures/logo.png -share/celestia/textures/lores/amalthea.jpg -share/celestia/textures/lores/ariel-lok-mask.png -share/celestia/textures/lores/ariel.jpg -share/celestia/textures/lores/astar.jpg -share/celestia/textures/lores/asteroid.jpg -share/celestia/textures/lores/browndwarf.jpg -share/celestia/textures/lores/bstar.jpg -share/celestia/textures/lores/callisto-lok-mask.png -share/celestia/textures/lores/callisto.jpg -share/celestia/textures/lores/charon-lok-spec.jpg -share/celestia/textures/lores/charon-lok.jpg -share/celestia/textures/lores/deimos.jpg -share/celestia/textures/lores/dione.jpg -share/celestia/textures/lores/earth-clouds.png -share/celestia/textures/lores/earth.png -share/celestia/textures/lores/earthnight.jpg -share/celestia/textures/lores/enceladus.jpg -share/celestia/textures/lores/epimetheus-lok.jpg -share/celestia/textures/lores/epimetheus.jpg -share/celestia/textures/lores/eros.jpg -share/celestia/textures/lores/europa-lok-mask.png -share/celestia/textures/lores/europa.jpg -share/celestia/textures/lores/exo-class1.jpg -share/celestia/textures/lores/exo-class2.jpg -share/celestia/textures/lores/exo-class3.jpg -share/celestia/textures/lores/exo-class4.jpg -share/celestia/textures/lores/exo-class4night.jpg -share/celestia/textures/lores/exo-class5.jpg -share/celestia/textures/lores/exo-class5night.jpg -share/celestia/textures/lores/extrasolar-lok.jpg -share/celestia/textures/lores/ganymede-lok-mask.png -share/celestia/textures/lores/ganymede.jpg -share/celestia/textures/lores/gaspramosaic.jpg -share/celestia/textures/lores/gstar.jpg -share/celestia/textures/lores/hyperion-lok.jpg -share/celestia/textures/lores/hyperion.jpg -share/celestia/textures/lores/iapetus.jpg -share/celestia/textures/lores/idamosaic.jpg -share/celestia/textures/lores/io-lok-mask.png -share/celestia/textures/lores/io.jpg -share/celestia/textures/lores/janus.jpg -share/celestia/textures/lores/jupiter.jpg -share/celestia/textures/lores/mars.jpg -share/celestia/textures/lores/marsbump.jpg -share/celestia/textures/lores/mercury-lok-mask.png -share/celestia/textures/lores/mercury.jpg -share/celestia/textures/lores/mimas-lok-mask.png -share/celestia/textures/lores/mimas.jpg -share/celestia/textures/lores/miranda-lok-mask.png -share/celestia/textures/lores/miranda.jpg -share/celestia/textures/lores/moon.jpg -share/celestia/textures/lores/moonbump.jpg -share/celestia/textures/lores/mstar.jpg -share/celestia/textures/lores/neptune-rings.png -share/celestia/textures/lores/neptune.jpg -share/celestia/textures/lores/oberon-lok-mask.png -share/celestia/textures/lores/oberon.jpg -share/celestia/textures/lores/phobos.jpg -share/celestia/textures/lores/phoebe.jpg -share/celestia/textures/lores/pluto-lok-spec.jpg -share/celestia/textures/lores/pluto-lok.jpg -share/celestia/textures/lores/prometheus.jpg -share/celestia/textures/lores/proteus.jpg -share/celestia/textures/lores/rhea.jpg -share/celestia/textures/lores/saturn-rings.png -share/celestia/textures/lores/saturn.jpg -share/celestia/textures/lores/tethys.jpg -share/celestia/textures/lores/titan-clouds.jpg -share/celestia/textures/lores/titan.jpg -share/celestia/textures/lores/titania-lok-mask.png -share/celestia/textures/lores/titania.jpg -share/celestia/textures/lores/triton-lok-mask.png -share/celestia/textures/lores/triton.jpg -share/celestia/textures/lores/umbriel-lok-mask.png -share/celestia/textures/lores/umbriel.jpg -share/celestia/textures/lores/uranus-rings.png -share/celestia/textures/lores/uranus.jpg -share/celestia/textures/lores/venus.jpg -share/celestia/textures/lores/venuslike.jpg -share/celestia/textures/lores/venuslikenight.jpg -share/celestia/textures/lores/venussurface.jpg -share/celestia/textures/medres/amalthea.jpg -share/celestia/textures/medres/ariel.jpg -share/celestia/textures/medres/astar.jpg -share/celestia/textures/medres/asteroid.jpg -share/celestia/textures/medres/browndwarf.jpg -share/celestia/textures/medres/bstar.jpg -share/celestia/textures/medres/callisto.jpg -share/celestia/textures/medres/charon-lok-spec.jpg -share/celestia/textures/medres/charon-lok.jpg -share/celestia/textures/medres/deimos.jpg -share/celestia/textures/medres/dione.jpg -share/celestia/textures/medres/earth-clouds.png -share/celestia/textures/medres/earth.png -share/celestia/textures/medres/earthnight.jpg -share/celestia/textures/medres/enceladus.jpg -share/celestia/textures/medres/epimetheus-lok.jpg -share/celestia/textures/medres/epimetheus.jpg -share/celestia/textures/medres/eros.jpg -share/celestia/textures/medres/europa.jpg -share/celestia/textures/medres/exo-class1.jpg -share/celestia/textures/medres/exo-class2.jpg -share/celestia/textures/medres/exo-class3.jpg -share/celestia/textures/medres/exo-class4.jpg -share/celestia/textures/medres/exo-class4night.jpg -share/celestia/textures/medres/exo-class5.jpg -share/celestia/textures/medres/exo-class5night.jpg -share/celestia/textures/medres/ganymede.jpg -share/celestia/textures/medres/gaspramosaic.jpg -share/celestia/textures/medres/gstar.jpg -share/celestia/textures/medres/hyperion-lok.jpg -share/celestia/textures/medres/hyperion.jpg -share/celestia/textures/medres/iapetus.jpg -share/celestia/textures/medres/idamosaic.jpg -share/celestia/textures/medres/io.jpg -share/celestia/textures/medres/iss-cap1.jpg -share/celestia/textures/medres/iss-mc1.jpg -share/celestia/textures/medres/iss-mc31.jpg -share/celestia/textures/medres/iss-sol1.jpg -share/celestia/textures/medres/janus.jpg -share/celestia/textures/medres/jupiter.jpg -share/celestia/textures/medres/mars.jpg -share/celestia/textures/medres/marsbump.jpg -share/celestia/textures/medres/mercury.jpg -share/celestia/textures/medres/mimas.jpg -share/celestia/textures/medres/miranda.jpg -share/celestia/textures/medres/moon.jpg -share/celestia/textures/medres/moonbump.jpg -share/celestia/textures/medres/mstar.jpg -share/celestia/textures/medres/neptune.jpg -share/celestia/textures/medres/oberon.jpg -share/celestia/textures/medres/phobos.jpg -share/celestia/textures/medres/phoebe.jpg -share/celestia/textures/medres/pluto-lok-spec.jpg -share/celestia/textures/medres/pluto-lok.jpg -share/celestia/textures/medres/prometheus.jpg -share/celestia/textures/medres/proteus.jpg -share/celestia/textures/medres/rhea.jpg -share/celestia/textures/medres/saturn.jpg -share/celestia/textures/medres/tethys.jpg -share/celestia/textures/medres/titan-clouds.jpg -share/celestia/textures/medres/titan.jpg -share/celestia/textures/medres/titania.jpg -share/celestia/textures/medres/triton.jpg -share/celestia/textures/medres/umbriel.jpg -share/celestia/textures/medres/venus.jpg -share/celestia/textures/medres/venuslike.jpg -share/celestia/textures/medres/venuslikenight.jpg -share/celestia/textures/medres/venussurface.jpg -share/examples/celestia/celestia.cfg.default -share/locale/de/LC_MESSAGES/celestia.mo -share/locale/el/LC_MESSAGES/celestia.mo -share/locale/en/LC_MESSAGES/celestia.mo -share/locale/es/LC_MESSAGES/celestia.mo -share/locale/fr/LC_MESSAGES/celestia.mo -share/locale/gl/LC_MESSAGES/celestia.mo -share/locale/hu/LC_MESSAGES/celestia.mo -share/locale/it/LC_MESSAGES/celestia.mo -share/locale/nl/LC_MESSAGES/celestia.mo -share/locale/pt/LC_MESSAGES/celestia.mo -share/locale/pt_br/LC_MESSAGES/celestia.mo -share/locale/ru/LC_MESSAGES/celestia.mo -@dirrm share/examples/celestia -@dirrm share/celestia/textures/medres -@dirrm share/celestia/textures/lores -@dirrm share/celestia/textures/hires -@dirrm share/celestia/textures -@dirrm share/celestia/splash -@dirrm share/celestia/shaders -@dirrm share/celestia/models -@dirrm share/celestia/fonts -@dirrm share/celestia/extras -@dirrm share/celestia/data -@dirrm share/celestia diff --git a/misc/celestia/PLIST.gtk b/misc/celestia/PLIST.gtk deleted file mode 100644 index 40a0a509124..00000000000 --- a/misc/celestia/PLIST.gtk +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST.gtk,v 1.1 2006/02/17 23:46:39 adam Exp $ -share/applications/celestia.desktop -share/celestia/celestia-logo.png -share/celestia/celestiaui.xml -share/pixmaps/celestia.png diff --git a/misc/celestia/PLIST.kde b/misc/celestia/PLIST.kde deleted file mode 100644 index 86b36fffab5..00000000000 --- a/misc/celestia/PLIST.kde +++ /dev/null @@ -1,56 +0,0 @@ -@comment $NetBSD: PLIST.kde,v 1.1 2006/02/17 23:46:39 adam Exp $ -share/celestia/bookmarks.xml -share/celestia/celestiaui.rc -share/celestia/favicons/celestia_20020830192652097.png -share/celestia/favicons/celestia_20020830192655186.png -share/celestia/favicons/celestia_20021210223316001.png -share/celestia/favicons/celestia_20021212191412299.png -share/celestia/favicons/celestia_20021215164511359.png -share/celestia/favicons/celestia_20021215164726547.png -share/celestia/favicons/celestia_20021215170159036.png -share/celestia/favicons/celestia_20030106235954721.png -share/doc/kde/HTML/en/celestia/common -share/doc/kde/HTML/en/celestia/fig1.jpg -share/doc/kde/HTML/en/celestia/fig10.jpg -share/doc/kde/HTML/en/celestia/fig11.jpg -share/doc/kde/HTML/en/celestia/fig12.jpg -share/doc/kde/HTML/en/celestia/fig13.jpg -share/doc/kde/HTML/en/celestia/fig14.jpg -share/doc/kde/HTML/en/celestia/fig15.jpg -share/doc/kde/HTML/en/celestia/fig16.jpg -share/doc/kde/HTML/en/celestia/fig17.jpg -share/doc/kde/HTML/en/celestia/fig18.jpg -share/doc/kde/HTML/en/celestia/fig19.jpg -share/doc/kde/HTML/en/celestia/fig2.jpg -share/doc/kde/HTML/en/celestia/fig20.jpg -share/doc/kde/HTML/en/celestia/fig21.jpg -share/doc/kde/HTML/en/celestia/fig22.jpg -share/doc/kde/HTML/en/celestia/fig221.jpg -share/doc/kde/HTML/en/celestia/fig23.jpg -share/doc/kde/HTML/en/celestia/fig24.jpg -share/doc/kde/HTML/en/celestia/fig25.jpg -share/doc/kde/HTML/en/celestia/fig26.jpg -share/doc/kde/HTML/en/celestia/fig27.jpg -share/doc/kde/HTML/en/celestia/fig28.jpg -share/doc/kde/HTML/en/celestia/fig29.jpg -share/doc/kde/HTML/en/celestia/fig3.jpg -share/doc/kde/HTML/en/celestia/fig30.jpg -share/doc/kde/HTML/en/celestia/fig4.jpg -share/doc/kde/HTML/en/celestia/fig5.jpg -share/doc/kde/HTML/en/celestia/fig6.jpg -share/doc/kde/HTML/en/celestia/fig7.jpg -share/doc/kde/HTML/en/celestia/fig8.jpg -share/doc/kde/HTML/en/celestia/fig9.jpg -share/doc/kde/HTML/en/celestia/index.cache.bz2 -share/doc/kde/HTML/en/celestia/index.docbook -share/kde/applnk/Edutainment/Science/celestia.desktop -share/kde/apps/celestia -share/kde/config/celestiarc -share/kde/icons/hicolor/16x16/apps/celestia.png -share/kde/icons/hicolor/22x22/apps/celestia.png -share/kde/icons/hicolor/32x32/apps/celestia.png -share/kde/icons/hicolor/48x48/apps/celestia.png -share/kde/mimelnk/application/x-celestia-script.desktop -share/kde/services/celestia.protocol -@dirrm share/doc/kde/HTML/en/celestia -@dirrm share/celestia/favicons diff --git a/misc/celestia/distinfo b/misc/celestia/distinfo deleted file mode 100644 index a6be7b88dab..00000000000 --- a/misc/celestia/distinfo +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: distinfo,v 1.16 2007/01/26 04:25:46 markd Exp $ - -SHA1 (celestia-1.4.1.tar.gz) = 37863498c43d3078b41027706bfa033bccd949a9 -RMD160 (celestia-1.4.1.tar.gz) = c66c2540e329613dace12e5b12b2dae2a4c679e0 -Size (celestia-1.4.1.tar.gz) = 23966886 bytes -SHA1 (patch-aa) = 04bfea9e2a83a4c9fbd3917e378b5812699ccbe9 -SHA1 (patch-ab) = e749cc8a8bd9be9dd10b4f53e6d7878875a2aa57 -SHA1 (patch-ac) = 22e1ed46c832f97a4f2f20b5b6d6255469ea6b90 -SHA1 (patch-ad) = 175d8df4eb58aa24c548ba14dee5c5ae1f240e41 -SHA1 (patch-ae) = a7ac58087cc366119f4ac5b193b49dc87ecc261c -SHA1 (patch-af) = 124f115719badb0d057cc324ac0455253e25022d -SHA1 (patch-ag) = e5300a702a92f3f35f07b34726d80cd825c1a759 -SHA1 (patch-ah) = 90f20cbbf4a8f187ea39de23f0e5b13aa4e10fb6 -SHA1 (patch-ai) = d5abfae0b4c4395572f22b6fdd1e7ad7bda4032f -SHA1 (patch-aj) = 1ef7a10260a3b1476392c4cae17081ab0e7771b4 -SHA1 (patch-ak) = 20506d8b2f7c8c9ff778e0844dc999b0e497d644 -SHA1 (patch-al) = f998727c986145d3f298295bed1760221a686245 -SHA1 (patch-am) = 34a83573294e6ca41d817a19aef3e7d3e4f14945 -SHA1 (patch-an) = 80bd712a8ae3f4dee0d908882deadbe2ad319abf -SHA1 (patch-ao) = ed7be1b0ac2d6a1bbf1c9ef8e66816124a7e8a99 diff --git a/misc/celestia/options.mk b/misc/celestia/options.mk deleted file mode 100644 index 88bc539e93c..00000000000 --- a/misc/celestia/options.mk +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: options.mk,v 1.2 2007/01/26 04:25:46 markd Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.celestia -PKG_SUPPORTED_OPTIONS= # empty -PKG_OPTIONS_OPTIONAL_GROUPS= gui -PKG_OPTIONS_GROUP.gui= glut gnome gtk kde -PKG_SUGGESTED_OPTIONS= gtk - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mglut) -CONFIGURE_ARGS+= --with-glut -. include "../../graphics/glut/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mgtk) -CONFIGURE_ARGS+= --with-gtk -PLIST_SRC= ${PKGDIR}/PLIST.gtk -. include "../../graphics/gtkglext/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mgnome) -CONFIGURE_ARGS+= --with-gnome -PLIST_SRC= ${PKGDIR}/PLIST.gtk -. include "../../devel/GConf2/schemas.mk" -. include "../../devel/libgnomeui/buildlink3.mk" -. include "../../graphics/gtkglext/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Mkde) -CONFIGURE_ARGS+= --with-kde -PLIST_SRC= ${PKGDIR}/PLIST.kde -USE_DIRS+= kde3-1.0 -. include "../../graphics/hicolor-icon-theme/buildlink3.mk" -. include "../../x11/kdelibs3/buildlink3.mk" -.endif - -PLIST_SRC+= ${PKGDIR}/PLIST diff --git a/misc/celestia/patches/patch-aa b/misc/celestia/patches/patch-aa deleted file mode 100644 index e236d673cd8..00000000000 --- a/misc/celestia/patches/patch-aa +++ /dev/null @@ -1,88 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2007/01/26 04:25:46 markd Exp $ - ---- configure.orig 2006-02-15 21:53:09.000000000 +0000 -+++ configure -@@ -21716,8 +21716,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo - - - CELESTIA_CPPFLAGS="" --CELESTIA_CFLAGS="-O2 -Wall -ffast-math -fexpensive-optimizations" --CELESTIA_CXXFLAGS="-O2 -Wall -ffast-math -fexpensive-optimizations" -+CELESTIA_CFLAGS="-Wall -ffast-math -fexpensive-optimizations" -+CELESTIA_CXXFLAGS="-Wall -ffast-math -fexpensive-optimizations" - - echo "$as_me:$LINENO: checking whether to include debugging code" >&5 - echo $ECHO_N "checking whether to include debugging code... $ECHO_C" >&6 -@@ -37346,19 +37346,19 @@ else - if test "$ac_use_path_checking" = "default"; then - - if test -z "$kde_htmldir"; then -- kde_htmldir='\${datadir}/doc/HTML' -+ kde_htmldir='\${datadir}/doc/kde/HTML' - fi - if test -z "$kde_appsdir"; then -- kde_appsdir='\${datadir}/applnk' -+ kde_appsdir='\${datadir}/kde/applnk' - fi - if test -z "$kde_icondir"; then - kde_icondir='\${datadir}/icons' - fi - if test -z "$kde_sounddir"; then -- kde_sounddir='\${datadir}/sounds' -+ kde_sounddir='\${datadir}/kde/sounds' - fi - if test -z "$kde_datadir"; then -- kde_datadir='\${datadir}/apps' -+ kde_datadir='\${datadir}/kde/apps' - fi - if test -z "$kde_locale"; then - kde_locale='\${datadir}/locale' -@@ -37367,31 +37367,31 @@ if test "$ac_use_path_checking" = "defau - kde_cgidir='\${exec_prefix}/cgi-bin' - fi - if test -z "$kde_confdir"; then -- kde_confdir='\${datadir}/config' -+ kde_confdir='\${datadir}/kde/config' - fi - if test -z "$kde_kcfgdir"; then -- kde_kcfgdir='\${datadir}/config.kcfg' -+ kde_kcfgdir='\${datadir}/kde/config.kcfg' - fi - if test -z "$kde_mimedir"; then -- kde_mimedir='\${datadir}/mimelnk' -+ kde_mimedir='\${datadir}/kde/mimelnk' - fi - if test -z "$kde_toolbardir"; then -- kde_toolbardir='\${datadir}/toolbar' -+ kde_toolbardir='\${datadir}/kde/toolbar' - fi - if test -z "$kde_wallpaperdir"; then -- kde_wallpaperdir='\${datadir}/wallpapers' -+ kde_wallpaperdir='\${datadir}/kde/wallpapers' - fi - if test -z "$kde_templatesdir"; then -- kde_templatesdir='\${datadir}/templates' -+ kde_templatesdir='\${datadir}/kde/templates' - fi - if test -z "$kde_bindir"; then - kde_bindir='\${exec_prefix}/bin' - fi - if test -z "$kde_servicesdir"; then -- kde_servicesdir='\${datadir}/services' -+ kde_servicesdir='\${datadir}/kde/services' - fi - if test -z "$kde_servicetypesdir"; then -- kde_servicetypesdir='\${datadir}/servicetypes' -+ kde_servicetypesdir='\${datadir}/kde/servicetypes' - fi - if test -z "$kde_moduledir"; then - if test "$kde_qtver" = "2"; then -@@ -39509,7 +39509,7 @@ echo "$as_me:$LINENO: checking whether t - echo $ECHO_N "checking whether to enable Celestia Extension Language... $ECHO_C" >&6 - if (test "$enable_lua" != "no"); then - CXXFLAGS="$CXXFLAGS -DCELX" -- LDFLAGS="$LDFLAGS -llualib -llua" -+ LDFLAGS="$LDFLAGS -llua" - - if (test "$lua_includes" != "no"); then - CXXFLAGS="$CXXFLAGS -I$lua_includes" diff --git a/misc/celestia/patches/patch-ab b/misc/celestia/patches/patch-ab deleted file mode 100644 index d25d0fe14e8..00000000000 --- a/misc/celestia/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2006/03/25 18:10:09 joerg Exp $ - ---- src/celutil/formatnum.cpp.orig 2006-03-25 18:04:47.000000000 +0000 -+++ src/celutil/formatnum.cpp -@@ -60,9 +60,9 @@ std::ostream& operator<<(std::ostream& o - char buf[32]; - char obuf[64]; - double value = num.getRoundedValue(); -- char *decimal_point = localeconv()->decimal_point; -- char *thousands_sep = localeconv()->thousands_sep; -- char *grouping = localeconv()->grouping; -+ const char *decimal_point = localeconv()->decimal_point; -+ const char *thousands_sep = localeconv()->thousands_sep; -+ const char *grouping = localeconv()->grouping; - - memset(obuf, 0, sizeof(obuf)); - diff --git a/misc/celestia/patches/patch-ac b/misc/celestia/patches/patch-ac deleted file mode 100644 index b89e3c01547..00000000000 --- a/misc/celestia/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2006/02/17 23:46:39 adam Exp $ - ---- config.h.in.orig 2006-02-15 22:53:21.000000000 +0100 -+++ config.h.in -@@ -248,7 +248,7 @@ int res_init(void); - - - --#if !defined(HAVE_STRLCAT_PROTO) -+#if !defined(HAVE_STRLCAT_PROTO) && defined(KDELIBSUFF) - #ifdef __cplusplus - extern "C" { - #endif -@@ -260,7 +260,7 @@ unsigned long strlcat(char*, const char* - - - --#if !defined(HAVE_STRLCPY_PROTO) -+#if !defined(HAVE_STRLCPY_PROTO) && defined(KDELIBSUFF) - #ifdef __cplusplus - extern "C" { - #endif diff --git a/misc/celestia/patches/patch-ad b/misc/celestia/patches/patch-ad deleted file mode 100644 index eac06f900fe..00000000000 --- a/misc/celestia/patches/patch-ad +++ /dev/null @@ -1,90 +0,0 @@ -$NetBSD: patch-ad,v 1.4 2006/12/13 16:45:42 obache Exp $ - ---- src/celestia/celestiacore.cpp.orig 2006-02-08 09:03:15.000000000 +0000 -+++ src/celestia/celestiacore.cpp -@@ -2577,16 +2577,16 @@ static void displayAngle(Overlay& overla - - if (degrees > 0) - { -- overlay.printf("%d%s %02d' %.1f\"", -+ overlay.myprintf("%d%s %02d' %.1f\"", - degrees, UTF8_DEGREE_SIGN, minutes, seconds); - } - else if (minutes > 0) - { -- overlay.printf("%02d' %.1f\"", minutes, seconds); -+ overlay.myprintf("%02d' %.1f\"", minutes, seconds); - } - else - { -- overlay.printf("%.1f\"", seconds); -+ overlay.myprintf("%.1f\"", seconds); - } - } - -@@ -2625,7 +2625,7 @@ static void displayApparentMagnitude(Ove - overlay << _("Absolute magnitude: "); - } - -- overlay.printf("%.1f\n", appMag); -+ overlay.myprintf("%.1f\n", appMag); - } - - static void displayAcronym(Overlay& overlay, char* s) -@@ -2665,7 +2665,7 @@ static void displayStarInfo(Overlay& ove - return; - } - -- overlay.printf(_("Abs (app) mag: %.2f (%.2f)\n"), -+ overlay.myprintf(_("Abs (app) mag: %.2f (%.2f)\n"), - star.getAbsoluteMagnitude(), - astro::absToAppMag(star.getAbsoluteMagnitude(), - (float) distance)); -@@ -2687,7 +2687,7 @@ static void displayStarInfo(Overlay& ove - if (detail > 1) - { - overlay << _("Surface temp: ") << SigDigitNum(star.getTemperature(), 3) << " K\n"; -- overlay.printf(_("Radius: %.2f Rsun\n"), star.getRadius() / 696000.0f); -+ overlay.myprintf(_("Radius: %.2f Rsun\n"), star.getRadius() / 696000.0f); - - overlay << _("Rotation period: "); - float period = star.getRotationElements().period; -@@ -2782,7 +2782,7 @@ static void displayPlanetInfo(Overlay& o - float appMag = body.getApparentMagnitude(*sun, - bodyPos - Point3d(0, 0, 0), - viewVec); -- overlay.printf(_("Apparent mag: %.2f\n"), appMag); -+ overlay.myprintf(_("Apparent mag: %.2f\n"), appMag); - #endif - } - } -@@ -3140,9 +3140,9 @@ void CelestiaCore::renderOverlay() - - // Field of view - float fov = radToDeg(sim->getActiveObserver()->getFOV()); -- overlay->printf(_("FOV: ")); -+ overlay->myprintf(_("FOV: ")); - displayAngle(*overlay, fov); -- overlay->printf(" (%.2f%s)\n", views[activeView]->zoom, -+ overlay->myprintf(" (%.2f%s)\n", views[activeView]->zoom, - UTF8_MULTIPLICATION_SIGN); - overlay->endText(); - glPopMatrix(); -@@ -3341,7 +3341,7 @@ void CelestiaCore::renderOverlay() - movieCapture->getFrameRate(); - int min = (int) (sec / 60); - sec -= min * 60.0f; -- overlay->printf("%3d:%05.2f", min, sec); -+ overlay->myprintf("%3d:%05.2f", min, sec); - glPopMatrix(); - - glPushMatrix(); -@@ -3547,7 +3547,7 @@ bool CelestiaCore::initSimulation(const - } - else - { -- config = ReadCelestiaConfig("celestia.cfg"); -+ config = ReadCelestiaConfig(PKG_SYSCONFDIR "/celestia.cfg"); - - string localConfigFile = WordExp("~/.celestia.cfg"); - if (localConfigFile != "") diff --git a/misc/celestia/patches/patch-ae b/misc/celestia/patches/patch-ae deleted file mode 100644 index 8665bdbf545..00000000000 --- a/misc/celestia/patches/patch-ae +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ae,v 1.4 2006/02/17 23:46:40 adam Exp $ - ---- Makefile.in.orig 2006-02-15 22:53:42.000000000 +0100 -+++ Makefile.in -@@ -307,7 +307,6 @@ noinst_DATA = \ - - - pkgdata_DATA = \ -- celestia.cfg \ - controls.txt \ - COPYING \ - $(wildcard *.cel) -@@ -848,7 +847,7 @@ dist-hook: - - install-data-hook: - if [ "$(kde_datadir)" -a -d $(kde_datadir)/@PACKAGE@ -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \ -- mv -f -b $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \ -+ mv -f $(kde_datadir)/@PACKAGE@/* $(datadir)/@PACKAGE@/ ; \ - rmdir $(kde_datadir)/@PACKAGE@ ; \ - fi - if [ "$(kde_datadir)" -a ! -h $(kde_datadir)/@PACKAGE@ ] ; then \ diff --git a/misc/celestia/patches/patch-af b/misc/celestia/patches/patch-af deleted file mode 100644 index 4de5c5ecda9..00000000000 --- a/misc/celestia/patches/patch-af +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-af,v 1.3 2006/08/14 22:43:08 wiz Exp $ - ---- src/celengine/star.h.orig 2005-12-06 17:30:23.000000000 +0000 -+++ src/celengine/star.h -@@ -30,7 +30,7 @@ class StarDetails - // orbits and StarDetails objects. Currently, it's assumed that they - // have lifetimes that continue until program termination. - public: -- StarDetails::StarDetails(); -+ StarDetails(); - - inline float getRadius() const; - inline float getTemperature() const; diff --git a/misc/celestia/patches/patch-ag b/misc/celestia/patches/patch-ag deleted file mode 100644 index 601148f5c73..00000000000 --- a/misc/celestia/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2006/08/14 22:43:08 wiz Exp $ - ---- src/celengine/command.h.orig 2004-12-22 22:07:15.000000000 +0000 -+++ src/celengine/command.h -@@ -94,7 +94,7 @@ class CommandGoto : public Instantaneous - class CommandGotoLongLat : public InstantaneousCommand - { - public: -- CommandGotoLongLat::CommandGotoLongLat(double t, -+ CommandGotoLongLat(double t, - double dist, - float _longitude, float _latitude, - Vec3f _up); diff --git a/misc/celestia/patches/patch-ah b/misc/celestia/patches/patch-ah deleted file mode 100644 index 043d6138d38..00000000000 --- a/misc/celestia/patches/patch-ah +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2006/12/13 16:45:42 obache Exp $ - ---- src/celutil/util.h.orig 2006-01-17 21:28:30.000000000 +0100 -+++ src/celutil/util.h -@@ -28,6 +28,7 @@ - #ifdef _WIN32 - #define _(s) s - #else -+#include <libintl.h> - #define _(s) gettext(s) - #endif - diff --git a/misc/celestia/patches/patch-ai b/misc/celestia/patches/patch-ai deleted file mode 100644 index d9cc747923e..00000000000 --- a/misc/celestia/patches/patch-ai +++ /dev/null @@ -1,64 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2006/08/14 22:43:08 wiz Exp $ - ---- src/celestia/celx.cpp.orig 2006-01-07 00:01:51.000000000 +0000 -+++ src/celestia/celx.cpp -@@ -368,6 +368,18 @@ static CelestiaCore* getAppCore(lua_Stat - return appCore; - } - -+static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) { -+ (void)ud; /* not used */ -+ (void)osize; /* not used */ -+ if (nsize == 0) { -+ free(ptr); /* ANSI requires that free(NULL) has no effect */ -+ return NULL; -+ } -+ else -+ /* ANSI requires that realloc(NULL, size) == malloc(size) */ -+ return realloc(ptr, nsize); -+} -+ - - LuaState::LuaState() : - timeout(MaxTimeslice), -@@ -378,7 +390,7 @@ LuaState::LuaState() : - scriptAwakenTime(0.1), - ioMode(NoIO) - { -- state = lua_open(); -+ state = lua_newstate(l_alloc, NULL); - timer = CreateTimer(); - screenshotCount = 0; - } -@@ -472,6 +484,7 @@ void LuaState::cleanup() - } - - -+ - bool LuaState::createThread() - { - // Initialize the coroutine which wraps the script -@@ -598,7 +611,7 @@ bool LuaState::charEntered(const char* c - int stackTop = lua_gettop(costate); - if (strcmp(c_p, "y") == 0) - { -- lua_iolibopen(costate); -+ luaopen_io(costate); - ioMode = IOAllowed; - } - else -@@ -4577,10 +4590,10 @@ bool LuaState::init(CelestiaCore* appCor - initMaps(); - - // Import the base and math libraries -- lua_baselibopen(state); -- lua_mathlibopen(state); -- lua_tablibopen(state); -- lua_strlibopen(state); -+ luaopen_base(state); -+ luaopen_math(state); -+ luaopen_table(state); -+ luaopen_string(state); - - // Add an easy to use wait function, so that script writers can - // live in ignorance of coroutines. There will probably be a significant diff --git a/misc/celestia/patches/patch-aj b/misc/celestia/patches/patch-aj deleted file mode 100644 index 8528710b8d1..00000000000 --- a/misc/celestia/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2006/02/17 23:46:40 adam Exp $ - ---- src/celestia/glutmain.cpp.orig 2005-07-19 22:30:59.000000000 +0200 -+++ src/celestia/glutmain.cpp -@@ -521,7 +521,7 @@ int main(int argc, char* argv[]) - // Set the simulation starting time to the current system time - time_t curtime=time(NULL); - appCore->start((double) curtime / 86400.0 + (double) astro::Date(1970, 1, 1)); -- #ifdef MACOSX -+ #if defined(MACOSX) || defined(__DragonFly__) - /* localtime in Darwin is is reentrant only - equiv to Linux localtime_r() - should probably port !MACOSX code to use this too, available since diff --git a/misc/celestia/patches/patch-ak b/misc/celestia/patches/patch-ak deleted file mode 100644 index a20686db065..00000000000 --- a/misc/celestia/patches/patch-ak +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ak,v 1.1 2006/06/14 12:37:53 markd Exp $ - ---- src/celestia/Makefile.in.orig 2006-06-13 00:08:44.000000000 +1200 -+++ src/celestia/Makefile.in -@@ -300,7 +300,7 @@ INCLUDES = -I.. - - localedir = $(datadir)/locale - @ENABLE_KDE_TRUE@celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \ --@ENABLE_KDE_TRUE@ $(LIBSOCKET) kde/libkdegui.a -+@ENABLE_KDE_TRUE@ $(LIBSOCKET) $(LIBINTL) kde/libkdegui.a - - @ENABLE_KDE_TRUE@celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH) - @ENABLE_GTK_TRUE@celestiaGTKLIBS = gtk/libgtkgui.a diff --git a/misc/celestia/patches/patch-al b/misc/celestia/patches/patch-al deleted file mode 100644 index 7ac0301d678..00000000000 --- a/misc/celestia/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2006/06/14 12:37:53 markd Exp $ - ---- src/celestia/kde/doc/celestia/Makefile.in.orig 2006-02-16 10:53:43.000000000 +1300 -+++ src/celestia/kde/doc/celestia/Makefile.in -@@ -642,7 +642,7 @@ install-docs: docs-am install-nls - $(INSTALL_DATA) $(srcdir)/index.cache.bz2 $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/; \ - fi - -rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common -- $(LN_S) $(kde_libs_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common -+ $(LN_S) $(kde_htmldir)/$(KDE_LANG)/common $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/celestia/common - - uninstall-docs: - -rm -rf $(kde_htmldir)/$(KDE_LANG)/celestia diff --git a/misc/celestia/patches/patch-am b/misc/celestia/patches/patch-am deleted file mode 100644 index 4f2a11257ed..00000000000 --- a/misc/celestia/patches/patch-am +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-am,v 1.1 2006/12/12 19:31:37 joerg Exp $ - ---- src/celutil/unixdirectory.cpp.orig 2006-12-12 16:52:18.000000000 +0000 -+++ src/celutil/unixdirectory.cpp -@@ -7,11 +7,19 @@ - // as published by the Free Software Foundation; either version 2 - // of the License, or (at your option) any later version. - -+#if defined(__DragonFly__) -+#define NO_WORDEXP -+#endif -+ - #include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> - #include <dirent.h> -+#ifdef NO_WORDEXP -+#include <glob.h> -+#else - #include <wordexp.h> -+#endif - #include "directory.h" - - using namespace std; -@@ -98,6 +106,19 @@ bool IsDirectory(const std::string& file - } - - std::string WordExp(const std::string& filename) { -+#ifdef NO_WORDEXP -+ 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; -+ } -+#else - wordexp_t result; - std::string expanded; - -@@ -121,4 +142,5 @@ std::string WordExp(const std::string& f - wordfree(&result); - - return expanded; -+#endif - } diff --git a/misc/celestia/patches/patch-an b/misc/celestia/patches/patch-an deleted file mode 100644 index 8ef7d95710b..00000000000 --- a/misc/celestia/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.1 2006/12/13 16:45:42 obache Exp $ - ---- src/celengine/overlay.cpp.orig 2005-07-19 20:30:54.000000000 +0000 -+++ src/celengine/overlay.cpp -@@ -173,7 +173,7 @@ void Overlay::print(char* s) - } - - --void Overlay::printf(const char* format, ...) -+void Overlay::myprintf(const char* format, ...) - { - va_list args; - va_start(args, format); diff --git a/misc/celestia/patches/patch-ao b/misc/celestia/patches/patch-ao deleted file mode 100644 index 720e325f1d9..00000000000 --- a/misc/celestia/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2006/12/13 16:45:42 obache Exp $ - ---- src/celengine/overlay.h.orig 2004-01-03 20:30:42.000000000 +0000 -+++ src/celengine/overlay.h -@@ -63,7 +63,7 @@ class Overlay : public std::ostream - void print(wchar_t); - void print(char); - void print(char*); -- void printf(const char*, ...); -+ void myprintf(const char*, ...); - - - private: |