Page MenuHomeFreeBSD
Files F148319475

D17275.diff
No OneTemporary
Actions

D17275.diff
View Options

Index: head/ObsoleteFiles.inc
===================================================================
--- head/ObsoleteFiles.inc
+++ head/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
Index: head/etc/mtree/BSD.usr.dist
===================================================================
--- head/etc/mtree/BSD.usr.dist
+++ head/etc/mtree/BSD.usr.dist
@@ -11,7 +11,7 @@
private
bsdstat
..
- event
+ event1
..
gmock
internal
Index: head/lib/Makefile
===================================================================
--- head/lib/Makefile
+++ head/lib/Makefile
@@ -48,7 +48,7 @@
libdwarf \
libedit \
libelftc \
- libevent \
+ libevent1 \
libexecinfo \
libexpat \
libfetch \
Index: head/lib/libevent/Makefile
===================================================================
--- head/lib/libevent/Makefile
+++ head/lib/libevent/Makefile
@@ -1,31 +0,0 @@
-# $FreeBSD$
-
-PACKAGE=lib${LIB}
-.PATH: ${SRCTOP}/contrib/pf/libevent
-
-.include <src.opts.mk>
-
-LIB= event
-SHLIB_MAJOR= 1
-PRIVATELIB=
-
-SRCS= buffer.c evbuffer.c event.c kqueue.c log.c poll.c select.c signal.c
-INCS= event.h
-
-CFLAGS+= -I${.CURDIR} \
- -DHAVE_CLOCK_GETTIME \
- -DHAVE_FCNTL_H \
- -DHAVE_POLL \
- -DHAVE_SELECT \
- -DHAVE_SETFD \
- -DHAVE_STDARG_H \
- -DHAVE_SYS_IOCTL_H \
- -DHAVE_SYS_TIME_H \
- -DHAVE_UNISTD_H \
- -DHAVE_VASPRINTF \
- -DHAVE_WORKING_KQUEUE \
- -DVERSION='"1.3b"'
-
-WARNS?= 2
-
-.include <bsd.lib.mk>
Index: head/lib/libevent/Makefile.depend
===================================================================
--- head/lib/libevent/Makefile.depend
+++ head/lib/libevent/Makefile.depend
@@ -1,16 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
- include \
- include/xlocale \
- lib/${CSU_DIR} \
- lib/libc \
- lib/libcompiler_rt \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
Index: head/lib/libevent1/Makefile
===================================================================
--- head/lib/libevent1/Makefile
+++ head/lib/libevent1/Makefile
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+PACKAGE=lib${LIB}
+.PATH: ${SRCTOP}/contrib/pf/libevent
+
+.include <src.opts.mk>
+
+LIB= event1
+SHLIB_MAJOR= 1
+PRIVATELIB=
+
+SRCS= buffer.c evbuffer.c event.c kqueue.c log.c poll.c select.c signal.c
+INCS= event.h
+
+CFLAGS+= -I${.CURDIR} \
+ -DHAVE_CLOCK_GETTIME \
+ -DHAVE_FCNTL_H \
+ -DHAVE_POLL \
+ -DHAVE_SELECT \
+ -DHAVE_SETFD \
+ -DHAVE_STDARG_H \
+ -DHAVE_SYS_IOCTL_H \
+ -DHAVE_SYS_TIME_H \
+ -DHAVE_UNISTD_H \
+ -DHAVE_VASPRINTF \
+ -DHAVE_WORKING_KQUEUE \
+ -DVERSION='"1.3b"'
+
+WARNS?= 2
+
+.include <bsd.lib.mk>
Index: head/lib/libevent1/Makefile.depend
===================================================================
--- head/lib/libevent1/Makefile.depend
+++ head/lib/libevent1/Makefile.depend
@@ -0,0 +1,16 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ include \
+ include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
Index: head/share/mk/src.libnames.mk
===================================================================
--- head/share/mk/src.libnames.mk
+++ head/share/mk/src.libnames.mk
@@ -18,7 +18,7 @@
auditd \
bsdstat \
devdctl \
- event \
+ event1 \
gmock \
gtest \
gmock_main \
Index: head/usr.sbin/ftp-proxy/Makefile
===================================================================
--- head/usr.sbin/ftp-proxy/Makefile
+++ head/usr.sbin/ftp-proxy/Makefile
@@ -9,7 +9,7 @@
CFLAGS+=-I${SRCTOP}/contrib/pf/libevent
-LIBADD= event
+LIBADD= event1
WARNS?= 3
Index: head/usr.sbin/ypldap/Makefile
===================================================================
--- head/usr.sbin/ypldap/Makefile
+++ head/usr.sbin/ypldap/Makefile
@@ -9,7 +9,7 @@
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

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 18, 3:53 AM (1 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29820401
Default Alt Text
D17275.diff (4 KB)

Event Timeline