diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2020-05-28 22:05:50 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2020-05-28 22:05:50 +0000 |
| commit | c5ea81f7a6786e7398678551e7d26d5b628c4caa (patch) | |
| tree | b2eb3c15add478f59f4653e76112135fbff69186 | |
| parent | 0d0f3cdf587b2a3d1249401bbb03a1d7d0ca4ba9 (diff) | |
| download | src-test2-c5ea81f7a6786e7398678551e7d26d5b628c4caa.tar.gz src-test2-c5ea81f7a6786e7398678551e7d26d5b628c4caa.zip | |
Notes
| -rw-r--r-- | ObsoleteFiles.inc | 4 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 2 | ||||
| -rw-r--r-- | lib/Makefile | 2 | ||||
| -rw-r--r-- | lib/libevent1/Makefile (renamed from lib/libevent/Makefile) | 2 | ||||
| -rw-r--r-- | lib/libevent1/Makefile.depend (renamed from lib/libevent/Makefile.depend) | 0 | ||||
| -rw-r--r-- | share/mk/src.libnames.mk | 2 | ||||
| -rw-r--r-- | usr.sbin/ftp-proxy/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/ypldap/Makefile | 2 |
8 files changed, 10 insertions, 6 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 4c35cb7d64a4..0343fb7cb95c 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -36,6 +36,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20200528: libevent renamed libevent1 +OLD_FILES+=usr/include/private/event/event.h +OLD_DIRS+=usr/include/private/event + # 20200523: new clang import which bumps version from 10.0.0 to 10.0.1.s OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/algorithm OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/complex diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index f5c1cb24eba1..3c7350ea24e1 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -11,7 +11,7 @@ private bsdstat .. - event + event1 .. gmock internal diff --git a/lib/Makefile b/lib/Makefile index 4d72fab858ad..3c29635ffda8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -48,7 +48,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \ libdwarf \ libedit \ libelftc \ - libevent \ + libevent1 \ libexecinfo \ libexpat \ libfetch \ diff --git a/lib/libevent/Makefile b/lib/libevent1/Makefile index 1618d0199ef6..8c3a9acf82a6 100644 --- a/lib/libevent/Makefile +++ b/lib/libevent1/Makefile @@ -5,7 +5,7 @@ PACKAGE=lib${LIB} .include <src.opts.mk> -LIB= event +LIB= event1 SHLIB_MAJOR= 1 PRIVATELIB= diff --git a/lib/libevent/Makefile.depend b/lib/libevent1/Makefile.depend index 8d409f5263ac..8d409f5263ac 100644 --- a/lib/libevent/Makefile.depend +++ b/lib/libevent1/Makefile.depend diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index b827dafb5065..2045e5b8af6f 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -18,7 +18,7 @@ _PRIVATELIBS= \ auditd \ bsdstat \ devdctl \ - event \ + event1 \ gmock \ gtest \ gmock_main \ diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile index 443db1c00a2d..7d05aa9bf624 100644 --- a/usr.sbin/ftp-proxy/Makefile +++ b/usr.sbin/ftp-proxy/Makefile @@ -9,7 +9,7 @@ SRCS= ftp-proxy.c filter.c CFLAGS+=-I${SRCTOP}/contrib/pf/libevent -LIBADD= event +LIBADD= event1 WARNS?= 3 diff --git a/usr.sbin/ypldap/Makefile b/usr.sbin/ypldap/Makefile index 4ba12a7bbd29..7fbe945aaf5d 100644 --- a/usr.sbin/ypldap/Makefile +++ b/usr.sbin/ypldap/Makefile @@ -9,7 +9,7 @@ SRCS= parse.y ypldap.c log.c \ MAN= ypldap.8 ypldap.conf.5 -LIBADD= openbsd event util rpcsvc +LIBADD= openbsd event1 util rpcsvc CFLAGS+=-I${.CURDIR} CFLAGS+=-I${SRCTOP}/contrib/pf/libevent |