astro/nightfall: update to latest upsteam and remove BROKEN

Bump to more recent(?) release from the website; German-only https://www.la-samhna.de/nightfall/index.html
freebsd · Apr 26, 2021 · 7ea9db4 · 7ea9db4
1 parent f5b7db0
commit 7ea9db4
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 13 deletions.
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
@@ -1,19 +1,18 @@
 # Created by: Christian Brueffer <chris@unixpages.org>
 
 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
@@ -32,7 +31,7 @@ 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 \

diff --git 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
@@ -1,6 +1,6 @@
---- 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        <<<<<<<<<<<<<<<<<<<<<  */
 

diff --git a/astro/nightfall/files/patch-Light.h b/astro/nightfall/files/patch-Light.h
@@ -1,6 +1,6 @@
---- 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)
  /*                                                                        */
  /**************************************************************************/
 

diff --git a/astro/nightfall/files/patch-LightGL.c 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
@@ -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
@@ -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
@@ -15,6 +15,7 @@ share/locale/it/LC_MESSAGES/nightfall.mo
 %%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
@@ -33,6 +34,7 @@ share/locale/it/LC_MESSAGES/nightfall.mo
 %%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