diff options
| -rw-r--r-- | x11/gnome2-lite/Makefile | 3 | ||||
| -rw-r--r-- | x11/gnome2/Makefile | 15 |
2 files changed, 14 insertions, 4 deletions
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index c62a0bc2f..2c318090a 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2-lite/Makefile,v 1.41 2005/08/24 05:42:57 mezz Exp $ +# $MCom: ports/x11/gnome2-lite/Makefile,v 1.42 2005/08/26 03:21:23 marcus Exp $ # PORTREVISION= 0 @@ -22,7 +22,6 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \ nautilus:${PORTSDIR}/x11-fm/nautilus2 \ yelp:${PORTSDIR}/x11/yelp \ - ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome \ ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \ ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \ file-roller:${PORTSDIR}/archivers/fileroller \ diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index e5648230f..23a092c1c 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.119 2005/08/26 03:21:23 marcus Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.120 2005/09/07 18:40:26 marcus Exp $ # PORTNAME= gnome2 @@ -31,7 +31,6 @@ RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 nautilus:${PORTSDIR}/x11-fm/nautilus2 \ yelp:${PORTSDIR}/x11/yelp \ ${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm \ - ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome \ ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \ ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \ ${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \ @@ -73,6 +72,10 @@ pre-configure: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif +.if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite" +OPTIONS= GNOME_SCREENSAVER "Use gnome-screensaver as screensaver app" off +.endif + do-install: # empty .include <bsd.port.pre.mk> @@ -83,4 +86,12 @@ RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany .endif .endif +.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite" +.if !defined(WITH_GNOME_SCREENSAVER) +RUN_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome +.else +RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver +.endif +.endif + .include <bsd.port.post.mk> |