From b7bfef00cb32cf686d7f809c32a7946bb1b925bc Mon Sep 17 00:00:00 2001 From: brooks Date: Wed, 13 Feb 2008 00:13:56 +0000 Subject: Add 6.x where x != 0 to the CONFLICTS list in prepration for hooking up the 6.1 port. --- sysutils/sge60/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sysutils') 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 -- cgit