Index: head/lib/libregex/Makefile
===================================================================
--- head/lib/libregex/Makefile	(revision 328262)
+++ head/lib/libregex/Makefile	(revision 328263)
@@ -1,20 +1,22 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 PACKAGE=lib${LIB}
 LIB=	regex
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
 
 CFLAGS+=	-DLIBREGEX
 LIBC_SRCTOP=	${.CURDIR:H}/libc
-SYMBOL_MAPS=	${SYM_MAPS}
 WARNS?=	2
+
+VERSION_DEF=	${.CURDIR}/Versions.def
+SYMBOL_MAPS=	${.CURDIR}/Symbol.map
 
 #HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include "../Makefile.inc"
 .include "${LIBC_SRCTOP}/regex/Makefile.inc"
 .include <bsd.lib.mk>
Index: head/lib/libregex/Symbol.map
===================================================================
--- head/lib/libregex/Symbol.map	(nonexistent)
+++ head/lib/libregex/Symbol.map	(revision 328263)
@@ -0,0 +1,16 @@
+/*
+ * $FreeBSD$
+ */
+
+/*
+ * libregex uses a different version name because its symbols are not strictly
+ * compatible with those provided by libc. Re-using the version name from libc
+ * could cause linking headaches and make debugging more difficult than it needs
+ * to be.
+ */
+LIBREGEX_1.0 {
+	regcomp;
+	regerror;
+	regexec;
+	regfree;
+};

Property changes on: head/lib/libregex/Symbol.map
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/lib/libregex/Versions.def
===================================================================
--- head/lib/libregex/Versions.def	(nonexistent)
+++ head/lib/libregex/Versions.def	(revision 328263)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+LIBREGEX_1.0 {
+};
+

Property changes on: head/lib/libregex/Versions.def
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property