Upgrade to 6.0u7. No major changes.

4 files changed, 48 insertions, 8 deletions

diff --git a/sysutils/sge60/Makefile b/sysutils/sge60/Makefile
index ad980c26d092..2be0aa60de15 100644
--- a/sysutils/sge60/Makefile
+++ b/sysutils/sge60/Makefile
@@ -9,10 +9,10 @@ PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
 PORTREVISION=	0
 CATEGORIES=	sysutils parallel
-MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/32/
+MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/40/
 MASTER_SITES+=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
-DISTNAME=	sge-V60u6_TAG-src
+DISTNAME=	sge-V60u7_TAG-src
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Sun Grid Engine, a batch queueing system
@@ -42,11 +42,17 @@ USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${SGE_ROOT}/lib/${SGE_ARCH}
 
+# We have to use fetch because the master site required cookies to
+# download the file.
+FETCH_DEPENDS=	wget:${PORTSDIR}/ftp/wget
+DISABLE_SIZE=	yes
+FETCH_CMD=	wget -c
+
 SGE_BASE?=	sge
 SGE_ROOT=	${PREFIX}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
-SGE_VERSION=	6.0.6
-SGE_RELEASE=	6.0u6
+SGE_VERSION=	6.0.7
+SGE_RELEASE=	6.0u7
 
 PLIST_SUB+=	SGE_ARCH=${SGE_ARCH}
 PLIST_SUB+=	SGE_BASE=${SGE_BASE}
@@ -166,7 +172,7 @@ do-build:
 	cd ${WRKSRC} && ./scripts/zerodepend
 	cd ${WRKSRC} && ${AIMK_CMD} depend
 	cd ${WRKSRC} && \
-	    ${AIMK_CMD} -secure -debug && \
+	    ${AIMK_CMD} -debug && \
 	    ${AIMK_CMD} -man ${SGE_PRODUCT} &&
 	${MKDIR} ${TMP_SGE_ROOT}
 	cd ${WRKSRC} && ${SETENV} SGE_ROOT=${TMP_SGE_ROOT} \
diff --git a/sysutils/sge60/distinfo b/sysutils/sge60/distinfo
index 8cf96f8ad4ef..d560292ebc5f 100644
--- a/sysutils/sge60/distinfo
+++ b/sysutils/sge60/distinfo
@@ -1,3 +1,2 @@
-MD5 (sge-V60u6_TAG-src.tar.gz) = 89a933c6731747522f6363cdd17868c2
-SHA256 (sge-V60u6_TAG-src.tar.gz) = 08e77113cd4c09989b275b11fefc33295a2a6216f8a78e6d299ec99f9d19dd64
-SIZE (sge-V60u6_TAG-src.tar.gz) = 10586734
+MD5 (sge-V60u7_TAG-src.tar.gz) = 6a8eb9cf7ff284ee106f8792c6691873
+SIZE (sge-V60u7_TAG-src.tar.gz) = 10569054
diff --git a/sysutils/sge60/files/patch-common_basis__types.h b/sysutils/sge60/files/patch-common_basis__types.h
new file mode 100644
index 000000000000..84515b99c65d
--- /dev/null
+++ b/sysutils/sge60/files/patch-common_basis__types.h
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- common/basis_types.h.orig
++++ common/basis_types.h
+@@ -251,12 +251,10 @@
+    else \
+       variable = pthread_getspecific(key)
+ 
+-#if !defined(FREEBSD)
+ #define HAS_GETPWNAM_R
+ #define HAS_GETGRNAM_R
+ #define HAS_GETPWUID_R
+ #define HAS_GETGRGID_R
+-#endif
+ 
+ #define HAS_LOCALTIME_R
+ #define HAS_CTIME_R
diff --git a/sysutils/sge60/pkg-plist b/sysutils/sge60/pkg-plist
index 862308e915a6..ef9075e288f3 100644
--- a/sysutils/sge60/pkg-plist
+++ b/sysutils/sge60/pkg-plist
@@ -406,6 +406,7 @@
 %%SGE_BASE%%/util/resources/loadsensors/sgi_tty_sensor.sh
 %%SGE_BASE%%/util/resources/loadsensors/solaris-iidle.sh
 %%SGE_BASE%%/util/resources/pe/make
+%%SGE_BASE%%/util/resources/pe/make.sge_pqs_api
 %%SGE_BASE%%/util/resources/schemas/qstat/detailed_job_info.xsd
 %%SGE_BASE%%/util/resources/schemas/qstat/message.xsd
 %%SGE_BASE%%/util/resources/schemas/qstat/qstat.xsd
@@ -485,12 +486,18 @@
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/maui.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/policy_module.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/priority_class.txt
+%%PORTDOCS%%%%DOCSDIR%%/devel/rfe/qmaster_monitoring.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/resource_attributes.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/resource_reservation.txt
 %%PORTDOCS%%%%DOCSDIR%%/devel/rfe/spooling.html
 %%PORTDOCS%%%%DOCSDIR%%/devel/sh-header
 %%PORTDOCS%%%%DOCSDIR%%/devel/structure.sda
 %%PORTDOCS%%%%DOCSDIR%%/devel/style_guide.txt
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/gethostbyaddr.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/gethostbyname.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/gethostname.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/getservbyname.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/hostnameutils.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qacct.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qalter.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qconf.html
@@ -501,6 +508,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qmake.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qmod.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qmon.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qping.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qresub.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qrls.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qrsh.html
@@ -511,6 +519,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/qtcsh.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/sge_ckpt.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/sge_intro.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/sge_types.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/sgepasswd.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman1/submit.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/_lNm2Str.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/_lStr2Nm.html
@@ -663,19 +673,26 @@
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman3/sge_gdi_trm.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/access_list.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/accounting.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/bootstrap.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/calendar_conf.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/checkpoint.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/complex.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/host_aliases.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/host_conf.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/hostgroup.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/project.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/qtask.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/queue_conf.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/reporting.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sched_conf.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_aliases.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_conf.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_h_aliases.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_pe.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_priority.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_qstat.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sge_request.html
+%%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/sgepasswd.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/share_tree.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/user.html
 %%PORTDOCS%%%%DOCSDIR%%/htmlman/htmlman5/usermapping.html