Date: Tue, 13 Jan 2004 00:45:01 +0100 (CET) From: Jean-Yves Lefort <jylefort@brutele.be> To: FreeBSD-gnats-submit@FreeBSD.org Cc: trevor@FreeBSD.org Subject: ports/61280: Update port: astro/celestia to 1.3.1 Message-ID: <20040112234501.2DD6822E1B@jsite.lefort.net> Resent-Message-ID: <200401122350.i0CNoFG9069933@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 61280
>Category: ports
>Synopsis: Update port: astro/celestia to 1.3.1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 12 15:50:15 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Jean-Yves Lefort
>Release: FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
System: FreeBSD jsite.lefort.net 4.9-RELEASE FreeBSD 4.9-RELEASE #0: Tue Dec 2 09:53:57 CET 2003 jylefort@jsite.lefort.net:/usr/obj/usr/src/sys/JSITE i386
>Description:
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/astro/celestia/Makefile celestia/Makefile
--- /usr/ports/astro/celestia/Makefile Sun Aug 31 12:22:54 2003
+++ celestia/Makefile Tue Jan 13 00:31:16 2004
@@ -2,11 +2,11 @@
# Date created: 2002-05-17
# Whom: trevor
#
-# $FreeBSD: ports/astro/celestia/Makefile,v 1.10 2003/08/31 04:37:44 edwin Exp $
+# $FreeBSD$
#
PORTNAME= celestia
-PORTVERSION= 1.2.4
+PORTVERSION= 1.3.1
CATEGORIES= astro
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= celestia
@@ -16,65 +16,79 @@
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.5:${PORTSDIR}/graphics/png \
- gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
+ png.5:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
PLIST= ${WRKDIR}/pkg-plist
USE_REINPLACE= yes
USE_GMAKE= yes
-USE_MESA= yes
+USE_GL= yes
USE_X_PREFIX= yes
-.if !defined(WITHOUT_GNOME)
-USE_GNOME= gnomelibs
-.endif
-CONFIGURE_ARGS= --prefix=${PREFIX} \
- --includedir="${LOCALBASE}/include" \
- --libdir="${LOCALBASE}/lib"
+# GTK+ support is deprecated and broken
+CONFIGURE_ARGS= --without-gtk
+
CONFIGURE_ENV= \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS}" \
- CPPFLAGS="-I${X11BASE}/include -I${X11BASE}/include/GL -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
+ CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
-.if defined(WITHOUT_GNOME)
-CONFIGURE_ARGS+= --without-gtk
+.if defined(WITH_KDE)
+USE_KDELIBS_VER= 3
+CONFIGURE_ARGS+= --with-kde
+.else
+CONFIGURE_ARGS+= --without-kde
.endif
+.if defined(WITH_LUA)
+LIB_DEPENDS+= lua.5:${PORTSDIR}/lang/lua
+CONFIGURE_ARGS+= --with-lua
+.else
+CONFIGURE_ARGS+= --without-lua
+.endif
+
+pre-everything::
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} "You may use the following build options:"
+ @${ECHO_CMD} ""
+ @${ECHO_CMD} " WITH_KDE=yes Enable KDE support"
+ @${ECHO_CMD} " WITH_LUA=yes Enable Lua support"
+ @${ECHO_CMD} ""
+
pre-patch:
- ${REINPLACE_CMD} -e \
+ @${REINPLACE_CMD} -e \
's:-O2::g; s:-Wall::g; s:-ffast-math::g; s:-fexpensive-optimizations::g; s:! /bin/sh:! ${LOCALBASE}/bin/bash:g' \
${WRKSRC}/configure
pre-install:
- ${ECHO_CMD} bin/celestia > ${PLIST}
- ${FIND} ${WRKSRC}/data/ -name '*.???' | \
+ @${ECHO_CMD} bin/celestia > ${PLIST}
+ @${FIND} ${WRKSRC}/data/ -name '*.???' | \
${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
- ${FIND} ${WRKSRC}/extras/ -name '*.ssc' | \
+ @${FIND} ${WRKSRC}/extras/ -name '*.ssc' | \
${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
- ${FIND} ${WRKSRC}/fonts/ -name '*.txf' | \
+ @${FIND} ${WRKSRC}/fonts/ -name '*.txf' | \
${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
.for ii in celestia.cfg demo.cel guide.cel start.cel
- ${ECHO_CMD} share/celestia/${ii} >> ${PLIST}
+ @${ECHO_CMD} share/celestia/${ii} >> ${PLIST}
.endfor
.if !defined(NOPORTDOCS)
-.for ii in AUTHORS COPYING ChangeLog INSTALL README TODO controls.txt
- ${ECHO_CMD} share/doc/celestia/${ii} >> ${PLIST}
+.for ii in AUTHORS ChangeLog README TODO controls.txt
+ @${ECHO_CMD} share/doc/celestia/${ii} >> ${PLIST}
.endfor
- ${FIND} ${WRKSRC}/manual/ -name '*.???*' | \
+ @${FIND} ${WRKSRC}/manual/ -name '*.???*' | \
${SED} -e "s:^${WRKSRC}/:share/doc/celestia/:g" >> ${PLIST}
.for ii in celestia/manual celestia
- ${ECHO_CMD} @dirrm share/doc/${ii} >> ${PLIST}
+ @${ECHO_CMD} @dirrm share/doc/${ii} >> ${PLIST}
.endfor
.endif
- ${FIND} ${WRKSRC}/models/ -name '*.???' | \
+ @${FIND} ${WRKSRC}/models/ -name '*.???' | \
${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
- ${FIND} ${WRKSRC}/shaders/ -name '*.vp' | \
+ @${FIND} ${WRKSRC}/shaders/ -name '*.vp' | \
${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
- ${FIND} ${WRKSRC}/textures/ -name '*.jpg' -o -name '*.png'| \
+ @${FIND} ${WRKSRC}/textures/ -name '*.jpg' -o -name '*.png'| \
${SED} -e "s:^${WRKSRC}/:share/celestia/:g" >> ${PLIST}
.for ii in /data /extras /textures/lores /textures/medres /textures /models \
/shaders /fonts /
- ${ECHO_CMD} @dirrm share/celestia${ii} >> ${PLIST}
+ @${ECHO_CMD} @dirrm share/celestia${ii} >> ${PLIST}
.endfor
do-install:
@@ -91,15 +105,15 @@
.endfor
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}/manual
-.for ii in AUTHORS COPYING ChangeLog INSTALL README TODO controls.txt
+.for ii in AUTHORS ChangeLog README TODO controls.txt
${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR}/
.endfor
${INSTALL_DATA} ${WRKSRC}/manual/*.???* ${DOCSDIR}/manual/
.endif
${INSTALL_DATA} ${WRKSRC}/models/*.??? ${DATADIR}/models/
${INSTALL_DATA} ${WRKSRC}/shaders/*.vp ${DATADIR}/shaders/
- ${INSTALL_DATA} ${WRKSRC}/textures/flare.jpg \
- ${WRKSRC}/textures/logo.png ${DATADIR}/textures/
+ ${INSTALL_DATA} ${WRKSRC}/textures/*.jpg \
+ ${WRKSRC}/textures/*.png ${DATADIR}/textures/
${INSTALL_DATA} ${WRKSRC}/textures/lores/*.??? \
${DATADIR}/textures/lores/
${INSTALL_DATA} ${WRKSRC}/textures/medres/*.??? \
diff -ruN /usr/ports/astro/celestia/distinfo celestia/distinfo
--- /usr/ports/astro/celestia/distinfo Sat May 18 05:24:20 2002
+++ celestia/distinfo Mon Jan 12 22:02:32 2004
@@ -1,2 +1 @@
-$FreeBSD: ports/astro/celestia/distinfo,v 1.1 2002/05/18 03:24:20 trevor Exp $
-MD5 (celestia-1.2.4.tar.gz) = 0378cd4507ebf4691c86a59c0825221b
+MD5 (celestia-1.3.1.tar.gz) = 6b5fd597e497b951228c83d4e756a340
diff -ruN /usr/ports/astro/celestia/files/patch-aa celestia/files/patch-aa
--- /usr/ports/astro/celestia/files/patch-aa Thu Jan 1 01:00:00 1970
+++ celestia/files/patch-aa Mon Jan 12 21:41:25 2004
@@ -0,0 +1,11 @@
+--- src/celengine/starbrowser.h.orig Mon Jan 12 20:42:39 2004
++++ src/celengine/starbrowser.h Mon Jan 12 20:42:51 2004
+@@ -12,6 +12,8 @@
+ #ifndef _CELENGINE_STARBROWSER_H_
+ #define _CELENGINE_STARBROWSER_H_
+
++using namespace std;
++
+ #include "star.h"
+ #include "stardb.h"
+ #include "simulation.h"
diff -ruN /usr/ports/astro/celestia/files/patch-ba celestia/files/patch-ba
--- /usr/ports/astro/celestia/files/patch-ba Thu Jan 1 01:00:00 1970
+++ celestia/files/patch-ba Mon Jan 12 21:41:52 2004
@@ -0,0 +1,20 @@
+--- src/celestia/celestiacore.cpp.orig Mon Jan 12 20:43:28 2004
++++ src/celestia/celestiacore.cpp Mon Jan 12 20:44:32 2004
+@@ -397,7 +397,7 @@
+ sim->setFrame(fav.coordSys, sim->getSelection());
+ }
+
+-void CelestiaCore::addFavorite(string name, string parentFolder, FavoritesList::iterator* iter)
++void CelestiaCore::addFavorite(std::string name, std::string parentFolder, FavoritesList::iterator* iter)
+ {
+ FavoritesList::iterator pos;
+ if(!iter)
+@@ -417,7 +417,7 @@
+ favorites->insert(pos, fav);
+ }
+
+-void CelestiaCore::addFavoriteFolder(string name, FavoritesList::iterator* iter)
++void CelestiaCore::addFavoriteFolder(std::string name, FavoritesList::iterator* iter)
+ {
+ FavoritesList::iterator pos;
+ if(!iter)
diff -ruN /usr/ports/astro/celestia/files/patch-ca celestia/files/patch-ca
--- /usr/ports/astro/celestia/files/patch-ca Thu Jan 1 01:00:00 1970
+++ celestia/files/patch-ca Mon Jan 12 21:42:14 2004
@@ -0,0 +1,11 @@
+--- src/celestia/glutmain.cpp.orig Mon Jan 12 20:46:44 2004
++++ src/celestia/glutmain.cpp Mon Jan 12 20:47:35 2004
+@@ -511,7 +511,7 @@
+ // 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(__FreeBSD__)
+ /* localtime in Darwin is is reentrant only
+ equiv to Linux localtime_r()
+ should probably port !MACOSX code to use this too, available since
diff -ruN /usr/ports/astro/celestia/files/patch-src::buildstardb.cpp celestia/files/patch-src::buildstardb.cpp
--- /usr/ports/astro/celestia/files/patch-src::buildstardb.cpp Sun Aug 31 06:37:45 2003
+++ celestia/files/patch-src::buildstardb.cpp Thu Jan 1 01:00:00 1970
@@ -1,29 +0,0 @@
---- src/buildstardb.cpp.orig Sat Aug 30 21:33:27 2003
-+++ src/buildstardb.cpp Sat Aug 30 21:34:05 2003
-@@ -921,7 +921,7 @@
- {
- MultistarSystem* multiSystem = new MultistarSystem();
- multiSystem->nStars = 1;
-- multiSystem->stars[0] = iter;
-+ multiSystem->stars[0] = &(*iter);
- starSystems.insert(MultistarSystemCatalog::value_type(iter->CCDMIdentifier, multiSystem));
- }
- else
-@@ -933,7 +933,7 @@
- }
- else
- {
-- multiSystem->stars[multiSystem->nStars] = iter;
-+ multiSystem->stars[multiSystem->nStars] = &(*iter);
- multiSystem->nStars++;
- }
- }
-@@ -1162,7 +1162,7 @@
- for (vector<HipparcosStar>::iterator iter = stars.begin();
- iter != stars.end(); iter++)
- {
-- starIndex.insert(starIndex.end(), iter);
-+ starIndex.insert(starIndex.end(), &(*iter));
- }
-
- HIPCatalogComparePredicate pred;
diff -ruN /usr/ports/astro/celestia/files/patch-src::celengine::starbrowser.h celestia/files/patch-src::celengine::starbrowser.h
--- /usr/ports/astro/celestia/files/patch-src::celengine::starbrowser.h Sun Aug 31 05:58:53 2003
+++ celestia/files/patch-src::celengine::starbrowser.h Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- src/celengine/starbrowser.h.orig Sat Aug 30 20:38:54 2003
-+++ src/celengine/starbrowser.h Sat Aug 30 20:39:08 2003
-@@ -12,6 +12,8 @@
- #ifndef _CELENGINE_STARBROWSER_H_
- #define _CELENGINE_STARBROWSER_H_
-
-+using namespace std;
-+
- #include "star.h"
- #include "stardb.h"
- #include "simulation.h"
diff -ruN /usr/ports/astro/celestia/files/patch-src::celestia::celestiacore.cpp celestia/files/patch-src::celestia::celestiacore.cpp
--- /usr/ports/astro/celestia/files/patch-src::celestia::celestiacore.cpp Sun Aug 31 06:37:45 2003
+++ celestia/files/patch-src::celestia::celestiacore.cpp Thu Jan 1 01:00:00 1970
@@ -1,39 +0,0 @@
---- src/celestia/celestiacore.cpp.orig Thu May 2 10:53:49 2002
-+++ src/celestia/celestiacore.cpp Sat Aug 30 21:32:21 2003
-@@ -38,7 +38,6 @@
- #include "celestiacore.h"
- #include <celutil/debug.h>
-
--
- using namespace std;
-
- static const int DragThreshold = 3;
-@@ -194,7 +193,7 @@
- sim->setFrame(fav.coordSys, sim->getSelection());
- }
-
--void CelestiaCore::addFavorite(string name, string parentFolder, FavoritesList::const_iterator* iter)
-+void CelestiaCore::addFavorite(std::string name, std::string parentFolder, FavoritesList::iterator* iter)
- {
- FavoritesList::iterator pos;
- if(!iter)
-@@ -214,7 +213,7 @@
- favorites->insert(pos, fav);
- }
-
--void CelestiaCore::addFavoriteFolder(string name, FavoritesList::const_iterator* iter)
-+void CelestiaCore::addFavoriteFolder(std::string name, FavoritesList::iterator* iter)
- {
- FavoritesList::iterator pos;
- if(!iter)
-@@ -1138,8 +1137,8 @@
- {
- double distFromSun = body.getHeliocentricPosition(t).distanceFromOrigin();
- float planetTemp = sun->getTemperature() *
-- (float) (pow(1 - body.getAlbedo(), 0.25) *
-- sqrt(sun->getRadius() / (2 * distFromSun)));
-+ (float) (pow((float)(1 - body.getAlbedo()),(float)(( 0.25) *
-+ sqrt(sun->getRadius() / (2 * distFromSun)))));
- overlay << setprecision(0);
- overlay << "Temperature: " << planetTemp << " K\n";
- overlay << setprecision(3);
diff -ruN /usr/ports/astro/celestia/files/patch-src::celestia::celestiacore.h celestia/files/patch-src::celestia::celestiacore.h
--- /usr/ports/astro/celestia/files/patch-src::celestia::celestiacore.h Sun Aug 31 06:37:45 2003
+++ celestia/files/patch-src::celestia::celestiacore.h Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
---- src/celestia/celestiacore.h.orig Sat Aug 30 21:30:15 2003
-+++ src/celestia/celestiacore.h Sat Aug 30 21:30:40 2003
-@@ -126,8 +126,8 @@
- void readFavoritesFile();
- void writeFavoritesFile();
- void activateFavorite(FavoritesEntry&);
-- void addFavorite(std::string, std::string, FavoritesList::const_iterator* iter=NULL);
-- void addFavoriteFolder(std::string, FavoritesList::const_iterator* iter=NULL);
-+ void addFavorite(std::string, std::string, FavoritesList::iterator* iter=NULL);
-+ void addFavoriteFolder(std::string, FavoritesList::iterator* iter=NULL);
- const FavoritesList* getFavorites();
-
- const DestinationList* getDestinations();
diff -ruN /usr/ports/astro/celestia/files/patch-src_celestia_glutmain.cpp celestia/files/patch-src_celestia_glutmain.cpp
--- /usr/ports/astro/celestia/files/patch-src_celestia_glutmain.cpp Thu May 23 11:17:41 2002
+++ celestia/files/patch-src_celestia_glutmain.cpp Thu Jan 1 01:00:00 1970
@@ -1,13 +0,0 @@
-$FreeBSD: ports/astro/celestia/files/patch-src_celestia_glutmain.cpp,v 1.2 2002/05/22 21:57:39 trevor Exp $
-
---- src/celestia/glutmain.cpp.orig Tue Apr 30 10:36:11 2002
-+++ src/celestia/glutmain.cpp Sat May 18 16:16:21 2002
-@@ -509,7 +509,7 @@
- // 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(__FreeBSD__)
- /* localtime in Darwin is is reentrant only
- equiv to Linux localtime_r()
- should probably port !MACOSX code to use this too, available since
diff -ruN /usr/ports/astro/celestia/files/patch-src_celestia_gtkmain.cpp celestia/files/patch-src_celestia_gtkmain.cpp
--- /usr/ports/astro/celestia/files/patch-src_celestia_gtkmain.cpp Wed May 22 23:58:38 2002
+++ celestia/files/patch-src_celestia_gtkmain.cpp Thu Jan 1 01:00:00 1970
@@ -1,36 +0,0 @@
-$FreeBSD: ports/astro/celestia/files/patch-src_celestia_gtkmain.cpp,v 1.1 2002/05/22 21:58:38 trevor Exp $
-
---- src/celestia/gtkmain.cpp.orig Thu May 2 11:02:50 2002
-+++ src/celestia/gtkmain.cpp Tue May 21 03:55:01 2002
-@@ -270,17 +270,8 @@
-
- static gint menuShowLocTime(GtkWidget* w, gpointer data)
- {
-- bool on = (appCore->getTimeZoneBias()==0);
-- if (on)
-- {
-- appCore->setTimeZoneBias(-timezone);
-- appCore->setTimeZoneName(tzname[daylight?0:1]);
-- }
-- else
-- {
-- appCore->setTimeZoneBias(0);
-- appCore->setTimeZoneName("UTC");
-- }
-+ appCore->setTimeZoneBias(0);
-+ appCore->setTimeZoneName("UTC");
- return TRUE;
- }
-
-@@ -2058,9 +2049,8 @@
- appCore->start((double) curtime / 86400.0 + (double) astro::Date(1970, 1, 1));
- localtime(&curtime); /* Only doing this to set timezone as a side
- effect*/
-- appCore->setTimeZoneBias(-timezone);
-- appCore->setTimeZoneName(tzname[daylight?0:1]);
-- timeOptions[1]=tzname[daylight?0:1];
-+ appCore->setTimeZoneBias(localtime(&curtime)->tm_gmtoff);
-+ appCore->setTimeZoneName(localtime(&curtime)->tm_zone);
- }
-
- return TRUE;
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040112234501.2DD6822E1B>