From bb02d570a411774abfee668bab31687dcfb9cf75 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Mon, 7 Oct 2013 10:46:24 +0000 Subject: [PATCH] Developement ceased 8 years ago, depends on some gnome1 libraries --- MOVED | 1 + astro/Makefile | 1 - astro/nova/Makefile | 31 ---- astro/nova/distinfo | 2 - astro/nova/files/patch-configure | 33 ---- astro/nova/files/patch-src::vega::grid.cc | 10 -- .../nova/files/patch-src__castor__asteroid.cc | 83 --------- astro/nova/files/patch-src__castor__comet.cc | 87 ---------- astro/nova/files/patch-src__castor__galaxy.cc | 22 --- .../nova/files/patch-src__castor__jupiter.cc | 112 ------------ astro/nova/files/patch-src__castor__mars.cc | 112 ------------ .../nova/files/patch-src__castor__mercury.cc | 112 ------------ astro/nova/files/patch-src__castor__nebula.cc | 40 ----- .../nova/files/patch-src__castor__neptune.cc | 112 ------------ astro/nova/files/patch-src__castor__pluto.cc | 112 ------------ astro/nova/files/patch-src__castor__saturn.cc | 112 ------------ astro/nova/files/patch-src__castor__sol.cc | 58 ------- astro/nova/files/patch-src__castor__uranus.cc | 112 ------------ astro/nova/files/patch-src__castor__venus.cc | 112 ------------ .../files/patch-src_castor_astro_object.hh | 11 -- .../files/patch-src_castor_deep_object.cc | 13 -- astro/nova/files/patch-src_gui_vsky_druid.cc | 164 ------------------ astro/nova/files/patch-src_gui_vsky_druid.hh | 11 -- astro/nova/files/patch-src_vega_sky_appbar.cc | 33 ---- .../nova/files/patch-src_vega_virtual_sky.cc | 20 --- .../nova/files/patch-src_vega_virtual_sky.hh | 11 -- astro/nova/files/patch5-configure.in | 18 -- astro/nova/pkg-descr | 14 -- astro/nova/pkg-plist | 23 --- 29 files changed, 1 insertion(+), 1581 deletions(-) delete mode 100644 astro/nova/Makefile delete mode 100644 astro/nova/distinfo delete mode 100644 astro/nova/files/patch-configure delete mode 100644 astro/nova/files/patch-src::vega::grid.cc delete mode 100644 astro/nova/files/patch-src__castor__asteroid.cc delete mode 100644 astro/nova/files/patch-src__castor__comet.cc delete mode 100644 astro/nova/files/patch-src__castor__galaxy.cc delete mode 100644 astro/nova/files/patch-src__castor__jupiter.cc delete mode 100644 astro/nova/files/patch-src__castor__mars.cc delete mode 100644 astro/nova/files/patch-src__castor__mercury.cc delete mode 100644 astro/nova/files/patch-src__castor__nebula.cc delete mode 100644 astro/nova/files/patch-src__castor__neptune.cc delete mode 100644 astro/nova/files/patch-src__castor__pluto.cc delete mode 100644 astro/nova/files/patch-src__castor__saturn.cc delete mode 100644 astro/nova/files/patch-src__castor__sol.cc delete mode 100644 astro/nova/files/patch-src__castor__uranus.cc delete mode 100644 astro/nova/files/patch-src__castor__venus.cc delete mode 100644 astro/nova/files/patch-src_castor_astro_object.hh delete mode 100644 astro/nova/files/patch-src_castor_deep_object.cc delete mode 100644 astro/nova/files/patch-src_gui_vsky_druid.cc delete mode 100644 astro/nova/files/patch-src_gui_vsky_druid.hh delete mode 100644 astro/nova/files/patch-src_vega_sky_appbar.cc delete mode 100644 astro/nova/files/patch-src_vega_virtual_sky.cc delete mode 100644 astro/nova/files/patch-src_vega_virtual_sky.hh delete mode 100644 astro/nova/files/patch5-configure.in delete mode 100644 astro/nova/pkg-descr delete mode 100644 astro/nova/pkg-plist diff --git a/MOVED b/MOVED index 6b52776cac08..306be68584c7 100644 --- a/MOVED +++ b/MOVED @@ -5020,3 +5020,4 @@ www/p5-HTTP-GHTTP||2013-10-07|Depends on EOLed gnome1 libraries www/libghttp||2013-10-07|Component of the obsolete gnome1 deskutils/gworkspace-clipbook||2013-10-07|Replaced by tabbed shelf in GWorkspace audio/yamt||2013-10-07|Depends on EOLed gnome1 libraries +astro/nova||2013-10-07|Developement ceased 8 years ago, depends on some gnome1 libraries diff --git a/astro/Makefile b/astro/Makefile index 8ef77c521af5..90f942af0c8c 100644 --- a/astro/Makefile +++ b/astro/Makefile @@ -47,7 +47,6 @@ SUBDIR += mkgmap-splitter SUBDIR += mymoon SUBDIR += nightfall - SUBDIR += nova SUBDIR += openmap SUBDIR += openuniverse SUBDIR += osmium diff --git a/astro/nova/Makefile b/astro/nova/Makefile deleted file mode 100644 index 24eaff16fc91..000000000000 --- a/astro/nova/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# Created by: Ying-Chieh Liao -# $FreeBSD$ - -PORTNAME= nova -PORTVERSION= 0.4 -PORTREVISION= 17 -CATEGORIES= astro -MASTER_SITES= SF - -MAINTAINER= ports@FreeBSD.org -COMMENT= Integrated observational environment for amateur astronomers - -LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \ - gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtkmm20 \ - gnomemm-2.0.1:${PORTSDIR}/x11/libgnomemm \ - glademm-2.0.1:${PORTSDIR}/devel/libglademm \ - gconfmm-2.0.1:${PORTSDIR}/devel/gconfmm \ - gnomecanvasmm-2.0.1:${PORTSDIR}/graphics/libgnomecanvasmm \ - gnomeuimm-2.0.1:${PORTSDIR}/x11-toolkits/libgnomeuimm \ - xml\\+\\+-1.0.1:${PORTSDIR}/textproc/libxml++ \ - nova:${PORTSDIR}/astro/libnova -RUN_DEPENDS= ${LOCALBASE}/share/nova/catalogs/sky2000.ncd:${PORTSDIR}/astro/sky2000 - -NO_STAGE= yes -USES= pkgconfig -USE_AUTOTOOLS= libtool -CPPFLAGS+= ${CXXFLAGS} -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --datadir=${DATADIR} - -.include diff --git a/astro/nova/distinfo b/astro/nova/distinfo deleted file mode 100644 index 9952c0912f2a..000000000000 --- a/astro/nova/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (nova-0.4.tar.gz) = abdf35b6f19363830ff3d7879969936e185e43368895629959733897260214da -SIZE (nova-0.4.tar.gz) = 367120 diff --git a/astro/nova/files/patch-configure b/astro/nova/files/patch-configure deleted file mode 100644 index fbbe4a836da5..000000000000 --- a/astro/nova/files/patch-configure +++ /dev/null @@ -1,33 +0,0 @@ ---- configure.orig Mon Jan 5 05:54:36 2004 -+++ configure Sat Nov 5 13:27:16 2005 -@@ -8350,7 +8350,7 @@ - #include - #include - #include --#include -+#include - - static char* - my_strdup (char *str) -@@ -8619,17 +8619,17 @@ - # Set NOVA_PIXMAP_DIR in config.h. - if test "x${prefix}" = "xNONE"; then - cat >>confdefs.h <<_ACEOF --#define NOVA_PIXMAP_DIR "${ac_default_prefix}/nova/pixmaps" -+#define NOVA_PIXMAP_DIR "${ac_default_prefix}/share/nova/pixmaps" - _ACEOF - -- NOVA_PIXMAP_DIR=${ac_default_prefix}/nova/pixmaps -+ NOVA_PIXMAP_DIR=${ac_default_prefix}/share/nova/pixmaps - - else - cat >>confdefs.h <<_ACEOF --#define NOVA_PIXMAP_DIR "${prefix}/nova/pixmaps" -+#define NOVA_PIXMAP_DIR "${prefix}/share/nova/pixmaps" - _ACEOF - -- NOVA_PIXMAP_DIR=${prefix}/nova/pixmaps -+ NOVA_PIXMAP_DIR=${prefix}/share/nova/pixmaps - - fi - diff --git a/astro/nova/files/patch-src::vega::grid.cc b/astro/nova/files/patch-src::vega::grid.cc deleted file mode 100644 index b8e0a91cfdbe..000000000000 --- a/astro/nova/files/patch-src::vega::grid.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- src/vega/grid.cc.orig Wed Sep 15 16:21:00 2004 -+++ src/vega/grid.cc Wed Sep 15 16:21:47 2004 -@@ -15,6 +15,7 @@ - // Copyright Liam Girdwood 2003 - - -+#include - #include "grid.hh" - - namespace Vega diff --git a/astro/nova/files/patch-src__castor__asteroid.cc b/astro/nova/files/patch-src__castor__asteroid.cc deleted file mode 100644 index 6c28da9c3b49..000000000000 --- a/astro/nova/files/patch-src__castor__asteroid.cc +++ /dev/null @@ -1,83 +0,0 @@ ---- src/castor/asteroid.cc.orig Sat Nov 5 12:43:37 2005 -+++ src/castor/asteroid.cc Sat Nov 5 12:44:30 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "asteroid.hh" --#include -+#include - #include - #include - -@@ -47,7 +47,7 @@ - void Asteroid::get_equ_posn (double JD, double& ra, double& dec) - { - struct ln_equ_posn posn; -- get_ell_body_equ_coords (JD, &m_orbit, &posn); -+ ln_get_ell_body_equ_coords (JD, &m_orbit, &posn); - ra = posn.ra; - dec = posn.dec; - } -@@ -63,7 +63,7 @@ - get_equ_posn(JD, ra, dec); - equ_posn.ra = ra; - equ_posn.dec = dec; -- get_hrz_from_equ (&equ_posn, observer, JD, posn); -+ ln_get_hrz_from_equ (&equ_posn, observer, JD, posn); - } - - /*! \fn void Asteroid::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -71,7 +71,7 @@ - */ - void Asteroid::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_ell_body_rst(JD, observer, &m_orbit, time); -+ ln_get_ell_body_rst(JD, observer, &m_orbit, time); - } - - /*! \fn double Asteroid::get_mag(double JD) -@@ -79,7 +79,7 @@ - */ - double Asteroid::get_mag(double JD) - { -- get_asteroid_mag (JD, &m_orbit, m_H, m_G); -+ ln_get_asteroid_mag (JD, &m_orbit, m_H, m_G); - } - - /*! \fn void Asteroid::get_id(std::string& id) -@@ -111,7 +111,7 @@ - void Asteroid::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_neptune_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_neptune_magnitude(m_render_JD); - double sdiam = (get_sdiam_arc(m_render_JD) / 240.0) * ppd; - if (size < sdiam) - size = sdiam; -@@ -134,22 +134,22 @@ - - double Asteroid::get_earth_dist (double JD) - { -- return get_ell_body_earth_dist (JD, &m_orbit); -+ return ln_get_ell_body_earth_dist (JD, &m_orbit); - } - - double Asteroid::get_sun_dist (double JD) - { -- return get_ell_body_solar_dist (JD, &m_orbit); -+ return ln_get_ell_body_solar_dist (JD, &m_orbit); - } - - double Asteroid::get_sdiam_km () - { -- return get_asteroid_sdiam_km(m_H, m_A); -+ return ln_get_asteroid_sdiam_km(m_H, m_A); - } - - double Asteroid::get_sdiam_arc (double JD) - { -- return get_asteroid_sdiam_arc(JD, &m_orbit, m_H, m_A); -+ return ln_get_asteroid_sdiam_arc(JD, &m_orbit, m_H, m_A); - } - - void Asteroid::set_render_jd (double JD) diff --git a/astro/nova/files/patch-src__castor__comet.cc b/astro/nova/files/patch-src__castor__comet.cc deleted file mode 100644 index 7578b52d57e2..000000000000 --- a/astro/nova/files/patch-src__castor__comet.cc +++ /dev/null @@ -1,87 +0,0 @@ ---- src/castor/comet.cc.orig Sat Nov 5 12:44:45 2005 -+++ src/castor/comet.cc Sat Nov 5 12:45:28 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "comet.hh" --#include -+#include - #include - #include - -@@ -60,9 +60,9 @@ - struct ln_equ_posn posn; - - if (m_is_parabolic) -- get_par_body_equ_coords (JD, &m_porbit, &posn); -+ ln_get_par_body_equ_coords (JD, &m_porbit, &posn); - else -- get_ell_body_equ_coords (JD, &m_eorbit, &posn); -+ ln_get_ell_body_equ_coords (JD, &m_eorbit, &posn); - - ra = posn.ra; - dec = posn.dec; -@@ -81,7 +81,7 @@ - get_equ_posn(JD, ra, dec); - equ_posn.ra = ra; - equ_posn.dec = dec; -- get_hrz_from_equ (&equ_posn, observer, JD, posn); -+ ln_get_hrz_from_equ (&equ_posn, observer, JD, posn); - } - - /*! \fn void Comet::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -90,9 +90,9 @@ - void Comet::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { - if (m_is_parabolic) -- get_par_body_rst(JD, observer, &m_porbit, time); -+ ln_get_par_body_rst(JD, observer, &m_porbit, time); - else -- get_ell_body_rst(JD, observer, &m_eorbit, time); -+ ln_get_ell_body_rst(JD, observer, &m_eorbit, time); - } - - /*! \fn double Comet::get_mag(double JD) -@@ -101,9 +101,9 @@ - double Comet::get_mag(double JD) - { - if (m_is_parabolic) -- return get_par_comet_mag (JD, &m_porbit, m_g, m_k); -+ return ln_get_par_comet_mag (JD, &m_porbit, m_g, m_k); - else -- return get_ell_comet_mag (JD, &m_eorbit, m_g, m_k); -+ return ln_get_ell_comet_mag (JD, &m_eorbit, m_g, m_k); - } - - /*! \fn void Comet::get_id(std::string& id) -@@ -135,7 +135,7 @@ - void Comet::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_neptune_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_neptune_magnitude(m_render_JD); - double shadow = 1.1 * size; - Gnome::Canvas::Ellipse *ellipse_back, *ellipse; - -@@ -161,17 +161,17 @@ - double Comet::get_earth_dist (double JD) - { - if (m_is_parabolic) -- return get_par_body_earth_dist(JD, &m_porbit); -+ return ln_get_par_body_earth_dist(JD, &m_porbit); - else -- return get_ell_body_earth_dist (JD, &m_eorbit); -+ return ln_get_ell_body_earth_dist (JD, &m_eorbit); - } - - double Comet::get_sun_dist (double JD) - { - if (m_is_parabolic) -- return get_par_body_solar_dist(JD, &m_porbit); -+ return ln_get_par_body_solar_dist(JD, &m_porbit); - else -- return get_ell_body_solar_dist (JD, &m_eorbit); -+ return ln_get_ell_body_solar_dist (JD, &m_eorbit); - } - - } diff --git a/astro/nova/files/patch-src__castor__galaxy.cc b/astro/nova/files/patch-src__castor__galaxy.cc deleted file mode 100644 index 89afd5d9e515..000000000000 --- a/astro/nova/files/patch-src__castor__galaxy.cc +++ /dev/null @@ -1,22 +0,0 @@ ---- src/castor/galaxy.cc.orig Sat Nov 5 12:57:42 2005 -+++ src/castor/galaxy.cc Sat Nov 5 12:58:27 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "galaxy.hh" --#include -+#include - - namespace Castor - { -@@ -130,8 +130,8 @@ - { - struct ln_equ_posn equ_posn; - -- get_equ_solar_coords(JD, &equ_posn); -- get_hrz_from_equ (&equ_posn, observer, JD, posn); -+ ln_get_solar_equ_coords(JD, &equ_posn); -+ ln_get_hrz_from_equ (&equ_posn, observer, JD, posn); - } - - /*! \fn void Galaxy::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) diff --git a/astro/nova/files/patch-src__castor__jupiter.cc b/astro/nova/files/patch-src__castor__jupiter.cc deleted file mode 100644 index 219c9922471b..000000000000 --- a/astro/nova/files/patch-src__castor__jupiter.cc +++ /dev/null @@ -1,112 +0,0 @@ ---- src/castor/jupiter.cc.orig Sat Nov 5 12:52:50 2005 -+++ src/castor/jupiter.cc Sat Nov 5 12:53:17 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "jupiter.hh" --#include -+#include - - namespace Castor - { -@@ -30,7 +30,7 @@ - - double Jupiter::get_disk (double JD) - { -- return get_jupiter_disk(JD); -+ return ln_get_jupiter_disk(JD); - } - - /*! \fn void Jupiter::get_equ_posn (double JD, ln_equ_posn* posn) -@@ -39,7 +39,7 @@ - void Jupiter::get_equ_posn (double JD, double& ra, double& dec) - { - struct ln_equ_posn equ; -- get_jupiter_equ_coords (JD, &equ); -+ ln_get_jupiter_equ_coords (JD, &equ); - ra = equ.ra; - dec = equ.dec; - } -@@ -51,8 +51,8 @@ - { - struct ln_equ_posn equ; - -- get_jupiter_equ_coords (JD, &equ); -- get_hrz_from_equ (&equ, observer, JD, posn); -+ ln_get_jupiter_equ_coords (JD, &equ); -+ ln_get_hrz_from_equ (&equ, observer, JD, posn); - } - - /*! \fn void Jupiter::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -60,7 +60,7 @@ - */ - void Jupiter::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_jupiter_rst(JD, observer, time); -+ ln_get_jupiter_rst(JD, observer, time); - } - - /*! \fn double Jupiter::get_mag(double JD) -@@ -70,7 +70,7 @@ - { - if (JD == 0) - JD = m_render_JD; -- return get_jupiter_magnitude (JD); -+ return ln_get_jupiter_magnitude (JD); - } - - /*! \fn void Jupiter::get_id(std::string& id) -@@ -102,7 +102,7 @@ - void Jupiter::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_jupiter_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_jupiter_magnitude(m_render_JD); - double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd; - if (size < sdiam) - size = sdiam; -@@ -126,37 +126,37 @@ - - double Jupiter::get_earth_dist (double JD) - { -- return get_jupiter_earth_dist(JD); -+ return ln_get_jupiter_earth_dist(JD); - } - - double Jupiter::get_sun_dist (double JD) - { -- return get_jupiter_sun_dist(JD); -+ return ln_get_jupiter_solar_dist(JD); - } - - double Jupiter::get_equ_sdiam (double JD) - { -- return get_jupiter_equ_sdiam(JD); -+ return ln_get_jupiter_equ_sdiam(JD); - } - - double Jupiter::get_pol_sdiam (double JD) - { -- return get_jupiter_pol_sdiam(JD); -+ return ln_get_jupiter_pol_sdiam(JD); - } - - void Jupiter::get_helio_coords (double JD, struct ln_helio_posn * position) - { -- get_jupiter_helio_coords (JD, position); -+ ln_get_jupiter_helio_coords (JD, position); - } - - double Jupiter::get_phase (double JD) - { -- return get_jupiter_phase (JD); -+ return ln_get_jupiter_phase (JD); - } - - void Jupiter::get_rect_helio (double JD, struct ln_rect_posn * position) - { -- get_jupiter_rect_helio (JD, position); -+ ln_get_jupiter_rect_helio (JD, position); - } - - void Jupiter::set_render_jd (double JD) diff --git a/astro/nova/files/patch-src__castor__mars.cc b/astro/nova/files/patch-src__castor__mars.cc deleted file mode 100644 index 5bfb272c6c31..000000000000 --- a/astro/nova/files/patch-src__castor__mars.cc +++ /dev/null @@ -1,112 +0,0 @@ ---- src/castor/mars.cc.orig Sat Nov 5 12:51:25 2005 -+++ src/castor/mars.cc Sat Nov 5 12:52:39 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "mars.hh" --#include -+#include - - namespace Castor - { -@@ -30,7 +30,7 @@ - - double Mars::get_disk (double JD) - { -- return get_mars_disk(JD); -+ return ln_get_mars_disk(JD); - } - - /*! \fn void Mars::get_equ_posn (double JD, ln_equ_posn* posn) -@@ -39,7 +39,7 @@ - void Mars::get_equ_posn (double JD, double& ra, double& dec) - { - struct ln_equ_posn equ; -- get_mars_equ_coords (JD, &equ); -+ ln_get_mars_equ_coords (JD, &equ); - ra = equ.ra; - dec = equ.dec; - } -@@ -51,8 +51,8 @@ - { - struct ln_equ_posn equ; - -- get_mars_equ_coords (JD, &equ); -- get_hrz_from_equ (&equ, observer, JD, posn); -+ ln_get_mars_equ_coords (JD, &equ); -+ ln_get_hrz_from_equ (&equ, observer, JD, posn); - } - - /*! \fn void Mars::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -60,7 +60,7 @@ - */ - void Mars::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_mars_rst(JD, observer, time); -+ ln_get_mars_rst(JD, observer, time); - } - - /*! \fn double Mars::get_mag(double JD) -@@ -70,7 +70,7 @@ - { - if (JD == 0) - JD = m_render_JD; -- return get_mars_magnitude (JD); -+ return ln_get_mars_magnitude (JD); - } - - /*! \fn void Mars::get_id(std::string& id) -@@ -102,7 +102,7 @@ - void Mars::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_mars_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_mars_magnitude(m_render_JD); - double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd; - if (size < sdiam) - size = sdiam; -@@ -125,37 +125,37 @@ - - double Mars::get_earth_dist (double JD) - { -- return get_mars_earth_dist(JD); -+ return ln_get_mars_earth_dist(JD); - } - - double Mars::get_sun_dist (double JD) - { -- return get_mars_sun_dist(JD); -+ return ln_get_mars_solar_dist(JD); - } - - double Mars::get_equ_sdiam (double JD) - { -- return get_mars_sdiam(JD); -+ return ln_get_mars_sdiam(JD); - } - - double Mars::get_pol_sdiam (double JD) - { -- return get_mars_sdiam(JD); -+ return ln_get_mars_sdiam(JD); - } - - void Mars::get_helio_coords (double JD, struct ln_helio_posn * position) - { -- get_mars_helio_coords (JD, position); -+ ln_get_mars_helio_coords (JD, position); - } - - double Mars::get_phase (double JD) - { -- return get_mars_phase (JD); -+ return ln_get_mars_phase (JD); - } - - void Mars::get_rect_helio (double JD, struct ln_rect_posn * position) - { -- get_mars_rect_helio (JD, position); -+ ln_get_mars_rect_helio (JD, position); - } - - void Mars::set_render_jd (double JD) diff --git a/astro/nova/files/patch-src__castor__mercury.cc b/astro/nova/files/patch-src__castor__mercury.cc deleted file mode 100644 index 222e7cb0b7ce..000000000000 --- a/astro/nova/files/patch-src__castor__mercury.cc +++ /dev/null @@ -1,112 +0,0 @@ ---- src/castor/mercury.cc.orig Sat Nov 5 12:45:45 2005 -+++ src/castor/mercury.cc Sat Nov 5 12:49:36 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "mercury.hh" --#include -+#include - - namespace Castor - { -@@ -30,7 +30,7 @@ - - double Mercury::get_disk (double JD) - { -- return get_mercury_disk(JD); -+ return ln_get_mercury_disk(JD); - } - - -@@ -40,7 +40,7 @@ - void Mercury::get_equ_posn (double JD, double& ra, double& dec) - { - struct ln_equ_posn equ; -- get_mercury_equ_coords (JD, &equ); -+ ln_get_mercury_equ_coords (JD, &equ); - ra = equ.ra; - dec = equ.dec; - } -@@ -53,8 +53,8 @@ - { - struct ln_equ_posn equ; - -- get_mercury_equ_coords (JD, &equ); -- get_hrz_from_equ (&equ, observer, JD, posn); -+ ln_get_mercury_equ_coords (JD, &equ); -+ ln_get_hrz_from_equ (&equ, observer, JD, posn); - } - - /*! \fn void Mercury::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -62,7 +62,7 @@ - */ - void Mercury::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_mercury_rst(JD, observer, time); -+ ln_get_mercury_rst(JD, observer, time); - } - - /*! \fn double Mercury::get_mag(double JD) -@@ -72,7 +72,7 @@ - { - if (JD == 0) - JD = m_render_JD; -- return get_mercury_magnitude (JD); -+ return ln_get_mercury_magnitude (JD); - } - - /*! \fn void Mercury::get_id(std::string& id) -@@ -104,7 +104,7 @@ - void Mercury::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_mercury_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_mercury_magnitude(m_render_JD); - double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd; - if (size < sdiam) - size = sdiam; -@@ -127,37 +127,37 @@ - - double Mercury::get_earth_dist (double JD) - { -- return get_mercury_earth_dist(JD); -+ return ln_get_mercury_earth_dist(JD); - } - - double Mercury::get_sun_dist (double JD) - { -- return get_mercury_sun_dist(JD); -+ return ln_get_mercury_solar_dist(JD); - } - - double Mercury::get_equ_sdiam (double JD) - { -- return get_mercury_sdiam(JD); -+ return ln_get_mercury_sdiam(JD); - } - - double Mercury::get_pol_sdiam (double JD) - { -- return get_mercury_sdiam(JD); -+ return ln_get_mercury_sdiam(JD); - } - - void Mercury::get_helio_coords (double JD, struct ln_helio_posn * position) - { -- get_mercury_helio_coords (JD, position); -+ ln_get_mercury_helio_coords (JD, position); - } - - double Mercury::get_phase (double JD) - { -- return get_mercury_phase (JD); -+ return ln_get_mercury_phase (JD); - } - - void Mercury::get_rect_helio (double JD, struct ln_rect_posn * position) - { -- get_mercury_rect_helio (JD, position); -+ ln_get_mercury_rect_helio (JD, position); - } - - void Mercury::set_render_jd (double JD) diff --git a/astro/nova/files/patch-src__castor__nebula.cc b/astro/nova/files/patch-src__castor__nebula.cc deleted file mode 100644 index f2ec12f16e37..000000000000 --- a/astro/nova/files/patch-src__castor__nebula.cc +++ /dev/null @@ -1,40 +0,0 @@ ---- src/castor/nebula.cc.orig Sat Nov 5 12:58:59 2005 -+++ src/castor/nebula.cc Sat Nov 5 12:59:25 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "nebula.hh" --#include -+#include - - namespace Castor - { -@@ -30,7 +30,7 @@ - - double Nebula::get_disk (double JD) - { -- return get_solar_sdiam(JD); -+ return ln_get_solar_sdiam(JD); - } - - /*! \fn void Nebula::get_equ_posn (double JD, ln_equ_posn* posn) -@@ -47,8 +47,8 @@ - { - struct ln_equ_posn equ_posn; - -- get_equ_solar_coords(JD, &equ_posn); -- get_hrz_from_equ (&equ_posn, observer, JD, posn); -+ ln_get_solar_equ_coords(JD, &equ_posn); -+ ln_get_hrz_from_equ (&equ_posn, observer, JD, posn); - } - - /*! \fn void Nebula::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -56,7 +56,7 @@ - */ - void Nebula::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_solar_rst(JD, observer, time); -+ ln_get_solar_rst(JD, observer, time); - } - - /*! \fn double Nebula::get_ra() diff --git a/astro/nova/files/patch-src__castor__neptune.cc b/astro/nova/files/patch-src__castor__neptune.cc deleted file mode 100644 index b3b8d2f65816..000000000000 --- a/astro/nova/files/patch-src__castor__neptune.cc +++ /dev/null @@ -1,112 +0,0 @@ ---- src/castor/neptune.cc.orig Sat Nov 5 12:56:34 2005 -+++ src/castor/neptune.cc Sat Nov 5 12:56:51 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "neptune.hh" --#include -+#include - - namespace Castor - { -@@ -30,7 +30,7 @@ - - double Neptune::get_disk (double JD) - { -- return get_solar_sdiam(JD); -+ return ln_get_solar_sdiam(JD); - } - - /*! \fn void Neptune::get_equ_posn (double JD, ln_equ_posn* posn) -@@ -39,7 +39,7 @@ - void Neptune::get_equ_posn (double JD, double& ra, double& dec) - { - struct ln_equ_posn equ; -- get_neptune_equ_coords (JD, &equ); -+ ln_get_neptune_equ_coords (JD, &equ); - ra = equ.ra; - dec = equ.dec; - } -@@ -51,8 +51,8 @@ - { - struct ln_equ_posn equ; - -- get_neptune_equ_coords (JD, &equ); -- get_hrz_from_equ (&equ, observer, JD, posn); -+ ln_get_neptune_equ_coords (JD, &equ); -+ ln_get_hrz_from_equ (&equ, observer, JD, posn); - } - - /*! \fn void Neptune::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -60,7 +60,7 @@ - */ - void Neptune::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_neptune_rst(JD, observer, time); -+ ln_get_neptune_rst(JD, observer, time); - } - - /*! \fn double Neptune::get_mag(double JD) -@@ -70,7 +70,7 @@ - { - if (JD == 0) - JD = m_render_JD; -- return get_neptune_magnitude (JD); -+ return ln_get_neptune_magnitude (JD); - } - - /*! \fn void Neptune::get_id(std::string& id) -@@ -102,7 +102,7 @@ - void Neptune::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_neptune_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_neptune_magnitude(m_render_JD); - double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd; - if (size < sdiam) - size = sdiam; -@@ -125,37 +125,37 @@ - - double Neptune::get_earth_dist (double JD) - { -- return get_neptune_earth_dist(JD); -+ return ln_get_neptune_earth_dist(JD); - } - - double Neptune::get_sun_dist (double JD) - { -- return get_neptune_sun_dist(JD); -+ return ln_get_neptune_solar_dist(JD); - } - - double Neptune::get_equ_sdiam (double JD) - { -- return get_neptune_sdiam(JD); -+ return ln_get_neptune_sdiam(JD); - } - - double Neptune::get_pol_sdiam (double JD) - { -- return get_neptune_sdiam(JD); -+ return ln_get_neptune_sdiam(JD); - } - - void Neptune::get_helio_coords (double JD, struct ln_helio_posn * position) - { -- get_neptune_helio_coords (JD, position); -+ ln_get_neptune_helio_coords (JD, position); - } - - double Neptune::get_phase (double JD) - { -- return get_neptune_phase (JD); -+ return ln_get_neptune_phase (JD); - } - - void Neptune::get_rect_helio (double JD, struct ln_rect_posn * position) - { -- get_neptune_rect_helio (JD, position); -+ ln_get_neptune_rect_helio (JD, position); - } - - void Neptune::set_render_jd (double JD) diff --git a/astro/nova/files/patch-src__castor__pluto.cc b/astro/nova/files/patch-src__castor__pluto.cc deleted file mode 100644 index 8861686817c4..000000000000 --- a/astro/nova/files/patch-src__castor__pluto.cc +++ /dev/null @@ -1,112 +0,0 @@ ---- src/castor/pluto.cc.orig Sat Nov 5 12:57:05 2005 -+++ src/castor/pluto.cc Sat Nov 5 12:57:21 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "pluto.hh" --#include -+#include - - namespace Castor - { -@@ -30,7 +30,7 @@ - - double Pluto::get_disk (double JD) - { -- return get_pluto_disk(JD); -+ return ln_get_pluto_disk(JD); - } - - /*! \fn void Pluto::get_equ_posn (double JD, ln_equ_posn* posn) -@@ -39,7 +39,7 @@ - void Pluto::get_equ_posn (double JD, double& ra, double& dec) - { - struct ln_equ_posn equ; -- get_pluto_equ_coords (JD, &equ); -+ ln_get_pluto_equ_coords (JD, &equ); - ra = equ.ra; - dec = equ.dec; - } -@@ -51,8 +51,8 @@ - { - struct ln_equ_posn equ; - -- get_pluto_equ_coords (JD, &equ); -- get_hrz_from_equ (&equ, observer, JD, posn); -+ ln_get_pluto_equ_coords (JD, &equ); -+ ln_get_hrz_from_equ (&equ, observer, JD, posn); - } - - /*! \fn void Pluto::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -60,7 +60,7 @@ - */ - void Pluto::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_pluto_rst(JD, observer, time); -+ ln_get_pluto_rst(JD, observer, time); - } - - /*! \fn double Pluto::get_mag(double JD) -@@ -70,7 +70,7 @@ - { - if (JD == 0) - JD = m_render_JD; -- return get_pluto_magnitude (JD); -+ return ln_get_pluto_magnitude (JD); - } - - /*! \fn void Pluto::get_id(std::string& id) -@@ -102,7 +102,7 @@ - void Pluto::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_pluto_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_pluto_magnitude(m_render_JD); - double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd; - if (size < sdiam) - size = sdiam; -@@ -125,37 +125,37 @@ - - double Pluto::get_earth_dist (double JD) - { -- return get_pluto_earth_dist(JD); -+ return ln_get_pluto_earth_dist(JD); - } - - double Pluto::get_sun_dist (double JD) - { -- return get_pluto_sun_dist(JD); -+ return ln_get_pluto_solar_dist(JD); - } - - double Pluto::get_equ_sdiam (double JD) - { -- return get_pluto_sdiam(JD); -+ return ln_get_pluto_sdiam(JD); - } - - double Pluto::get_pol_sdiam (double JD) - { -- return get_pluto_sdiam(JD); -+ return ln_get_pluto_sdiam(JD); - } - - void Pluto::get_helio_coords (double JD, struct ln_helio_posn * position) - { -- get_pluto_helio_coords (JD, position); -+ ln_get_pluto_helio_coords (JD, position); - } - - double Pluto::get_phase (double JD) - { -- return get_pluto_phase (JD); -+ return ln_get_pluto_phase (JD); - } - - void Pluto::get_rect_helio (double JD, struct ln_rect_posn * position) - { -- get_pluto_rect_helio (JD, position); -+ ln_get_pluto_rect_helio (JD, position); - } - - void Pluto::set_render_jd (double JD) diff --git a/astro/nova/files/patch-src__castor__saturn.cc b/astro/nova/files/patch-src__castor__saturn.cc deleted file mode 100644 index 238af3bed1e0..000000000000 --- a/astro/nova/files/patch-src__castor__saturn.cc +++ /dev/null @@ -1,112 +0,0 @@ ---- src/castor/saturn.cc.orig Sat Nov 5 12:53:27 2005 -+++ src/castor/saturn.cc Sat Nov 5 12:53:47 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "saturn.hh" --#include -+#include - - namespace Castor - { -@@ -30,7 +30,7 @@ - - double Saturn::get_disk (double JD) - { -- return get_saturn_disk(JD); -+ return ln_get_saturn_disk(JD); - } - - /*! \fn void Saturn::get_equ_posn (double JD, ln_equ_posn* posn) -@@ -39,7 +39,7 @@ - void Saturn::get_equ_posn (double JD, double& ra, double& dec) - { - struct ln_equ_posn equ; -- get_saturn_equ_coords (JD, &equ); -+ ln_get_saturn_equ_coords (JD, &equ); - ra = equ.ra; - dec = equ.dec; - } -@@ -51,8 +51,8 @@ - { - struct ln_equ_posn equ; - -- get_saturn_equ_coords (JD, &equ); -- get_hrz_from_equ (&equ, observer, JD, posn); -+ ln_get_saturn_equ_coords (JD, &equ); -+ ln_get_hrz_from_equ (&equ, observer, JD, posn); - } - - /*! \fn void Saturn::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -60,7 +60,7 @@ - */ - void Saturn::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_saturn_rst(JD, observer, time); -+ ln_get_saturn_rst(JD, observer, time); - } - - /*! \fn double Saturn::get_mag(double JD) -@@ -70,7 +70,7 @@ - { - if (JD == 0) - JD = m_render_JD; -- return get_saturn_magnitude (JD); -+ return ln_get_saturn_magnitude (JD); - } - - /*! \fn void Saturn::get_id(std::string& id) -@@ -102,7 +102,7 @@ - void Saturn::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_saturn_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_saturn_magnitude(m_render_JD); - double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd; - if (size < sdiam) - size = sdiam; -@@ -125,37 +125,37 @@ - - double Saturn::get_earth_dist (double JD) - { -- return get_saturn_earth_dist(JD); -+ return ln_get_saturn_earth_dist(JD); - } - - double Saturn::get_sun_dist (double JD) - { -- return get_saturn_sun_dist(JD); -+ return ln_get_saturn_solar_dist(JD); - } - - double Saturn::get_equ_sdiam (double JD) - { -- return get_saturn_equ_sdiam(JD); -+ return ln_get_saturn_equ_sdiam(JD); - } - - double Saturn::get_pol_sdiam (double JD) - { -- return get_saturn_pol_sdiam(JD); -+ return ln_get_saturn_pol_sdiam(JD); - } - - void Saturn::get_helio_coords (double JD, struct ln_helio_posn * position) - { -- get_saturn_helio_coords (JD, position); -+ ln_get_saturn_helio_coords (JD, position); - } - - double Saturn::get_phase (double JD) - { -- return get_saturn_phase (JD); -+ return ln_get_saturn_phase (JD); - } - - void Saturn::get_rect_helio (double JD, struct ln_rect_posn * position) - { -- get_saturn_rect_helio (JD, position); -+ ln_get_saturn_rect_helio (JD, position); - } - - void Saturn::set_render_jd (double JD) diff --git a/astro/nova/files/patch-src__castor__sol.cc b/astro/nova/files/patch-src__castor__sol.cc deleted file mode 100644 index 10ffbc6bc1d9..000000000000 --- a/astro/nova/files/patch-src__castor__sol.cc +++ /dev/null @@ -1,58 +0,0 @@ ---- src/castor/sol.cc.orig Sat Nov 5 12:06:25 2005 -+++ src/castor/sol.cc Sat Nov 5 12:43:11 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "sol.hh" --#include -+#include - - namespace Castor - { -@@ -30,7 +30,7 @@ - - double Sol::get_sdiam (double JD) - { -- return get_solar_sdiam(JD); -+ return ln_get_solar_sdiam(JD); - } - - /*! \fn void Sol::get_equ_posn (double JD, ln_equ_posn* posn) -@@ -39,7 +39,7 @@ - void Sol::get_equ_posn (double JD, double& ra, double& dec) - { - struct ln_equ_posn posn; -- get_equ_solar_coords(JD, &posn); -+ ln_get_solar_equ_coords(JD, &posn); - ra = posn.ra; - dec = posn.dec; - } -@@ -51,8 +51,8 @@ - { - struct ln_equ_posn equ_posn; - -- get_equ_solar_coords(JD, &equ_posn); -- get_hrz_from_equ (&equ_posn, observer, JD, posn); -+ ln_get_solar_equ_coords(JD, &equ_posn); -+ ln_get_hrz_from_equ (&equ_posn, observer, JD, posn); - } - - /*! \fn void Sol::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -60,7 +60,7 @@ - */ - void Sol::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_solar_rst(JD, observer, time); -+ ln_get_solar_rst(JD, observer, time); - } - - /*! \fn double Sol::get_mag() -@@ -100,7 +100,7 @@ - void Sol::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_neptune_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_neptune_magnitude(m_render_JD); - double sdiam = (get_sdiam(m_render_JD) / 240.0) * ppd; - if (size < sdiam) - size = sdiam; diff --git a/astro/nova/files/patch-src__castor__uranus.cc b/astro/nova/files/patch-src__castor__uranus.cc deleted file mode 100644 index 988aade4be91..000000000000 --- a/astro/nova/files/patch-src__castor__uranus.cc +++ /dev/null @@ -1,112 +0,0 @@ ---- src/castor/uranus.cc.orig Sat Nov 5 12:53:57 2005 -+++ src/castor/uranus.cc Sat Nov 5 12:54:16 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "uranus.hh" --#include -+#include - - namespace Castor - { -@@ -30,7 +30,7 @@ - - double Uranus::get_disk (double JD) - { -- return get_uranus_disk(JD); -+ return ln_get_uranus_disk(JD); - } - - /*! \fn void Uranus::get_equ_posn (double JD, ln_equ_posn* posn) -@@ -39,7 +39,7 @@ - void Uranus::get_equ_posn (double JD, double& ra, double& dec) - { - struct ln_equ_posn equ; -- get_uranus_equ_coords (JD, &equ); -+ ln_get_uranus_equ_coords (JD, &equ); - ra = equ.ra; - dec = equ.dec; - } -@@ -51,8 +51,8 @@ - { - struct ln_equ_posn equ; - -- get_uranus_equ_coords (JD, &equ); -- get_hrz_from_equ (&equ, observer, JD, posn); -+ ln_get_uranus_equ_coords (JD, &equ); -+ ln_get_hrz_from_equ (&equ, observer, JD, posn); - } - - /*! \fn void Uranus::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -60,7 +60,7 @@ - */ - void Uranus::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_uranus_rst(JD, observer, time); -+ ln_get_uranus_rst(JD, observer, time); - } - - /*! \fn double Uranus::get_mag(double JD) -@@ -70,7 +70,7 @@ - { - if (JD == 0) - JD = m_render_JD; -- return get_uranus_magnitude (JD); -+ return ln_get_uranus_magnitude (JD); - } - - /*! \fn void Uranus::get_id(std::string& id) -@@ -102,7 +102,7 @@ - void Uranus::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_uranus_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_uranus_magnitude(m_render_JD); - double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd; - if (size < sdiam) - size = sdiam; -@@ -125,37 +125,37 @@ - - double Uranus::get_earth_dist (double JD) - { -- return get_uranus_earth_dist(JD); -+ return ln_get_uranus_earth_dist(JD); - } - - double Uranus::get_sun_dist (double JD) - { -- return get_uranus_sun_dist(JD); -+ return ln_get_uranus_solar_dist(JD); - } - - double Uranus::get_equ_sdiam (double JD) - { -- return get_uranus_sdiam(JD); -+ return ln_get_uranus_sdiam(JD); - } - - double Uranus::get_pol_sdiam (double JD) - { -- return get_uranus_sdiam(JD); -+ return ln_get_uranus_sdiam(JD); - } - - void Uranus::get_helio_coords (double JD, struct ln_helio_posn * position) - { -- get_uranus_helio_coords (JD, position); -+ ln_get_uranus_helio_coords (JD, position); - } - - double Uranus::get_phase (double JD) - { -- return get_uranus_phase (JD); -+ return ln_get_uranus_phase (JD); - } - - void Uranus::get_rect_helio (double JD, struct ln_rect_posn * position) - { -- get_uranus_rect_helio (JD, position); -+ ln_get_uranus_rect_helio (JD, position); - } - - void Uranus::set_render_jd (double JD) diff --git a/astro/nova/files/patch-src__castor__venus.cc b/astro/nova/files/patch-src__castor__venus.cc deleted file mode 100644 index 714a2768a147..000000000000 --- a/astro/nova/files/patch-src__castor__venus.cc +++ /dev/null @@ -1,112 +0,0 @@ ---- src/castor/venus.cc.orig Sat Nov 5 12:49:48 2005 -+++ src/castor/venus.cc Sat Nov 5 12:51:06 2005 -@@ -15,7 +15,7 @@ - // Copyright 2003 Liam Girdwood - - #include "venus.hh" --#include -+#include - - namespace Castor - { -@@ -30,7 +30,7 @@ - - double Venus::get_disk (double JD) - { -- return get_venus_disk(JD); -+ return ln_get_venus_disk(JD); - } - - /*! \fn void Venus::get_equ_posn (double JD, ln_equ_posn* posn) -@@ -39,7 +39,7 @@ - void Venus::get_equ_posn (double JD, double& ra, double& dec) - { - struct ln_equ_posn equ; -- get_venus_equ_coords (JD, &equ); -+ ln_get_venus_equ_coords (JD, &equ); - ra = equ.ra; - dec = equ.dec; - } -@@ -51,8 +51,8 @@ - { - struct ln_equ_posn equ; - -- get_venus_equ_coords (JD, &equ); -- get_hrz_from_equ (&equ, observer, JD, posn); -+ ln_get_venus_equ_coords (JD, &equ); -+ ln_get_hrz_from_equ (&equ, observer, JD, posn); - } - - /*! \fn void Venus::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) -@@ -60,7 +60,7 @@ - */ - void Venus::get_rst_time (double JD, ln_lnlat_posn* observer, ln_rst_time* time) - { -- get_venus_rst(JD, observer, time); -+ ln_get_venus_rst(JD, observer, time); - } - - /*! \fn double Venus::get_mag(double JD) -@@ -70,7 +70,7 @@ - { - if (JD == 0) - JD = m_render_JD; -- return get_venus_magnitude (JD); -+ return ln_get_venus_magnitude (JD); - } - - /*! \fn void Venus::get_id(std::string& id) -@@ -102,7 +102,7 @@ - void Venus::render(double x, double y, double mag_max, Gnome::Canvas::Group& group, bool bright, double ppd) - { - // draw object on canvas -- double size = (mag_max + 1) - get_venus_magnitude(m_render_JD); -+ double size = (mag_max + 1) - ln_get_venus_magnitude(m_render_JD); - double sdiam = (get_equ_sdiam(m_render_JD) / 240.0) * ppd; - if (size < sdiam) - size = sdiam; -@@ -125,37 +125,37 @@ - - double Venus::get_earth_dist (double JD) - { -- return get_venus_earth_dist(JD); -+ return ln_get_venus_earth_dist(JD); - } - - double Venus::get_sun_dist (double JD) - { -- return get_venus_sun_dist(JD); -+ return ln_get_venus_solar_dist(JD); - } - - double Venus::get_equ_sdiam (double JD) - { -- return get_venus_sdiam(JD); -+ return ln_get_venus_sdiam(JD); - } - - double Venus::get_pol_sdiam (double JD) - { -- return get_venus_sdiam(JD); -+ return ln_get_venus_sdiam(JD); - } - - void Venus::get_helio_coords (double JD, struct ln_helio_posn * position) - { -- get_venus_helio_coords (JD, position); -+ ln_get_venus_helio_coords (JD, position); - } - - double Venus::get_phase (double JD) - { -- return get_venus_phase (JD); -+ return ln_get_venus_phase (JD); - } - - void Venus::get_rect_helio (double JD, struct ln_rect_posn * position) - { -- get_venus_rect_helio (JD, position); -+ ln_get_venus_rect_helio (JD, position); - } - - void Venus::set_render_jd (double JD) diff --git a/astro/nova/files/patch-src_castor_astro_object.hh b/astro/nova/files/patch-src_castor_astro_object.hh deleted file mode 100644 index 1f1fb69e18a1..000000000000 --- a/astro/nova/files/patch-src_castor_astro_object.hh +++ /dev/null @@ -1,11 +0,0 @@ ---- src/castor/astro_object.hh.orig Sat Nov 5 01:00:59 2005 -+++ src/castor/astro_object.hh Sat Nov 5 01:01:06 2005 -@@ -19,7 +19,7 @@ - - #include - #include --#include -+#include - #include - #include - diff --git a/astro/nova/files/patch-src_castor_deep_object.cc b/astro/nova/files/patch-src_castor_deep_object.cc deleted file mode 100644 index e216ea062fe4..000000000000 --- a/astro/nova/files/patch-src_castor_deep_object.cc +++ /dev/null @@ -1,13 +0,0 @@ ---- src/castor/deep_object.cc.orig Sat Nov 5 01:04:20 2005 -+++ src/castor/deep_object.cc Sat Nov 5 01:04:58 2005 -@@ -266,8 +266,8 @@ - struct ln_hms hms; - struct ln_dms dms; - -- deg_to_dms (m_dec, &dms); -- deg_to_hms (m_ra, &hms); -+ ln_deg_to_dms (m_dec, &dms); -+ ln_deg_to_hms (m_ra, &hms); - - name.push_front(Glib::ustring("Dist(ly)")); - sprintf(temp, "%4.2f", m_distance_ly); diff --git a/astro/nova/files/patch-src_gui_vsky_druid.cc b/astro/nova/files/patch-src_gui_vsky_druid.cc deleted file mode 100644 index a908dbedfd15..000000000000 --- a/astro/nova/files/patch-src_gui_vsky_druid.cc +++ /dev/null @@ -1,164 +0,0 @@ ---- src/gui/vsky_druid.cc.orig Sat Nov 5 13:04:49 2005 -+++ src/gui/vsky_druid.cc Sat Nov 5 13:07:03 2005 -@@ -37,8 +37,8 @@ - m_is_location_complete = false; - m_is_date_complete = false; - m_is_zone_complete = false; -- get_ln_date_from_sys(&m_date); -- m_JD = get_julian_from_sys(); -+ ln_get_date_from_sys(&m_date); -+ m_JD = ln_get_julian_from_sys(); - - // create pages - create_page_start (); -@@ -738,7 +738,7 @@ - double latitude; - - m_lat.degrees = (int)m_lat_deg_spinbutton->get_value(); -- latitude = dms_to_deg(&m_lat); -+ latitude = ln_dms_to_deg(&m_lat); - m_vsky->set_latitude(latitude); - } - -@@ -747,7 +747,7 @@ - double latitude; - - m_lat.minutes = (int)m_lat_min_spinbutton->get_value(); -- latitude = dms_to_deg(&m_lat); -+ latitude = ln_dms_to_deg(&m_lat); - m_vsky->set_latitude(latitude); - } - -@@ -756,7 +756,7 @@ - double latitude; - - m_lat.seconds = m_lat_sec_spinbutton->get_value(); -- latitude = dms_to_deg(&m_lat); -+ latitude = ln_dms_to_deg(&m_lat); - m_vsky->set_latitude(latitude); - } - -@@ -765,7 +765,7 @@ - double longitude; - - m_long.degrees = (int)m_long_deg_spinbutton->get_value(); -- longitude = dms_to_deg(&m_long); -+ longitude = ln_dms_to_deg(&m_long); - m_vsky->set_longitude(longitude); - } - -@@ -774,7 +774,7 @@ - double longitude; - - m_long.minutes = (int)m_long_min_spinbutton->get_value(); -- longitude = dms_to_deg(&m_long); -+ longitude = ln_dms_to_deg(&m_long); - m_vsky->set_longitude(longitude); - } - -@@ -783,7 +783,7 @@ - double longitude; - - m_long.seconds = m_long_sec_spinbutton->get_value(); -- longitude = dms_to_deg(&m_long); -+ longitude = ln_dms_to_deg(&m_long); - m_vsky->set_longitude(longitude); - } - -@@ -851,7 +851,7 @@ - - m_date.years = (int)m_year_spinbutton->get_value(); - refresh_date(); -- JD = get_julian_day(&m_date); -+ JD = ln_get_julian_day(&m_date); - m_vsky->set_jd(JD); - } - -@@ -861,7 +861,7 @@ - - m_date.months = (int)m_month_spinbutton->get_value(); - refresh_date(); -- JD = get_julian_day(&m_date); -+ JD = ln_get_julian_day(&m_date); - m_vsky->set_jd(JD); - } - -@@ -871,7 +871,7 @@ - - m_date.days = (int)m_day_spinbutton->get_value(); - refresh_date(); -- JD = get_julian_day(&m_date); -+ JD = ln_get_julian_day(&m_date); - m_vsky->set_jd(JD); - } - -@@ -881,7 +881,7 @@ - - m_date.hours = (int)m_hours_spinbutton->get_value(); - refresh_date(); -- JD = get_julian_day(&m_date); -+ JD = ln_get_julian_day(&m_date); - m_vsky->set_jd(JD); - } - -@@ -891,7 +891,7 @@ - - m_date.minutes = (int)m_minutes_spinbutton->get_value(); - refresh_date(); -- JD = get_julian_day(&m_date); -+ JD = ln_get_julian_day(&m_date); - m_vsky->set_jd(JD); - } - -@@ -901,7 +901,7 @@ - - m_date.seconds = m_seconds_spinbutton->get_value(); - refresh_date(); -- JD = get_julian_day(&m_date); -+ JD = ln_get_julian_day(&m_date); - m_vsky->set_jd(JD); - } - -@@ -911,7 +911,7 @@ - - m_JD = m_julian_spinbutton->get_value(); - refresh_date(); -- JD = get_julian_day(&m_date); -+ JD = ln_get_julian_day(&m_date); - m_vsky->set_jd(JD); - } - -@@ -938,7 +938,7 @@ - m_use_another_date = false; - m_use_julian_date = true; - refresh_date(); -- JD = get_julian_day(&m_date); -+ JD = ln_get_julian_day(&m_date); - m_vsky->set_jd(JD); - } - -@@ -976,8 +976,8 @@ - void VSkyDruid::refresh_date() - { - if (m_use_sys_date) { -- get_ln_date_from_sys(&m_date); -- m_JD = get_julian_from_sys(); -+ ln_get_date_from_sys(&m_date); -+ m_JD = ln_get_julian_from_sys(); - - m_year_spinbutton->set_value(m_date.years); - m_month_spinbutton->set_value(m_date.months); -@@ -989,11 +989,11 @@ - - } else if (m_use_another_date) { - -- m_JD = get_julian_day(&m_date); -+ m_JD = ln_get_julian_day(&m_date); - m_julian_spinbutton->set_value(m_JD); - - } else { -- get_date(m_JD, &m_date); -+ ln_get_date(m_JD, &m_date); - - m_year_spinbutton->set_value(m_date.years); - m_month_spinbutton->set_value(m_date.months); diff --git a/astro/nova/files/patch-src_gui_vsky_druid.hh b/astro/nova/files/patch-src_gui_vsky_druid.hh deleted file mode 100644 index 8418f12ffd92..000000000000 --- a/astro/nova/files/patch-src_gui_vsky_druid.hh +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gui/vsky_druid.hh.orig Sat Nov 5 13:04:15 2005 -+++ src/gui/vsky_druid.hh Sat Nov 5 13:04:25 2005 -@@ -37,7 +37,7 @@ - #include - #include - #include "virtual_sky.hh" --#include -+#include - - namespace GUI - { diff --git a/astro/nova/files/patch-src_vega_sky_appbar.cc b/astro/nova/files/patch-src_vega_sky_appbar.cc deleted file mode 100644 index a26819836391..000000000000 --- a/astro/nova/files/patch-src_vega_sky_appbar.cc +++ /dev/null @@ -1,33 +0,0 @@ ---- src/vega/sky_appbar.cc.orig Sat Nov 5 13:03:00 2005 -+++ src/vega/sky_appbar.cc Sat Nov 5 13:03:35 2005 -@@ -16,7 +16,7 @@ - - #include "sky_appbar.hh" - --#include -+#include - - namespace Vega - { -@@ -124,8 +124,8 @@ - struct ln_dms hdec; - char text[32]; - -- deg_to_dms (dec, &hdec); -- deg_to_hms (ra, &hra); -+ ln_deg_to_dms (dec, &hdec); -+ ln_deg_to_hms (ra, &hra); - - sprintf(text, "%2.2d", hra.hours); - m_equ_rah.set_text(text); -@@ -151,8 +151,8 @@ - struct ln_dms halt, haz; - char text[32]; - -- deg_to_dms (alt, &halt); -- deg_to_dms (az, &haz); -+ ln_deg_to_dms (alt, &halt); -+ ln_deg_to_dms (az, &haz); - - sprintf(text, "%2.2d", halt.degrees); - m_hrz_ald.set_text(text); diff --git a/astro/nova/files/patch-src_vega_virtual_sky.cc b/astro/nova/files/patch-src_vega_virtual_sky.cc deleted file mode 100644 index 0d904c40a392..000000000000 --- a/astro/nova/files/patch-src_vega_virtual_sky.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- src/vega/virtual_sky.cc.orig Sat Nov 5 13:00:16 2005 -+++ src/vega/virtual_sky.cc Sat Nov 5 13:02:23 2005 -@@ -17,7 +17,7 @@ - #include "virtual_sky.hh" - #include "astro_object.hh" - --#include -+#include - - namespace Vega - { -@@ -430,7 +430,7 @@ - m_projection->get_position(x, y, ra, dec); - equ.ra = ra; - equ.dec = dec; -- get_hrz_from_equ(&equ, &m_observer, m_JD, &hrz); -+ ln_get_hrz_from_equ(&equ, &m_observer, m_JD, &hrz); - m_appbar.set_hrz_posn(hrz.alt, hrz.az); - } else - m_appbar.set_hrz_posn(x,y); diff --git a/astro/nova/files/patch-src_vega_virtual_sky.hh b/astro/nova/files/patch-src_vega_virtual_sky.hh deleted file mode 100644 index 3333f76ddcc1..000000000000 --- a/astro/nova/files/patch-src_vega_virtual_sky.hh +++ /dev/null @@ -1,11 +0,0 @@ ---- src/vega/virtual_sky.hh.orig Sat Nov 5 13:01:44 2005 -+++ src/vega/virtual_sky.hh Sat Nov 5 13:01:55 2005 -@@ -28,7 +28,7 @@ - #include "sky_spherical.hh" - #include "sky_appbar.hh" - #include --#include -+#include - - /*! \namespace Vega - * \brief Nova Virtual Sky Engine diff --git a/astro/nova/files/patch5-configure.in b/astro/nova/files/patch5-configure.in deleted file mode 100644 index f915c9c5d19b..000000000000 --- a/astro/nova/files/patch5-configure.in +++ /dev/null @@ -1,18 +0,0 @@ ---- configure.in.orig Sat Nov 5 13:26:00 2005 -+++ configure.in Sat Nov 5 13:26:20 2005 -@@ -138,12 +138,12 @@ - - # Set NOVA_PIXMAP_DIR in config.h. - if test "x${prefix}" = "xNONE"; then -- AC_DEFINE_UNQUOTED(NOVA_PIXMAP_DIR, "${ac_default_prefix}/nova/pixmaps") -+ AC_DEFINE_UNQUOTED(NOVA_PIXMAP_DIR, "${ac_default_prefix}/share/nova/pixmaps") - NOVA_PIXMAP_DIR=${ac_default_prefix}/nova/pixmaps - AC_SUBST(NOVA_PIXMAP_DIR) - else -- AC_DEFINE_UNQUOTED(NOVA_PIXMAP_DIR, "${prefix}/nova/pixmaps") -- NOVA_PIXMAP_DIR=${prefix}/nova/pixmaps -+ AC_DEFINE_UNQUOTED(NOVA_PIXMAP_DIR, "${prefix}/share/nova/pixmaps") -+ NOVA_PIXMAP_DIR=${prefix}/share/nova/pixmaps - AC_SUBST(NOVA_PIXMAP_DIR) - fi - diff --git a/astro/nova/pkg-descr b/astro/nova/pkg-descr deleted file mode 100644 index b7537fc17f3c..000000000000 --- a/astro/nova/pkg-descr +++ /dev/null @@ -1,14 +0,0 @@ -The Nova project is a free Integrated Observational Environment for amateur -astronomers. It combines Ephemeris, Sky view, Observatory control and basic -Image manipulation functionality into a single application. - -Features - * Virtual view of night sky - * Ephemeris calculation and plotting. - * Telescope control - * CCD control - * Image manipulation - * Supports most ASCII astronomical object catalogs - * Automatic scheduling of observational activity. - -WWW: http://nova.sourceforge.net/ diff --git a/astro/nova/pkg-plist b/astro/nova/pkg-plist deleted file mode 100644 index 04646675982c..000000000000 --- a/astro/nova/pkg-plist +++ /dev/null @@ -1,23 +0,0 @@ -bin/nova -bin/catbuilder -%%DATADIR%%/pixmaps/asteroid-small.xpm -%%DATADIR%%/pixmaps/comet-small.xpm -%%DATADIR%%/pixmaps/earth-small.xpm -%%DATADIR%%/pixmaps/galaxy-small.xpm -%%DATADIR%%/pixmaps/jupiter-small.xpm -%%DATADIR%%/pixmaps/mars-small.xpm -%%DATADIR%%/pixmaps/mercury-small.xpm -%%DATADIR%%/pixmaps/moon-small.xpm -%%DATADIR%%/pixmaps/nebula-small.xpm -%%DATADIR%%/pixmaps/neptune-small.xpm -%%DATADIR%%/pixmaps/other-small.xpm -%%DATADIR%%/pixmaps/pluto-small.xpm -%%DATADIR%%/pixmaps/saturn-small.xpm -%%DATADIR%%/pixmaps/star6.xpm -%%DATADIR%%/pixmaps/star8.xpm -%%DATADIR%%/pixmaps/sun-small.xpm -%%DATADIR%%/pixmaps/uranus-small.xpm -%%DATADIR%%/pixmaps/venus-small.xpm -%%DATADIR%%/pixmaps/nova_logo.png -@dirrm %%DATADIR%%/pixmaps -@dirrmtry %%DATADIR%%