Use system's posix compliant regex library (GNU regex for now).

diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 7702004..a332442 100644 (file)
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,14 +1,16 @@
 PROG=  ed
 PROG=  ed

-CFLAGS+=-I${.CURDIR} -DVI_BANG -DGNU_REGEX -DHAVE_STRING_H=1
-SRCS=  ed.c re.c buf.c cbc.c regex.c
+CFLAGS+=-I${.CURDIR} -DVI_BANG -DGNU_REGEX
+SRCS=  ed.c re.c buf.c cbc.c 

 LINKS= ${BINDIR}/ed ${BINDIR}/red
 MLINKS=        ed.1 red.1
 
 .if exists(/usr/lib/libcrypt.a)
 CFLAGS+=-DDES
 LINKS= ${BINDIR}/ed ${BINDIR}/red
 MLINKS=        ed.1 red.1
 
 .if exists(/usr/lib/libcrypt.a)
 CFLAGS+=-DDES

-DPADD+= ${LIBCRYPT}

 LDADD+= -lcrypt
 LDADD+= -lcrypt

+DPADD+= ${LIBCRYPT}

 .endif
 
 .endif
 

+LDADD+=        -lgnuregex
+DPADD+=        /usr/lib/libgnuregex.a

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>