Date: Tue, 30 Mar 2004 17:15:55 -0800 (PST) From: Brooks Davis <brooks@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/64961: maintainer-update: sge-2.5.6.20040330 Message-ID: <200403310115.i2V1FtYg095256@freefall.freebsd.org> Resent-Message-ID: <200403310120.i2V1KI2O095603@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 64961
>Category: ports
>Synopsis: maintainer-update: sge-2.5.6.20040330
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 30 17:20:18 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Brooks Davis
>Release: FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 4.9-STABLE FreeBSD 4.9-STABLE #11: Thu Feb 5 19:43:44 PST 2004 kensmith@freefall.freebsd.org:/c/src/sys/compile/FREEFALL i386
>Description:
Upgrade SGE to 2.5.6 (most a version bump for OpenSSL).
Fix build on amd64.
Add a patch that might fix the build on alpha under 4.x.
Fix install in certain odd environments.
>How-To-Repeat:
>Fix:
Added files:
files/patch-utilbin_infotext.c
Removed files:
<none>
diff -ruN vendor/sge/Makefile sge/Makefile
--- vendor/sge/Makefile Wed Feb 25 11:35:41 2004
+++ sge/Makefile Tue Mar 30 16:47:14 2004
@@ -27,9 +27,9 @@
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 @@
.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 @@
${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 -ruN vendor/sge/distinfo sge/distinfo
--- vendor/sge/distinfo Wed Feb 25 11:35:41 2004
+++ sge/distinfo Tue Mar 30 16:47:14 2004
@@ -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 -ruN vendor/sge/files/patch-aimk.site sge/files/patch-aimk.site
--- vendor/sge/files/patch-aimk.site Sat Jan 31 22:40:53 2004
+++ sge/files/patch-aimk.site Tue Mar 30 16:47:14 2004
@@ -1,13 +1,13 @@
-$FreeBSD: ports/sysutils/sge/files/patch-aimk.site,v 1.1 2004/02/01 06:40:53 maho Exp $
+$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 -ruN vendor/sge/files/patch-scripts_distinst.site sge/files/patch-scripts_distinst.site
--- vendor/sge/files/patch-scripts_distinst.site Wed Feb 25 11:35:41 2004
+++ sge/files/patch-scripts_distinst.site Tue Mar 30 16:47:14 2004
@@ -1,11 +1,11 @@
-$FreeBSD: ports/sysutils/sge/files/patch-scripts_distinst.site,v 1.2 2004/02/25 19:35:41 krion Exp $
+$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 -ruN vendor/sge/files/patch-utilbin_infotext.c sge/files/patch-utilbin_infotext.c
--- vendor/sge/files/patch-utilbin_infotext.c Wed Dec 31 16:00:00 1969
+++ sge/files/patch-utilbin_infotext.c Tue Mar 30 17:03:06 2004
@@ -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));
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200403310115.i2V1FtYg095256>