Upgrade to 4.0.2 plus all current eratta fixes.

It builds for me on i386 and amd64 so remove BROKEN for now in hopes
that it's really fixed.

Spell powerpc correctly in the makefile and the patched internal autotools
configuration. [0]

PR:		ports/98615 [0]

6 files changed, 189 insertions, 250 deletions

diff --git a/net/globus4/Makefile b/net/globus4/Makefile
index 475efc10e688..aac3c4f4f2c2 100644
--- a/net/globus4/Makefile
+++ b/net/globus4/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	globus
-PORTVERSION=	4.0.1
-PORTREVISION=	20051201
+PORTVERSION=	4.0.2
+PORTREVISION=	20060706
 CATEGORIES=	net java parallel
 MASTER_SITES=	ftp://ftp.globus.org/pub/gt4/4.0/${PORTVERSION}/%SUBDIR%/src/:installers,updates
 MASTER_SITE_SUBDIR=	installers/:installers updates/:updates
@@ -20,11 +20,6 @@ EXTRACT_ONLY=	${INSTALLER}
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Grid computing toolkit
 
-BROKEN=		fails to install
-
-CONFLICTS=	globus-2*
-
-EXTRACT_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
 RUN_DEPENDS=	${LOCALBASE}/bin/sudo:${PORTSDIR}/security/sudo
 
 INSTALLER=	${DISTNAME}${EXTRACT_SUFX}
@@ -33,39 +28,13 @@ BUNDLE_SUFX=	.tar.gz
 # Updates from http://www.globus.org/toolkit/advisories.html
 #
 # All entries are listed.  Inapplicable ones are commented out.
-# 2005-08-16	Cancelling multiple process condor jobs (bug 3642).
-#UPDATE_BUNDLES+=	globus_gram_job_manager_setup_condor-2.6:%FLAVOR%
-# 2005-09-20	XIO HTTP driver can crash if content length exceeds
-#		Content-Length buffer size (bug 3733)
-UPDATE_BUNDLES+=	  globus_xio-0.32:%FLAVOR%,%FLAVOR%pthr
-# 2005-11-01	Fixes PBS scheduler event generator parsing issues (bug
-#		3699 bug 3777)
-#UPDATE_BUNDLES+=	globus_scheduler_event_generator_pbs-0.4:%FLAVOR%
-# 2005-11-22	Fixes possible memory corruption issues when using the
-#		restart plugin and performing multiple ftp operations
-#		on the same handle. (bug 3919)
-UPDATE_BUNDLES+=	globus_ftp_client-3.3:%FLAVOR%,%FLAVOR%pthr
-# 2005-11-29	Fix some bash-isms(bug 3958)
-UPDATE_BUNDLES+=	globus_simple_ca-0.15:%FLAVOR%
-# 2005-11-29	Fixes HP-UX setup and pkg_data_src.gpt.tmpl errors
-#		(bug 3702 bug 3567 bug 3958)
-UPDATE_BUNDLES+=	  globus_simple_ca_setup-0.27:%FLAVOR%
-# 2005-12-01	Fixes bug in the -cd option where it would only create
-#		the top level destination directory (bug 3769). Fixes
-#		failed recursive transfers when encountering filenames
-#		that contain url-invalid characters (bug 1858).
-UPDATE_BUNDLES+=	globus_gass_copy-3.20:%FLAVOR%,%FLAVOR%pthr
-# 2005-12-01	Fix possible memory corruption when failing to
-#		discover the local ip address. (bug 3392)
-UPDATE_BUNDLES+=	   globus_usage-0.5:%FLAVOR%
-
-CONFLICTS?=	globus-2*
+# The format is <file name minus .tar.gz>:<flavor list>
+UPDATE_BUNDLES+=	globus_gass_copy-3.21:%FLAVOR%,%FLAVOR%pthr
 
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-TAR=		gtar
 
 GLOBUS_BASE?=	globus
 GLOBUS_LOCATION=${PREFIX}/${GLOBUS_BASE}
@@ -76,7 +45,7 @@ TMP_GLOBUS_ENV=	GLOBUS_LOCATION=${TMP_GLOBUS_LOCATION} \
 CONFIGURE_ARGS=	--prefix=${TMP_GLOBUS_LOCATION} ${CONFIGURE_TARGET}
 CONFIGURE_ENV+=	${TMP_GLOBUS_ENV}
 # WARNING: this only works because we do the install ourselves
-MAKE_ENV+=	${TMP_GLOBUS_ENV}
+MAKE_ENV+=	${TMP_GLOBUS_ENV} PATH=${WRKDIR}/tmpbin:${PATH} LD_LIBRARY_PATH=${TMP_GLOBUS_LOCATION}/lib
 
 PLIST_SUB+=	BASE_FLAVOR=${BASE_FLAVOR} \
 		GLOBUS_BASE=${GLOBUS_BASE} \
@@ -108,7 +77,7 @@ CPIOARGS=       --quiet -pdum
 IGNORE=		FreeBSD < 5.3 not supported
 .endif
 
-.if (${ARCH} == "i386") || (${ARCH} == "ppc")
+.if (${ARCH} == "i386") || (${ARCH} == "powerpc")
 ARCHBITS?=32
 PERL_ARCH=	${ARCH}-freebsd-64int
 .else
@@ -118,11 +87,11 @@ PERL_ARCH=	${ARCH}-freebsd
 BASE_FLAVOR=	gcc${ARCHBITS}dbg
 
 post-patch:
-	cd ${WRKSRC}/gpt-3.2autotools2004/packaging_tools/etc/ ; \
+	cd ${WRKSRC}/gpt/packaging_tools/etc/ ; \
 	    tar xfz globus_core-src.tar.gz ; \
-	    ${CP} ${WRKSRC}/source-trees/core/source/configure globus_core-4.26/ ; \
-	    ${CP} ${WRKSRC}/source-trees/core/source/config/accompiler.m4 globus_core-4.26/config ; \
-	    tar cfz globus_core-src.tar.gz globus_core-4.26
+	    ${CP} ${WRKSRC}/source-trees/core/source/configure globus_core-4.30/ ; \
+	    ${CP} ${WRKSRC}/source-trees/core/source/config/accompiler.m4 globus_core-4.30/config ; \
+	    tar cfz globus_core-src.tar.gz globus_core-4.30
 
 # HACK: this is under defined(GNU_CONFIGURE) in do-configure, but we
 # have to do it ourselves because we can't set GNU_CONFIGURE and install
@@ -138,7 +107,9 @@ pre-configure:
 	done
 
 pre-build:
-	${MKDIR} ${WRKSRC}/gpt-3.2autotools2004/packaging_tools/etc/gpt
+	${MKDIR} ${WRKSRC}/gpt/packaging_tools/etc/gpt
+	${MKDIR} ${WRKDIR}/tmpbin
+	${LN} -s `which gmake` ${WRKDIR}/tmpbin/make || ${TRUE}
 
 post-build:
 .for _B in ${UPDATE_BUNDLES}
@@ -187,7 +158,8 @@ build-plist:
 	    ${SED} -e 's|${TMP_GLOBUS_LOCATION}/man/[cm]a[nt]./||g' | \
 	    ${SORT} >> ${.CURDIR}/Makefile.man
 	@${FIND} ${TMP_GLOBUS_LOCATION}/man/ -type f | \
-	     ${SED} -e 's|${TMP_GLOBUS_LOCATION}/man/man\([0-9LN]\)/\(.*\)|MAN\1+=\2|' | \
+	     ${SED} -e 's|${TMP_GLOBUS_LOCATION}/man/man\([0-9LN]\)/\(.*\)|MAN\1+=\2|' \
+	    -e 's|${BASE_FLAVOR}|$${BASE_FLAVOR}|g' | \
 	     ${SORT} >> ${.CURDIR}/Makefile.man
 
 .include <bsd.port.post.mk>
diff --git a/net/globus4/Makefile.man b/net/globus4/Makefile.man
index b305ef05f482..e2e82f2f418b 100644
--- a/net/globus4/Makefile.man
+++ b/net/globus4/Makefile.man
@@ -5,10 +5,15 @@ MLINKS+= ssh.d/scp.1 gsiscp.1
 MLINKS+= ssh.d/sftp.1 gsisftp.1
 MLINKS+= ssh.d/ssh.1 gsissh.1
 MLINKS+= ssh.d/ssh.1 ssh.d/slogin.1
+MAN1+=${BASE_FLAVOR}/shared/gsiscp.1
+MAN1+=${BASE_FLAVOR}/shared/gsisftp.1
+MAN1+=${BASE_FLAVOR}/shared/gsissh.1
+MAN1+=.cvsignore
+MAN1+=CVS/Entries
+MAN1+=CVS/Repository
+MAN1+=CVS/Root
+MAN1+=CVS/Tag
 MAN1+=applypatch.1
-MAN1+=gcc32dbg/shared/gsiscp.1
-MAN1+=gcc32dbg/shared/gsisftp.1
-MAN1+=gcc32dbg/shared/gsissh.1
 MAN1+=makepatch.1
 MAN1+=man1/globus-job-manager-service.1
 MAN1+=myproxy-change-pass-phrase.1
@@ -22,14 +27,14 @@ MAN1+=myproxy-store.1
 MAN1+=pod2usage.1
 MAN1+=podchecker.1
 MAN1+=podselect.1
-MAN1+=ssh.d/gcc32dbg/shared/scp.1
-MAN1+=ssh.d/gcc32dbg/shared/sftp.1
-MAN1+=ssh.d/gcc32dbg/shared/slogin.1
-MAN1+=ssh.d/gcc32dbg/shared/ssh-add.1
-MAN1+=ssh.d/gcc32dbg/shared/ssh-agent.1
-MAN1+=ssh.d/gcc32dbg/shared/ssh-keygen.1
-MAN1+=ssh.d/gcc32dbg/shared/ssh-keyscan.1
-MAN1+=ssh.d/gcc32dbg/shared/ssh.1
+MAN1+=ssh.d/${BASE_FLAVOR}/shared/scp.1
+MAN1+=ssh.d/${BASE_FLAVOR}/shared/sftp.1
+MAN1+=ssh.d/${BASE_FLAVOR}/shared/slogin.1
+MAN1+=ssh.d/${BASE_FLAVOR}/shared/ssh-add.1
+MAN1+=ssh.d/${BASE_FLAVOR}/shared/ssh-agent.1
+MAN1+=ssh.d/${BASE_FLAVOR}/shared/ssh-keygen.1
+MAN1+=ssh.d/${BASE_FLAVOR}/shared/ssh-keyscan.1
+MAN1+=ssh.d/${BASE_FLAVOR}/shared/ssh.1
 MAN1+=ssh.d/scp.1
 MAN1+=ssh.d/sftp.1
 MAN1+=ssh.d/ssh-add.1
@@ -59,8 +64,8 @@ MAN3+=Pod::Select.3
 MAN3+=Pod::Usage.3
 MAN3+=libxml.3
 MAN5+=myproxy-server.config.5
-MAN5+=ssh.d/gcc32dbg/shared/ssh_config.5
-MAN5+=ssh.d/gcc32dbg/shared/sshd_config.5
+MAN5+=ssh.d/${BASE_FLAVOR}/shared/ssh_config.5
+MAN5+=ssh.d/${BASE_FLAVOR}/shared/sshd_config.5
 MAN5+=ssh.d/ssh_config.5
 MAN5+=ssh.d/sshd_config.5
 MAN8+=myproxy-admin-adduser.8
@@ -69,10 +74,10 @@ MAN8+=myproxy-admin-load-credential.8
 MAN8+=myproxy-admin-query.8
 MAN8+=myproxy-replicate.8
 MAN8+=myproxy-server.8
-MAN8+=ssh.d/gcc32dbg/shared/sftp-server.8
-MAN8+=ssh.d/gcc32dbg/shared/ssh-keysign.8
-MAN8+=ssh.d/gcc32dbg/shared/ssh-rand-helper.8
-MAN8+=ssh.d/gcc32dbg/shared/sshd.8
+MAN8+=ssh.d/${BASE_FLAVOR}/shared/sftp-server.8
+MAN8+=ssh.d/${BASE_FLAVOR}/shared/ssh-keysign.8
+MAN8+=ssh.d/${BASE_FLAVOR}/shared/ssh-rand-helper.8
+MAN8+=ssh.d/${BASE_FLAVOR}/shared/sshd.8
 MAN8+=ssh.d/sftp-server.8
 MAN8+=ssh.d/ssh-keysign.8
 MAN8+=ssh.d/ssh-rand-helper.8
diff --git a/net/globus4/distinfo b/net/globus4/distinfo
index 022a7aa5a53f..af635f9e1e6d 100644
--- a/net/globus4/distinfo
+++ b/net/globus4/distinfo
@@ -1,21 +1,6 @@
-MD5 (globus/gt4.0.1-all-source-installer.tar.bz2) = 398076812364f53d694194320836b8ad
-SHA256 (globus/gt4.0.1-all-source-installer.tar.bz2) = 4b2aeb28bdddda7ebffe5814bfcdacf777a553738a5b824336ff7e18a06dac50
-SIZE (globus/gt4.0.1-all-source-installer.tar.bz2) = 88609887
-MD5 (globus/globus_xio-0.32.tar.gz) = 01aeeccfeb5eabd85023bcebf28c848d
-SHA256 (globus/globus_xio-0.32.tar.gz) = 6c146b6cb7d2ebdfc9501839a78639d158ae395c90d8dda612df2bf6e1db04e0
-SIZE (globus/globus_xio-0.32.tar.gz) = 492627
-MD5 (globus/globus_ftp_client-3.3.tar.gz) = 3d32910dae3a1d981eae84d33f7e327d
-SHA256 (globus/globus_ftp_client-3.3.tar.gz) = 6323f85510381b9b947ecf6518c1eecee274e66dcd8c19b6104501129422b72d
-SIZE (globus/globus_ftp_client-3.3.tar.gz) = 296433
-MD5 (globus/globus_simple_ca-0.15.tar.gz) = 6afe55db1058909e86c9700fd972d077
-SHA256 (globus/globus_simple_ca-0.15.tar.gz) = ff4a7bb6f9b56e68a2d0fccaf07ebd913278432186b51c96640043e70061433f
-SIZE (globus/globus_simple_ca-0.15.tar.gz) = 168775
-MD5 (globus/globus_simple_ca_setup-0.27.tar.gz) = a7a8b059df459e770999ec7c0c598bee
-SHA256 (globus/globus_simple_ca_setup-0.27.tar.gz) = 4eefc1bfddc8f0a413dce1ba997c02dab50da5b39bb148adaf6c27627390da1a
-SIZE (globus/globus_simple_ca_setup-0.27.tar.gz) = 387925
-MD5 (globus/globus_gass_copy-3.20.tar.gz) = 35fb2865df935021bf495eb93e0e22ee
-SHA256 (globus/globus_gass_copy-3.20.tar.gz) = b902e5cd237f1a767c53d83a501c3d1a2c206607bed3ce9494496486a78ec078
-SIZE (globus/globus_gass_copy-3.20.tar.gz) = 223720
-MD5 (globus/globus_usage-0.5.tar.gz) = 4eeeb9a6a0a64809e22d0c9cd917d577
-SHA256 (globus/globus_usage-0.5.tar.gz) = 7e07b02e83961e4a9aecd9aa2b939dfcdfb6b7f8676eb637fc21390db9b78646
-SIZE (globus/globus_usage-0.5.tar.gz) = 171552
+MD5 (globus/gt4.0.2-all-source-installer.tar.bz2) = 2f029baad4fbe4b830911131503bb39d
+SHA256 (globus/gt4.0.2-all-source-installer.tar.bz2) = 1fd5eecd30167acc4d7d528f2c7e1d0d540458c6ffd6426de76a0ff57dedd651
+SIZE (globus/gt4.0.2-all-source-installer.tar.bz2) = 87301919
+MD5 (globus/globus_gass_copy-3.21.tar.gz) = d3cef9549fc762d83c214b6d99d1703e
+SHA256 (globus/globus_gass_copy-3.21.tar.gz) = 40f0eda8051afcf907a70c5e975930612237aa07cd901e451a6ef2acb161ee07
+SIZE (globus/globus_gass_copy-3.21.tar.gz) = 223564
diff --git a/net/globus4/files/patch-source-trees_core_source_config_accompiler.m4 b/net/globus4/files/patch-source-trees_core_source_config_accompiler.m4
index ce9b701d49a6..a7a4cfcd995a 100644
--- a/net/globus4/files/patch-source-trees_core_source_config_accompiler.m4
+++ b/net/globus4/files/patch-source-trees_core_source_config_accompiler.m4
@@ -13,7 +13,7 @@ $FreeBSD$
 +	echo "freebsd: $host"
 +        if test "$lac_cv_build_64bit" = "yes"; then
 +		case ${host} in
-+		i386-*|ppc-*)
++		i386-*|powerpc-*)
 +			AC_MSG_ERROR(64 bits not supported on this platform)
 +			exit 1
 +			;;
diff --git a/net/globus4/files/patch-source-trees_core_source_configure b/net/globus4/files/patch-source-trees_core_source_configure
index 23255052218a..96e14f516e04 100644
--- a/net/globus4/files/patch-source-trees_core_source_configure
+++ b/net/globus4/files/patch-source-trees_core_source_configure
@@ -3,15 +3,15 @@ $FreeBSD$
 
 --- source-trees/core/source/configure.orig
 +++ source-trees/core/source/configure
-@@ -14552,6 +14552,437 @@
-         lac_CPPFLAGS="$lac_CPPFLAGS -I/sw/include"
+@@ -14919,6 +14919,437 @@
+         lac_CPPFLAGS="$lac_CPPFLAGS -I/sw/include -DBIND_8_COMPAT"
          lac_LDFLAGS="$lac_LDFLAGS -L/sw/lib"
        ;;
 +    *-freebsd* )
 +        		echo "freebsd: $host"
 +        if test "$lac_cv_build_64bit" = "yes"; then
 +		case ${host} in
-+		i386-*|ppc-*)
++		i386-*|powerpc-*)
 +			{ { echo "$as_me:$LINENO: error: 64 bits not supported on this platform" >&5
 +echo "$as_me: error: 64 bits not supported on this platform" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -441,215 +441,215 @@ $FreeBSD$
      * )
                  if test "$lac_cv_build_64bit" = "yes"; then
                  { { echo "$as_me:$LINENO: error: 64 bits not supported on this platform" >&5
-@@ -30036,7 +30467,7 @@
+@@ -30403,7 +30834,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 30039 "configure"' > conftest.$ac_ext
-+  echo '#line 30470 "configure"' > conftest.$ac_ext
+-  echo '#line 30406 "configure"' > conftest.$ac_ext
++  echo '#line 30837 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -31142,7 +31573,7 @@
+@@ -31509,7 +31940,7 @@
  
  
  # Provide some information about the compiler.
--echo "$as_me:31145:" \
-+echo "$as_me:31576:" \
+-echo "$as_me:31512:" \
++echo "$as_me:31943:" \
       "checking for Fortran 77 compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
  { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -32199,11 +32630,11 @@
+@@ -32566,11 +32997,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:32202: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:32633: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:32569: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:33000: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:32206: \$? = $ac_status" >&5
-+   echo "$as_me:32637: \$? = $ac_status" >&5
+-   echo "$as_me:32573: \$? = $ac_status" >&5
++   echo "$as_me:33004: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -32442,11 +32873,11 @@
+@@ -32809,11 +33240,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:32445: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:32876: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:32812: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:33243: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:32449: \$? = $ac_status" >&5
-+   echo "$as_me:32880: \$? = $ac_status" >&5
+-   echo "$as_me:32816: \$? = $ac_status" >&5
++   echo "$as_me:33247: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -32502,11 +32933,11 @@
+@@ -32869,11 +33300,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:32505: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:32936: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:32872: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:33303: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:32509: \$? = $ac_status" >&5
-+   echo "$as_me:32940: \$? = $ac_status" >&5
+-   echo "$as_me:32876: \$? = $ac_status" >&5
++   echo "$as_me:33307: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -34687,7 +35118,7 @@
+@@ -35066,7 +35497,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 34690 "configure"
-+#line 35121 "configure"
+-#line 35069 "configure"
++#line 35500 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -34785,7 +35216,7 @@
+@@ -35164,7 +35595,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 34788 "configure"
-+#line 35219 "configure"
+-#line 35167 "configure"
++#line 35598 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -36978,11 +37409,11 @@
+@@ -37357,11 +37788,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:36981: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:37412: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:37360: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:37791: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:36985: \$? = $ac_status" >&5
-+   echo "$as_me:37416: \$? = $ac_status" >&5
+-   echo "$as_me:37364: \$? = $ac_status" >&5
++   echo "$as_me:37795: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -37038,11 +37469,11 @@
+@@ -37417,11 +37848,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:37041: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:37472: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:37420: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:37851: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:37045: \$? = $ac_status" >&5
-+   echo "$as_me:37476: \$? = $ac_status" >&5
+-   echo "$as_me:37424: \$? = $ac_status" >&5
++   echo "$as_me:37855: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -38399,7 +38830,7 @@
+@@ -38790,7 +39221,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 38402 "configure"
-+#line 38833 "configure"
+-#line 38793 "configure"
++#line 39224 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -38497,7 +38928,7 @@
+@@ -38888,7 +39319,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 38500 "configure"
-+#line 38931 "configure"
+-#line 38891 "configure"
++#line 39322 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -39334,11 +39765,11 @@
+@@ -39725,11 +40156,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:39337: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:39768: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:39728: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:40159: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:39341: \$? = $ac_status" >&5
-+   echo "$as_me:39772: \$? = $ac_status" >&5
+-   echo "$as_me:39732: \$? = $ac_status" >&5
++   echo "$as_me:40163: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -39394,11 +39825,11 @@
+@@ -39785,11 +40216,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:39397: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:39828: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:39788: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:40219: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:39401: \$? = $ac_status" >&5
-+   echo "$as_me:39832: \$? = $ac_status" >&5
+-   echo "$as_me:39792: \$? = $ac_status" >&5
++   echo "$as_me:40223: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -41429,11 +41860,11 @@
+@@ -41832,11 +42263,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:41432: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:41863: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:41835: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:42266: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:41436: \$? = $ac_status" >&5
-+   echo "$as_me:41867: \$? = $ac_status" >&5
+-   echo "$as_me:41839: \$? = $ac_status" >&5
++   echo "$as_me:42270: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -41672,11 +42103,11 @@
+@@ -42075,11 +42506,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:41675: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:42106: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:42078: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:42509: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:41679: \$? = $ac_status" >&5
-+   echo "$as_me:42110: \$? = $ac_status" >&5
+-   echo "$as_me:42082: \$? = $ac_status" >&5
++   echo "$as_me:42513: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -41732,11 +42163,11 @@
+@@ -42135,11 +42566,11 @@
     -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:41735: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:42166: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:42138: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:42569: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:41739: \$? = $ac_status" >&5
-+   echo "$as_me:42170: \$? = $ac_status" >&5
+-   echo "$as_me:42142: \$? = $ac_status" >&5
++   echo "$as_me:42573: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -43917,7 +44348,7 @@
+@@ -44332,7 +44763,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 43920 "configure"
-+#line 44351 "configure"
+-#line 44335 "configure"
++#line 44766 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -44015,7 +44446,7 @@
+@@ -44430,7 +44861,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 44018 "configure"
-+#line 44449 "configure"
+-#line 44433 "configure"
++#line 44864 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
diff --git a/net/globus4/pkg-plist b/net/globus4/pkg-plist
index f580c64bfa0d..92a33109e42e 100644
--- a/net/globus4/pkg-plist
+++ b/net/globus4/pkg-plist
@@ -131,7 +131,6 @@
 %%GLOBUS_BASE%%/lib/libglobus_wsa_bindings_%%BASE_FLAVOR%%.so
 %%GLOBUS_BASE%%/lib/libglobus_wsbf_bindings_%%BASE_FLAVOR%%.so
 %%GLOBUS_BASE%%/lib/libglobus_wsc_bindings_%%BASE_FLAVOR%%.so
-%%GLOBUS_BASE%%/lib/libglobus_wsdl_parser_%%BASE_FLAVOR%%.so
 %%GLOBUS_BASE%%/lib/libglobus_wsnt_bindings_%%BASE_FLAVOR%%.so
 %%GLOBUS_BASE%%/lib/libglobus_wsp_bindings_%%BASE_FLAVOR%%.so
 %%GLOBUS_BASE%%/lib/libglobus_wsrf_core_tools_%%BASE_FLAVOR%%.so
@@ -591,15 +590,9 @@
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_c_ws_security/%%BASE_FLAVOR%%rtl.format
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_c_ws_security/pkg_data_%%BASE_FLAVOR%%_dev.gpt
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_c_ws_security/pkg_data_%%BASE_FLAVOR%%_rtl.gpt
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsdl_parser/%%BASE_FLAVOR%%_dev.filelist
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsdl_parser/%%BASE_FLAVOR%%_pgm.filelist
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsdl_parser/%%BASE_FLAVOR%%_rtl.filelist
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsdl_parser/%%BASE_FLAVOR%%dev.format
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsdl_parser/%%BASE_FLAVOR%%pgm.format
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsdl_parser/%%BASE_FLAVOR%%rtl.format
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsdl_parser/pkg_data_%%BASE_FLAVOR%%_dev.gpt
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsdl_parser/pkg_data_%%BASE_FLAVOR%%_pgm.gpt
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsdl_parser/pkg_data_%%BASE_FLAVOR%%_rtl.gpt
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsrf_cgen/%%BASE_FLAVOR%%_pgm.filelist
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsrf_cgen/%%BASE_FLAVOR%%pgm.format
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_c_wsrf_cgen/noflavor_data.filelist
@@ -1359,12 +1352,6 @@
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_libxml2/pkg_data_%%BASE_FLAVOR%%_rtl.gpt
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_libxml2/pkg_data_noflavor_data.gpt
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_libxml2/pkg_data_noflavor_doc.gpt
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_mds_test/%%BASE_FLAVOR%%_pgm.filelist
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_mds_test/%%BASE_FLAVOR%%pgm.format
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_mds_test/noflavor_data.filelist
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_mds_test/noflavordata.format
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_mds_test/pkg_data_%%BASE_FLAVOR%%_pgm.gpt
-%%GLOBUS_BASE%%/etc/gpt/packages/globus_mds_test/pkg_data_noflavor_data.gpt
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_mp/%%BASE_FLAVOR%%_dev.filelist
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_mp/%%BASE_FLAVOR%%_rtl.filelist
 %%GLOBUS_BASE%%/etc/gpt/packages/globus_mp/%%BASE_FLAVOR%%dev.format
@@ -1838,7 +1825,6 @@
 %%GLOBUS_BASE%%/etc/gram-service/registration.xml
 %%GLOBUS_BASE%%/etc/gram-service/server-config.wsdd
 %%GLOBUS_BASE%%/etc/grid-info-gram-rsl-reporter.schema
-%%GLOBUS_BASE%%/etc/myproxy-server.config
 %%GLOBUS_BASE%%/include/%%BASE_FLAVOR%%/%%BASE_FLAVOR%%/shared/ltdl.h
 %%GLOBUS_BASE%%/include/%%BASE_FLAVOR%%/CounterRP.h
 %%GLOBUS_BASE%%/include/%%BASE_FLAVOR%%/CounterRPType.h
@@ -3855,9 +3841,6 @@
 %%GLOBUS_BASE%%/lib/libglobus_wsc_bindings_%%BASE_FLAVOR%%.a
 %%GLOBUS_BASE%%/lib/libglobus_wsc_bindings_%%BASE_FLAVOR%%.la
 %%GLOBUS_BASE%%/lib/libglobus_wsc_bindings_%%BASE_FLAVOR%%.so.0
-%%GLOBUS_BASE%%/lib/libglobus_wsdl_parser_%%BASE_FLAVOR%%.a
-%%GLOBUS_BASE%%/lib/libglobus_wsdl_parser_%%BASE_FLAVOR%%.la
-%%GLOBUS_BASE%%/lib/libglobus_wsdl_parser_%%BASE_FLAVOR%%.so.0
 %%GLOBUS_BASE%%/lib/libglobus_wsnt_bindings_%%BASE_FLAVOR%%.a
 %%GLOBUS_BASE%%/lib/libglobus_wsnt_bindings_%%BASE_FLAVOR%%.la
 %%GLOBUS_BASE%%/lib/libglobus_wsnt_bindings_%%BASE_FLAVOR%%.so.0
@@ -3960,9 +3943,17 @@
 %%GLOBUS_BASE%%/lib/naming-java.jar
 %%GLOBUS_BASE%%/lib/naming-resources.jar
 %%GLOBUS_BASE%%/lib/opensaml.jar
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/CVS/Entries
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/CVS/Repository
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/CVS/Root
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/CVS/Tag
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/Compress/Zlib.pm
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/Digest/MD5.pm
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Archive/Tar/.packlist
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/CVS/Entries
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/CVS/Repository
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/CVS/Root
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/CVS/Tag
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Compress/Zlib/.packlist
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Compress/Zlib/Zlib.bs
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Compress/Zlib/Zlib.so
@@ -3973,6 +3964,10 @@
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/IO/Zlib/.packlist
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Pod/Parser/.packlist
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/.packlist
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/CVS/Entries
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/CVS/Repository
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/CVS/Root
+%%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/CVS/Tag
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/zlib/extralibs.ld
 %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/perllocal.pod
 %%GLOBUS_BASE%%/lib/perl/Archive/Tar.pm
@@ -4099,6 +4094,8 @@
 %%GLOBUS_BASE%%/lib/webmds/bin/webmds-create-context-file
 %%GLOBUS_BASE%%/lib/webmds/conf/containerinfo
 %%GLOBUS_BASE%%/lib/webmds/conf/containerinfo_nosec
+%%GLOBUS_BASE%%/lib/webmds/conf/gluehostsxsl
+%%GLOBUS_BASE%%/lib/webmds/conf/gluesummaryxsl
 %%GLOBUS_BASE%%/lib/webmds/conf/indexinfo
 %%GLOBUS_BASE%%/lib/webmds/conf/indexinfo_nosec
 %%GLOBUS_BASE%%/lib/webmds/conf/openEndedQuery
@@ -4109,6 +4106,8 @@
 %%GLOBUS_BASE%%/lib/webmds/conf/testfileinfo
 %%GLOBUS_BASE%%/lib/webmds/conf/testxslfalse
 %%GLOBUS_BASE%%/lib/webmds/conf/testxslnull
+%%GLOBUS_BASE%%/lib/webmds/conf/tg_gluehostsxsl
+%%GLOBUS_BASE%%/lib/webmds/conf/tg_gluesummaryxsl
 %%GLOBUS_BASE%%/lib/webmds/eprfiles/testepr.xml
 %%GLOBUS_BASE%%/lib/webmds/index.html
 %%GLOBUS_BASE%%/lib/webmds/sample_form.html
@@ -4117,6 +4116,15 @@
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/container.xsl
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/delegation_factory.xsl
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/footer.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/glue/clusterbase.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/glue/hostbase.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/glue/queuebase.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/glue/subcluster.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/glue/subclusterhosts.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/glue/tg_subclusterhosts.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/glue/tgextensions.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/gluehosts.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/gluesummary.xsl
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/heath.xsl
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/local/footer.xsl
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/local/style.xsl
@@ -4130,6 +4138,8 @@
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/sgtypes/rft.xsl
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/sgtypes/rls.xsl
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/sgtypes/sticky.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/tg_gluehosts.xsl
+%%GLOBUS_BASE%%/lib/webmds/xslfiles/tg_gluesummary.xsl
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/ugly.xsl
 %%GLOBUS_BASE%%/lib/webmds/xslfiles/xslfooter.xsl
 %%GLOBUS_BASE%%/lib/wsdl4j.jar
@@ -4242,6 +4252,10 @@
 %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%pthr/shared/grid-mapfile-add-entry
 %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%pthr/shared/grid-mapfile-check-consistency
 %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%pthr/shared/grid-mapfile-delete-entry
+%%GLOBUS_BASE%%/sbin/CVS/Entries
+%%GLOBUS_BASE%%/sbin/CVS/Repository
+%%GLOBUS_BASE%%/sbin/CVS/Root
+%%GLOBUS_BASE%%/sbin/CVS/Tag
 %%GLOBUS_BASE%%/sbin/applypatch
 %%GLOBUS_BASE%%/sbin/config.guess
 %%GLOBUS_BASE%%/sbin/globus-build-doxygen-dependencies
@@ -4359,11 +4373,11 @@
 %%GLOBUS_BASE%%/share/aclocal/libtool.m4
 %%GLOBUS_BASE%%/share/aclocal/libxml.m4
 %%GLOBUS_BASE%%/share/aclocal/ltdl.m4
-%%GLOBUS_BASE%%/share/doc/libxml2-0.12/Copyright
-%%GLOBUS_BASE%%/share/doc/libxml2-0.12/examples/testHTML.c
-%%GLOBUS_BASE%%/share/doc/libxml2-0.12/examples/testSAX.c
-%%GLOBUS_BASE%%/share/doc/libxml2-0.12/examples/testXPath.c
-%%GLOBUS_BASE%%/share/doc/libxml2-0.12/examples/xmllint.c
+%%GLOBUS_BASE%%/share/doc/libxml2-0.13/Copyright
+%%GLOBUS_BASE%%/share/doc/libxml2-0.13/examples/testHTML.c
+%%GLOBUS_BASE%%/share/doc/libxml2-0.13/examples/testSAX.c
+%%GLOBUS_BASE%%/share/doc/libxml2-0.13/examples/testXPath.c
+%%GLOBUS_BASE%%/share/doc/libxml2-0.13/examples/xmllint.c
 %%GLOBUS_BASE%%/share/doc/perl/Globus/GRAM/Error.html
 %%GLOBUS_BASE%%/share/doc/perl/Globus/GRAM/JobDescription.html
 %%GLOBUS_BASE%%/share/doc/perl/Globus/GRAM/JobManager.html
@@ -4857,7 +4871,9 @@
 %%GLOBUS_BASE%%/share/globus_wsrf_mds_usefulrp_schema/NStoPkg.properties
 %%GLOBUS_BASE%%/share/globus_wsrf_rendezvous_stubs/NStoPkg.properties
 %%GLOBUS_BASE%%/share/globus_wsrf_rft/rft_schema.sql
+%%GLOBUS_BASE%%/share/globus_wsrf_rft/rft_schema_derby.sql
 %%GLOBUS_BASE%%/share/globus_wsrf_rft/rft_schema_mysql.sql
+%%GLOBUS_BASE%%/share/globus_wsrf_rft/rft_schema_mysql_pre4.0.sql
 %%GLOBUS_BASE%%/share/globus_wsrf_rft/update.sql
 %%GLOBUS_BASE%%/share/globus_wsrf_rft_client/delete.xfr
 %%GLOBUS_BASE%%/share/globus_wsrf_rft_client/dir_transfer.xfr
@@ -5001,6 +5017,7 @@
 %%GLOBUS_BASE%%/share/myproxy/login.html
 %%GLOBUS_BASE%%/share/myproxy/myproxy-get-delegation.cgi
 %%GLOBUS_BASE%%/share/myproxy/myproxy-passphrase-policy
+%%GLOBUS_BASE%%/share/myproxy/myproxy-server.config
 %%GLOBUS_BASE%%/share/myproxy/myproxy.cron
 %%GLOBUS_BASE%%/share/schema/cas/cas_admin_port_type.wsdl
 %%GLOBUS_BASE%%/share/schema/cas/cas_bindings.wsdl
@@ -5241,11 +5258,15 @@
 %%GLOBUS_BASE%%/test/globus_authz_test/authtest
 %%GLOBUS_BASE%%/test/globus_authz_test/authz_cred_test
 %%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/%%BASE_FLAVOR%%/shared/TESTS.pl
+%%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/%%BASE_FLAVOR%%/shared/globus-service-engine-start-stop-test
+%%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/%%BASE_FLAVOR%%/shared/globus-service-engine-start-stop-test.pl
 %%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/%%BASE_FLAVOR%%/shared/xsd-qname-hashtable-test
 %%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/%%BASE_FLAVOR%%/shared/xsd-qname-hashtable-test.pl
 %%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/%%BASE_FLAVOR%%/shared/xsd-type-info-test
 %%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/%%BASE_FLAVOR%%/shared/xsd-type-info-test.pl
 %%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/TESTS.pl
+%%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/globus-service-engine-start-stop-test
+%%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/globus-service-engine-start-stop-test.pl
 %%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/xsd-qname-hashtable-test
 %%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/xsd-qname-hashtable-test.pl
 %%GLOBUS_BASE%%/test/globus_c_ws_messaging_test/xsd-type-info-test
@@ -5881,66 +5902,6 @@
 %%GLOBUS_BASE%%/test/globus_io_test/globus_io_tcp_test_server
 %%GLOBUS_BASE%%/test/globus_io_test/run-io-tests.pl
 %%GLOBUS_BASE%%/test/globus_io_test/testcred.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/TESTS.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/dc31a685.0
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/dc31a685.signing_policy
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-anon-giis-test.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-anon-gris-test.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-anon-load-gris.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-auth-load-giis.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-auth-load-giis.stderr
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-check-for-commands.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-errchk-bad-base.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-errchk-bad-base.stdout
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-infoprov-chk-helper.sh
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-infoprov-chk.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-server-start.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/mds-server-stop.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/reconfig-port.sh
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/run-mds-tests.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared/testcred.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/TESTS.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/dc31a685.0
-%%GLOBUS_BASE%%/test/globus_mds_test/dc31a685.signing_policy
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/lemoncert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/lemonkey.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/lucky1cert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/lucky1key.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/lucky6cert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/lucky6key.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/nmi-aixcert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/nmi-aixkey.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/pitcairncert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/pitcairnkey.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/titancert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared/titankey.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/lemoncert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/lemonkey.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/lucky1cert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/lucky1key.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/lucky6cert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/lucky6key.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/nmi-aixcert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/nmi-aixkey.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/pitcairncert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/pitcairnkey.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/titancert.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/titankey.pem
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-anon-giis-test.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-anon-gris-test.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-anon-load-gris.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-auth-load-giis.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-auth-load-giis.stderr
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-check-for-commands.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-errchk-bad-base.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-errchk-bad-base.stdout
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-infoprov-chk-helper.sh
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-infoprov-chk.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-server-start.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/mds-server-stop.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/reconfig-port.sh
-%%GLOBUS_BASE%%/test/globus_mds_test/run-mds-tests.pl
-%%GLOBUS_BASE%%/test/globus_mds_test/testcred.pem
 %%GLOBUS_BASE%%/test/globus_openssl_error_test/%%BASE_FLAVOR%%/shared/TESTS.pl
 %%GLOBUS_BASE%%/test/globus_openssl_error_test/%%BASE_FLAVOR%%/shared/globus-openssl-error-test.pl
 %%GLOBUS_BASE%%/test/globus_openssl_error_test/%%BASE_FLAVOR%%/shared/globus_openssl_error_test
@@ -6130,6 +6091,15 @@
 %%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit302.err
 %%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit302.out
 %%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit302.xml
+%%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit401.err
+%%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit401.in
+%%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit401.out
+%%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit401.xml
+%%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit402.xml
+%%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit403.err
+%%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit403.in
+%%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit403.out
+%%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test/submit403.xml
 %%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/xml-tags.pl
 %%GLOBUS_BASE%%/test/globus_wsrf_gram_service_java_test_throughput/gram-throughput-tester
 %%GLOBUS_BASE%%/test/globus_wsrf_gram_service_java_test_throughput/run-throughput-tests.pl
@@ -6142,6 +6112,8 @@
 %%GLOBUS_BASE%%/test/globus_wsrf_gram_service_java_test_unit/simplest_multi_job.xml
 %%GLOBUS_BASE%%/test/globus_wsrf_gram_service_java_test_unit/sparse_file_mapping.xml
 %%GLOBUS_BASE%%/test/globus_wsrf_gram_service_java_test_unit/test.xml
+%%GLOBUS_BASE%%/test/globus_wsrf_test_interop/TESTS.pl
+%%GLOBUS_BASE%%/test/globus_wsrf_test_unit/TESTS.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/TESTS.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/attr-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/basic-test.pl
@@ -6157,12 +6129,14 @@
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http-post-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http-put-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http-throughput-test.pl
+%%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http-timeout-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http_get_test
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http_header_test
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http_pingpong_test
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http_post_test
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http_put_test
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http_throughput_test
+%%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/http_timeout_test
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/random-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/read-barrier-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared/run-all-tests.pl
@@ -6191,12 +6165,14 @@
 %%GLOBUS_BASE%%/test/globus_xio_test/http-post-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/http-put-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/http-throughput-test.pl
+%%GLOBUS_BASE%%/test/globus_xio_test/http-timeout-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/http_get_test
 %%GLOBUS_BASE%%/test/globus_xio_test/http_header_test
 %%GLOBUS_BASE%%/test/globus_xio_test/http_pingpong_test
 %%GLOBUS_BASE%%/test/globus_xio_test/http_post_test
 %%GLOBUS_BASE%%/test/globus_xio_test/http_put_test
 %%GLOBUS_BASE%%/test/globus_xio_test/http_throughput_test
+%%GLOBUS_BASE%%/test/globus_xio_test/http_timeout_test
 %%GLOBUS_BASE%%/test/globus_xio_test/random-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/read-barrier-test.pl
 %%GLOBUS_BASE%%/test/globus_xio_test/run-all-tests.pl
@@ -6219,6 +6195,8 @@
 @dirrm %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%/shared
 @dirrm %%GLOBUS_BASE%%/test/globus_xio_test/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/test/globus_xio_test
+@dirrm %%GLOBUS_BASE%%/test/globus_wsrf_test_unit
+@dirrm %%GLOBUS_BASE%%/test/globus_wsrf_test_interop
 @dirrm %%GLOBUS_BASE%%/test/globus_wsrf_gram_service_java_test_unit
 @dirrm %%GLOBUS_BASE%%/test/globus_wsrf_gram_service_java_test_throughput
 @dirrm %%GLOBUS_BASE%%/test/globus_wsrf_gram_scheduler_test/submit_test
@@ -6237,12 +6215,6 @@
 @dirrm %%GLOBUS_BASE%%/test/globus_openssl_error_test/%%BASE_FLAVOR%%/shared
 @dirrm %%GLOBUS_BASE%%/test/globus_openssl_error_test/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/test/globus_openssl_error_test
-@dirrm %%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%/shared
-@dirrm %%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts/%%BASE_FLAVOR%%
-@dirrm %%GLOBUS_BASE%%/test/globus_mds_test/ldapcerts
-@dirrm %%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%/shared
-@dirrm %%GLOBUS_BASE%%/test/globus_mds_test/%%BASE_FLAVOR%%
-@dirrm %%GLOBUS_BASE%%/test/globus_mds_test
 @dirrm %%GLOBUS_BASE%%/test/globus_io_test/%%BASE_FLAVOR%%/shared
 @dirrm %%GLOBUS_BASE%%/test/globus_io_test/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/test/globus_io_test
@@ -6397,8 +6369,8 @@
 @dirrm %%GLOBUS_BASE%%/share/doc/perl/Globus/GRAM
 @dirrm %%GLOBUS_BASE%%/share/doc/perl/Globus
 @dirrm %%GLOBUS_BASE%%/share/doc/perl
-@dirrm %%GLOBUS_BASE%%/share/doc/libxml2-0.12/examples
-@dirrm %%GLOBUS_BASE%%/share/doc/libxml2-0.12
+@dirrm %%GLOBUS_BASE%%/share/doc/libxml2-0.13/examples
+@dirrm %%GLOBUS_BASE%%/share/doc/libxml2-0.13
 @dirrm %%GLOBUS_BASE%%/share/doc
 @dirrm %%GLOBUS_BASE%%/share/aclocal/%%BASE_FLAVOR%%pthr/shared
 @dirrm %%GLOBUS_BASE%%/share/aclocal/%%BASE_FLAVOR%%pthr
@@ -6411,6 +6383,7 @@
 @dirrm %%GLOBUS_BASE%%/setup/globus/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/setup/globus
 @dirrm %%GLOBUS_BASE%%/setup
+@dirrm %%GLOBUS_BASE%%/sbin/CVS
 @dirrm %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%pthr/shared
 @dirrm %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%pthr
 @dirrm %%GLOBUS_BASE%%/sbin/%%BASE_FLAVOR%%/shared
@@ -6429,6 +6402,7 @@
 @dirrm %%GLOBUS_BASE%%/man/man1/ssh.d/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/man/man1/ssh.d
 @dirrm %%GLOBUS_BASE%%/man/man1/man1
+@dirrm %%GLOBUS_BASE%%/man/man1/CVS
 @dirrm %%GLOBUS_BASE%%/man/man1/%%BASE_FLAVOR%%/shared
 @dirrm %%GLOBUS_BASE%%/man/man1/%%BASE_FLAVOR%%
 @dirrm %%GLOBUS_BASE%%/man/man1
@@ -6443,6 +6417,7 @@
 @dirrm %%GLOBUS_BASE%%/libexec
 @dirrm %%GLOBUS_BASE%%/lib/webmds/xslfiles/sgtypes
 @dirrm %%GLOBUS_BASE%%/lib/webmds/xslfiles/local
+@dirrm %%GLOBUS_BASE%%/lib/webmds/xslfiles/glue
 @dirrm %%GLOBUS_BASE%%/lib/webmds/xslfiles
 @dirrm %%GLOBUS_BASE%%/lib/webmds/test
 @dirrm %%GLOBUS_BASE%%/lib/webmds/schema/mds/webmds
@@ -6471,6 +6446,7 @@
 @dirrm %%GLOBUS_BASE%%/lib/perl/Globus
 @dirrm %%GLOBUS_BASE%%/lib/perl/Archive
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/zlib
+@dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch/CVS
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/makepatch
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Pod/Parser
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Pod
@@ -6480,11 +6456,13 @@
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Digest
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Compress/Zlib
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Compress
+@dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/CVS
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Archive/Tar
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto/Archive
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/auto
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/Digest
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/Compress
+@dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%/CVS
 @dirrm %%GLOBUS_BASE%%/lib/perl/%%PERL_ARCH%%
 @dirrm %%GLOBUS_BASE%%/lib/perl
 @dirrm %%GLOBUS_BASE%%/lib/globus_service_modules/wsrf/services
@@ -6629,7 +6607,6 @@
 @dirrm %%GLOBUS_BASE%%/etc/gpt/packages/globus_notification_consumer
 @dirrm %%GLOBUS_BASE%%/etc/gpt/packages/globus_nexus
 @dirrm %%GLOBUS_BASE%%/etc/gpt/packages/globus_mp
-@dirrm %%GLOBUS_BASE%%/etc/gpt/packages/globus_mds_test
 @dirrm %%GLOBUS_BASE%%/etc/gpt/packages/globus_libxml2
 @dirrm %%GLOBUS_BASE%%/etc/gpt/packages/globus_libtool/%%BASE_FLAVOR%%pthr/shared
 @dirrm %%GLOBUS_BASE%%/etc/gpt/packages/globus_libtool/%%BASE_FLAVOR%%pthr