Date: Mon, 11 Jun 2012 20:56:15 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r749 - branches/experimental/Mk Message-ID: <201206112056.q5BKuFdK021366@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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-<hgid>} 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206112056.q5BKuFdK021366>