Update to a gdb 6.1 snapshot.

Note that the FreeBSD local hacks haven't been updated to 6.1 in this
commit.  That will come later.

6 files changed, 44 insertions, 20 deletions

diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index fc3e902bd307..4a182f499c64 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -6,25 +6,32 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2003-03-11
+SNAPDATE=	2004-03-23
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gdb
-PORTVERSION=	5.3
+PORTVERSION=	6
 PORTREVISION=	${SNAPVER}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	gdb/snapshots/branch
-DISTNAME=	gdb+dejagnu-weekly-5.3.0.90_${SNAPVER}
+MASTER_SITE_SUBDIR=	gdb/snapshots/current
+DISTNAME=	gdb+dejagnu-weekly-${SNAPVER}
 
-MAINTAINER=	mp@FreeBSD.org
-COMMENT=	GNU GDB 5.3 developmental snapshot
+MAINTAINER=	obrien@FreeBSD.org
+COMMENT=	GNU GDB 6
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-weekly//}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-suffix=53
+CONFIGURE_ARGS=	--program-suffix=6
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/$$/ [FreeBSD]/' ${WRKSRC}/gdb/version.in
+
+do-patch: post-patch
+	@${ECHO} 'FreeBSD-specific patches disabled for now, until upgraded.'
 
 pre-configure:
 	cd ${WRKSRC} ; ${RM} -rf dejagnu expect sim tcl texinfo
@@ -35,7 +42,11 @@ do-install:
 
 cklatest:
 	ncftpls \
-	    ftp://mirrors.rcn.net/mirrors/sources.redhat.com/${MASTER_SITE_SUBDIR}/  \
+	    ftp://sources.redhat.com/pub/${MASTER_SITE_SUBDIR}/  \
 	    | ${GREP} gdb+dejagnu-weekly
 
 .include <bsd.port.mk>
+
+.if ${ARCH} == "amd64"
+CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.endif
diff --git a/devel/gdb6/distinfo b/devel/gdb6/distinfo
index d827efdc2aad..12090414b4be 100644
--- a/devel/gdb6/distinfo
+++ b/devel/gdb6/distinfo
@@ -1 +1,2 @@
-MD5 (gdb+dejagnu-weekly-5.3.0.90_20030311.tar.bz2) = 71b01efff86986c79491e2a540449117
+MD5 (gdb+dejagnu-weekly-20040323.tar.bz2) = 23a338564165e36161bbafbad3b4e0c4
+SIZE (gdb+dejagnu-weekly-20040323.tar.bz2) = 16676944
diff --git a/devel/gdb6/pkg-plist b/devel/gdb6/pkg-plist
index 83f42a1b4111..18c85983f58d 100644
--- a/devel/gdb6/pkg-plist
+++ b/devel/gdb6/pkg-plist
@@ -1,2 +1,2 @@
 @comment $FreeBSD$
-bin/gdb53
+bin/gdb6
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index fc3e902bd307..4a182f499c64 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -6,25 +6,32 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2003-03-11
+SNAPDATE=	2004-03-23
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gdb
-PORTVERSION=	5.3
+PORTVERSION=	6
 PORTREVISION=	${SNAPVER}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR=	gdb/snapshots/branch
-DISTNAME=	gdb+dejagnu-weekly-5.3.0.90_${SNAPVER}
+MASTER_SITE_SUBDIR=	gdb/snapshots/current
+DISTNAME=	gdb+dejagnu-weekly-${SNAPVER}
 
-MAINTAINER=	mp@FreeBSD.org
-COMMENT=	GNU GDB 5.3 developmental snapshot
+MAINTAINER=	obrien@FreeBSD.org
+COMMENT=	GNU GDB 6
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-weekly//}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-suffix=53
+CONFIGURE_ARGS=	--program-suffix=6
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/$$/ [FreeBSD]/' ${WRKSRC}/gdb/version.in
+
+do-patch: post-patch
+	@${ECHO} 'FreeBSD-specific patches disabled for now, until upgraded.'
 
 pre-configure:
 	cd ${WRKSRC} ; ${RM} -rf dejagnu expect sim tcl texinfo
@@ -35,7 +42,11 @@ do-install:
 
 cklatest:
 	ncftpls \
-	    ftp://mirrors.rcn.net/mirrors/sources.redhat.com/${MASTER_SITE_SUBDIR}/  \
+	    ftp://sources.redhat.com/pub/${MASTER_SITE_SUBDIR}/  \
 	    | ${GREP} gdb+dejagnu-weekly
 
 .include <bsd.port.mk>
+
+.if ${ARCH} == "amd64"
+CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
+.endif
diff --git a/devel/gdb66/distinfo b/devel/gdb66/distinfo
index d827efdc2aad..12090414b4be 100644
--- a/devel/gdb66/distinfo
+++ b/devel/gdb66/distinfo
@@ -1 +1,2 @@
-MD5 (gdb+dejagnu-weekly-5.3.0.90_20030311.tar.bz2) = 71b01efff86986c79491e2a540449117
+MD5 (gdb+dejagnu-weekly-20040323.tar.bz2) = 23a338564165e36161bbafbad3b4e0c4
+SIZE (gdb+dejagnu-weekly-20040323.tar.bz2) = 16676944
diff --git a/devel/gdb66/pkg-plist b/devel/gdb66/pkg-plist
index 83f42a1b4111..18c85983f58d 100644
--- a/devel/gdb66/pkg-plist
+++ b/devel/gdb66/pkg-plist
@@ -1,2 +1,2 @@
 @comment $FreeBSD$
-bin/gdb53
+bin/gdb6