- Upgrade to an SGE snapshot from Feb 24, 2004.

* Fix build on non-i386 platforms.
* Obey CC and CPP in a few places (qmake, qtcsh, pvm
  integration).
* Use USE_GETTEXT.
* Sort USE_* variables.
* Remove $Aero$ revision tags since I now work in perforce.
* Fix a patch so openssl is found and add to plist.
* Move maintainer make targets to the bottom.  Add one to build a
  distfile from CVS.
* Sizify.
* Use %D instead of %%PREFIX%% in plist.

PR:		ports/63361
Submitted by:	brooks

4 files changed, 44 insertions, 56 deletions

diff --git a/sysutils/sge61/Makefile b/sysutils/sge61/Makefile
index 9c6542ca345a..4c2b0bdc6a73 100644
--- a/sysutils/sge61/Makefile
+++ b/sysutils/sge61/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Brooks Davis <brooks@FreeBSD.org>
 #
 # $FreeBSD$
-# $Aero: ports/sge/Makefile,v 1.3 2004/01/21 22:26:12 brooks Exp $
 #
 
 PORTNAME=	sge
-PORTVERSION=	5.3.5.20040120
-PORTREVISION=	1
+PORTVERSION=	${SGE_VERSION}.${SGE_SNAPDATE}
+PORTREVISION=	0
 CATEGORIES=	sysutils parallel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -16,12 +15,11 @@ MASTER_SITE_SUBDIR=	brooks
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT?=	Sun Grid Engine, a batch queueing system
 
-LIB_DEPENDS=	intl.6:${PORTSDIR}/devel/gettext
-
 USE_BZIP2=	yes
-USE_OPENSSL=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_MOTIF=	yes
+USE_OPENSSL=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	${SGE_ROOT}/lib/${SGE_ARCH}
@@ -29,6 +27,8 @@ 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
 
 PLIST_SUB+=	SGE_ARCH=${SGE_ARCH}
@@ -69,6 +69,11 @@ post-patch:
 	    -e "s|%%CFLAGS%%|${CFLAGS}|g" -e "s|%CXXFLAGS%%|${CXXFLAGS}|g" \
 	    ${WRKSRC}/aimk \
 	    ${WRKSRC}/dist/pvm/src/aimk
+	@${REINPLACE_CMD} -e 's|^CC = gcc|CC = ${CC}|' \
+	    -e 's|^CPP = gcc -E|CPP = ${CPP}|' \
+	    ${WRKSRC}/3rdparty/qmake/FREEBSD_*/Makefile \
+	    ${WRKSRC}/3rdparty/qmake/FREEBSD_*/glob/Makefile \
+	    ${WRKSRC}/3rdparty/qtcsh/FREEBSD_*/Makefile
 	@${RM} ${WRKSRC}/dist/util/arch_variables.orig
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
 	    ${REINPLACE_CMD} "s|-g -O2|${CFLAGS}|"
@@ -100,12 +105,6 @@ do-install:
 	    | ${TAR} cTf - - | ${TAR} xUCf ${DOCSDIR} -
 .endif
 
-# Automaticly produce the offical machine dependent tarball
-release-tar: install
-	cd ${SGE_ROOT} && \
-	    ${TAR} cfvz ${.CURDIR}/sge-${SGE_RELEASE}-bin-${SGE_ARCH}.tar.gz \
-	    `find . -name ${SGE_ARCH}`
-
 post-install:
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
 	    -e 's|%%SGE_BASE%%|${SGE_BASE}|g' \
@@ -113,4 +112,27 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO}
 
+# Automaticly produce the offical machine dependent tarball
+# Be sure to do an install first
+release-tar:
+	cd ${SGE_ROOT} && \
+	    ${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
+# port's maintainer.
+SGE_TAG=	V53_beta2_BRANCH
+TODAY!=		/bin/date +%Y%m%d
+XDISTNAME=	sge-${SGE_VERSION}.${TODAY}
+XDISTFILE=	${DISTDIR}/${XDISTNAME}.tar.bz2
+distfile:
+	${MKDIR} ${WRKDIR}
+	cd ${WRKDIR}; \
+	    cvs -d :pserver:guest@cvs.gridengine.sunsource.net:/cvs co \
+	    -r ${SGE_TAG} -d ${XDISTNAME} gridengine
+	${FIND} ${WRKDIR}/${XDISTNAME} -name CVS | ${XARGS} ${RM} -rf
+	cd ${WRKDIR}; ${TAR} cfy ${XDISTFILE} ${XDISTNAME}
+	@${RM} -rf ${WRKDIR}/${XDISTNAME}
+	@${RMDIR} ${WRKDIR} 2> /dev/null || true
+
 .include <bsd.port.mk>
diff --git a/sysutils/sge61/distinfo b/sysutils/sge61/distinfo
index 43913f55ba89..737347173380 100644
--- a/sysutils/sge61/distinfo
+++ b/sysutils/sge61/distinfo
@@ -1 +1,2 @@
-MD5 (sge-5.3.5.20040120.tar.bz2) = 443ea8901620c1e17d41618ecd5d34c7
+MD5 (sge-5.3.5.20040224.tar.bz2) = 625d9895301767af151f989d89671add
+SIZE (sge-5.3.5.20040224.tar.bz2) = 7398194
diff --git a/sysutils/sge61/files/patch-scripts_distinst.site b/sysutils/sge61/files/patch-scripts_distinst.site
index 93ee3e08de90..f8409897df1b 100644
--- a/sysutils/sge61/files/patch-scripts_distinst.site
+++ b/sysutils/sge61/files/patch-scripts_distinst.site
@@ -1,47 +1,11 @@
 
 $FreeBSD$
 
---- scripts/distinst.site.orig	Tue Jan 20 16:28:32 2004
-+++ scripts/distinst.site	Tue Jan 20 16:52:32 2004
-@@ -30,6 +30,41 @@
- ##########################################################################
- #___INFO__MARK_END__
- 
-+# Base directory where the openssl binary and libraries resides
-+OPENSSLBASE=/usr
-+BERKELEYDBBASE=/vol2/SW/db-4.2.52
-+#___INFO__MARK_BEGIN__
-+##########################################################################
-+#
-+#  The Contents of this file are made available subject to the terms of
-+#  the Sun Industry Standards Source License Version 1.2
-+#
-+#  Sun Microsystems Inc., March, 2001
-+#
-+#
-+#  Sun Industry Standards Source License Version 1.2
-+#  =================================================
-+#  The contents of this file are subject to the Sun Industry Standards
-+#  Source License Version 1.2 (the "License"); You may not use this file
-+#  except in compliance with the License. You may obtain a copy of the
-+#  License at http://gridengine.sunsource.net/Gridengine_SISSL_license.html
-+#
-+#  Software provided under this License is provided on an "AS IS" basis,
-+#  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-+#  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-+#  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-+#  See the License for the specific provisions governing your rights and
-+#  obligations concerning the Software.
-+#
-+#  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-+#
-+#  Copyright: 2001 by Sun Microsystems, Inc.
-+#
-+#  All Rights Reserved.
-+#
-+##########################################################################
-+#___INFO__MARK_END__
-+
- # Base directory where a distribution is installed with "distinst"
+--- scripts/distinst.site.orig	Wed Oct 22 03:29:29 2003
++++ scripts/distinst.site	Tue Feb 24 22:02:32 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=/usr
diff --git a/sysutils/sge61/pkg-plist b/sysutils/sge61/pkg-plist
index 91fe536eec32..c9e026ce3484 100644
--- a/sysutils/sge61/pkg-plist
+++ b/sysutils/sge61/pkg-plist
@@ -279,6 +279,7 @@
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/infotext
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/loadcheck
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/now
+%%SGE_BASE%%/utilbin/%%SGE_ARCH%%/openssl
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/qrsh_starter
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/rlogin
 %%SGE_BASE%%/utilbin/%%SGE_ARCH%%/rsh
@@ -514,4 +515,4 @@
 @dirrm %%PORTDOCS%%%%DOCSDIR%%/testsuite/adoc
 @dirrm %%PORTDOCS%%%%DOCSDIR%%/testsuite
 @dirrm %%PORTDOCS%%%%DOCSDIR%%
-@unexec rmdir %%PREFIX%%/%%SGE_BASE%%/ 2>/dev/null || ( echo "Configuration information saved.  If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")
+@unexec rmdir %D/%%SGE_BASE%%/ 2>/dev/null || ( echo "Configuration information saved.  If you will *NOT* use this package anymore," && echo "please remove %D/%%SGE_BASE%% and its contents manually.")