3 files changed, 26 insertions, 29 deletions

diff --git a/misc/gpt/Makefile b/misc/gpt/Makefile
index d88d4471e597..f5f463d30333 100644
--- a/misc/gpt/Makefile
+++ b/misc/gpt/Makefile
@@ -9,13 +9,13 @@ PORTNAME=	gpt
 PORTVERSION=	3.2
 PORTREVISION=	1
 CATEGORIES=	misc archivers devel parallel
-MASTER_SITES=	http://www-unix.globus.org/ftppub/gt4/4.0/4.0.0/gpt/
+MASTER_SITES=	ftp://ftp.globus.org/pub/gt4/4.0/4.0.0/gpt/
 DISTNAME=	gpt-${PORTVERSION}autotools2004-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Grid Packaging Tools (used to install Globus)
 
-CONFLICTS=	gpt-3.1
+CONFLICTS=	gpt-3.1*
 
 RUN_DEPENDS+=	${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
@@ -27,10 +27,7 @@ RUN_DEPENDS+=	${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
 		${LOCALBASE}/bin/gmake:${PORTSDIR}/devel/gmake \
 		${LOCALBASE}/bin/makepatch:${PORTSDIR}/textproc/makepatch
 
-BROKEN=		Broken distinfo
-
 USE_PERL5=	yes
-USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}autotools2004
 NO_BUILD=	yes
 
@@ -56,7 +53,7 @@ FIX_VAR_FILES=	${WRKSRC}/packaging_tools/perl/GPT/Localize.pm \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		"Does not build"
+BROKEN=		Does not build
 .endif
 
 post-patch:
diff --git a/misc/gpt/distinfo b/misc/gpt/distinfo
index e4f7b3df5c1e..d21b7ef1e360 100644
--- a/misc/gpt/distinfo
+++ b/misc/gpt/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpt-3.2-src.tar.gz) = 478ca14d571d4b5701c8a687b7ced11f
-SHA256 (gpt-3.2-src.tar.gz) = 11bc5a4a3414f7b241817619782257223d18f71324d02de07eb2c734c8ab40c3
-SIZE (gpt-3.2-src.tar.gz) = 1522596
+MD5 (gpt-3.2autotools2004-src.tar.gz) = 2222797c2400c42e81e1f2cff76d475d
+SHA256 (gpt-3.2autotools2004-src.tar.gz) = 3880ec0ab66d29eb9faa6f771677449898f744edb6ee06d517e4e7c69979ae65
+SIZE (gpt-3.2autotools2004-src.tar.gz) = 1697719
diff --git a/misc/gpt/pkg-plist b/misc/gpt/pkg-plist
index c2ab4ef87dc0..aea0ce046ca7 100644
--- a/misc/gpt/pkg-plist
+++ b/misc/gpt/pkg-plist
@@ -100,23 +100,23 @@ sbin/gpt_save_flavor
 sbin/gpt_sort_filelist
 sbin/gpt_version
 share/globus_aclocal
-share/gpt/aclocal/Makefile_am.frg
-share/gpt/aclocal/bootstrap.frg
-share/gpt/aclocal/configure_in.frg
-share/gpt/aclocal/gpt_autoconf_macros.m4
-share/gpt/aclocal/pkg_data_src_gpt_in.frg
-share/gpt/aclocal/top_Makefile_am.frg
-share/gpt/amdir/data.am
-share/gpt/amdir/filelist.am
-share/gpt/amdir/header.am
-share/gpt/amdir/libs.am
-share/gpt/amdir/ltlib.am
-share/gpt/amdir/mans.am
-share/gpt/amdir/pkgdata_Makefile.am
-share/gpt/amdir/progs.am
-share/gpt/amdir/scripts.am
-share/gpt/amdir/subdirs.am
-share/gpt/config.guess
+%%DATADIR%%/aclocal/Makefile_am.frg
+%%DATADIR%%/aclocal/bootstrap.frg
+%%DATADIR%%/aclocal/configure_in.frg
+%%DATADIR%%/aclocal/gpt_autoconf_macros.m4
+%%DATADIR%%/aclocal/pkg_data_src_gpt_in.frg
+%%DATADIR%%/aclocal/top_Makefile_am.frg
+%%DATADIR%%/amdir/data.am
+%%DATADIR%%/amdir/filelist.am
+%%DATADIR%%/amdir/header.am
+%%DATADIR%%/amdir/libs.am
+%%DATADIR%%/amdir/ltlib.am
+%%DATADIR%%/amdir/mans.am
+%%DATADIR%%/amdir/pkgdata_Makefile.am
+%%DATADIR%%/amdir/progs.am
+%%DATADIR%%/amdir/scripts.am
+%%DATADIR%%/amdir/subdirs.am
+%%DATADIR%%/config.guess
 share/gpt_amdir
 @dirrm etc/gpt/dtd
 @dirrm etc/gpt
@@ -129,8 +129,8 @@ share/gpt_amdir
 @dirrm lib/perl/Grid/GPT
 @dirrm lib/perl/Grid
 @dirrm lib/perl
-@dirrm share/gpt/aclocal
-@dirrm share/gpt/amdir
-@dirrm share/gpt
+@dirrm %%DATADIR%%/aclocal
+@dirrm %%DATADIR%%/amdir
+@dirrm %%DATADIR%%
 @exec PATH=%%LOCALBASE%%/bin:${PATH} GPT_LOCATION=%D %D/sbin/gpt-config -probe -perl=%%PERL%%
 @unexec echo "Configuration information saved.  If you will *NOT* use this package" && echo "anymore, please remove /var/db/gpt and its contents manually."