4 files changed, 19 insertions, 40 deletions

diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index 9155f2689aef..75651031f0f1 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	nightfall
-PORTVERSION=	1.64
-PORTREVISION=	1
+PORTVERSION=	1.70
 CATEGORIES=	astro
-MASTER_SITES=	http://www.la-samhna.de/nightfall/ CENKES
+MASTER_SITES=	http://www.la-samhna.de/nightfall/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An interactive binary star application
 
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
+OPTIONS=	GNOMEUI "Enable LibGnomeUI support" off \
+		PGPLOT "Enable PGPLOT support" on \
+		OPENGL "Enable OpenGL support" on
 
-USE_XORG=	x11 xext xrender xinerama xi xrandr xcursor \
-		xcomposite xdamage xfixes
-WANT_GNOME=	yes
 USE_GNOME=	gnomehack gnomehier gnometarget gtk20
 USE_PERL5=	yes
 USE_GETTEXT=	yes
@@ -32,13 +30,14 @@ MAN1=		nightfall.1
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-PKGNAMESUFFIX=	-gnome
+.if defined(WITH_GNOMEUI)
 USE_GNOME+=	gnomeprefix libgnomeui
 CONFIGURE_ARGS+=	--with-gnomedoc-prefix=${PREFIX}/share
 INSTALLS_OMF=	yes
+PLIST_SUB+=	GNOMEUI=""
 .else
 CONFIGURE_ARGS+=	--disable-gnome
+PLIST_SUB+=	GNOMEUI="@comment "
 .endif
 
 .if defined(WITHOUT_PGPLOT)
@@ -59,14 +58,6 @@ USE_GL=		glut
 CONFIGURE_ARGS+=	--with-lib-GL
 .endif
 
-pre-everything::
-	@${ECHO_MSG} "Nightfall has the following tunable option(s):"
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "	WITHOUT_GNOME=libgnomeui	Turns off Gnome support"
-	@${ECHO_MSG} "	WITHOUT_PGPLOT=yes		Turns off PGPLOT support"
-	@${ECHO_MSG} "	WITHOUT_OPENGL=yes		Turns off OpenGL support"
-	@${ECHO_MSG} ""
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS -O3|CFLAGS|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|^Icon=gnome|Icon=${DATADIR}/pixmaps|g' \
diff --git a/astro/nightfall/distinfo b/astro/nightfall/distinfo
index 226464dbb903..8d51fa48897d 100644
--- a/astro/nightfall/distinfo
+++ b/astro/nightfall/distinfo
@@ -1,3 +1,3 @@
-MD5 (nightfall-1.64.tar.gz) = 6491790212b04449e37b96b2b3023f68
-SHA256 (nightfall-1.64.tar.gz) = 20b8b5ffd3be551830c03bd21211791a2035cfb8d5da04e74b69d45af3d8d41d
-SIZE (nightfall-1.64.tar.gz) = 1430336
+MD5 (nightfall-1.70.tar.gz) = e2e3ded15f8b69a620585b035071a1ea
+SHA256 (nightfall-1.70.tar.gz) = d282b3d5f90e51284cbfb1619ab54184549eb2a21422ee452d794cded58c14de
+SIZE (nightfall-1.70.tar.gz) = 1457748
diff --git a/astro/nightfall/files/patch-LightInput.c b/astro/nightfall/files/patch-LightInput.c
deleted file mode 100644
index ac0c15b168ac..000000000000
--- a/astro/nightfall/files/patch-LightInput.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- LightInput.c.orig	2008-07-23 03:59:38.000000000 +0900
-+++ LightInput.c	2008-07-23 23:44:48.000000000 +0900
-@@ -672,7 +672,9 @@
- 	Flags.interactive = ON;
- 	Flags.fractional  = ON;
- 	Flags.visualize   = ON;
-+#ifdef _WITH_OPENGL
- 	Flags.use_opengl  = ON;
-+#endif
- 	Flags.PlotBand    = Vmag;
-       } else {
- 	WARNERR(_("Bad Option (use 'nightfall <RETURN> to get a list of options): "), 
diff --git a/astro/nightfall/pkg-plist b/astro/nightfall/pkg-plist
index 3598c5bb6b5b..aed5fe74b58e 100644
--- a/astro/nightfall/pkg-plist
+++ b/astro/nightfall/pkg-plist
@@ -1,7 +1,7 @@
 bin/nightfall
 share/applications/nightfall.desktop
-%%GNOME:%%share/gnome/help/nightfall/C/nightfall.xml
-%%GNOME:%%share/gnome/help/nightfall/de/nightfall.xml
+%%GNOMEUI%%share/gnome/help/nightfall/C/nightfall.xml
+%%GNOMEUI%%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
@@ -89,9 +89,9 @@ share/locale/it/LC_MESSAGES/nightfall.mo
 %%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
-%%GNOME:%%@dirrm share/omf/nightfall
+%%GNOMEUI%%share/omf/nightfall/nightfall-C.omf
+%%GNOMEUI%%share/omf/nightfall/nightfall-de.omf
+%%GNOMEUI%%@dirrm share/omf/nightfall
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/doc/de/edu
 @dirrm %%DATADIR%%/doc/de
@@ -101,7 +101,7 @@ share/locale/it/LC_MESSAGES/nightfall.mo
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%/cfg
 @dirrm %%DATADIR%%
-%%GNOME:%%@dirrm share/gnome/help/nightfall/de
-%%GNOME:%%@dirrm share/gnome/help/nightfall/C
-%%GNOME:%%@dirrm share/gnome/help/nightfall
+%%GNOMEUI%%@dirrm share/gnome/help/nightfall/de
+%%GNOMEUI%%@dirrm share/gnome/help/nightfall/C
+%%GNOMEUI%%@dirrm share/gnome/help/nightfall
 @dirrmtry share/applications