Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/astro/nightfall/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	24 Oct 2007 23:34:43 -0000	1.21
+++ Makefile	12 Mar 2008 13:04:37 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	nightfall
 PORTVERSION=	1.62
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	http://www.la-samhna.de/nightfall/ CENKES
 
@@ -16,8 +16,8 @@
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_XLIB=	yes
-WANT_GNOME=	yes
+USE_XORG=	x11 xext xrender xinerama xi xrandr xcursor \
+		xcomposite xdamage xfixes
 USE_GNOME=	gnomehack gnomehier gnometarget gtk20
 USE_PERL5=	yes
 USE_GETTEXT=	yes
@@ -35,8 +35,10 @@
 PKGNAMESUFFIX=	-gnome
 USE_GNOME+=	gnomeprefix libgnomeui
 INSTALLS_OMF=	yes
+PLIST_SUB=	GNOME=""
 .else
 CONFIGURE_ARGS+=	--disable-gnome
+PLIST_SUB=	GNOME="@comment "
 .endif
 
 .if defined(WITHOUT_PGPLOT)
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/astro/nightfall/pkg-plist,v
retrieving revision 1.6
diff -u -r1.6 pkg-plist
--- pkg-plist	24 Oct 2007 23:34:43 -0000	1.6
+++ pkg-plist	12 Mar 2008 12:53:59 -0000
@@ -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
+%%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
@@ -83,9 +83,9 @@
 %%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
+%%GNOME%%share/omf/nightfall/nightfall-C.omf
+%%GNOME%%share/omf/nightfall/nightfall-de.omf
+%%GNOME%%@dirrm share/omf/nightfall
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/doc/de
 @dirrm %%DATADIR%%/doc/C
@@ -93,7 +93,7 @@
 @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
+%%GNOME%%@dirrm share/gnome/help/nightfall/de
+%%GNOME%%@dirrm share/gnome/help/nightfall/C
+%%GNOME%%@dirrm share/gnome/help/nightfall
 @dirrmtry share/applications