10 files changed, 35 insertions, 119 deletions

diff --git a/devel/i386-rtems-gdb/Makefile b/devel/i386-rtems-gdb/Makefile
index 4ccf58aa07ca..77fa084930f8 100644
--- a/devel/i386-rtems-gdb/Makefile
+++ b/devel/i386-rtems-gdb/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	gdb
-PORTVERSION=	4.18
+PORTVERSION=	5.0
+PORTREVISION=	2
 CATEGORIES=	devel
-MASTER_SITES=   ftp://ftp.oarcorp.com/pub/rtems/betas/rtems-4.5.0-beta/c_tools/source/ \
-		http://www.thehousleys.net/rtems-4.5.0b3/
-PATCHFILES=	${GDBNAME}-rtems-20000524.diff.gz
-PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/betas/rtems-4.5.0-beta/c_tools/source/ \
-		http://www.thehousleys.net/rtems-4.5.0b3/
+MASTER_SITES=   ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
+		http://rtems.thehousleys.net/
+PATCHFILES=	${GDBNAME}-rtems-20000718.diff.gz
+PATCH_SITES=	ftp://ftp.oarcorp.com/pub/rtems/snapshots/c_tools/source/ \
+		http://rtems.thehousleys.net/
 
 MAINTAINER=	jim@thehousleys.net
 
@@ -20,7 +21,7 @@ DIST_SUBDIR=	rtems
 
 LCLTARGET?=	i386-rtems
 
-GDBNAME=	gdb-4.18
+GDBNAME=	gdb-5.0
 MASTERDIR=	${.CURDIR}/../i386-rtems-gdb
 PLIST=		${PKGDIR}/PLIST.${LCLTARGET}
 
@@ -40,7 +41,6 @@ CONFIGURE_WRKSRC?=	${WRKDIR}/build-${LCLTARGET}
 CONFIGURE_SCRIPT?=	../${GDBNAME}/configure
 
 MAN1=		${LCLTARGET}-gdb.1
-MAN3=		readline.3
 
 .if defined(PATCH_DEBUG)
 PATCH_DIST_ARGS=   -d ${WRKDIR} -E ${PATCH_DIST_STRIP}
@@ -59,8 +59,4 @@ do-install:
 	@(cd ${WRKDIR}/build-${LCLTARGET} && \
 	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 
-post-install:
-	@install-info ${PREFIX}/info/readline.info ${PREFIX}/info/dir
-	@install-info ${PREFIX}/info/history.info ${PREFIX}/info/dir
-
 .include <bsd.port.mk>
diff --git a/devel/i386-rtems-gdb/distinfo b/devel/i386-rtems-gdb/distinfo
index f5df36a03923..356b53b7febc 100644
--- a/devel/i386-rtems-gdb/distinfo
+++ b/devel/i386-rtems-gdb/distinfo
@@ -1,2 +1,2 @@
-MD5 (rtems/gdb-4.18-rtems-20000524.diff.gz) = 72f00b298c95d968212c8b77c240aca3
-MD5 (rtems/gdb-4.18.tar.gz) = 828d28487af6cec074639c1102569473
+MD5 (rtems/gdb-5.0.tar.gz) = 9511b69b6b5a3b38c62ad207b3c94673
+MD5 (rtems/gdb-5.0-rtems-20000718.diff.gz) = ba6ab55fbf2758b3efe64f99e31fc11e
diff --git a/devel/i386-rtems-gdb/files/patch-aa b/devel/i386-rtems-gdb/files/patch-aa
new file mode 100644
index 000000000000..1f84f62ff4c2
--- /dev/null
+++ b/devel/i386-rtems-gdb/files/patch-aa
@@ -0,0 +1,24 @@
+--- Makefile.in.orig	Thu May 18 01:00:23 2000
++++ Makefile.in	Tue Aug 29 16:28:47 2000
+@@ -662,9 +662,7 @@
+ 	install-autoconf \
+ 	install-automake \
+ 	install-bash \
+-	install-bfd \
+ 	install-bzip2 \
+-	install-opcodes \
+ 	install-binutils \
+ 	install-bison \
+ 	install-byacc \
+@@ -696,11 +694,9 @@
+ 	install-itcl \
+ 	install-ld \
+ 	install-libgui \
+-	install-libiberty \
+ 	install-libtool \
+ 	install-m4 \
+ 	install-make \
+-	install-mmalloc \
+ 	install-patch \
+ 	install-perl \
+ 	install-prms \
diff --git a/devel/i386-rtems-gdb/pkg-plist.i386-rtems b/devel/i386-rtems-gdb/pkg-plist.i386-rtems
index 8fd25606312c..1e4d25ce1729 100644
--- a/devel/i386-rtems-gdb/pkg-plist.i386-rtems
+++ b/devel/i386-rtems-gdb/pkg-plist.i386-rtems
@@ -1,16 +1 @@
 bin/i386-rtems-gdb
-include/readline/readline.h
-include/readline/chardefs.h
-include/readline/keymaps.h
-include/readline/history.h
-include/readline/tilde.h
-@unexec install-info --delete %D/info/readline.info %D/info/dir
-@unexec install-info --delete %D/info/history.info %D/info/dir
-info/readline.info
-info/history.info
-@exec install-info %D/info/history.info %D/info/dir
-@exec install-info %D/info/readline.info %D/info/dir
-lib/libmmalloc.a
-lib/libreadline.a
-lib/libhistory.a
-@dirrm include/readline
diff --git a/devel/i386-rtems-gdb/pkg-plist.i960-rtems b/devel/i386-rtems-gdb/pkg-plist.i960-rtems
index 04541c6cbb42..97cd9078a8c7 100644
--- a/devel/i386-rtems-gdb/pkg-plist.i960-rtems
+++ b/devel/i386-rtems-gdb/pkg-plist.i960-rtems
@@ -1,18 +1,3 @@
 bin/i960-rtems-gdb
 bin/i960-rtems-run
-include/readline/readline.h
-include/readline/chardefs.h
-include/readline/keymaps.h
-include/readline/history.h
-include/readline/tilde.h
-@unexec install-info --delete %D/info/readline.info %D/info/dir
-@unexec install-info --delete %D/info/history.info %D/info/dir
-info/readline.info
-info/history.info
-@exec install-info %D/info/history.info %D/info/dir
-@exec install-info %D/info/readline.info %D/info/dir
-lib/libmmalloc.a
-lib/libreadline.a
-lib/libhistory.a
 lib/libi960-rtems-sim.a
-@dirrm include/readline
diff --git a/devel/i386-rtems-gdb/pkg-plist.m68k-rtems b/devel/i386-rtems-gdb/pkg-plist.m68k-rtems
index 6598bcd6642f..66ca3e8262b0 100644
--- a/devel/i386-rtems-gdb/pkg-plist.m68k-rtems
+++ b/devel/i386-rtems-gdb/pkg-plist.m68k-rtems
@@ -1,16 +1 @@
 bin/m68k-rtems-gdb
-include/readline/readline.h
-include/readline/chardefs.h
-include/readline/keymaps.h
-include/readline/history.h
-include/readline/tilde.h
-@unexec install-info --delete %D/info/readline.info %D/info/dir
-@unexec install-info --delete %D/info/history.info %D/info/dir
-info/readline.info
-info/history.info
-@exec install-info %D/info/history.info %D/info/dir
-@exec install-info %D/info/readline.info %D/info/dir
-lib/libmmalloc.a
-lib/libreadline.a
-lib/libhistory.a
-@dirrm include/readline
diff --git a/devel/i386-rtems-gdb/pkg-plist.mips64orion-rtems b/devel/i386-rtems-gdb/pkg-plist.mips64orion-rtems
index 176a0387dfc6..52417221f78f 100644
--- a/devel/i386-rtems-gdb/pkg-plist.mips64orion-rtems
+++ b/devel/i386-rtems-gdb/pkg-plist.mips64orion-rtems
@@ -1,18 +1,3 @@
 bin/mips64orion-rtems-gdb
 bin/mips64orion-rtems-run
-include/readline/readline.h
-include/readline/chardefs.h
-include/readline/keymaps.h
-include/readline/history.h
-include/readline/tilde.h
-@unexec install-info --delete %D/info/readline.info %D/info/dir
-@unexec install-info --delete %D/info/history.info %D/info/dir
-info/readline.info
-info/history.info
-@exec install-info %D/info/history.info %D/info/dir
-@exec install-info %D/info/readline.info %D/info/dir
-lib/libmmalloc.a
-lib/libreadline.a
-lib/libhistory.a
 lib/libmips64orion-rtems-sim.a
-@dirrm include/readline
diff --git a/devel/i386-rtems-gdb/pkg-plist.powerpc-rtems b/devel/i386-rtems-gdb/pkg-plist.powerpc-rtems
index 58e729d4a781..2c804e502677 100644
--- a/devel/i386-rtems-gdb/pkg-plist.powerpc-rtems
+++ b/devel/i386-rtems-gdb/pkg-plist.powerpc-rtems
@@ -1,16 +1,2 @@
 bin/powerpc-rtems-gdb
-include/readline/readline.h
-include/readline/chardefs.h
-include/readline/keymaps.h
-include/readline/history.h
-include/readline/tilde.h
-@unexec install-info --delete %D/info/readline.info %D/info/dir
-@unexec install-info --delete %D/info/history.info %D/info/dir
-info/readline.info
-info/history.info
-@exec install-info %D/info/history.info %D/info/dir
-@exec install-info %D/info/readline.info %D/info/dir
-lib/libmmalloc.a
-lib/libreadline.a
-lib/libhistory.a
-@dirrm include/readline
+bin/powerpc-rtems-run
diff --git a/devel/i386-rtems-gdb/pkg-plist.sh-rtems b/devel/i386-rtems-gdb/pkg-plist.sh-rtems
index d054764e559c..41f7d7067e54 100644
--- a/devel/i386-rtems-gdb/pkg-plist.sh-rtems
+++ b/devel/i386-rtems-gdb/pkg-plist.sh-rtems
@@ -1,18 +1,3 @@
 bin/sh-rtems-gdb
 bin/sh-rtems-run
-include/readline/readline.h
-include/readline/chardefs.h
-include/readline/keymaps.h
-include/readline/history.h
-include/readline/tilde.h
-@unexec install-info --delete %D/info/readline.info %D/info/dir
-@unexec install-info --delete %D/info/history.info %D/info/dir
-info/readline.info
-info/history.info
-@exec install-info %D/info/history.info %D/info/dir
-@exec install-info %D/info/readline.info %D/info/dir
-lib/libmmalloc.a
-lib/libreadline.a
-lib/libhistory.a
 lib/libsh-rtems-sim.a
-@dirrm include/readline
diff --git a/devel/i386-rtems-gdb/pkg-plist.sparc-rtems b/devel/i386-rtems-gdb/pkg-plist.sparc-rtems
index fe5380626d37..0ae6820e3526 100644
--- a/devel/i386-rtems-gdb/pkg-plist.sparc-rtems
+++ b/devel/i386-rtems-gdb/pkg-plist.sparc-rtems
@@ -1,19 +1,4 @@
 bin/sparc-rtems-gdb
 bin/sparc-rtems-run
 bin/sparc-rtems-sis
-include/readline/readline.h
-include/readline/chardefs.h
-include/readline/keymaps.h
-include/readline/history.h
-include/readline/tilde.h
-@unexec install-info --delete %D/info/readline.info %D/info/dir
-@unexec install-info --delete %D/info/history.info %D/info/dir
-info/readline.info
-info/history.info
-@exec install-info %D/info/history.info %D/info/dir
-@exec install-info %D/info/readline.info %D/info/dir
-lib/libmmalloc.a
-lib/libreadline.a
-lib/libhistory.a
 lib/libsparc-rtems-sim.a
-@dirrm include/readline