From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Oct 9 11:50:03 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EEC0106564A for ; Sun, 9 Oct 2011 11:50:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 72FA48FC18 for ; Sun, 9 Oct 2011 11:50:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p99Bo3U4029321 for ; Sun, 9 Oct 2011 11:50:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p99Bo3U4029305; Sun, 9 Oct 2011 11:50:03 GMT (envelope-from gnats) Resent-Date: Sun, 9 Oct 2011 11:50:03 GMT Resent-Message-Id: <201110091150.p99Bo3U4029305@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Nali Toja Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE4F9106564A for ; Sun, 9 Oct 2011 11:41:31 +0000 (UTC) (envelope-from nalitoja@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 7A0698FC08 for ; Sun, 9 Oct 2011 11:41:31 +0000 (UTC) Received: by bkbzs8 with SMTP id zs8so8360946bkb.13 for ; Sun, 09 Oct 2011 04:41:30 -0700 (PDT) Received: by 10.204.154.12 with SMTP id m12mr3159247bkw.25.1318160489829; Sun, 09 Oct 2011 04:41:29 -0700 (PDT) Received: from nil (politkovskaja.torservers.net. [77.247.181.165]) by mx.google.com with ESMTPS id s12sm14437405bkt.4.2011.10.09.04.41.25 (version=SSLv3 cipher=OTHER); Sun, 09 Oct 2011 04:41:29 -0700 (PDT) Message-Id: <86pqi6tmtg.fsf@gmail.com> Date: Sun, 09 Oct 2011 11:40:43 +0000 From: Nali Toja To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/161421: [patch] www/firefox: use libevent2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Oct 2011 11:50:03 -0000 >Number: 161421 >Category: ports >Synopsis: [patch] www/firefox: use libevent2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 09 11:50:02 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Nali Toja >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: >Description: >How-To-Repeat: >Fix: --- libevent2.diff begins here --- Index: Mk/bsd.gecko.mk =================================================================== RCS file: /a/.csup/ports/Mk/bsd.gecko.mk,v retrieving revision 1.42 diff -u -p -r1.42 bsd.gecko.mk --- Mk/bsd.gecko.mk 28 Sep 2011 03:14:22 -0000 1.42 +++ Mk/bsd.gecko.mk 9 Oct 2011 09:23:18 -0000 @@ -775,6 +782,10 @@ @${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/iconv.h @${ECHO_CMD} "#include \"${LOCALBASE}/include/iconv.h\"" >> ${MOZSRC}/${subdir}/iconv.h @${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/iconv.h + @${ECHO_CMD} "#pragma GCC system_header" >> ${MOZSRC}/${subdir}/event.h + @${ECHO_CMD} "#pragma GCC visibility push(default)" >> ${MOZSRC}/${subdir}/event.h + @${ECHO_CMD} "#include " >> ${MOZSRC}/${subdir}/event.h + @${ECHO_CMD} "#pragma GCC visibility pop" >> ${MOZSRC}/${subdir}/event.h .endfor .for subdir in "" nsprpub js/src @if [ -f ${MOZSRC}/${subdir}/config/system-headers ] ; then \ Index: www/firefox/Makefile =================================================================== RCS file: /a/.csup/ports/www/firefox/Makefile,v retrieving revision 1.251 diff -u -p -r1.251 Makefile --- www/firefox/Makefile 30 Sep 2011 15:07:49 -0000 1.251 +++ www/firefox/Makefile 9 Oct 2011 09:19:39 -0000 @@ -16,10 +16,10 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}.sou MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.8.8:${PORTSDIR}/devel/nspr \ cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ - event-1.4:${PORTSDIR}/devel/libevent + event-2.0.6:${PORTSDIR}/devel/libevent2 CONFLICTS_BUILD= spidermonkey-* Index: www/firefox/files/patch-configure.in =================================================================== RCS file: /a/.csup/ports/www/firefox/files/patch-configure.in,v retrieving revision 1.3 diff -u -p -r1.3 patch-configure.in --- www/firefox/files/patch-configure.in 28 Jun 2011 16:42:58 -0000 1.3 +++ www/firefox/files/patch-configure.in 9 Oct 2011 09:22:08 -0000 @@ -45,6 +45,31 @@ AC_DEFINE(HAVE_CLOCK_MONOTONIC) AC_SUBST(HAVE_CLOCK_MONOTONIC) AC_SUBST(REALTIME_LIBS) +@@ -4019,17 +4019,17 @@ else + if test "${LIBEVENT_DIR}" = "yes"; then + LIBEVENT_DIR=/usr + fi +- CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS" +- LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS" ++ CFLAGS="-I${LIBEVENT_DIR}/include/event2 -I${LIBEVENT_DIR}/include/event2/compat $CFLAGS" ++ LDFLAGS="-L${LIBEVENT_DIR}/lib/event2 $LDFLAGS" + MOZ_CHECK_HEADER(event.h, +- [if test ! -f "${LIBEVENT_DIR}/include/event.h"; then +- AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include]) ++ [if test ! -f "${LIBEVENT_DIR}/include/event2/event.h"; then ++ AC_MSG_ERROR([event.h found, but is not in ${LIBEVENT_DIR}/include/event2]) + fi], + AC_MSG_ERROR([--with-system-libevent requested but event.h not found])) +- AC_CHECK_LIB(event, event_init, ++ AC_CHECK_LIB(event-2.0, event_init, + [MOZ_NATIVE_LIBEVENT=1 +- MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include" +- MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"], ++ MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include/event2 ${LIBEVENT_DIR}/include/event2/compat" ++ MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib/event2 -levent-2.0"], + [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=]) + fi + CFLAGS=$_SAVE_CFLAGS @@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS LIBS=$_SAVE_LIBS --- libevent2.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: