- Fix the build by setting the GPT_LOCATION variable when calling

  gpt-build
- Add the latest openssl upgrade
- Add a new ftp_control upgrade

PR:		ports/65227
Submitted by:	maintainer

2 files changed, 13 insertions, 9 deletions

diff --git a/misc/globus2/Makefile b/misc/globus2/Makefile
index 358037b4e73e..448a5f52c77d 100644
--- a/misc/globus2/Makefile
+++ b/misc/globus2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	globus
 PORTVERSION=	${GLOBUS_VER}.3
+PORTREVISION=	1
 CATEGORIES=	misc net parallel
 MASTER_SITES=	ftp://ftp.globus.org/pub/gt2/${GLOBUS_VER}/${PORTVERSION}/%SUBDIR%/:bundles,updates
 MASTER_SITE_SUBDIR=	bundles/src/:bundles updates/src/:updates
@@ -39,11 +40,12 @@ DISTFILES+=	${BUNDLE_FILES:S/$/:bundles/}
 UPDATES_NOTHR+=	common-3.17
 UPDATES_THR+=	common-3.17
 UPDATES_NOTHR+=	ftp_client-1.10
+UPDATES_NOTHR+=	ftp_control-1.10
 UPDATES_NOTHR+=	gridftp_server-1.12
 UPDATES_THR+=	ldapmodules-0.14
 UPDATES_THR+=	openldap-2.0.22
-UPDATES_NOTHR+=	openssl-0.19
-UPDATES_THR+=	openssl-0.19
+UPDATES_NOTHR+=	openssl-0.20
+UPDATES_THR+=	openssl-0.20
 UPDATE_FILES_NOTHR=	${UPDATES_NOTHR:S/^/globus_/:S/$/.tar.gz/}
 UPDATE_FILES_THR=	${UPDATES_THR:S/^/globus_/:S/$/.tar.gz/}
 UPDATE_FILES=	${UPDATE_FILES_NOTHR} ${UPDATE_FILES_THR}
@@ -84,29 +86,29 @@ PLIST_SUB+=	GLOBUS_BASE=${GLOBUS_BASE}/
 
 do-install:
 .for BUNDLE in ${BUNDLE_FILES_DM}
-	GLOBUS_LOCATION=${GLOBUS_LOCATION} \
+	GPT_LOCATION=${GPT_LOCATION} GLOBUS_LOCATION=${GLOBUS_LOCATION} \
 	    ${GPT_BUILD} -builddir=${WRKSRC}/BUILD \
 	    ${DISTDIR}/${DIST_SUBDIR}/${BUNDLE} ${BASE_FLAVOR}
 .endfor
 .for BUNDLE in ${BUNDLE_FILES_RM}
-	GLOBUS_LOCATION=${GLOBUS_LOCATION} \
+	GPT_LOCATION=${GPT_LOCATION} GLOBUS_LOCATION=${GLOBUS_LOCATION} \
 	    ${GPT_BUILD} -builddir=${WRKSRC}/BUILD \
 	    ${DISTDIR}/${DIST_SUBDIR}/${BUNDLE} ${BASE_FLAVOR}
 .endfor
 .for BUNDLE in ${BUNDLE_FILES_IS}
-	GLOBUS_LOCATION=${GLOBUS_LOCATION} \
+	GPT_LOCATION=${GPT_LOCATION} GLOBUS_LOCATION=${GLOBUS_LOCATION} \
 	    ${GPT_BUILD} -builddir=${WRKSRC}/BUILD \
 	    ${DISTDIR}/${DIST_SUBDIR}/${BUNDLE} ${BASE_FLAVOR}pthr
 .endfor
 .for UPDATE in ${UPDATES_NOTHR}
-	GLOBUS_LOCATION=${GLOBUS_LOCATION} \
+	GPT_LOCATION=${GPT_LOCATION} GLOBUS_LOCATION=${GLOBUS_LOCATION} \
 	    ${GPT_BUILD} -update -builddir=${WRKSRC}/BUILD \
 	    ${DISTDIR}/${DIST_SUBDIR}/${UPDATE:S/^/globus_/:S/$/.tar.gz/} \
 	    ${BASE_FLAVOR}
 	${RM} -rf ${GLOBUS_LOCATION}/etc/gpt/packages/`echo ${UPDATE:S/^/globus_/} | ${SED} -e 's/-[0-9.]*//'`/bak
 .endfor
 .for UPDATE in ${UPDATES_THR}
-	GLOBUS_LOCATION=${GLOBUS_LOCATION} \
+	GPT_LOCATION=${GPT_LOCATION} GLOBUS_LOCATION=${GLOBUS_LOCATION} \
 	    ${GPT_BUILD} -update -builddir=${WRKSRC}/BUILD \
 	    ${DISTDIR}/${DIST_SUBDIR}/${UPDATE:S/^/globus_/:S/$/.tar.gz/} \
 	    ${BASE_FLAVOR}pthr
diff --git a/misc/globus2/distinfo b/misc/globus2/distinfo
index d8bbfad89d5d..4c79eba3c5e7 100644
--- a/misc/globus2/distinfo
+++ b/misc/globus2/distinfo
@@ -20,11 +20,13 @@ MD5 (globus/globus_common-3.17.tar.gz) = fbcfabde6cf695c7c106b86ad2c20bac
 SIZE (globus/globus_common-3.17.tar.gz) = 301412
 MD5 (globus/globus_ftp_client-1.10.tar.gz) = e6b1e58343304517ebb511164d7febfe
 SIZE (globus/globus_ftp_client-1.10.tar.gz) = 216969
+MD5 (globus/globus_ftp_control-1.10.tar.gz) = 1c1c14f994d1479a65088cc41193453f
+SIZE (globus/globus_ftp_control-1.10.tar.gz) = 208457
 MD5 (globus/globus_gridftp_server-1.12.tar.gz) = 21d2e8d06c22c11d33789c0f12b37c99
 SIZE (globus/globus_gridftp_server-1.12.tar.gz) = 408559
 MD5 (globus/globus_ldapmodules-0.14.tar.gz) = dcf7c31222e68b87a0c5e450f124738a
 SIZE (globus/globus_ldapmodules-0.14.tar.gz) = 133818
 MD5 (globus/globus_openldap-2.0.22.tar.gz) = 3c631c0d60b5acdc7aebb47bf6679d77
 SIZE (globus/globus_openldap-2.0.22.tar.gz) = 2697731
-MD5 (globus/globus_openssl-0.19.tar.gz) = b1107abaa4226f7246277eff05c08a2e
-SIZE (globus/globus_openssl-0.19.tar.gz) = 1667798
+MD5 (globus/globus_openssl-0.20.tar.gz) = 3804a3c67e95f6d6d92ae3f34cbf8a03
+SIZE (globus/globus_openssl-0.20.tar.gz) = 1702643