Merge sync of head

3 files changed, 1 insertions, 40 deletions

diff --git a/usr.bin/svn/lib/Makefile b/usr.bin/svn/lib/Makefile
index 3200625..5f4cf28 100644
--- a/usr.bin/svn/lib/Makefile
+++ b/usr.bin/svn/lib/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=	libapr libapr_util libserf libsqlite3 \
+SUBDIR=	libapr libapr_util libserf \
 	libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_fs_fs \
 	libsvn_fs_util libsvn_ra libsvn_ra_local libsvn_ra_serf \
 	libsvn_ra_svn libsvn_repos libsvn_subr libsvn_wc
diff --git a/usr.bin/svn/lib/libsqlite3/Makefile b/usr.bin/svn/lib/libsqlite3/Makefile
deleted file mode 100644
index 15a2d00..0000000
--- a/usr.bin/svn/lib/libsqlite3/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $FreeBSD$
-
-.include "${.CURDIR}/../Makefile.inc"
-
-INTERNALLIB=	yes
-LIB=		sqlite3
-
-SRCS=		sqlite3.c
-
-.PATH:		${SQLITE}
-
-CFLAGS+= 	-DHAVE_CONFIG_H -I${.CURDIR} \
-		-I${APR}/include/arch/unix -I${APR}/include
-
-CFLAGS+=	-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
-		-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \
-		-DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \
-		-DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE_USLEEP=1 \
-		-DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 \
-		-DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 \
-		-DHAVE_READLINE=1 -DHAVE_POSIX_FALLOCATE=1 \
-		-I${SQLITE} -D_REENTRANT=1 -DSQLITE_THREADSAFE=1 \
-		-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
-
-.include <bsd.lib.mk>
diff --git a/usr.bin/svn/lib/libsqlite3/Makefile.depend b/usr.bin/svn/lib/libsqlite3/Makefile.depend
deleted file mode 100644
index 639d45d..0000000
--- a/usr.bin/svn/lib/libsqlite3/Makefile.depend
+++ /dev/null
@@ -1,14 +0,0 @@
-# Autogenerated - do NOT edit!
-
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
-DIRDEPS = \
-	include \
-	include/xlocale \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif