- Update to version 5.3.6

- Fix build on amd64
- Add a patch that might fix the build on alpha under 4.x
- Fix install in certain odd environments

PR:		ports/64961
Submitted by:	brooks (maintainer)

5 files changed, 27 insertions, 13 deletions

diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile
index 4c2b0bdc6a73..2db20e5496e3 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -27,9 +27,9 @@ LDCONFIG_DIRS=	${SGE_ROOT}/lib/${SGE_ARCH}
 SGE_BASE?=	sge
 SGE_ROOT=	${PREFIX}/${SGE_BASE}
 SGE_ARCH=	fbsd-${ARCH}
-SGE_VERSION=	5.3.5
-SGE_SNAPDATE=	20040224
-SGE_RELEASE=	5.3p5-snap-20040120
+SGE_VERSION=	5.3.6
+SGE_SNAPDATE=	20040330
+SGE_RELEASE=	5.3p6-snap-${SGE_SNAPDATE}
 
 PLIST_SUB+=	SGE_ARCH=${SGE_ARCH}
 PLIST_SUB+=	SGE_BASE=${SGE_BASE}
@@ -90,7 +90,7 @@ pre-install:
 .if defined(MASTERDIR)
 	${SH} ${MASTERDIR}/pkg-install ${PKGNAME} PRE-INSTALL
 .else
-	${SH} pkg-install ${PKGNAME} PRE-INSTALL
+	${SH} ${.CURDIR}/pkg-install ${PKGNAME} PRE-INSTALL
 .endif
 
 do-install:
@@ -119,7 +119,7 @@ release-tar:
 	    ${TAR} cfvz ${.CURDIR}/sge-${SGE_RELEASE}-bin-${SGE_ARCH}.tar.gz \
 	    `find . -name ${SGE_ARCH}`
 
-# Produce a distfile for today.  This target exists for the use of the
+# Produce a distfile for today.  This target exists for use by the
 # port's maintainer.
 SGE_TAG=	V53_beta2_BRANCH
 TODAY!=		/bin/date +%Y%m%d
diff --git a/sysutils/sge61/distinfo b/sysutils/sge61/distinfo
index 737347173380..554d0c562cb6 100644
--- a/sysutils/sge61/distinfo
+++ b/sysutils/sge61/distinfo
@@ -1,2 +1,2 @@
-MD5 (sge-5.3.5.20040224.tar.bz2) = 625d9895301767af151f989d89671add
-SIZE (sge-5.3.5.20040224.tar.bz2) = 7398194
+MD5 (sge-5.3.6.20040330.tar.bz2) = 700e3a63a5c4bce7ec3aacad4e48730d
+SIZE (sge-5.3.6.20040330.tar.bz2) = 7396499
diff --git a/sysutils/sge61/files/patch-aimk.site b/sysutils/sge61/files/patch-aimk.site
index e5fe9e426803..4df3e37d3f80 100644
--- a/sysutils/sge61/files/patch-aimk.site
+++ b/sysutils/sge61/files/patch-aimk.site
@@ -1,13 +1,13 @@
 
 $FreeBSD$
 
---- aimk.site.orig	Tue Jan 20 16:26:10 2004
-+++ aimk.site	Tue Jan 20 16:50:19 2004
+--- aimk.site.orig	Thu Mar 25 07:00:59 2004
++++ aimk.site	Tue Mar 30 13:03:37 2004
 @@ -34,7 +34,7 @@
  # OPENSSL_HOME the directory where the include and lib directory of openssl
  # is installed
  #
--set OPENSSL_HOME = /vol2/tools/SW/openssl-0.9.7c-static/$buildarch
+-set OPENSSL_HOME = /vol2/tools/SW/openssl-0.9.7d-static/$buildarch
 +set OPENSSL_HOME = /usr
  
  # 
diff --git a/sysutils/sge61/files/patch-scripts_distinst.site b/sysutils/sge61/files/patch-scripts_distinst.site
index f8409897df1b..f976ee9501c7 100644
--- a/sysutils/sge61/files/patch-scripts_distinst.site
+++ b/sysutils/sge61/files/patch-scripts_distinst.site
@@ -1,11 +1,11 @@
 
 $FreeBSD$
 
---- scripts/distinst.site.orig	Wed Oct 22 03:29:29 2003
-+++ scripts/distinst.site	Tue Feb 24 22:02:32 2004
+--- scripts/distinst.site.orig	Thu Mar 25 07:01:00 2004
++++ scripts/distinst.site	Tue Mar 30 13:04:21 2004
 @@ -34,4 +34,4 @@
  BASEDIR=/dist/OS-SGEDIST
  
  # Base directory where the openssl binary resides
--OPENSSL_HOME=/vol2/tools/SW/openssl-0.9.7c-static
+-OPENSSL_HOME=/vol2/tools/SW/openssl-0.9.7d-static
 +OPENSSL_HOME=/usr
diff --git a/sysutils/sge61/files/patch-utilbin_infotext.c b/sysutils/sge61/files/patch-utilbin_infotext.c
new file mode 100644
index 000000000000..bd5cb521812e
--- /dev/null
+++ b/sysutils/sge61/files/patch-utilbin_infotext.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- utilbin/infotext.c.orig	Tue Mar 30 16:50:40 2004
++++ utilbin/infotext.c	Tue Mar 30 16:51:20 2004
+@@ -1035,7 +1035,7 @@
+    DPRINTF(("pass 4\n"));
+    {
+       if (real_args > 0) {
+-#if defined(ALPHA) || defined(ALPHA5) || defined(ALINUX) || defined(HP11) || defined(HP10) || __GNUC__ == 3
++#if defined(ALPHA) || defined(ALPHA5) || defined(ALINUX) || defined(HP11) || defined(HP10) || defined(FREEBSD_ALPHA) || __GNUC__ == 3
+       for(i=0;i<real_args;i++) {
+ /*      printf("argument[%d]: \"%s\"\n",i,argv[first_arg +i]); */
+          sge_dstring_copy_string(&buffer, sge_infotext_string_replace(&tmp_buf, (char*)sge_dstring_get_string(&buffer2),"%s",argv[first_arg +i],1));