Upgrade to GridEngine 6.1u4.

Follow Linux and Solaris by not setting LD_LIBRARY_PATH in the setup.(c)sh
scripts.

4 files changed, 34 insertions, 13 deletions

diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile
index cdae92dfe8fc..540dda683095 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -7,9 +7,8 @@
 
 PORTNAME=	sge
 PORTVERSION=	${SGE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils parallel
-MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/161/:src \
+MASTER_SITES=	http://gridengine.sunsource.net/files/documents/7/169/:src \
 		http://gridengine.sunsource.net/download/SGE61/:bin \
 		${MASTER_SITE_LOCAL}:src,bin
 MASTER_SITE_SUBDIR=	brooks
@@ -47,7 +46,7 @@ SGE_BASE?=	sge
 SGE_ROOT=	${PREFIX}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
 SGE_BUILD_ARCH=	FREEBSD_${ARCH:U}
-SGE_RELEASE=	6.1u3
+SGE_RELEASE=	6.1u4
 SGE_VERSION=	${SGE_RELEASE:S/u/./}
 
 PLIST_SUB+=	SGE_ARCH=${SGE_ARCH}
@@ -157,6 +156,7 @@ post-patch:
 	    ${WRKSRC}/3rdparty/qmake/FREEBSD_*/glob/Makefile \
 	    ${WRKSRC}/3rdparty/qtcsh/${SGE_BUILD_ARCH}/Makefile
 	@${RM} ${WRKSRC}/dist/util/arch_variables.orig
+	@${RM} ${WRKSRC}/dist/util/create_settings.sh.orig
 	@${RM} ${WRKSRC}/dist/util/install_modules/inst_common.sh.orig
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
 	    ${REINPLACE_CMD} "s|-g -O2|${CFLAGS}|"
@@ -218,9 +218,9 @@ release-tar: build
 
 # Build a pkg-plist and Makefile.man
 build-plist: build
-#.if defined(WITHOUT_BDB) || defined(WITHOUT_JAVA) || defined(WITHOUT_X11)
-#	@echo "ERROR: All OPTIONS must be enabled to build plist!" && ${FALSE}
-#.endif
+.if defined(WITHOUT_BDB) || defined(WITHOUT_JAVA) || defined(WITHOUT_X11)
+	@echo "ERROR: All OPTIONS must be enabled to build plist!" && ${FALSE}
+.endif
 	@${FIND} ${TMP_SGE_ROOT}/* -name man -prune -o \
 	    \( -type f -o -type l \) -print | \
 	    ${SORT} | \
diff --git a/sysutils/sge61/distinfo b/sysutils/sge61/distinfo
index 245fcb7be031..763d80dc598c 100644
--- a/sysutils/sge61/distinfo
+++ b/sysutils/sge61/distinfo
@@ -1,6 +1,6 @@
-MD5 (ge-V61u3_TAG-src.tar.gz) = a0e8ff817ac79f1ad76aa7e100b3cd9c
-SHA256 (ge-V61u3_TAG-src.tar.gz) = 3d6008649234c2781c9c8459333670103055588f2740ec382b2e6bcdb3636688
-SIZE (ge-V61u3_TAG-src.tar.gz) = 8559414
-MD5 (ge-6.1u3-common.tar.gz) = b239e13d42e3a6851517e99ab3beee71
-SHA256 (ge-6.1u3-common.tar.gz) = 0be1715cb56d939fff9db5ced1c85212396ba0e30ab4e33b3d6bd72696a811d7
-SIZE (ge-6.1u3-common.tar.gz) = 2933888
+MD5 (ge-V61u4_TAG-src.tar.gz) = d47aee70a978ab59e6a74c3e96c47dd8
+SHA256 (ge-V61u4_TAG-src.tar.gz) = 8c423b8a1aca3856e7596f59956a1e8b87cea07679e6e4b976f31c57eee25a6d
+SIZE (ge-V61u4_TAG-src.tar.gz) = 8571338
+MD5 (ge-6.1u4-common.tar.gz) = 8eacc1f7d324afd47d738fed19defcae
+SHA256 (ge-6.1u4-common.tar.gz) = 9583c13f940dd0a296c5fb58649e5b53f8f1944c4f287d20e9e8944640256a1c
+SIZE (ge-6.1u4-common.tar.gz) = 3531475
diff --git a/sysutils/sge61/files/patch-dist_util_create__settings.sh b/sysutils/sge61/files/patch-dist_util_create__settings.sh
new file mode 100644
index 000000000000..398a8a705e0e
--- /dev/null
+++ b/sysutils/sge61/files/patch-dist_util_create__settings.sh
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- dist/util/create_settings.sh.orig
++++ dist/util/create_settings.sh
+@@ -102,6 +102,7 @@
+ echo 'switch ($ARCH)'                                            >> $SP_CSH
+ #ENFORCE_SHLIBPATH#echo 'case "sol*":'                           >> $SP_CSH
+ #ENFORCE_SHLIBPATH#echo 'case "lx*":'                            >> $SP_CSH
++#ENFORCE_SHLIBPATH#echo 'case "fbsd-*":'                         >> $SP_CSH
+ #ENFORCE_SHLIBPATH#echo '   breaksw'                             >> $SP_CSH
+ echo 'case "*":'                                                 >> $SP_CSH
+ echo "   set shlib_path_name = \`\$SGE_ROOT/util/arch -lib\`"       >> $SP_CSH
+@@ -154,7 +155,7 @@
+ 
+ echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_SH
+ echo 'case $ARCH in'                                                >> $SP_SH
+-#ENFORCE_SHLIBPATH#echo 'sol*|lx*)'                                 >> $SP_SH
++#ENFORCE_SHLIBPATH#echo 'sol*|lx*|fbsd-*)'                          >> $SP_SH
+ #ENFORCE_SHLIBPATH#echo '   ;;'                                     >> $SP_SH
+ echo '*)'                                                           >> $SP_SH
+ echo "   shlib_path_name=\`\$SGE_ROOT/util/arch -lib\`"             >> $SP_SH
diff --git a/sysutils/sge61/pkg-plist b/sysutils/sge61/pkg-plist
index fc4bc4a6c65f..597f52ad83aa 100644
--- a/sysutils/sge61/pkg-plist
+++ b/sysutils/sge61/pkg-plist
@@ -489,7 +489,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/README-DRMAA-Java.txt
 %%PORTDOCS%%%%DOCSDIR%%/README-DRMAA.txt
 %%PORTDOCS%%%%DOCSDIR%%/README-Update-60u2.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-Upgrade-61.txt
 %%PORTDOCS%%%%DOCSDIR%%/README-Upgrade.txt
 %%PORTDOCS%%%%DOCSDIR%%/compatibility_test.html
 %%PORTDOCS%%%%DOCSDIR%%/devel/adoc.html