From f9721976514fd3ee8d8ae74e1b32f2e63a4719f7 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 13 Oct 2014 22:15:26 +0000
Subject: [PATCH] Promote libevent to lib/ level and fold ftp-proxy into its
 parent Makefile. This allows us to use libevent for other application in the
 future.

For now libevent is still INTERNALLIB and no shared library is installed.

MFC after:	1 month
---
 lib/Makefile                                  |  5 +++++
 {usr.sbin/ftp-proxy => lib}/libevent/Makefile | 10 +++++++---
 share/mk/src.libnames.mk                      |  4 ++++
 usr.sbin/ftp-proxy/Makefile                   | 16 ++++++++++++++--
 usr.sbin/ftp-proxy/Makefile.inc               |  5 -----
 usr.sbin/ftp-proxy/ftp-proxy/Makefile         | 17 -----------------
 6 files changed, 30 insertions(+), 27 deletions(-)
 rename {usr.sbin/ftp-proxy => lib}/libevent/Makefile (76%)
 delete mode 100644 usr.sbin/ftp-proxy/Makefile.inc
 delete mode 100644 usr.sbin/ftp-proxy/ftp-proxy/Makefile

diff --git a/lib/Makefile b/lib/Makefile
index a5ab970f014b..c558f1188499 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -44,6 +44,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libdevstat \
 	libdwarf \
 	libedit \
+	${_libevent} \
 	libexecinfo \
 	libexpat \
 	libfetch \
@@ -226,6 +227,10 @@ _libnetgraph=	libnetgraph
 _libypclnt=	libypclnt
 .endif
 
+.if ${MK_PF} != "no"
+_libevent=	libevent
+.endif
+
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 _libsmb=	libsmb
 _libvgl=	libvgl
diff --git a/usr.sbin/ftp-proxy/libevent/Makefile b/lib/libevent/Makefile
similarity index 76%
rename from usr.sbin/ftp-proxy/libevent/Makefile
rename to lib/libevent/Makefile
index a8ff09b9ba5f..d8b1e2032ce3 100644
--- a/usr.sbin/ftp-proxy/libevent/Makefile
+++ b/lib/libevent/Makefile
@@ -1,10 +1,14 @@
 # $FreeBSD$
 
-.PATH:	${.CURDIR}/../../../contrib/pf/libevent
+.PATH:	${.CURDIR}/../../contrib/pf/libevent
 
+.include <src.opts.mk>
+
+LIB=		event
+SHLIB_MAJOR=	1
+PRIVATELIB=
+INTERNALLIB=
 
-LIB=	event
-INTERNALLIB=yes
 SRCS=	buffer.c evbuffer.c event.c kqueue.c log.c poll.c select.c signal.c
 HDRS=	event.h
 
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index bc41ea2a64ab..336ede11e3a6 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -21,6 +21,10 @@ LIBBSDSTATDIR=	${ROOTOBJDIR}/lib/libbsdstat
 LDBSDSTAT?=	${LIBBSDSTATDIR}/libbsdstat.so
 LIBBSDSTAT?=	${LIBBSDSTATDIR}/libbsdstat.a
 
+LIBEVENTDIR=	${ROOTOBJDIR}/lib/libevent
+LDEVENT?=	${LIBEVENTDIR}/libevent.so
+LIBEVENT?=	${LIBEVENTDIR}/libevent.a
+
 LIBHEIMIPCCDIR=	${ROOTOBJDIR}/kerberos5/lib/libheimipcc
 LDHEIMIPCC?=	${LIBHEIMIPCCDIR}/libheimipcc.so
 LIBHEIMIPCC?=	${LIBHEIMIPCCDIR}/libheimipcc.a
diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile
index 67660c8cad30..7a3ef477226c 100644
--- a/usr.sbin/ftp-proxy/Makefile
+++ b/usr.sbin/ftp-proxy/Makefile
@@ -1,5 +1,17 @@
 # $FreeBSD$
 
-SUBDIR= libevent ftp-proxy
+.PATH:	${.CURDIR}/../../contrib/pf/ftp-proxy
 
-.include <bsd.subdir.mk>
+PROG=	ftp-proxy
+MAN=	ftp-proxy.8
+
+SRCS=	ftp-proxy.c filter.c
+
+CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent
+
+LDADD+=	${LIBEVENT}
+DPADD+=	${LIBEVENT}
+
+WARNS?=	3
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/ftp-proxy/Makefile.inc b/usr.sbin/ftp-proxy/Makefile.inc
deleted file mode 100644
index 9043d098fca2..000000000000
--- a/usr.sbin/ftp-proxy/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-LIBEVENT= ${.OBJDIR}/../libevent/libevent.a
-
-.include "../Makefile.inc"
diff --git a/usr.sbin/ftp-proxy/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/ftp-proxy/Makefile
deleted file mode 100644
index de4988815016..000000000000
--- a/usr.sbin/ftp-proxy/ftp-proxy/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../../contrib/pf/ftp-proxy
-
-PROG=	ftp-proxy
-MAN=	ftp-proxy.8
-
-SRCS=	ftp-proxy.c filter.c
-
-CFLAGS+= -I${.CURDIR}/../../../contrib/pf/libevent
-
-LDADD+= ${LIBEVENT}
-DPADD+= ${LIBEVENT}
-
-WARNS?=	3
-
-.include <bsd.prog.mk>