aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2008-02-13 08:13:56 +0800
committerbrooks <brooks@FreeBSD.org>2008-02-13 08:13:56 +0800
commitb7bfef00cb32cf686d7f809c32a7946bb1b925bc (patch)
tree877bab4066121156c19933dbe1fde78c3bc7cefd /sysutils
parentb7f895952731a60b4a11cab3a549f9e7d3fddccd (diff)
downloadfreebsd-ports-gnome-b7bfef00cb32cf686d7f809c32a7946bb1b925bc.tar.gz
freebsd-ports-gnome-b7bfef00cb32cf686d7f809c32a7946bb1b925bc.tar.zst
freebsd-ports-gnome-b7bfef00cb32cf686d7f809c32a7946bb1b925bc.zip
Add 6.x where x != 0 to the CONFLICTS list in prepration for hooking up the
6.1 port.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/sge60/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile
index 982e1d1c63ef..0f458d8d7279 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -28,7 +28,7 @@ OPTIONS= BDB "Use DB based spooler" on \
JAVA "Support Java DRMAA API" on \
X11 "Qmon X11 GUI" on
-CONFLICTS= sge-5* sgeee-[0-9]* sge-0.*
+CONFLICTS= sge-6.[1-9]* sge-5* sgeee-[0-9]* sge-0.*
EXTRA_PATCHES= ${FILESDIR}/sge-freebsd-pdc.diff