diff options
| -rw-r--r-- | misc/celestia/Makefile | 17 | ||||
| -rw-r--r-- | misc/celestia/Makefile.common | 31 | ||||
| -rw-r--r-- | misc/celestia/PLIST | 137 | ||||
| -rw-r--r-- | misc/celestia/distinfo | 15 | ||||
| -rw-r--r-- | misc/celestia/patches/patch-aa | 154 | ||||
| -rw-r--r-- | misc/celestia/patches/patch-ab | 20 | ||||
| -rw-r--r-- | misc/celestia/patches/patch-ac | 12 | ||||
| -rw-r--r-- | misc/celestia/patches/patch-ad | 8 | ||||
| -rw-r--r-- | misc/celestia/patches/patch-ae | 8 |
9 files changed, 165 insertions, 237 deletions
diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile index db45a9f375f..a4453627af9 100644 --- a/misc/celestia/Makefile +++ b/misc/celestia/Makefile @@ -1,25 +1,14 @@ -# $NetBSD: Makefile,v 1.4 2004/04/24 18:53:40 snj Exp $ -# - -.include "../../misc/celestia/Makefile.common" +# $NetBSD: Makefile,v 1.5 2004/11/10 16:38:27 adam Exp $ COMMENT= Free real-time 3D space simulator -USE_PKGINSTALL= YES - -CONFIGURE_ARGS+= --without-gtk -CONFIGURE_ARGS+= --without-kde +USE_PKGINSTALL= yes EGDIR= ${PREFIX}/share/examples/celestia - CONF_FILES= ${EGDIR}/celestia.cfg.default ${PKG_SYSCONFDIR}/celestia.cfg post-install: ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/celestia.cfg ${EGDIR}/celestia.cfg.default -.include "../../graphics/Mesa/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" +.include "../../misc/celestia/Makefile.common" diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common index 48937ccc0ba..f83ab67c0db 100644 --- a/misc/celestia/Makefile.common +++ b/misc/celestia/Makefile.common @@ -1,8 +1,6 @@ -# $NetBSD: Makefile.common,v 1.7 2004/10/03 00:12:58 tv Exp $ -# +# $NetBSD: Makefile.common,v 1.8 2004/11/10 16:38:27 adam Exp $ DISTNAME= celestia-${CELESTIA_VERS} -PKGREVISION= 2 CATEGORIES= misc x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=celestia/} @@ -12,18 +10,17 @@ HOMEPAGE= http://www.shatters.net/celestia/ DISTINFO_FILE= ${.CURDIR}/../../misc/celestia/distinfo PATCHDIR= ${.CURDIR}/../../misc/celestia/patches -CELESTIA_VERS= 1.3.0 +CELESTIA_VERS= 1.3.2 -USE_BUILDLINK3= YES -GNU_CONFIGURE= YES -USE_X11= YES -USE_GNU_TOOLS+= make -USE_LIBTOOL= YES +USE_BUILDLINK3= yes +USE_GNU_TOOLS+= make +USE_LIBTOOL= yes +USE_X11= yes +GNU_CONFIGURE= yes +#CONFIGURE_ARGS+= --includedir=${PREFIX}/include +CONFIGURE_ARGS+= --with-lua --with-glut -CONFIGURE_ARGS+= --includedir=${PREFIX}/include -CONFIGURE_ARGS+= --with-lua=${BUILDLINK_PREFIX.lua} - -CXXFLAGS= -DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\" +CXXFLAGS+= -DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\" .include "../../mk/bsd.prefs.mk" @@ -31,9 +28,15 @@ CXXFLAGS= -DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\" CONFIGURE_ARGS+= --with-xinerama .endif -.include "../../lang/lua/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") CONFIGURE_ARGS+= --disable-threading .endif + +.include "../../graphics/glut/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" +.include "../../graphics/png/buildlink3.mk" +.include "../../lang/lua/buildlink3.mk" + +.include "../../mk/bsd.pkg.mk" diff --git a/misc/celestia/PLIST b/misc/celestia/PLIST index e1f95ccfb1f..9d14b21f712 100644 --- a/misc/celestia/PLIST +++ b/misc/celestia/PLIST @@ -1,25 +1,45 @@ -@comment $NetBSD: PLIST,v 1.2 2003/05/09 00:23:56 salo Exp $ +@comment $NetBSD: PLIST,v 1.3 2004/11/10 16:38:27 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 share/celestia/data/boundaries.dat +share/celestia/data/cassini.xyz +share/celestia/data/comets.ssc share/celestia/data/deepsky.dsc share/celestia/data/extrasolar.ssc -share/celestia/data/galaxies.dat share/celestia/data/galileo.xyz -share/celestia/data/hdnames.dat +share/celestia/data/huygens.xyz +share/celestia/data/outersys.ssc share/celestia/data/solarsys.ssc +share/celestia/data/solsys_locs.ssc +share/celestia/data/spacecraft.ssc share/celestia/data/starnames.dat share/celestia/data/stars.dat +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 @@ -32,142 +52,220 @@ 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/amalthea.3ds +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/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 +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/diffuse_arb.vp +share/celestia/shaders/diffuse_nv.fp share/celestia/shaders/diffuse_texoff.vp share/celestia/shaders/diffuse_texoff_arb.vp +share/celestia/shaders/eclipse1_nv.fp +share/celestia/shaders/eclipse2_nv.fp share/celestia/shaders/glossmap_arb.vp share/celestia/shaders/haze.vp share/celestia/shaders/haze_arb.vp +share/celestia/shaders/multishadow_arb.vp share/celestia/shaders/night.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/specular_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/start.cel -share/celestia/textures/astar.jpg -share/celestia/textures/bstar.jpg share/celestia/textures/flare.jpg -share/celestia/textures/gstar.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.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-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 +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/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 +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/jupiterlike.jpg share/celestia/textures/lores/mars.jpg -share/celestia/textures/lores/marsbump1k.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 share/celestia/textures/lores/miranda.jpg share/celestia/textures/lores/moon.jpg -share/celestia/textures/lores/moonbump1k.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/pluto.jpg -share/celestia/textures/lores/plutobump1k.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/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-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 +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/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 +share/celestia/textures/medres/hyperion.jpg share/celestia/textures/medres/iapetus.jpg share/celestia/textures/medres/idamosaic.jpg share/celestia/textures/medres/io.jpg @@ -175,43 +273,48 @@ 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/jupiterlike.jpg share/celestia/textures/medres/mars.jpg -share/celestia/textures/medres/marsbump1k.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 -share/celestia/textures/medres/moonbump1k.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/pluto.jpg -share/celestia/textures/medres/plutobump1k.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 +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/venussurface.jpg -share/celestia/textures/mstar.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 @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 -@exec ${MKDIR} %D/share/celestia/textures/hires @dirrm share/celestia/textures/hires @dirrm share/celestia/textures @dirrm share/celestia/shaders diff --git a/misc/celestia/distinfo b/misc/celestia/distinfo index 2247fac2480..262e128c94b 100644 --- a/misc/celestia/distinfo +++ b/misc/celestia/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.3 2003/11/27 13:45:25 markd Exp $ +$NetBSD: distinfo,v 1.4 2004/11/10 16:38:27 adam Exp $ -SHA1 (celestia-1.3.0.tar.gz) = 1ec0c5520f9ca44d76df8828afe6cd2f3d361894 -Size (celestia-1.3.0.tar.gz) = 15935711 bytes -SHA1 (patch-aa) = 1523b4faec51534b2e0df05b93071b93c5c2f493 -SHA1 (patch-ab) = 8e452ab8d693d0b79c89805adb6b876708285ec1 -SHA1 (patch-ac) = 47bf6f71ea272f82dbbf661cd38e1a0f3e31abd3 -SHA1 (patch-ad) = 76d5382d61154456d3f128e7ff170aaab0c2898b -SHA1 (patch-ae) = 0487878520c9328adb27cd7b60f0f50e362f897e +SHA1 (celestia-1.3.2.tar.gz) = 3407610f3844cd8aaf4f079e1ec5b0c236d3d547 +Size (celestia-1.3.2.tar.gz) = 18091458 bytes +SHA1 (patch-aa) = ec2d90e1a6211acf02e5fd89dcf0f7a100394fa0 +SHA1 (patch-ab) = 40c925ad12cc52b3034bcd15720b3c6483e2fdc1 +SHA1 (patch-ad) = a0567e08ab982bff12bda44233938e6f98904025 +SHA1 (patch-ae) = 09923dc44ed2c16193f634360f49c9fd12bab353 SHA1 (patch-af) = df2dae0d054a475ee98286281780037f088f07bc SHA1 (patch-ag) = 16a8ae890c82bf1fa4f89953a5ebfc1c07ec1491 diff --git a/misc/celestia/patches/patch-aa b/misc/celestia/patches/patch-aa deleted file mode 100644 index 14f3fba8d49..00000000000 --- a/misc/celestia/patches/patch-aa +++ /dev/null @@ -1,154 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/05/08 23:47:03 salo Exp $ - ---- configure.orig 2003-04-16 09:03:21.000000000 +0200 -+++ configure 2003-05-08 18:06:45.000000000 +0200 -@@ -14924,7 +14924,7 @@ - else - enable_debug="no" - fi; --if test "$enable_debug" == "yes" ; then -+if test "$enable_debug" = "yes" ; then - CELESTIA_CFLAGS="-g -Wall"; CELESTIA_CXXFLAGS="-g -Wall" - cat >>confdefs.h <<\_ACEOF - #define DEBUG 1 -@@ -14943,7 +14943,7 @@ - else - enable_pedantic="no" - fi; --if test "$enable_pedantic" == "yes" ; then -+if test "$enable_pedantic" = "yes" ; then - CELESTIA_CFLAGS="$CELESTIA_CFLAGS -ansi -pedantic"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pedantic" - fi - echo "$as_me:$LINENO: result: $enable_pedantic" >&5 -@@ -14958,7 +14958,7 @@ - else - enable_profile="no" - fi; --if test "$enable_profile" == "yes" ; then -+if test "$enable_profile" = "yes" ; then - CELESTIA_CFLAGS="$CELESTIA_CFLAGS -pg"; CELESTIA_CXXFLAGS="$CELESTIA_CXXFLAGS -pg" - else - if test "$enable_debug" != "yes" ; then -@@ -15026,7 +15026,7 @@ - - echo "$as_me:$LINENO: checking whether to enable GLUT" >&5 - echo $ECHO_N "checking whether to enable GLUT... $ECHO_C" >&6 --if test "$enable_gtk" == "no" -a "$gtk_by_default" == "no" -a "$enable_kde" == "no" -a "$kde_by_default" == "no"; then -+if test "$enable_gtk" = "no" -a "$gtk_by_default" = "no" -a "$enable_kde" = "no" -a "$kde_by_default" = "no"; then - enable_glut="yes" - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 -@@ -15035,15 +15035,15 @@ - echo "${ECHO_T}no" >&6 - fi - --if test "$enable_gtk" != "no" -a "$gtk_by_default" == "no" -a "$enable_kde" != "no" -a "$kde_by_default" == "no"; then -+if test "$enable_gtk" != "no" -a "$gtk_by_default" = "no" -a "$enable_kde" != "no" -a "$kde_by_default" = "no"; then - enable_gtk="no" - fi - --if test "$enable_gtk" != "no" -a "$gtk_by_default" == "no" -a "$kde_by_default" == "yes" ; then -+if test "$enable_gtk" != "no" -a "$gtk_by_default" = "no" -a "$kde_by_default" = "yes" ; then - enable_kde="no" - fi - --if test "$enable_gtk" == "no" -a "$gtk_by_default" == "yes" -a "$enable_kde" == "no" -a "$kde_by_default" == "no" ; then -+if test "$enable_gtk" = "no" -a "$gtk_by_default" = "yes" -a "$enable_kde" = "no" -a "$kde_by_default" = "no" ; then - enable_gtk="yes" - fi - -@@ -15058,7 +15058,7 @@ - echo "$as_me:$LINENO: result: GTK" >&5 - echo "${ECHO_T}GTK" >&6 - fi --if test "$enable_glut" == "yes" ; then -+if test "$enable_glut" = "yes" ; then - echo "$as_me:$LINENO: result: GLUT" >&5 - echo "${ECHO_T}GLUT" >&6 - fi -@@ -15067,7 +15067,7 @@ - - echo "$as_me:$LINENO: checking whether to disable GTK." >&5 - echo $ECHO_N "checking whether to disable GTK.... $ECHO_C" >&6 --if test "$enable_gtk" == "yes" ; then -+if test "$enable_gtk" = "yes" ; then - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 - -@@ -15376,7 +15376,7 @@ - rm -f conf.gtktest - - -- if test "$enable_gtk_by_default" == "no" -a "$enable_gtk" == "no"; then -+ if test "$enable_gtk_by_default" = "no" -a "$enable_gtk" = "no"; then - echo "$as_me:$LINENO: result: Unable to find GTK" >&5 - echo "${ECHO_T}Unable to find GTK" >&6 - enable_glut="yes" -@@ -20537,7 +20537,7 @@ - fi - - --if test "$enable_gtk" != "no" -o "$enable_glut" == "yes" ; then -+if test "$enable_gtk" != "no" -o "$enable_glut" = "yes" ; then - - for ac_header in GL/glut.h - do -@@ -20756,7 +20756,7 @@ - fi - - --if test "$enable_glut" == "yes"; then -+if test "$enable_glut" = "yes"; then - ENABLE_GLUT_TRUE= - ENABLE_GLUT_FALSE='#' - else -@@ -20835,7 +20835,7 @@ - fi - - -- if test "$enable_gtk_by_default" == "no" -a "$enable_gtk" == "no"; then -+ if test "$enable_gtk_by_default" = "no" -a "$enable_gtk" = "no"; then - { { echo "$as_me:$LINENO: error: Unable to find gtkglarea" >&5 - echo "$as_me: error: Unable to find gtkglarea" >&2;} - { (exit 1); exit 1; }; } -@@ -22103,7 +22103,7 @@ - LIBS="$LIBS $GTK_LIBS $GNOME_LIBS $GNOMEUI_LIBS $GTKGL_LIBS" - LDFLAGS="$LDFLAGS $GNOME_LIBDIR" - else -- if test "$enable_gtk_by_default" == "yes" ; then -+ if test "$enable_gtk_by_default" = "yes" ; then - { echo "$as_me:$LINENO: WARNING: Disabled GTK GUI because of missing necessary packages" >&5 - echo "$as_me: WARNING: Disabled GTK GUI because of missing necessary packages" >&2;} - fi -@@ -22111,7 +22111,7 @@ - fi - - --if test "$enable_gtk" == "yes"; then -+if test "$enable_gtk" = "yes"; then - ENABLE_GTK_TRUE= - ENABLE_GTK_FALSE='#' - else -@@ -29752,7 +29752,7 @@ - fi - - --if test "$enable_kde" == "yes"; then -+if test "$enable_kde" = "yes"; then - ENABLE_KDE_TRUE= - ENABLE_KDE_FALSE='#' - else -@@ -30423,12 +30423,7 @@ - prefix=$ac_default_prefix - fi - --if test "$enable_kde" == "yes" ; then -- PKGDATADIR=`eval echo "${kde_datadir}/$PACKAGE"` -- datadir=${kde_datadir} --else -- PKGDATADIR=`eval echo "${datadir}/$PACKAGE"` --fi -+PKGDATADIR=`eval echo "${datadir}/$PACKAGE"` - - - cat >>confdefs.h <<_ACEOF diff --git a/misc/celestia/patches/patch-ab b/misc/celestia/patches/patch-ab index 6755fac367e..7d957019121 100644 --- a/misc/celestia/patches/patch-ab +++ b/misc/celestia/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/05/08 23:47:03 salo Exp $ +$NetBSD: patch-ab,v 1.2 2004/11/10 16:38:27 adam Exp $ ---- manual/Makefile.in.orig 2003-04-16 09:04:31.000000000 +0200 -+++ manual/Makefile.in 2003-05-07 23:38:16.000000000 +0200 -@@ -38,7 +38,7 @@ - build_triplet = @build@ - host_triplet = @host@ - target_triplet = @target@ +--- 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 - ACLOCAL = @ACLOCAL@ - AMDEP_FALSE = @AMDEP_FALSE@ - AMDEP_TRUE = @AMDEP_TRUE@ + AMTAR = @AMTAR@ + ARTSCCONFIG = @ARTSCCONFIG@ + AS = @AS@ diff --git a/misc/celestia/patches/patch-ac b/misc/celestia/patches/patch-ac deleted file mode 100644 index 826f740b2b6..00000000000 --- a/misc/celestia/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/05/08 23:47:03 salo Exp $ - ---- src/celestia/kde/kdeapp.h.orig 2003-04-09 09:14:04.000000000 +0200 -+++ src/celestia/kde/kdeapp.h 2003-05-08 18:45:02.000000000 +0200 -@@ -22,6 +22,7 @@ - #include <config.h> - #endif - -+#include <time.h> - #include <kapp.h> - #include <qwidget.h> - #include <kmainwindow.h> diff --git a/misc/celestia/patches/patch-ad b/misc/celestia/patches/patch-ad index 7bf160f5f18..793414e74ab 100644 --- a/misc/celestia/patches/patch-ad +++ b/misc/celestia/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2003/05/08 23:47:03 salo Exp $ +$NetBSD: patch-ad,v 1.2 2004/11/10 16:38:27 adam Exp $ ---- src/celestia/celestiacore.cpp.orig 2003-04-14 19:58:00.000000000 +0200 -+++ src/celestia/celestiacore.cpp 2003-05-08 23:46:34.000000000 +0200 -@@ -2658,7 +2658,7 @@ +--- src/celestia/celestiacore.cpp.orig 2004-07-30 07:10:10.000000000 +0000 ++++ src/celestia/celestiacore.cpp +@@ -3454,7 +3454,7 @@ bool CelestiaCore::initSimulation() } #endif diff --git a/misc/celestia/patches/patch-ae b/misc/celestia/patches/patch-ae index 336f03bc7be..6215481fe49 100644 --- a/misc/celestia/patches/patch-ae +++ b/misc/celestia/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2003/05/09 00:23:56 salo Exp $ +$NetBSD: patch-ae,v 1.3 2004/11/10 16:38:27 adam Exp $ ---- Makefile.in.orig 2003-04-16 09:04:31.000000000 +0200 -+++ Makefile.in 2003-05-08 23:54:18.000000000 +0200 -@@ -270,7 +270,7 @@ +--- Makefile.in.orig 2004-08-23 07:22:06.000000000 +0000 ++++ Makefile.in +@@ -255,7 +255,7 @@ x_includes = @x_includes@ x_libraries = @x_libraries@ dosstuff = celestia.mak $(wildcard *.bat) noinst_DATA = devguide.txt $(dosstuff) |