summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-screensaver/Makefile4
-rw-r--r--x11/gnome-screensaver3/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 85593ad35..f923cb55d 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.121 2010/09/30 19:51:41 kwm Exp $
+# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.123 2011/03/06 20:29:27 kwm Exp $
#
PORTNAME= gnome-screensaver
@@ -19,6 +19,8 @@ COMMENT= GNOME screen saver and locker
LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify
RUN_DEPENDS= xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
+CONFLICTS= gnome-screensaver-3.[0-9]*
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
diff --git a/x11/gnome-screensaver3/Makefile b/x11/gnome-screensaver3/Makefile
index 7cfc34fb8..c8cf86783 100644
--- a/x11/gnome-screensaver3/Makefile
+++ b/x11/gnome-screensaver3/Makefile
@@ -3,7 +3,7 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-screensaver3/Makefile,v 1.11 2011/03/31 10:55:11 kwm Exp $
+# $MCom: ports/x11/gnome-screensaver3/Makefile,v 1.12 2011/04/05 12:59:56 kwm Exp $
#
PORTNAME= gnome-screensaver
@@ -20,6 +20,8 @@ LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify \
RUN_DEPENDS= pam_helper:${PORTSDIR}/security/pam_helper \
${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring3
+CONFLICTS= gnome-screensaver-2.[0-9]*
+
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes