diff options
author | Brooks Davis <brooks@FreeBSD.org> | 2008-02-13 00:13:56 +0000 |
---|---|---|
committer | Brooks Davis <brooks@FreeBSD.org> | 2008-02-13 00:13:56 +0000 |
commit | 2db4eeb7d302ac3e113d88367599a15be18e5012 (patch) | |
tree | f8f7eaef5056e9538e565946d1c9a4b7e84a4385 /sysutils | |
parent | - Update to 1.0.2 (diff) |
Add 6.x where x != 0 to the CONFLICTS list in prepration for hooking up the
6.1 port.
Notes
Notes:
svn path=/head/; revision=207128
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/sge60/Makefile | 2 |
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 |