summaryrefslogtreecommitdiff
path: root/x11/xscreensaver-gnome
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2005-09-14 03:26:54 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2005-09-14 03:26:54 +0000
commit33c9cee3d5340d159b1ca3df967588d23b91c74b (patch)
tree84b51e96f024aa06578d95a4ec84fc5863857220 /x11/xscreensaver-gnome
parentAdd xscreensaver-gnome-hacks a slave port of xscreensaver-gnome that only (diff)
Conflict with xscreensaver-gnome-hacks.
Notes
Notes: svn path=/head/; revision=142669
Diffstat (limited to 'x11/xscreensaver-gnome')
-rw-r--r--x11/xscreensaver-gnome/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 9f020f73a6cb..669210744410 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -17,7 +17,7 @@ COMMENT= Save your screen while you entertain your cat (for GNOME users)
LIB_DEPENDS= gle.3:${PORTSDIR}/graphics/gle
-CONFLICTS?= xscreensaver-[0-9]*
+CONFLICTS?= xscreensaver-[0-9]* xscreensaver-gnome-hacks-[0-9]*
USE_X_PREFIX= yes
USE_XPM= yes