diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile index d2eeaf83b18f..93a48062202e 100644 --- a/astro/nightfall/Makefile +++ b/astro/nightfall/Makefile @@ -1,59 +1,58 @@ # Created by: Christian Brueffer PORTNAME= nightfall -PORTVERSION= 1.86 -PORTREVISION= 9 +PORTVERSION= 1.92 CATEGORIES= astro education MASTER_SITES= http://www.la-samhna.de/nightfall/ MAINTAINER= ports@FreeBSD.org COMMENT= Interactive binary star application -BROKEN_FreeBSD_12= does not build: multiple definition of 'texture_maxval' -BROKEN_FreeBSD_13= does not build: multiple definition of 'texture_maxval' +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 -USES= compiler gettext gmake gnome pathfix perl5 pkgconfig -USE_GNOME= gtk20 +USES= compiler gettext gmake gnome jpeg pathfix perl5 pkgconfig +USE_GNOME= cairo gdkpixbuf2 gtk20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-locale-prefix=${PREFIX}/share/locale OPTIONS_DEFINE= GNOME PGPLOT OPENGL OPTIONS_DEFAULT= PGPLOT OPENGL OPTIONS_SUB= yes GNOME_CONFIGURE_ON= --with-gnomedoc-prefix=${PREFIX}/share GNOME_CONFIGURE_OFF= --disable-gnome GNOME_USE= GNOME=gnomeprefix,libgnomeui GNOME_VARS= INSTALLS_OMF=yes OPENGL_CONFIGURE_ON= --with-lib-GL OPENGL_CONFIGURE_OFF= --disable-opengl OPENGL_LIB_DEPENDS= libgtkgl-2.0.so:x11-toolkits/gtkglarea2 OPENGL_USES= gl -OPENGL_USE= GL=glut +OPENGL_USE= GL=glut,gl,glu PGPLOT_DESC= PGPLOT support PGPLOT_CONFIGURE_ON= --with-pgplot-include=${LOCALBASE}/include \ --with-pgplot-lib=${LOCALBASE}/lib PGPLOT_CONFIGURE_OFF= --with-gnuplot PGPLOT_LIB_DEPENDS= libpgplot.so:graphics/pgplot PGPLOT_RUN_DEPENDS_OFF= gnuplot:math/gnuplot PGPLOT_USES= fortran .include post-patch: .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's|-fforce-addr||' ${WRKSRC}/configure .endif @${REINPLACE_CMD} -e 's|CFLAGS -O3|CFLAGS|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|^Icon=gnome|Icon=${DATADIR}/pixmaps|g' \ ${WRKSRC}/nightfall.desktop post-install: ${INSTALL_DATA} ${WRKSRC}/nightfall.desktop \ ${STAGEDIR}${PREFIX}/share/applications .include diff --git a/astro/nightfall/distinfo b/astro/nightfall/distinfo index 0d7319ee7b9d..d0b28fed0ed5 100644 --- a/astro/nightfall/distinfo +++ b/astro/nightfall/distinfo @@ -1,2 +1,3 @@ -SHA256 (nightfall-1.86.tar.gz) = 2394133c77d512f048198da91a9bf9378887997c4df1a7283e6b91f08dd54e80 -SIZE (nightfall-1.86.tar.gz) = 1479521 +TIMESTAMP = 1619452023 +SHA256 (nightfall-1.92.tar.gz) = dba425c826ff3e98d5893ecd83de317095ceb6a4b1906ee5d616ffa3afd9b029 +SIZE (nightfall-1.92.tar.gz) = 1501044 diff --git a/astro/nightfall/files/patch-Light.c b/astro/nightfall/files/patch-Light.c index 509591a83a40..3ff08b4e6fa4 100644 --- a/astro/nightfall/files/patch-Light.c +++ b/astro/nightfall/files/patch-Light.c @@ -1,13 +1,13 @@ ---- Light.c.orig 2014-09-25 08:03:26 UTC +--- Light.c.orig 2016-08-26 08:14:53 UTC +++ Light.c -@@ -252,8 +252,10 @@ int main(int argc, char *argv[]) +@@ -254,8 +254,10 @@ int main(int argc, char *argv[]) /* >>>>>>>>>>>>>>>> ALLOCATE MEMORY <<<<<<<<<<<<<<<<<<<<< */ +#if 0 program_invocation_name = malloc (1 + strlen(argv[0])); strcpy(program_invocation_name, argv[0]); +#endif /* should be freed by OS on program exit (?) */ diff --git a/astro/nightfall/files/patch-Light.h b/astro/nightfall/files/patch-Light.h index bd73f74cb55f..3fd7f7457de5 100644 --- a/astro/nightfall/files/patch-Light.h +++ b/astro/nightfall/files/patch-Light.h @@ -1,12 +1,12 @@ ---- Light.h.orig 2014-09-25 09:25:17 UTC +--- Light.h.orig 2016-09-06 07:52:21 UTC +++ Light.h -@@ -935,7 +935,9 @@ void DefineAxis(double *Min, double *Max +@@ -957,7 +957,9 @@ void DefineAxis(double *Min, double *Max, double *Inc) /* */ /**************************************************************************/ +#if 0 extern char * program_invocation_name; +#endif /* ----------- Error Messages ---------------------------------------- */ diff --git a/astro/nightfall/files/patch-LightGL.c b/astro/nightfall/files/patch-LightGL.c new file mode 100644 index 000000000000..222542038b7c --- /dev/null +++ b/astro/nightfall/files/patch-LightGL.c @@ -0,0 +1,10 @@ +--- LightGL.c.orig 2021-04-26 15:56:57 UTC ++++ LightGL.c +@@ -375,4 +375,7 @@ int WriteJPEGFile(JSAMPLE * imgbuff, char *filename, i + return(TRUE); + } + ++float texture_minval[NUM_COMP] = {0}; ++float texture_maxval[NUM_COMP] = {0}; ++ + #endif /* OpenGL end */ diff --git a/astro/nightfall/files/patch-LightGL.h b/astro/nightfall/files/patch-LightGL.h new file mode 100644 index 000000000000..f88f86d2c566 --- /dev/null +++ b/astro/nightfall/files/patch-LightGL.h @@ -0,0 +1,13 @@ +--- LightGL.h.orig 2021-04-26 15:56:15 UTC ++++ LightGL.h +@@ -67,8 +67,8 @@ + #define VP_RV_WIDTH 300 + #define VP_RV_HEIGHT 250 + +-float texture_minval[NUM_COMP]; +-float texture_maxval[NUM_COMP]; ++extern float texture_minval[NUM_COMP]; ++extern float texture_maxval[NUM_COMP]; + + /* wedge primary */ + #define VP_WP_X0 0 diff --git a/astro/nightfall/files/patch-LightPassband.c b/astro/nightfall/files/patch-LightPassband.c new file mode 100644 index 000000000000..13c989bc357e --- /dev/null +++ b/astro/nightfall/files/patch-LightPassband.c @@ -0,0 +1,11 @@ +--- LightPassband.c.orig 2021-04-26 15:54:23 UTC ++++ LightPassband.c +@@ -1455,7 +1455,7 @@ void nf_pb_readInternal() + snprintf(msg, sizeof(msg), + _("no flux data in external passband %d (%s)"), + pos, +- (pb_bands[pos].name) ? pb_bands[pos].name : "NULL"); ++ (pb_bands[pos].name[0]) ? pb_bands[pos].name : "NULL"); + WARNING(msg); + } + else diff --git a/astro/nightfall/pkg-plist b/astro/nightfall/pkg-plist index a9b6103f7e60..83e149ecba4c 100644 --- a/astro/nightfall/pkg-plist +++ b/astro/nightfall/pkg-plist @@ -1,94 +1,96 @@ bin/nightfall man/man1/nightfall.1.gz share/applications/nightfall.desktop %%GNOME%%share/gnome/help/nightfall/C/nightfall.xml %%GNOME%%share/gnome/help/nightfall/de/nightfall.xml share/locale/de/LC_MESSAGES/nightfall.mo share/locale/it/LC_MESSAGES/nightfall.mo %%DATADIR%%/cfg/51_peg.cfg %%DATADIR%%/cfg/bh_vir.cfg %%DATADIR%%/cfg/bh_vir_simple.cfg %%DATADIR%%/cfg/dd_mon.cfg %%DATADIR%%/cfg/er_vul.cfg %%DATADIR%%/cfg/lz_cen.cfg %%DATADIR%%/cfg/mr_cyg.cfg %%DATADIR%%/cfg/ty_boo.cfg %%DATADIR%%/cfg/v541_cyg.cfg %%DATADIR%%/data/51_pegR1.dat +%%DATADIR%%/data/Filter_OM_UVM2.txt %%DATADIR%%/data/bh_virB.dat %%DATADIR%%/data/bh_virR1.dat %%DATADIR%%/data/bh_virR2.dat %%DATADIR%%/data/bh_virV.dat %%DATADIR%%/data/bh_virb.dat %%DATADIR%%/data/bh_viru.dat %%DATADIR%%/data/bh_virv.dat %%DATADIR%%/data/bh_viry.dat %%DATADIR%%/data/dd_monB.dat %%DATADIR%%/data/dd_monR2.dat %%DATADIR%%/data/dd_monV.dat %%DATADIR%%/data/er_vulB.dat %%DATADIR%%/data/er_vulI.dat %%DATADIR%%/data/er_vulR.dat %%DATADIR%%/data/er_vulR1.dat %%DATADIR%%/data/er_vulR2.dat %%DATADIR%%/data/er_vulU.dat %%DATADIR%%/data/er_vulV.dat +%%DATADIR%%/data/filtertest %%DATADIR%%/data/lz_cenR1.dat %%DATADIR%%/data/lz_cenR2.dat %%DATADIR%%/data/lz_cenb.dat %%DATADIR%%/data/lz_cenu.dat %%DATADIR%%/data/lz_cenv.dat %%DATADIR%%/data/lz_ceny.dat %%DATADIR%%/data/mr_cygB.dat %%DATADIR%%/data/mr_cygR1.dat %%DATADIR%%/data/mr_cygR2.dat %%DATADIR%%/data/mr_cygU.dat %%DATADIR%%/data/mr_cygV.dat %%DATADIR%%/data/ty_booB.dat %%DATADIR%%/data/ty_booR1.dat %%DATADIR%%/data/ty_booR2.dat %%DATADIR%%/data/ty_booV.dat %%DATADIR%%/data/v541_cygR1.dat %%DATADIR%%/data/v541_cygR2.dat %%DATADIR%%/data/v541_cygV.dat %%DATADIR%%/doc/C/edu/help0.txt %%DATADIR%%/doc/C/edu/help1.txt %%DATADIR%%/doc/C/edu/help2.txt %%DATADIR%%/doc/C/edu/help3.txt %%DATADIR%%/doc/C/edu/help5.txt %%DATADIR%%/doc/C/help0.txt %%DATADIR%%/doc/C/help1.txt %%DATADIR%%/doc/C/help2.txt %%DATADIR%%/doc/C/help3.txt %%DATADIR%%/doc/C/help4.txt %%DATADIR%%/doc/C/help5.txt %%DATADIR%%/doc/C/help6.txt %%DATADIR%%/doc/C/help7.txt %%DATADIR%%/doc/C/help8.txt %%DATADIR%%/doc/de/edu/help0.txt %%DATADIR%%/doc/de/edu/help1.txt %%DATADIR%%/doc/de/edu/help2.txt %%DATADIR%%/doc/de/edu/help3.txt %%DATADIR%%/doc/de/edu/help5.txt %%DATADIR%%/doc/de/help0.txt %%DATADIR%%/doc/de/help1.txt %%DATADIR%%/doc/de/help2.txt %%DATADIR%%/doc/de/help3.txt %%DATADIR%%/doc/de/help5.txt %%DATADIR%%/pixmaps/checker_256.jpg %%DATADIR%%/pixmaps/disk_128.jpg %%DATADIR%%/pixmaps/disk_256.jpg %%DATADIR%%/pixmaps/gnome-nightfall.png %%DATADIR%%/pixmaps/manim.xpm %%DATADIR%%/pixmaps/mcomp.xpm %%DATADIR%%/pixmaps/mhelp.xpm %%DATADIR%%/pixmaps/mplot.xpm %%DATADIR%%/pixmaps/nf_logo.xpm %%DATADIR%%/pixmaps/star_128.jpg %%DATADIR%%/pixmaps/star_256.jpg %%DATADIR%%/pixmaps/starp_128.jpg %%DATADIR%%/pixmaps/starp_256.jpg %%DATADIR%%/pixmaps/stars_128.jpg %%DATADIR%%/pixmaps/stars_256.jpg %%GNOME%%share/omf/nightfall/nightfall-C.omf %%GNOME%%share/omf/nightfall/nightfall-de.omf