From owner-freebsd-gecko@FreeBSD.ORG Thu Jul 24 18:41:10 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0CC98207 for ; Thu, 24 Jul 2014 18:41:10 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A5DC92965 for ; Thu, 24 Jul 2014 18:41:09 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s6OIf0as048611 for ; Thu, 24 Jul 2014 18:41:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s6OIetOW046147 for freebsd-gecko@freebsd.org; Thu, 24 Jul 2014 18:40:55 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 24 Jul 2014 18:40:55 GMT Message-Id: <201407241840.s6OIetOW046147@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1640 - in trunk: Mk mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Jul 2014 18:41:10 -0000 Author: jbeich Date: Thu Jul 24 18:40:55 2014 New Revision: 1640 Log: remove devel/libevent2 hacks now that devel/libevent is gone Deleted: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in trunk/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in trunk/www/firefox/files/patch-ipc-chromium-Makefile.in trunk/www/libxul/files/patch-ipc-chromium-Makefile.in trunk/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Modified: trunk/Mk/bsd.gecko.mk Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Jul 23 14:12:46 2014 (r1639) +++ trunk/Mk/bsd.gecko.mk Thu Jul 24 18:40:55 2014 (r1640) @@ -134,7 +134,7 @@ cairo_MOZ_OPTIONS= --enable-system-cairo cairo_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo/cairo -event_LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 +event_LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 event_MOZ_OPTIONS= --with-system-libevent event_EXTRACT_AFTER_ARGS= --exclude mozilla*/ipc/chromium/src/third_party/libevent Deleted: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-Makefile.in Thu Jul 24 18:40:55 2014 (r1639) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/ipc/chromium/Makefile.in~ -+++ mozilla/ipc/chromium/Makefile.in -@@ -28,6 +28,8 @@ include $(topsrcdir)/config/rules.mk - - ifdef MOZ_NATIVE_LIBEVENT # { - -+OS_CPPFLAGS += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) -+ - export-preqs = \ - $(call mkdir_deps,$(CURDIR)/third_party/libevent) \ - $(NULL) Deleted: trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/firefox-esr/files/patch-ipc-chromium-Makefile.in Thu Jul 24 18:40:55 2014 (r1639) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- ipc/chromium/Makefile.in~ -+++ ipc/chromium/Makefile.in -@@ -55,9 +60,7 @@ vpath %.c \ - $(srcdir)/src/third_party/libevent \ - $(NULL) - else # } else { --# message_pump_libevent.cc includes third_party/libevent/event.h, --# which we put in $(DIST), see export rule below --LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) - endif # } - - vpath %.cc \ Deleted: trunk/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- trunk/www/firefox-esr/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Thu Jul 24 18:40:55 2014 (r1639) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- ipc/chromium/src/base/message_pump_libevent.cc~ -+++ ipc/chromium/src/base/message_pump_libevent.cc -@@ -16,7 +16,7 @@ - #include "base/scoped_ptr.h" - #include "base/time.h" - #include "nsDependentSubstring.h" --#include "third_party/libevent/event.h" -+#include "event.h" - - // Lifecycle of struct event - // Libevent uses two main data structures: Deleted: trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/firefox-nightly/files/patch-ipc-chromium-Makefile.in Thu Jul 24 18:40:55 2014 (r1639) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- ipc/chromium/Makefile.in~ -+++ ipc/chromium/Makefile.in -@@ -28,6 +28,8 @@ include $(topsrcdir)/config/rules.mk - - ifdef MOZ_NATIVE_LIBEVENT # { - -+OS_CPPFLAGS += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) -+ - export-preqs = \ - $(call mkdir_deps,$(CURDIR)/third_party/libevent) \ - $(NULL) Deleted: trunk/www/firefox/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/firefox/files/patch-ipc-chromium-Makefile.in Thu Jul 24 18:40:55 2014 (r1639) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- ipc/chromium/Makefile.in~ -+++ ipc/chromium/Makefile.in -@@ -28,6 +28,8 @@ include $(topsrcdir)/config/rules.mk - - ifdef MOZ_NATIVE_LIBEVENT # { - -+OS_CPPFLAGS += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) -+ - export-preqs = \ - $(call mkdir_deps,$(CURDIR)/third_party/libevent) \ - $(NULL) Deleted: trunk/www/libxul/files/patch-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/libxul/files/patch-ipc-chromium-Makefile.in Thu Jul 24 18:40:55 2014 (r1639) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- ipc/chromium/Makefile.in~ -+++ ipc/chromium/Makefile.in -@@ -55,9 +60,7 @@ vpath %.c \ - $(srcdir)/src/third_party/libevent \ - $(NULL) - else # } else { --# message_pump_libevent.cc includes third_party/libevent/event.h, --# which we put in $(DIST), see export rule below --LOCAL_INCLUDES += -I$(DIST) -+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) - endif # } - - vpath %.cc \ Deleted: trunk/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc ============================================================================== --- trunk/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc Thu Jul 24 18:40:55 2014 (r1639) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- ipc/chromium/src/base/message_pump_libevent.cc~ -+++ ipc/chromium/src/base/message_pump_libevent.cc -@@ -16,7 +16,7 @@ - #include "base/scoped_ptr.h" - #include "base/time.h" - #include "nsDependentSubstring.h" --#include "third_party/libevent/event.h" -+#include "event.h" - - // Lifecycle of struct event - // Libevent uses two main data structures: Deleted: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Thu Jul 24 18:40:55 2014 (r1639) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/ipc/chromium/Makefile.in~ -+++ mozilla/ipc/chromium/Makefile.in -@@ -28,6 +28,8 @@ include $(topsrcdir)/config/rules.mk - - ifdef MOZ_NATIVE_LIBEVENT # { - -+OS_CPPFLAGS += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS)) -+ - export-preqs = \ - $(call mkdir_deps,$(CURDIR)/third_party/libevent) \ - $(NULL)