Scott Ullrich wrote:
I have been working on this nonstop. Please give me a week or so.
I'm just trying to help you with an additional pair of eyes, and
reporting what I find.
For example, pftpx still doesn't build because of the libevent issue.
Please find attached a patch that removes libevent13, and upgrades
libevent to the same version found in FreeBSD ports (can be applied from
pfPorts directory).
Ciao,
Angelo Turetta
PS: if you mention me in CVS logs, please omit email address, the spam
is too bad already... :)
Index: Makefile.RELENG_6_3
===================================================================
RCS file: /home/pfsense/cvsroot/tools/pfPorts/Makefile.RELENG_6_3,v
retrieving revision 1.10
diff -u -r1.10 Makefile.RELENG_6_3
--- Makefile.RELENG_6_3 24 Jun 2008 22:43:47 -0000 1.10
+++ Makefile.RELENG_6_3 29 Jun 2008 23:54:53 -0000
@@ -26,7 +26,7 @@
SUBDIR += mpd
SUBDIR += olsrd
SUBDIR += pftop
-SUBDIR += libevent13
+SUBDIR += libevent
SUBDIR += pftpx
SUBDIR += slbd
SUBDIR += ssh_tunnel_shell
Index: Makefile.RELENG_7_0
===================================================================
RCS file: /home/pfsense/cvsroot/tools/pfPorts/Makefile.RELENG_7_0,v
retrieving revision 1.9
diff -u -r1.9 Makefile.RELENG_7_0
--- Makefile.RELENG_7_0 24 Jun 2008 21:08:39 -0000 1.9
+++ Makefile.RELENG_7_0 29 Jun 2008 23:55:27 -0000
@@ -25,7 +25,7 @@
SUBDIR += mpd4
SUBDIR += olsrd
SUBDIR += pftop
-SUBDIR += libevent13
+SUBDIR += libevent
SUBDIR += pftpx
SUBDIR += relayd
SUBDIR += slbd
Index: libevent/Makefile
===================================================================
RCS file: /home/pfsense/cvsroot/tools/pfPorts/libevent/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- libevent/Makefile 28 Jun 2008 19:44:44 -0000 1.7
+++ libevent/Makefile 29 Jun 2008 23:33:58 -0000
@@ -1,28 +1,91 @@
-# ex:ts=8
-# Ports collection makefile for: libevnet
-# Date created: Apr 22, 2007
-# Whom: ijliao
+# New ports collection makefile for: libevent
+# Date created: 20 June 2001
+# Whom: Pete Fritchman <[EMAIL
PROTECTED]>
#
-# $FreeBSD: ports/net/libevnet/Makefile,v 1.4 2008/01/02 23:43:01 mnag Exp $
+# $FreeBSD: ports/devel/libevent/Makefile,v 1.34 2008/01/02 23:42:18 mnag Exp $
#
-PORTNAME= libevent
-PORTVERSION= 0.3.8
-PORTREVISION= 2
-CATEGORIES= net
-MASTER_SITES= http://www.25thandclement.com/~william/projects/releases/
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= [EMAIL PROTECTED]
-COMMENT= Network Daemon Services for libevent
-
-BUILD_DEPENDS= ${LOCALBASE}/lib/libarena.a:${PORTSDIR}/devel/libarena
-LIB_DEPENDS= event-1.3e:${PORTSDIR}/devel/libevent \
- cares.1:${PORTSDIR}/dns/c-ares
-RUN_DEPENDS= ${LOCALBASE}/lib/libarena.a:${PORTSDIR}/devel/libarena
-
-USE_OPENSSL= yes
-USE_PTHREAD= yes
-USE_GMAKE= yes
+PORTNAME= libevent
+PORTVERSION= 1.3e
+CATEGORIES= devel
+MASTER_SITES= http://monkey.org/~provos/
+
+MAINTAINER= [EMAIL PROTECTED]
+COMMENT= Provides an API to execute callback functions on certain events
+
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+
+MAN3= event.3 \
+ evdns.3
+MLINKS= event.3 event_init.3 \
+ - event_dispatch.3 \
+ - event_loop.3 \
+ - event_loopexit.3 \
+ - event_set.3 \
+ - event_base_dispatch.3 \
+ - event_base_loop.3 \
+ - event_base_loopexit.3 \
+ - event_base_set.3 \
+ - event_add.3 \
+ - event_del.3 \
+ - event_once.3 \
+ - event_pending.3 \
+ - event_initialized.3 \
+ - event_priority_init.3 \
+ - event_priority_set.3 \
+ - evtimer_set.3 \
+ - evtimer_add.3 \
+ - evtimer_del.3 \
+ - evtimer_pending.3 \
+ - evtimer_initialized.3 \
+ - signal_set.3 \
+ - signal_add.3 \
+ - signal_del.3 \
+ - signal_pending.3 \
+ - signal_initialized.3 \
+ - bufferevent_new.3 \
+ - bufferevent_free.3 \
+ - bufferevent_write.3 \
+ - bufferevent_write_buffer.3 \
+ - bufferevent_read.3 \
+ - bufferevent_enable.3 \
+ - bufferevent_disable.3 \
+ - bufferevent_settimeout.3 \
+ - bufferevent_base_set.3 \
+ - evbuffer_new.3 \
+ - evbuffer_free.3 \
+ - evbuffer_add.3 \
+ - evbuffer_add_buffer.3 \
+ - evbuffer_add_printf.3 \
+ - evbuffer_add_vprintf.3 \
+ - evbuffer_drain.3 \
+ - evbuffer_write.3 \
+ - evbuffer_read.3 \
+ - evbuffer_find.3 \
+ - evbuffer_readline.3 \
+ - evhttp_start.3 \
+ - evhttp_free.3 \
+ evdns.3 evdns_init.3 \
+ - evdns_shutdown.3 \
+ - evdns_err_to_string.3 \
+ - evdns_nameserver_add.3 \
+ - evdns_count_nameservers.3 \
+ - evdns_clear_nameservers_and_suspend.3 \
+ - evdns_resume.3 \
+ - evdns_nameserver_ip_add.3 \
+ - evdns_resolve_ipv4.3 \
+ - evdns_resolve_reverse.3 \
+ - evdns_resolv_conf_parse.3 \
+ - evdns_search_clear.3 \
+ - evdns_search_add.3 \
+ - evdns_search_ndots_set.3 \
+ - evdns_set_log_fn.3 \
+ - evdns_config_windows_nameservers.3
+
+post-patch:
+ @${REINPLACE_CMD} -e 's,CFLAGS =,CFLAGS +=,' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' \
+ ${WRKSRC}/epoll.c ${WRKSRC}/epoll_sub.c ${WRKSRC}/evdns.c
.include <bsd.port.mk>
Index: libevent/distinfo
===================================================================
RCS file: /home/pfsense/cvsroot/tools/pfPorts/libevent/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- libevent/distinfo 28 Mar 2008 22:36:12 -0000 1.4
+++ libevent/distinfo 29 Jun 2008 23:33:58 -0000
@@ -1,3 +1,3 @@
-MD5 (libevnet-0.3.8.tgz) = 1f8b8f6aec64cf6d183ad48f92bb46ec
-SHA256 (libevnet-0.3.8.tgz) =
72c5ce004e8190e902475e0602e93f60a0c4cd165c6a4d79af7e49774caa5cac
-SIZE (libevnet-0.3.8.tgz) = 81265
+MD5 (libevent-1.3e.tar.gz) = 8553ad0f8a35d8d96ae0c69c387e06d3
+SHA256 (libevent-1.3e.tar.gz) =
df523e0d9606e5bcbd8006840cee72ebf3acb934d54624bce8e19f7470237df5
+SIZE (libevent-1.3e.tar.gz) = 452077
Index: libevent/pkg-descr
===================================================================
RCS file: /home/pfsense/cvsroot/tools/pfPorts/libevent/pkg-descr,v
retrieving revision 1.2
diff -u -r1.2 pkg-descr
--- libevent/pkg-descr 28 Mar 2008 22:36:12 -0000 1.2
+++ libevent/pkg-descr 29 Jun 2008 23:33:58 -0000
@@ -1,4 +1,20 @@
-libevnet provides a suite of interfaces, all built around libevent, useful to
-network daemons.
+The libevent API provides a mechanism to execute a callback function when
+a specific event occurs on a file descriptor or after a timeout has been
+reached.
-WWW: http://www.25thandclement.com/~william/projects/libevnet.html
+libevent is meant to replace the asynchronous event loop found in event
+driven network servers. An application just needs to call event_dispatch()
+and can then add or remove events dynamically without having to change the
+event loop.
+
+Currently, libevent supports kqueue(2), select(2), poll(2), and epoll(4).
+The internal event mechanism is completely independent of the exposed event
+API, and a simple update of libevent can provide new functionality without
+having to redesign the applications. As a result, Libevent allows for
+portable application development and provides the most scalable event
+notification mechanism available on an operating system.
+
+WWW: http://www.monkey.org/~provos/libevent/
+
+- Pete
[EMAIL PROTECTED]
Index: libevent/pkg-plist
===================================================================
RCS file: /home/pfsense/cvsroot/tools/pfPorts/libevent/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- libevent/pkg-plist 28 Mar 2008 22:36:12 -0000 1.4
+++ libevent/pkg-plist 29 Jun 2008 23:33:58 -0000
@@ -1,13 +1,9 @@
-include/evnet/bufio.h
-include/evnet/bufio/drain.h
-include/evnet/bufio/membuf.h
-include/evnet/bufio/pagebuf.h
-include/evnet/bufio/pipe.h
-include/evnet/bufio/socket.h
-include/evnet/lookup.h
-include/evnet/socket.h
-include/evnet/thread.h
-include/evnet/tls.h
[EMAIL PROTECTED] include/evnet/bufio
[EMAIL PROTECTED] include/evnet
-lib/libevnet.a
+bin/event_rpcgen.py
+include/event.h
+include/evhttp.h
+include/evdns.h
+lib/libevent-1.3e.so
+lib/libevent-1.3e.so.1
+lib/libevent.a
+lib/libevent.la
+lib/libevent.so
Index: libevent/files/patch-Makefile
===================================================================
RCS file: libevent/files/patch-Makefile
diff -N libevent/files/patch-Makefile
--- libevent/files/patch-Makefile 28 Mar 2008 22:34:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
---- Makefile.orig Mon Jun 11 23:07:29 2007
-+++ Makefile Mon Jun 11 23:07:58 2007
-@@ -1,3 +1,7 @@
-+CPPFLAGS += -I/usr/local/include
-+CPPFLAGS += -DUSE_OPENSSL -DUSE_CARES -DUSE_IPV6 -DUSE_PTHREADS
-+CPPFLAGS += -DHAVE_STRLCPY -DHAVE_STRLCAT
-+CPPFLAGS += -D_REENTRANT
-
- #
- # Setup our targets
Index: libevent13/Makefile
===================================================================
RCS file: libevent13/Makefile
diff -N libevent13/Makefile
--- libevent13/Makefile 1 Jun 2007 03:12:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,92 +0,0 @@
-# New ports collection makefile for: libevent
-# Date created: 20 June 2001
-# Whom: Pete Fritchman <[EMAIL
PROTECTED]>
-#
-# $FreeBSD: ports/devel/libevent/Makefile,v 1.31 2007/04/06 18:27:07 mnag Exp $
-#
-
-PORTNAME= libevent
-PORTVERSION= 1.3b
-CATEGORIES= devel
-MASTER_SITES= http://monkey.org/~provos/
-
-MAINTAINER= [EMAIL PROTECTED]
-COMMENT= Provides an API to execute callback functions on certain events
-
-CONFIGURE_ARGS= --mandir=${MANPREFIX}/man
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-
-MAN3= event.3 \
- evdns.3
-MLINKS= event.3 event_init.3 \
- - event_dispatch.3 \
- - event_loop.3 \
- - event_loopexit.3 \
- - event_set.3 \
- - event_base_dispatch.3 \
- - event_base_loop.3 \
- - event_base_loopexit.3 \
- - event_base_set.3 \
- - event_add.3 \
- - event_del.3 \
- - event_once.3 \
- - event_pending.3 \
- - event_initialized.3 \
- - event_priority_init.3 \
- - event_priority_set.3 \
- - evtimer_set.3 \
- - evtimer_add.3 \
- - evtimer_del.3 \
- - evtimer_pending.3 \
- - evtimer_initialized.3 \
- - signal_set.3 \
- - signal_add.3 \
- - signal_del.3 \
- - signal_pending.3 \
- - signal_initialized.3 \
- - bufferevent_new.3 \
- - bufferevent_free.3 \
- - bufferevent_write.3 \
- - bufferevent_write_buffer.3 \
- - bufferevent_read.3 \
- - bufferevent_enable.3 \
- - bufferevent_disable.3 \
- - bufferevent_settimeout.3 \
- - bufferevent_base_set.3 \
- - evbuffer_new.3 \
- - evbuffer_free.3 \
- - evbuffer_add.3 \
- - evbuffer_add_buffer.3 \
- - evbuffer_add_printf.3 \
- - evbuffer_add_vprintf.3 \
- - evbuffer_drain.3 \
- - evbuffer_write.3 \
- - evbuffer_read.3 \
- - evbuffer_find.3 \
- - evbuffer_readline.3 \
- - evhttp_start.3 \
- - evhttp_free.3 \
- evdns.3 evdns_init.3 \
- - evdns_shutdown.3 \
- - evdns_err_to_string.3 \
- - evdns_nameserver_add.3 \
- - evdns_count_nameservers.3 \
- - evdns_clear_nameservers_and_suspend.3 \
- - evdns_resume.3 \
- - evdns_nameserver_ip_add.3 \
- - evdns_resolve_ipv4.3 \
- - evdns_resolve_reverse.3 \
- - evdns_resolv_conf_parse.3 \
- - evdns_search_clear.3 \
- - evdns_search_add.3 \
- - evdns_search_ndots_set.3 \
- - evdns_set_log_fn.3 \
- - evdns_config_windows_nameservers.3
-
-post-patch:
- @${REINPLACE_CMD} -e 's,CFLAGS =,CFLAGS +=,' ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' \
- ${WRKSRC}/epoll.c ${WRKSRC}/epoll_sub.c ${WRKSRC}/evdns.c
-
-.include <bsd.port.mk>
Index: libevent13/distinfo
===================================================================
RCS file: libevent13/distinfo
diff -N libevent13/distinfo
--- libevent13/distinfo 1 Jun 2007 03:12:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-MD5 (libevent-1.3b.tar.gz) = 7fc864faee87dbe1ed5e34ab8787172c
-SHA256 (libevent-1.3b.tar.gz) =
200a229e1fcaf07772b454a087a7cdf4b2e8b90b8493883d4027fd70a3dbf0d1
-SIZE (libevent-1.3b.tar.gz) = 445461
Index: libevent13/pkg-descr
===================================================================
RCS file: libevent13/pkg-descr
diff -N libevent13/pkg-descr
--- libevent13/pkg-descr 1 Jun 2007 03:12:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-The libevent API provides a mechanism to execute a callback function when
-a specific event occurs on a file descriptor or after a timeout has been
-reached.
-
-libevent is meant to replace the asynchronous event loop found in event
-driven network servers. An application just needs to call event_dispatch()
-and can then add or remove events dynamically without having to change the
-event loop.
-
-Currently, libevent supports kqueue(2), select(2), poll(2), and epoll(4).
-The internal event mechanism is completely independent of the exposed event
-API, and a simple update of libevent can provide new functionality without
-having to redesign the applications. As a result, Libevent allows for
-portable application development and provides the most scalable event
-notification mechanism available on an operating system.
-
-WWW: http://www.monkey.org/~provos/libevent/
-
-- Pete
[EMAIL PROTECTED]
Index: libevent13/pkg-plist
===================================================================
RCS file: libevent13/pkg-plist
diff -N libevent13/pkg-plist
--- libevent13/pkg-plist 1 Jun 2007 03:12:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,9 +0,0 @@
-bin/event_rpcgen.py
-include/event.h
-include/evhttp.h
-include/evdns.h
-lib/libevent-1.3b.so
-lib/libevent-1.3b.so.1
-lib/libevent.a
-lib/libevent.la
-lib/libevent.so
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
