From cf5c43aaa831bb22ffd3d2e388841eb4eed50fe5 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Mon, 25 Feb 2008 23:43:39 +0000 Subject: [PATCH] Remove a nolonger needed workaround for systems prior to 6.0 that was preventing builds on 5.x. Don't bump PORTREVISION because we were only trying to apply the patch to 5.x systems and thus no changes will occur on systems that were building prior to this change. Reported by: pointyhat (via erwin) --- sysutils/sge60/Makefile | 3 --- sysutils/sge60/files/pthread-types.diff | 14 -------------- sysutils/sge61/Makefile | 3 --- sysutils/sge61/files/pthread-types.diff | 14 -------------- sysutils/sge62/Makefile | 3 --- sysutils/sge62/files/pthread-types.diff | 14 -------------- 6 files changed, 51 deletions(-) delete mode 100644 sysutils/sge60/files/pthread-types.diff delete mode 100644 sysutils/sge61/files/pthread-types.diff delete mode 100644 sysutils/sge62/files/pthread-types.diff diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile index 1b7cc6807271..0e06067af324 100644 --- a/sysutils/sge60/Makefile +++ b/sysutils/sge60/Makefile @@ -33,9 +33,6 @@ CONFLICTS= sge-6.[1-9]* sge-5* sgeee-[0-9]* sge-0.* EXTRA_PATCHES= ${FILESDIR}/sge-freebsd-pdc.diff -.if !exists(/usr/include/sys/_pthreadtypes.h) -EXTRA_PATCHES= ${FILESDIR}/pthread-types.diff -.endif NOT_FOR_ARCHS= alpha USE_GETTEXT= yes diff --git a/sysutils/sge60/files/pthread-types.diff b/sysutils/sge60/files/pthread-types.diff deleted file mode 100644 index 6f2bbc2b9acc..000000000000 --- a/sysutils/sge60/files/pthread-types.diff +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libs/uti/sge_profiling.h.orig -+++ libs/uti/sge_profiling.h -@@ -35,7 +35,7 @@ - #include - #include - #include -- -+#include - - #include "basis_types.h" - diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile index 8279736c5258..cdae92dfe8fc 100644 --- a/sysutils/sge61/Makefile +++ b/sysutils/sge61/Makefile @@ -36,9 +36,6 @@ OPTIONS= BDB "Use DB based spooler" on \ LATEST_LINK= sge61 CONFLICTS= sge-6.[02-9]* sge-5* sgeee-[0-9]* sge-0.* -.if !exists(/usr/include/sys/_pthreadtypes.h) -EXTRA_PATCHES= ${FILESDIR}/pthread-types.diff -.endif NOT_FOR_ARCHS= alpha USE_GETTEXT= yes diff --git a/sysutils/sge61/files/pthread-types.diff b/sysutils/sge61/files/pthread-types.diff deleted file mode 100644 index 6f2bbc2b9acc..000000000000 --- a/sysutils/sge61/files/pthread-types.diff +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libs/uti/sge_profiling.h.orig -+++ libs/uti/sge_profiling.h -@@ -35,7 +35,7 @@ - #include - #include - #include -- -+#include - - #include "basis_types.h" - diff --git a/sysutils/sge62/Makefile b/sysutils/sge62/Makefile index 8279736c5258..cdae92dfe8fc 100644 --- a/sysutils/sge62/Makefile +++ b/sysutils/sge62/Makefile @@ -36,9 +36,6 @@ OPTIONS= BDB "Use DB based spooler" on \ LATEST_LINK= sge61 CONFLICTS= sge-6.[02-9]* sge-5* sgeee-[0-9]* sge-0.* -.if !exists(/usr/include/sys/_pthreadtypes.h) -EXTRA_PATCHES= ${FILESDIR}/pthread-types.diff -.endif NOT_FOR_ARCHS= alpha USE_GETTEXT= yes diff --git a/sysutils/sge62/files/pthread-types.diff b/sysutils/sge62/files/pthread-types.diff deleted file mode 100644 index 6f2bbc2b9acc..000000000000 --- a/sysutils/sge62/files/pthread-types.diff +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- libs/uti/sge_profiling.h.orig -+++ libs/uti/sge_profiling.h -@@ -35,7 +35,7 @@ - #include - #include - #include -- -+#include - - #include "basis_types.h" -