From owner-freebsd-gecko@FreeBSD.ORG Mon Jun 11 20:56:21 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB8F71065672 for ; Mon, 11 Jun 2012 20:56:21 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 3BCC48FC14 for ; Mon, 11 Jun 2012 20:56:21 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q5BKuKFw021556 for ; Mon, 11 Jun 2012 20:56:20 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q5BKuFdK021366 for freebsd-gecko@freebsd.org; Mon, 11 Jun 2012 20:56:15 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 11 Jun 2012 20:56:15 GMT Message-Id: <201206112056.q5BKuFdK021366@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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r749 - branches/experimental/Mk X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2012 20:56:21 -0000 Author: jbeich Date: Mon Jun 11 20:56:15 2012 New Revision: 749 Log: - add more extraction excludes - use modern paths: firefox* and libxul use mozilla-{esr*,release,central-} as WRKSRC - disable nss exclude to not have to remove patches Modified: branches/experimental/Mk/bsd.gecko.mk Modified: branches/experimental/Mk/bsd.gecko.mk ============================================================================== --- branches/experimental/Mk/bsd.gecko.mk Mon Jun 11 20:55:59 2012 (r748) +++ branches/experimental/Mk/bsd.gecko.mk Mon Jun 11 20:56:15 2012 (r749) @@ -547,7 +547,7 @@ EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/* \ --exclude */package/* \ - --exclude mozilla/gc/boehm + --exclude mozilla*/gc/boehm MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \ ${MOZILLA}-xpcom ${MOZILLA}-plugin @@ -578,40 +578,44 @@ cairo_LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo cairo_MOZ_OPTIONS= --enable-system-cairo -cairo_EXTRACT_AFTER_ARGS= --exclude mozilla/gfx/cairo +cairo_EXTRACT_AFTER_ARGS= --exclude mozilla*/gfx/cairo -dbm_EXTRACT_AFTER_ARGS= --exclude mozilla/dbm +dbm_EXTRACT_AFTER_ARGS= --exclude mozilla*/dbm event_LIB_DEPENDS= event-1:${PORTSDIR}/devel/libevent event_MOZ_OPTIONS= --with-system-libevent=${LOCALBASE} +event_EXTRACT_AFTER_ARGS= --exclude mozilla*/ipc/chromium/src/third_party/libevent ffi_LIB_DEPENDS= ffi:${PORTSDIR}/devel/libffi ffi_MOZ_OPTIONS= --enable-system-ffi +ffi_EXTRACT_AFTER_ARGS= --exclude mozilla*/js/src/ctypes/libffi hunspell_LIB_DEPENDS= hunspell-1.3:${PORTSDIR}/textproc/hunspell hunspell_MOZ_OPTIONS= --enable-system-hunspell jpeg_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} -jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla/jpeg +jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libjpeg nspr_LIB_DEPENDS= nspr4:${PORTSDIR}/devel/nspr nspr_MOZ_OPTIONS= --with-system-nspr nss_LIB_DEPENDS= nss3:${PORTSDIR}/security/nss -nss_EXTRACT_AFTER_ARGS= --exclude mozilla/security/nss nss_MOZ_OPTIONS= --with-system-nss +#nss_EXTRACT_AFTER_ARGS= --exclude mozilla*/security/nss nss_CPPFLAGS+= -I${LOCALBASE}/include/nss -I${LOCALBASE}/include/nss/nss nss_LDFLAGS+= -L${LOCALBASE}/lib/nss -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} png_LIB_DEPENDS= png15:${PORTSDIR}/graphics/png png_MOZ_OPTIONS= --with-system-png=${LOCALBASE} +png_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libpng sqlite_LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 sqlite_MOZ_OPTIONS= --enable-system-sqlite vpx_LIB_DEPENDS= vpx:${PORTSDIR}/multimedia/libvpx vpx_MOZ_OPTIONS= --with-system-libvpx=${LOCALBASE} +vpx_EXTRACT_AFTER_ARGS= --exclude mozilla*/media/libvpx zip_DEPENDS= zip:${PORTSDIR}/archivers/zip