aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-05-25 05:01:30 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-05-25 05:01:30 +0000
commita2c2f55504b922257544b8d2521e8c3d46d68457 (patch)
treeb362a13d5987adbb28ce38da5cf850b9326b59fc
parent65da3df8b292600ad287a1cd984677d6db2fbd50 (diff)
downloadports-a2c2f55504b922257544b8d2521e8c3d46d68457.tar.gz
ports-a2c2f55504b922257544b8d2521e8c3d46d68457.zip
Fix nognome PLIST breakage introduced in the previous commit and add missing
item into the PLIST.
Notes
Notes: svn path=/head/; revision=59967
-rw-r--r--x11/xscreensaver/Makefile5
-rw-r--r--x11/xscreensaver/pkg-plist1
2 files changed, 3 insertions, 3 deletions
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 804550648b9f..3ebc07d1aed2 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -20,9 +20,7 @@ USE_X_PREFIX= yes
USE_XPM= yes
USE_MESA= yes
USE_GTK= yes
-.if defined(WITH_GNOME)
WANT_GNOME= yes
-.endif
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \
--with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \
@@ -31,11 +29,12 @@ CONFIGURE_ARGS= --without-pam --with-gl --with-gle --with-xpm --with-xml \
.include <bsd.port.pre.mk>
-.if defined(HAVE_GNOME)
+.if defined(HAVE_GNOME) && defined(WITH_GNOME)
USE_GNOME= yes
CONFIGURE_ARGS+= --with-gnome
.else
CONFIGURE_ARGS+= --without-gnome
+PLIST_SUB+= GNOME:="@comment "
.endif
CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include/gnome-xml
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index 1073cd6f79cf..10e3b9760610 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -135,6 +135,7 @@ bin/xscreensaver-hacks/vidwhacker
bin/xscreensaver-hacks/vines
bin/xscreensaver-hacks/wander
bin/xscreensaver-hacks/webcollage
+bin/xscreensaver-hacks/webcollage-helper
bin/xscreensaver-hacks/whirlwindwarp
bin/xscreensaver-hacks/whirlygig
bin/xscreensaver-hacks/worm