diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index ad3638c7887f..9ea50341905b 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -1,78 +1,80 @@
 # New ports collection makefile for:      nightfall
 # Date created:         21 February 2002
 # Whom:                 Christian Brueffer <chris@unixpages.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	nightfall
-PORTVERSION=	1.61
+PORTVERSION=	1.62
 CATEGORIES=	astro
 MASTER_SITES=	http://www.la-samhna.de/nightfall/ CENKES
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An interactive binary star application
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_XLIB=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnomehack gnomehier gnometarget gtk20
 USE_PERL5=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-locale-prefix=${PREFIX}/share/locale
 
 MAN1=		nightfall.1
 
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 PKGNAMESUFFIX=	-gnome
 USE_GNOME+=	gnomeprefix libgnomeui
 CONFIGURE_ARGS+=	--with-gnomedoc-prefix=${PREFIX}/share
 INSTALLS_OMF=	yes
 DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
 .else
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
 .if defined(WITHOUT_PGPLOT)
 RUN_DEPENDS+=	gnuplot:${PORTSDIR}/math/gnuplot
 CONFIGURE_ARGS+=	--with-gnuplot
 .else
 LIB_DEPENDS+=	pgplot.5:${PORTSDIR}/graphics/pgplot
+USE_FORTRAN=	yes
+CONFIGURE_ENV+=	FC="${FC}" F77="${F77}" FFLAGS="${FFLAGS}"
 CONFIGURE_ARGS+=	--with-pgplot-include=${LOCALBASE}/include \
 			--with-pgplot-lib=${LOCALBASE}/lib
 .endif
 
 .if defined(WITHOUT_OPENGL)
 CONFIGURE_ARGS+=	--disable-opengl
 .else
-LIB_DEPENDS+=	glut.4:${PORTSDIR}/graphics/libglut \
-		gtkgl-2.0.1:${PORTSDIR}/x11-toolkits/gtkglarea2
+LIB_DEPENDS+=	gtkgl-2.0.1:${PORTSDIR}/x11-toolkits/gtkglarea2
+USE_GL=		glut
 CONFIGURE_ARGS+=	--with-lib-GL
 .endif
 
-pre-configure:
+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|-O3||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|CFLAGS -O3|CFLAGS|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|^Icon=gnome|Icon=${DATADIR}/pixmaps/gnome|g' \
 		${WRKSRC}/nightfall.desktop
 
 post-install:
-	@${INSTALL} -d ${PREFIX}/share/gnome/applications/
-	@${INSTALL_DATA} ${WRKSRC}/nightfall.desktop \
-		${PREFIX}/share/gnome/applications/
+	@${MKDIR} ${PREFIX}/share/gnome/applications
+	${INSTALL_DATA} ${WRKSRC}/nightfall.desktop \
+		${PREFIX}/share/gnome/applications
 
 .include <bsd.port.post.mk>
diff --git a/astro/nightfall/distinfo b/astro/nightfall/distinfo
index 579df428cdc8..102cb5fee4a2 100644
--- a/astro/nightfall/distinfo
+++ b/astro/nightfall/distinfo
@@ -1,3 +1,3 @@
-MD5 (nightfall-1.61.tar.gz) = 8224a80cbd0a255b0bc8b2c5d94d22e1
-SHA256 (nightfall-1.61.tar.gz) = eefffafd36d415687f13ebf48ee00f66488e6cfc466fad522ff8d1de27139868
-SIZE (nightfall-1.61.tar.gz) = 1331088
+MD5 (nightfall-1.62.tar.gz) = 318314e97b83fdb74860aba6adef219b
+SHA256 (nightfall-1.62.tar.gz) = b2d023b5c7d41d9f28bc0aec1444eb908c6b3dd61e9dd99a8927da1b5808d30f
+SIZE (nightfall-1.62.tar.gz) = 1331078