summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsthen <sthen@openbsd.org>2016-09-23 09:18:05 +0000
committersthen <sthen@openbsd.org>2016-09-23 09:18:05 +0000
commit2b5055b02eb03bc73580e7d0d1d802ab2efef213 (patch)
tree21d6d8374b22dfe23d840d2afa3a176286fa8ee6
parentAdd quirk to allow Yamaha UR22 to attach as uaudio(4). From (diff)
downloadwireguard-openbsd-2b5055b02eb03bc73580e7d0d1d802ab2efef213.tar.xz
wireguard-openbsd-2b5055b02eb03bc73580e7d0d1d802ab2efef213.zip
Unhook sqlite3.
-rw-r--r--Makefile.cross3
-rw-r--r--include/Makefile8
-rw-r--r--lib/Makefile4
-rw-r--r--share/man/man3/intro.39
-rw-r--r--usr.bin/Makefile4
5 files changed, 11 insertions, 17 deletions
diff --git a/Makefile.cross b/Makefile.cross
index d0cbb80e819..cfb6d2f1e54 100644
--- a/Makefile.cross
+++ b/Makefile.cross
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.87 2016/09/03 13:37:39 guenther Exp $
+# $OpenBSD: Makefile.cross,v 1.88 2016/09/23 09:18:05 sthen Exp $
cross-tools: cross-includes cross-binutils cross-gcc cross-lib
cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -104,7 +104,6 @@ BINUTILS_DIR=gnu/usr.bin/binutils-2.17
NO_CROSS+=microcode
NO_CROSS+=groff binutils binutils-2.17 perl texinfo gcc cvs
NO_CROSS+=nsd
-NO_CROSS+=sqlite3
NO_CROSS+=bind
NO_CROSS+=unbound
diff --git a/include/Makefile b/include/Makefile
index d9a889ab04a..818fd242204 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.212 2016/05/07 21:58:24 tedu Exp $
+# $OpenBSD: Makefile,v 1.213 2016/09/23 09:18:05 sthen Exp $
# $NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
# @(#)Makefile 5.45.1.1 (Berkeley) 5/6/91
@@ -35,9 +35,9 @@ PRDIRS=
RDIRS= ../lib/libcrypto ../lib/libcurses ../lib/libedit \
../lib/libevent ../lib/libexpat ../lib/libform \
../lib/libfuse ../lib/libkeynote ../lib/libmenu \
- ../lib/libossaudio ../lib/libpanel \
- ../lib/libpcap ../lib/libradius ../lib/librpcsvc ../lib/librthread \
- ../lib/libskey ../lib/libsqlite3 ../lib/libssl ../lib/libtls \
+ ../lib/libossaudio ../lib/libpanel ../lib/libpcap \
+ ../lib/libradius ../lib/librpcsvc ../lib/librthread \
+ ../lib/libskey ../lib/libssl ../lib/libtls \
../lib/libusbhid ../lib/libutil ../lib/libz \
../usr.bin/lex ../gnu/lib/libreadline \
../sys/arch/${MACHINE}
diff --git a/lib/Makefile b/lib/Makefile
index bdc2f6da6f0..7bca1e4bf2d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.71 2015/11/14 23:56:49 deraadt Exp $
+# $OpenBSD: Makefile,v 1.72 2016/09/23 09:18:05 sthen Exp $
# $NetBSD: Makefile,v 1.20.4.1 1996/06/14 17:22:38 cgd Exp $
SUBDIR= csu libarch libc libcrypto libcurses libedit libevent libexpat \
libform libfuse libkeynote libkvm libl libm libmenu \
libossaudio libpanel libpcap libradius librthread \
- librpcsvc libskey libsndio libsqlite3 libssl libtls libusbhid \
+ librpcsvc libskey libsndio libssl libtls libusbhid \
libutil liby libz
.include <bsd.subdir.mk>
diff --git a/share/man/man3/intro.3 b/share/man/man3/intro.3
index c991acacbeb..f01b0c5ba05 100644
--- a/share/man/man3/intro.3
+++ b/share/man/man3/intro.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: intro.3,v 1.76 2016/08/12 06:15:18 jmc Exp $
+.\" $OpenBSD: intro.3,v 1.77 2016/09/23 09:18:05 sthen Exp $
.\" $NetBSD: intro.3,v 1.5 1995/05/10 22:46:24 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)intro.3 8.1 (Berkeley) 6/5/93
.\"
-.Dd $Mdocdate: August 12 2016 $
+.Dd $Mdocdate: September 23 2016 $
.Dt INTRO 3
.Os
.Sh NAME
@@ -306,11 +306,6 @@ audio server.
See
.Xr sio_open 3 .
.Pp
-.It libsqlite3 Pq Fl lsqlite3
-SQL database library.
-See
-.Xr sqlite3 1 .
-.Pp
.It libssl Pq Fl lssl
The OpenSSL ssl library implements the Secure Sockets Layer
.Pq SSL v3
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 4004454d8ed..4a95705fe70 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.153 2015/07/16 20:50:40 tedu Exp $
+# $OpenBSD: Makefile,v 1.154 2016/09/23 09:18:05 sthen Exp $
.include <bsd.own.mk>
@@ -22,7 +22,7 @@ SUBDIR= apply arch at aucat audioctl awk banner \
readlink renice rev rpcgen rpcinfo rs rup rusers rwall \
sdiff script sed sendbug shar showmount signify skey \
skeyaudit skeyinfo skeyinit sndiod \
- sort spell split sqlite3 ssh stat su systat \
+ sort spell split ssh stat su systat \
tail talk tcpbench tee telnet tftp tic time \
tmux top touch tput tr true tset tsort tty usbhidaction usbhidctl \
ul uname unexpand unifdef uniq units \