From b2f04064f4b9e8dfca04c34066a92ec0c306426f Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 17 Feb 2006 23:46:39 +0000 Subject: Changes 1.4.0 * New stars.dat format with HD catalog numbers and parallax errors omitted * Added catalog cross indexes for HD and SAO catalogs * Fixed bugs in parsing catalog numbers * Added white dwarf temperatures and spectral types DA, DB, DC, DO, DQ, and DZ * Added handling for partial spectral types where one or both of the subclass and luminosity class are unknown * Permit extended star attributes in .stc files: mesh, texture, rotation elements, semiaxes * Support multiple star systems of any complexity with orbits and barycenters * Changed .stc loader so that a star definition with a duplicate catalog number replaces the previous definition * Made catalog numbers optional in .stc files; stars can be defined without having to create fake catalog numbers * Star colors now chosen based on temperature; either 'classic' and black body colors may be selected * Bound % key to toggle between star color tables * Fixed black holes: infinite radius bug gone, rendered just as a plain black sphere * Added comprehensive catalog of all knows stars within 25 light years of the Sun, including orbits for multiple star systems [More] Changes 1.4.1 * Changed maximum number of eclipse shadows in OpenGL 2.0 path from two to three; if max is exceeded, clamp to three rather than not rendering the shadows at all. * Corrected a bad calculation in ring shadow shaders that caused ring shadows to be drawn in the wrong place. * Windows: Fixed the minimum feature size slider in the locations dialog so it updates in response to all the standard controls. * Added a correct InfoURL for the Moon * Windows: added splash screen with a progress indicator * Corrected a local flashing of the Milky Way brightness. * Now the distance to the galaxy center is displayed, if the observer is located inside the galaxy (Milky Way...). * Eliminated various incorrect Hubble type acronyms in deepsky.dsc that had penetrated the PERL filter. * Updated Titan and Iapetus textures in lores directory * Added lunar elevation map, using Clementine laser altimeter data, merged in the polar regions, with topographic data from Clementine 750 nm oblique and nadir images. * Updated/added Tethys textures in lores, medres and hires directories. * Added locations on Phoebe in satmoons2.ssc, as extracted from USGS/IAU official data. * Added Mesh for Phoebe texture. * Updated Iapetus texture. * Moved locations files from extras into data directory for inclusion in standard package. * Fixed bug where displayed time scale differed from actual time scale after clicking a cel URL. [More] Pkgsrc: * Use options.mk framework to build GLUT, GTK, GNOME, or KDE user interface. --- misc/celestia/Makefile | 42 ++++++++++++- misc/celestia/Makefile.common | 47 -------------- misc/celestia/PLIST | 140 ++++++++++++++++++++--------------------- misc/celestia/PLIST.gtk | 5 ++ misc/celestia/PLIST.kde | 56 +++++++++++++++++ misc/celestia/distinfo | 22 +++---- misc/celestia/options.mk | 36 +++++++++++ misc/celestia/patches/patch-aa | 73 +++++++++++++++++++-- misc/celestia/patches/patch-ab | 13 ---- misc/celestia/patches/patch-ac | 47 ++++++-------- misc/celestia/patches/patch-ad | 18 +++--- misc/celestia/patches/patch-ae | 26 +++++--- misc/celestia/patches/patch-ah | 27 +++----- misc/celestia/patches/patch-ai | 22 ------- misc/celestia/patches/patch-aj | 6 +- 15 files changed, 342 insertions(+), 238 deletions(-) delete mode 100644 misc/celestia/Makefile.common create mode 100644 misc/celestia/PLIST.gtk create mode 100644 misc/celestia/PLIST.kde create mode 100644 misc/celestia/options.mk delete mode 100644 misc/celestia/patches/patch-ab delete mode 100644 misc/celestia/patches/patch-ai (limited to 'misc') diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile index 5e0cac8b579..5f296264dcb 100644 --- a/misc/celestia/Makefile +++ b/misc/celestia/Makefile @@ -1,15 +1,51 @@ -# $NetBSD: Makefile,v 1.9 2006/02/05 23:10:07 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2006/02/17 23:46:39 adam Exp $ -PKGREVISION= 2 +DISTNAME= celestia-1.4.1 +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_LANGUAGES= 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) +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 "../../misc/celestia/Makefile.common" +.include "options.mk" + +.include "../../devel/gettext-lib/buildlink3.mk" +.include "../../graphics/glu/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../lang/lua/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common deleted file mode 100644 index 7f76ccc0c67..00000000000 --- a/misc/celestia/Makefile.common +++ /dev/null @@ -1,47 +0,0 @@ -# $NetBSD: Makefile.common,v 1.21 2005/12/05 23:55:12 rillig Exp $ - -DISTNAME= celestia-${CELESTIA_VERS} -CATEGORIES= misc x11 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=celestia/} - -MAINTAINER= cesar_catrian@yahoo.com -HOMEPAGE= http://www.shatters.net/celestia/ - -DISTINFO_FILE= ${.CURDIR}/../../misc/celestia/distinfo -PATCHDIR= ${.CURDIR}/../../misc/celestia/patches - -CELESTIA_VERS= 1.3.2 - -USE_TOOLS+= gmake -USE_LANGUAGES= c++ -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-lua --with-glut -.if defined(CELESTIA_PROGPREFIX) -CONFIGURE_ARGS+= --program-prefix=${CELESTIA_PROGPREFIX:Q} -.endif - -GCC_REQD+= 3.0 - -CXXFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\"" - -.include "../../mk/bsd.prefs.mk" - -.if exists(${X11BASE}/include/X11/extensions/Xinerama.h) -CONFIGURE_ARGS+= --with-xinerama -.endif - -.include "../../mk/pthread.buildlink3.mk" - -.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") -CONFIGURE_ARGS+= --disable-threading -.endif - -.include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/glut/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../lang/lua/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" diff --git a/misc/celestia/PLIST b/misc/celestia/PLIST index 9d14b21f712..dd629c5be89 100644 --- a/misc/celestia/PLIST +++ b/misc/celestia/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.3 2004/11/10 16:38:27 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/02/17 23:46:39 adam Exp $ bin/celestia share/celestia/COPYING -share/celestia/celestia.png share/celestia/controls.txt share/celestia/data/asterisms.dat share/celestia/data/asteroids.ssc @@ -9,37 +8,44 @@ 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/solsys_locs.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/eros_locs2.ssc -share/celestia/extras/gaspra_locs2.ssc -share/celestia/extras/ida_locs2.ssc -share/celestia/extras/jupmoons2.ssc -share/celestia/extras/mars_locs2.ssc -share/celestia/extras/marsmoons2.ssc -share/celestia/extras/merc_locs2.ssc share/celestia/extras/minormoons.ssc -share/celestia/extras/moon_locs2.ssc -share/celestia/extras/nepmoons2.ssc share/celestia/extras/numberedmoons.ssc -share/celestia/extras/ring_locs.ssc -share/celestia/extras/satmoons2.ssc share/celestia/extras/shroxclassic.ssc share/celestia/extras/shroxmars.ssc share/celestia/extras/skylab.ssc -share/celestia/extras/uranmoons.ssc -share/celestia/extras/venus_locs2.ssc share/celestia/fonts/clean12.txf share/celestia/fonts/clean16.txf share/celestia/fonts/cleanbold12.txf @@ -61,67 +67,41 @@ share/celestia/fonts/sansbold12.txf share/celestia/fonts/sansbold14.txf share/celestia/fonts/sansbold20.txf share/celestia/guide.cel -share/celestia/models/amalthea.3ds +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/apollo.3ds share/celestia/models/asteroid.cms -share/celestia/models/bacchus.3ds share/celestia/models/bacchus.cmod share/celestia/models/borrelly.cms -share/celestia/models/cassini.3ds -share/celestia/models/castalia.3ds share/celestia/models/castalia.cmod -share/celestia/models/deimos.3ds share/celestia/models/deimos.cmod -share/celestia/models/epimetheus.3ds share/celestia/models/epimetheus.cmod -share/celestia/models/eros.3ds share/celestia/models/eros.cmod share/celestia/models/eros.cms -share/celestia/models/galileo.3ds -share/celestia/models/gaspra.3ds share/celestia/models/gaspra.cmod -share/celestia/models/gemini.3ds -share/celestia/models/geographos.3ds share/celestia/models/geographos.cmod -share/celestia/models/golevka.3ds share/celestia/models/golevka.cmod -share/celestia/models/halley.3ds share/celestia/models/halley.cmod -share/celestia/models/hubble.3ds -share/celestia/models/huygens.3ds -share/celestia/models/hyperion.3ds share/celestia/models/hyperion.cmod share/celestia/models/hyperion.cms -share/celestia/models/ida.3ds share/celestia/models/ida.cmod -share/celestia/models/iss.3ds -share/celestia/models/janus.3ds share/celestia/models/janus.cmod -share/celestia/models/kleopatra.3ds share/celestia/models/kleopatra.cmod -share/celestia/models/ky26.3ds share/celestia/models/ky26.cmod -share/celestia/models/larissa.3ds share/celestia/models/larissa.cmod -share/celestia/models/marsglobalsurvr.3ds -share/celestia/models/marsodyssey.3ds -share/celestia/models/mercury7.3ds -share/celestia/models/mir.3ds -share/celestia/models/pandora.3ds share/celestia/models/pandora.cmod -share/celestia/models/phobos.3ds share/celestia/models/phobos.cmod -share/celestia/models/prometheus.3ds +share/celestia/models/phoebe.cmod share/celestia/models/prometheus.cmod -share/celestia/models/proteus.3ds share/celestia/models/proteus.cmod share/celestia/models/proteus.cms share/celestia/models/roughsphere.cms -share/celestia/models/skylab.3ds -share/celestia/models/toutatis.3ds share/celestia/models/toutatis.cmod -share/celestia/models/vesta.3ds share/celestia/models/vesta.cmod share/celestia/shaders/bumpdiffuse.vp share/celestia/shaders/bumpdiffuse_arb.vp @@ -129,34 +109,41 @@ 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/sample_nv.fp 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 @@ -174,8 +161,6 @@ 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-spec.png -share/celestia/textures/lores/earth.jpg share/celestia/textures/lores/earth.png share/celestia/textures/lores/earthnight.jpg share/celestia/textures/lores/enceladus.jpg @@ -184,11 +169,16 @@ 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/gasgiant.jpg -share/celestia/textures/lores/gasgiantnight.jpg share/celestia/textures/lores/gaspramosaic.jpg share/celestia/textures/lores/gstar.jpg share/celestia/textures/lores/hyperion-lok.jpg @@ -199,12 +189,10 @@ 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/jupiterlike.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/mercurybump.jpg share/celestia/textures/lores/mimas-lok-mask.png share/celestia/textures/lores/mimas.jpg share/celestia/textures/lores/miranda-lok-mask.png @@ -217,6 +205,7 @@ 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 @@ -237,6 +226,7 @@ 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 @@ -250,8 +240,6 @@ 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-spec.png -share/celestia/textures/medres/earth.jpg share/celestia/textures/medres/earth.png share/celestia/textures/medres/earthnight.jpg share/celestia/textures/medres/enceladus.jpg @@ -259,9 +247,14 @@ 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/gasgiant.jpg -share/celestia/textures/medres/gasgiantnight.jpg share/celestia/textures/medres/gaspramosaic.jpg share/celestia/textures/medres/gstar.jpg share/celestia/textures/medres/hyperion-lok.jpg @@ -275,11 +268,9 @@ 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/jupiterlike.jpg share/celestia/textures/medres/mars.jpg share/celestia/textures/medres/marsbump.jpg share/celestia/textures/medres/mercury.jpg -share/celestia/textures/medres/mercurybump.jpg share/celestia/textures/medres/mimas.jpg share/celestia/textures/medres/miranda.jpg share/celestia/textures/medres/moon.jpg @@ -288,11 +279,11 @@ 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/renova.jpg share/celestia/textures/medres/rhea.jpg share/celestia/textures/medres/saturn.jpg share/celestia/textures/medres/tethys.jpg @@ -303,20 +294,27 @@ 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/doc/html/celestia/manual/celestia.html -share/doc/html/celestia/manual/manual.css -share/doc/html/celestia/manual/movement.html -share/doc/html/celestia/manual/starting.html share/examples/celestia/celestia.cfg.default -@exec ${MKDIR} %D/share/celestia/textures/hires +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/el/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/en/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/pt_br/LC_MESSAGES/celestia.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/celestia.mo @dirrm share/examples/celestia -@dirrm share/doc/html/celestia/manual -@dirrm share/doc/html/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 diff --git a/misc/celestia/PLIST.gtk b/misc/celestia/PLIST.gtk new file mode 100644 index 00000000000..40a0a509124 --- /dev/null +++ b/misc/celestia/PLIST.gtk @@ -0,0 +1,5 @@ +@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 new file mode 100644 index 00000000000..86b36fffab5 --- /dev/null +++ b/misc/celestia/PLIST.kde @@ -0,0 +1,56 @@ +@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 index 9870e36ced6..ef55d46e0c7 100644 --- a/misc/celestia/distinfo +++ b/misc/celestia/distinfo @@ -1,15 +1,13 @@ -$NetBSD: distinfo,v 1.8 2006/01/20 03:09:17 joerg Exp $ +$NetBSD: distinfo,v 1.9 2006/02/17 23:46:39 adam Exp $ -SHA1 (celestia-1.3.2.tar.gz) = 3407610f3844cd8aaf4f079e1ec5b0c236d3d547 -RMD160 (celestia-1.3.2.tar.gz) = 4f891866be70a2d918bdb75ad4fd7d4dddcef4ce -Size (celestia-1.3.2.tar.gz) = 18091458 bytes -SHA1 (patch-aa) = ec2d90e1a6211acf02e5fd89dcf0f7a100394fa0 -SHA1 (patch-ab) = 40c925ad12cc52b3034bcd15720b3c6483e2fdc1 -SHA1 (patch-ac) = 269d67d161cb9fb3e3832c2176b6f7bd9de34da0 -SHA1 (patch-ad) = a0567e08ab982bff12bda44233938e6f98904025 -SHA1 (patch-ae) = 09923dc44ed2c16193f634360f49c9fd12bab353 +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) = 06ecb4fb7fa13702bd8dfc2fcf8d240fbb2a4b08 +SHA1 (patch-ac) = 22e1ed46c832f97a4f2f20b5b6d6255469ea6b90 +SHA1 (patch-ad) = f7d9d5c3d80385eaba721045ea619f15fa3af326 +SHA1 (patch-ae) = a7ac58087cc366119f4ac5b193b49dc87ecc261c SHA1 (patch-af) = df2dae0d054a475ee98286281780037f088f07bc SHA1 (patch-ag) = 16a8ae890c82bf1fa4f89953a5ebfc1c07ec1491 -SHA1 (patch-ah) = d48d210f7ddc35c85e86600f3c3cac2f425f372a -SHA1 (patch-ai) = 26e44588bf810d9002249bb7dab3581d6ba1bdc9 -SHA1 (patch-aj) = 36a1a71e630b7fe477dd0c6413b29dffa33e8111 +SHA1 (patch-ah) = 90f20cbbf4a8f187ea39de23f0e5b13aa4e10fb6 +SHA1 (patch-aj) = 1ef7a10260a3b1476392c4cae17081ab0e7771b4 diff --git a/misc/celestia/options.mk b/misc/celestia/options.mk new file mode 100644 index 00000000000..4b135b561ab --- /dev/null +++ b/misc/celestia/options.mk @@ -0,0 +1,36 @@ +# $NetBSD: options.mk,v 1.1 2006/02/17 23:46:39 adam 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 +. include "../../x11/kdelibs3/buildlink3.mk" +.endif + +PLIST_SRC+= ${PKGDIR}/PLIST diff --git a/misc/celestia/patches/patch-aa b/misc/celestia/patches/patch-aa index fb472996de6..367461c55b2 100644 --- a/misc/celestia/patches/patch-aa +++ b/misc/celestia/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2004/11/10 16:38:51 adam Exp $ +$NetBSD: patch-aa,v 1.4 2006/02/17 23:46:39 adam Exp $ ---- configure.orig 2004-08-23 07:15:43.000000000 +0000 +--- configure.orig 2006-02-15 22:53:09.000000000 +0100 +++ configure -@@ -14591,8 +14591,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo +@@ -21716,8 +21716,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo CELESTIA_CPPFLAGS="" @@ -11,5 +11,70 @@ $NetBSD: patch-aa,v 1.3 2004/11/10 16:38:51 adam Exp $ +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' ++ kde_icondir='\${datadir}/kde/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 diff --git a/misc/celestia/patches/patch-ab b/misc/celestia/patches/patch-ab deleted file mode 100644 index 7d957019121..00000000000 --- a/misc/celestia/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2004/11/10 16:38:27 adam Exp $ - ---- manual/Makefile.in.orig 2004-08-23 07:22:06.000000000 +0000 -+++ manual/Makefile.in -@@ -69,7 +69,7 @@ target_triplet = @target@ - EXEEXT = @EXEEXT@ - OBJEXT = @OBJEXT@ - PATH_SEPARATOR = @PATH_SEPARATOR@ --pkgdatadir = @datadir@/@PACKAGE@/manual -+pkgdatadir = @datadir@/doc/html/@PACKAGE@/manual - AMTAR = @AMTAR@ - ARTSCCONFIG = @ARTSCCONFIG@ - AS = @AS@ diff --git a/misc/celestia/patches/patch-ac b/misc/celestia/patches/patch-ac index 0f33db57dbb..b89e3c01547 100644 --- a/misc/celestia/patches/patch-ac +++ b/misc/celestia/patches/patch-ac @@ -1,31 +1,22 @@ -$NetBSD: patch-ac,v 1.3 2004/11/16 14:34:39 adam Exp $ +$NetBSD: patch-ac,v 1.4 2006/02/17 23:46:39 adam Exp $ ---- src/celestia/kde/celestialbrowser.cpp.orig 2004-11-15 17:03:29.000000000 +0000 -+++ src/celestia/kde/celestialbrowser.cpp -@@ -138,7 +138,7 @@ void CelestialBrowser::slotRefresh() - QString starClass(buf); +--- config.h.in.orig 2006-02-15 22:53:21.000000000 +0100 ++++ config.h.in +@@ -248,7 +248,7 @@ int res_init(void); - CelListViewItem *starItem = new CelListViewItem(listStars, QString(name), -- QString::fromUtf8(ReplaceGreekLetterAbbr(name).c_str()), dist, appMag, absMag, starClass); -+ QString(name), dist, appMag, absMag, starClass); - - SolarSystemCatalog::iterator iter = solarSystemCatalog->find(star->getCatalogNumber()); - if (iter != solarSystemCatalog->end()) -@@ -156,7 +156,7 @@ void CelestialBrowser::slotRefresh() - sprintf(buf, " %.2f au", starBodyDist / KM_PER_AU); - QString distStarBody(buf); - -- CelListViewItem *planetItem = new CelListViewItem(starItem, QString(body->getName()), -+ CelListViewItem *planetItem = new CelListViewItem(starItem, QString(body->getName().c_str()), - QString::fromUtf8(body->getName().c_str()), - distStarBody, "", "", getClassification(body->getClassification())); - -@@ -173,7 +173,7 @@ void CelestialBrowser::slotRefresh() - sprintf(buf, " %.0f km", bodySatDist); - QString distBodySat(buf); - -- new CelListViewItem(planetItem, QString(sat->getName()), -+ new CelListViewItem(planetItem, QString(sat->getName().c_str()), - QString::fromUtf8(sat->getName().c_str()), - distBodySat, "", "", getClassification(sat->getClassification())); + +-#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 index 793414e74ab..45cd61c9a3e 100644 --- a/misc/celestia/patches/patch-ad +++ b/misc/celestia/patches/patch-ad @@ -1,13 +1,13 @@ -$NetBSD: patch-ad,v 1.2 2004/11/10 16:38:27 adam Exp $ +$NetBSD: patch-ad,v 1.3 2006/02/17 23:46:40 adam Exp $ ---- src/celestia/celestiacore.cpp.orig 2004-07-30 07:10:10.000000000 +0000 +--- src/celestia/celestiacore.cpp.orig 2006-02-08 10:03:15.000000000 +0100 +++ src/celestia/celestiacore.cpp -@@ -3454,7 +3454,7 @@ bool CelestiaCore::initSimulation() +@@ -3547,7 +3547,7 @@ bool CelestiaCore::initSimulation(const } - #endif - -- config = ReadCelestiaConfig("celestia.cfg"); -+ config = ReadCelestiaConfig(PKG_SYSCONFDIR "/celestia.cfg"); - if (config == NULL) + else { - fatalError("Error reading configuration file.");; +- 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 index 6215481fe49..8665bdbf545 100644 --- a/misc/celestia/patches/patch-ae +++ b/misc/celestia/patches/patch-ae @@ -1,13 +1,21 @@ -$NetBSD: patch-ae,v 1.3 2004/11/10 16:38:27 adam Exp $ +$NetBSD: patch-ae,v 1.4 2006/02/17 23:46:40 adam Exp $ ---- Makefile.in.orig 2004-08-23 07:22:06.000000000 +0000 +--- Makefile.in.orig 2006-02-15 22:53:42.000000000 +0100 +++ Makefile.in -@@ -255,7 +255,7 @@ x_includes = @x_includes@ - x_libraries = @x_libraries@ - dosstuff = celestia.mak $(wildcard *.bat) - noinst_DATA = devguide.txt $(dosstuff) --pkgdata_DATA = celestia.cfg $(wildcard *.cel) controls.txt COPYING -+pkgdata_DATA = $(wildcard *.cel) controls.txt COPYING +@@ -307,7 +307,6 @@ noinst_DATA = \ - EXTRA_DIST = $(pkgdata_DATA) $(noinst_DATA) admin + 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-ah b/misc/celestia/patches/patch-ah index fb348347626..e0220780003 100644 --- a/misc/celestia/patches/patch-ah +++ b/misc/celestia/patches/patch-ah @@ -1,19 +1,12 @@ -$NetBSD: patch-ah,v 1.1 2005/06/20 06:02:30 hira Exp $ +$NetBSD: patch-ah,v 1.2 2006/02/17 23:46:40 adam Exp $ ---- src/celestia/gtk/data/Makefile.in.orig 2004-08-23 16:22:09.000000000 +0900 -+++ src/celestia/gtk/data/Makefile.in 2005-06-20 01:12:04.000000000 +0900 -@@ -253,11 +253,11 @@ - qt_libraries = @qt_libraries@ - x_includes = @x_includes@ - x_libraries = @x_libraries@ --schemasdir = $(GCONF_SCHEMA_FILE_DIR) --schemas_DATA = celestia.schemas -+@ENABLE_GTK_TRUE@schemasdir = $(GCONF_SCHEMA_FILE_DIR) -+@ENABLE_GTK_TRUE@schemas_DATA = celestia.schemas +--- 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 + #define _(s) gettext(s) + #endif - EXTRA_DIST = $(schemas_DATA) celestia.png celestia.desktop --pkgdata_DATA = celestia.png -+@ENABLE_GTK_FALSE@pkgdata_DATA = celestia.png - - @ENABLE_GTK_TRUE@Applicationsdir = $(datadir)/applications - @ENABLE_GTK_TRUE@Applications_DATA = celestia.desktop diff --git a/misc/celestia/patches/patch-ai b/misc/celestia/patches/patch-ai deleted file mode 100644 index 22cdf9a64ea..00000000000 --- a/misc/celestia/patches/patch-ai +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2006/01/20 03:09:17 joerg Exp $ - ---- src/celutil/resmanager.h.orig 2006-01-20 02:31:51.000000000 +0000 -+++ src/celutil/resmanager.h -@@ -72,7 +72,7 @@ template class ResourceManager - { - ResourceHandle h = handles.size(); - resources.insert(resources.end(), info); -- handles.insert(ResourceHandleMap::value_type(info, h)); -+ handles.insert(typename ResourceHandleMap::value_type(info, h)); - return h; - } - } -@@ -105,7 +105,7 @@ template class ResourceManager - else - { - resources[h].state = ResourceLoaded; -- loadedResources.insert(NameMap::value_type(resources[h].resolvedName, resources[h].resource)); -+ loadedResources.insert(typename NameMap::value_type(resources[h].resolvedName, resources[h].resource)); - } - } - } diff --git a/misc/celestia/patches/patch-aj b/misc/celestia/patches/patch-aj index 0c3e13568ac..8528710b8d1 100644 --- a/misc/celestia/patches/patch-aj +++ b/misc/celestia/patches/patch-aj @@ -1,8 +1,8 @@ -$NetBSD: patch-aj,v 1.1 2006/01/20 03:09:17 joerg Exp $ +$NetBSD: patch-aj,v 1.2 2006/02/17 23:46:40 adam Exp $ ---- src/celestia/glutmain.cpp.orig 2006-01-20 02:46:31.000000000 +0000 +--- src/celestia/glutmain.cpp.orig 2005-07-19 22:30:59.000000000 +0200 +++ src/celestia/glutmain.cpp -@@ -511,7 +511,7 @@ int main(int argc, char* argv[]) +@@ -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)); -- cgit v1.2.3