Remove regex code, use -lgnuregex instead

5 files changed, 9 insertions, 9 deletions

diff --git a/gnu/usr.bin/binutils/gdb/Makefile b/gnu/usr.bin/binutils/gdb/Makefile
index 3e481ce..990a1ab 100644
--- a/gnu/usr.bin/binutils/gdb/Makefile
+++ b/gnu/usr.bin/binutils/gdb/Makefile
@@ -12,7 +12,7 @@ SRCS = annotate.c blockframe.c breakpoint.c buildsym.c c-lang.c \
 	infrun.c inftarg.c init.c kcorelow.c language.c \
 	m2-lang.c m2-typeprint.c m2-valprint.c main.c maint.c \
 	mem-break.c minsyms.c objfiles.c parse.c \
-	printcmd.c regex.c remote.c remote-utils.c solib.c source.c \
+	printcmd.c remote.c remote-utils.c solib.c source.c \
 	stabsread.c stack.c symfile.c symmisc.c \
 	symtab.c target.c thread.c top.c \
 	typeprint.c utils.c valarith.c valops.c \
@@ -45,8 +45,8 @@ m2-exp.tab.c: $(.CURDIR)/m2-exp.y
 
 
 CFLAGS+= -I$(.CURDIR)/. -I${DESTDIR}/usr/include/readline -I$(.CURDIR)/../bfd
-DPADD+= ${LIBREADLINE} ${LIBTERMCAP}
-LDADD+= -lreadline  -ltermcap
+DPADD+= ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
+LDADD+= -lreadline  -ltermcap -lgnuregex
 
 .if exists(${.CURDIR}/../libiberty/obj)
 LDADD+=   -L${.CURDIR}/../libiberty/obj -liberty
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index 3e481ce..990a1ab 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -12,7 +12,7 @@ SRCS = annotate.c blockframe.c breakpoint.c buildsym.c c-lang.c \
 	infrun.c inftarg.c init.c kcorelow.c language.c \
 	m2-lang.c m2-typeprint.c m2-valprint.c main.c maint.c \
 	mem-break.c minsyms.c objfiles.c parse.c \
-	printcmd.c regex.c remote.c remote-utils.c solib.c source.c \
+	printcmd.c remote.c remote-utils.c solib.c source.c \
 	stabsread.c stack.c symfile.c symmisc.c \
 	symtab.c target.c thread.c top.c \
 	typeprint.c utils.c valarith.c valops.c \
@@ -45,8 +45,8 @@ m2-exp.tab.c: $(.CURDIR)/m2-exp.y
 
 
 CFLAGS+= -I$(.CURDIR)/. -I${DESTDIR}/usr/include/readline -I$(.CURDIR)/../bfd
-DPADD+= ${LIBREADLINE} ${LIBTERMCAP}
-LDADD+= -lreadline  -ltermcap
+DPADD+= ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
+LDADD+= -lreadline  -ltermcap -lgnuregex
 
 .if exists(${.CURDIR}/../libiberty/obj)
 LDADD+=   -L${.CURDIR}/../libiberty/obj -liberty
diff --git a/gnu/usr.bin/gdb/gdb/solib.c b/gnu/usr.bin/gdb/gdb/solib.c
index d4e6319..f851dee 100644
--- a/gnu/usr.bin/gdb/gdb/solib.c
+++ b/gnu/usr.bin/gdb/gdb/solib.c
@@ -48,7 +48,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "command.h"
 #include "target.h"
 #include "frame.h"
-#include "regex.h"
+#include "gnuregex.h"
 #include "inferior.h"
 #include "language.h"
 
diff --git a/gnu/usr.bin/gdb/gdb/source.c b/gnu/usr.bin/gdb/gdb/source.c
index 1f60821..af2d14d 100644
--- a/gnu/usr.bin/gdb/gdb/source.c
+++ b/gnu/usr.bin/gdb/gdb/source.c
@@ -31,7 +31,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/stat.h>
 #include <fcntl.h>
 #include "gdbcore.h"
-#include "regex.h"
+#include "gnuregex.h"
 #include "symfile.h"
 #include "objfiles.h"
 #include "annotate.h"
diff --git a/gnu/usr.bin/gdb/gdb/symtab.c b/gnu/usr.bin/gdb/gdb/symtab.c
index e08807c..8f65ea1 100644
--- a/gnu/usr.bin/gdb/gdb/symtab.c
+++ b/gnu/usr.bin/gdb/gdb/symtab.c
@@ -29,7 +29,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "objfiles.h"
 #include "gdbcmd.h"
 #include "call-cmds.h"
-#include "regex.h"
+#include "gnuregex.h"
 #include "expression.h"
 #include "language.h"
 #include "demangle.h"