pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/firefox Build firefox against external runtime com...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ef5b5c74c3e2
branches:  trunk
changeset: 399315:ef5b5c74c3e2
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Sep 16 19:06:18 2009 +0000

description:
Build firefox against external runtime components from devel/xulrunner.
Bump PKGREVISION.

diffstat:

 www/firefox/Makefile            |    38 +-
 www/firefox/PLIST               |  2071 +--------------------------------------
 www/firefox/buildlink3.mk       |    13 -
 www/firefox/distinfo            |    50 +-
 www/firefox/files/firefox.sh.in |     9 +
 www/firefox/options.mk          |    40 +-
 www/firefox/patches/patch-aa    |    41 +-
 www/firefox/patches/patch-ab    |    26 -
 www/firefox/patches/patch-ac    |    83 -
 www/firefox/patches/patch-ad    |    13 -
 www/firefox/patches/patch-ae    |    43 -
 www/firefox/patches/patch-af    |    32 -
 www/firefox/patches/patch-ag    |    31 -
 www/firefox/patches/patch-ah    |    18 -
 www/firefox/patches/patch-ai    |    13 -
 www/firefox/patches/patch-aj    |    20 -
 www/firefox/patches/patch-ak    |    19 -
 www/firefox/patches/patch-al    |    27 -
 www/firefox/patches/patch-am    |    17 -
 www/firefox/patches/patch-an    |    48 -
 www/firefox/patches/patch-ap    |    13 -
 www/firefox/patches/patch-aq    |    13 -
 www/firefox/patches/patch-ar    |    39 -
 www/firefox/patches/patch-as    |    33 -
 www/firefox/patches/patch-at    |    25 -
 www/firefox/patches/patch-au    |    26 -
 www/firefox/patches/patch-av    |    40 -
 www/firefox/patches/patch-mb    |    72 -
 www/firefox/patches/patch-md    |    17 -
 www/firefox/patches/patch-me    |    15 -
 www/firefox/patches/patch-mf    |    21 -
 www/firefox/patches/patch-mg    |    90 -
 www/firefox/patches/patch-mj    |    15 -
 www/firefox/patches/patch-ml    |    16 -
 www/firefox/patches/patch-mn    |    15 -
 www/firefox/patches/patch-mp    |    26 -
 www/firefox/patches/patch-na    |   122 --
 www/firefox/patches/patch-nb    |    35 -
 www/firefox/patches/patch-nc    |    20 -
 www/firefox/patches/patch-nd    |    37 -
 www/firefox/patches/patch-xa    |   119 --
 www/firefox/patches/patch-xb    |    91 -
 www/firefox/patches/patch-xc    |    73 -
 www/firefox/patches/patch-xd    |   126 --
 www/firefox/patches/patch-xe    |    77 -
 www/firefox/patches/patch-xf    |    43 -
 www/firefox/patches/patch-xg    |    33 -
 www/firefox/patches/patch-xh    |   181 ---
 www/firefox/patches/patch-xi    |   213 ----
 www/firefox/patches/patch-xj    |   129 --
 www/firefox/patches/patch-xk    |   156 --
 www/firefox/patches/patch-xl    |   200 ---
 www/firefox/patches/patch-xm    |    49 -
 53 files changed, 71 insertions(+), 4761 deletions(-)

diffs (truncated from 5191 to 300 lines):

diff -r 03c1148a9a41 -r ef5b5c74c3e2 www/firefox/Makefile
--- a/www/firefox/Makefile      Wed Sep 16 19:06:00 2009 +0000
+++ b/www/firefox/Makefile      Wed Sep 16 19:06:18 2009 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.55 2009/09/10 00:03:37 tnn Exp $
+# $NetBSD: Makefile,v 1.56 2009/09/16 19:06:18 tnn Exp $
 #
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${FIREFOX_VER}
 FIREFOX_VER=   3.5.3
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.bz2
@@ -25,25 +26,21 @@
 PRIVILEGED_STAGES=     clean
 
 CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess
-CONFIG_GUESS_OVERRIDE+=        js/src/build/autoconf/config.guess
-CONFIG_GUESS_OVERRIDE+=        nsprpub/build/autoconf/config.guess
 CONFIG_SUB_OVERRIDE=   build/autoconf/config.sub
-CONFIG_SUB_OVERRIDE+=  js/src/build/autoconf/config.sub
-CONFIG_SUB_OVERRIDE+=  nsprpub/build/autoconf/config.sub
 
 CONFIGURE_ARGS+=       --enable-application=browser
-CONFIGURE_ARGS+=       --enable-libxul
 CONFIGURE_ARGS+=       --disable-tests --disable-pedantic
 CONFIGURE_ARGS+=       --enable-crypto
 CONFIGURE_ARGS+=       --enable-optimize=-O2 --with-pthreads
-CONFIGURE_ARGS+=       --disable-gnomeui --disable-javaxpcom
+CONFIGURE_ARGS+=       --disable-javaxpcom
 CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk2
 CONFIGURE_ARGS+=       --enable-svg --enable-mathml
-CONFIGURE_ARGS+=       --enable-system-cairo --enable-system-lcms
+CONFIGURE_ARGS+=       --enable-system-cairo
 CONFIGURE_ARGS+=       --with-system-jpeg
 CONFIGURE_ARGS+=       --with-system-zlib --with-system-bz2
 CONFIGURE_ARGS+=       --enable-system-sqlite
 CONFIGURE_ARGS+=       --disable-crashreporter
+CONFIGURE_ARGS+=       --with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk
 
 ALL_ENV+=              MOZILLA_PKG_NAME=firefox
 
@@ -65,20 +62,12 @@
 
 pre-configure:
        cd ${WRKSRC} && autoconf
-       cd ${WRKSRC}/js/src && autoconf
-       cd ${WRKSRC}/nsprpub && autoconf
-
 # Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
-.PHONY: create-rm-wrapper
-pre-configure: create-rm-wrapper
-create-rm-wrapper:
        printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
          ${WRAPPER_DIR}/bin/rm
        chmod +x ${WRAPPER_DIR}/bin/rm
 
-.PHONY: install-desktop
-post-install: install-desktop
-install-desktop:
+post-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications
        ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/pixmaps
        ${SED}  -e 's|@MOZILLA@|${MOZILLA}|g'                           \
@@ -90,14 +79,27 @@
          ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
        ${INSTALL_DATA} ${MOZILLA_ICON}                                 \
          ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
+       rm -f ${DESTDIR}${PREFIX}/bin/firefox
+       ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in  \
+         > ${WRKDIR}/firefox
+       ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
 
 .if ${OPSYS} == "Linux"
+# XXX check if this still applies after xulrunnerization
 .include "../../audio/alsa-lib/buildlink3.mk"
 .endif
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
+bUILDLINK_API_DEPENDS.xulrunner+=      xulrunner>=1.9.1.3nb4
+.include "../../devel/xulrunner/buildlink3.mk"
+PLIST_VARS+=   gnome
+.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)
+CONFIGURE_ARGS+=       --enable-gnomevfs --enable-dbus --enable-gnomeui
+PLIST.gnome=   yes
+.else
+CONFIGURE_ARGS+=       --disable-gnomevfs --disable-dbus --disable-gnomeui
+.endif
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/lcms/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff -r 03c1148a9a41 -r ef5b5c74c3e2 www/firefox/PLIST
--- a/www/firefox/PLIST Wed Sep 16 19:06:00 2009 +0000
+++ b/www/firefox/PLIST Wed Sep 16 19:06:18 2009 +0000
@@ -1,577 +1,5 @@
-@comment $NetBSD: PLIST,v 1.37 2009/08/30 01:14:49 markd Exp $
+@comment $NetBSD: PLIST,v 1.38 2009/09/16 19:06:18 tnn Exp $
 bin/firefox
-include/firefox/stable/base64.h
-include/firefox/stable/blapit.h
-include/firefox/stable/cert.h
-include/firefox/stable/certdb.h
-include/firefox/stable/certt.h
-include/firefox/stable/ciferfam.h
-include/firefox/stable/cmmf.h
-include/firefox/stable/cmmft.h
-include/firefox/stable/cms.h
-include/firefox/stable/cmsreclist.h
-include/firefox/stable/cmst.h
-include/firefox/stable/crmf.h
-include/firefox/stable/crmft.h
-include/firefox/stable/cryptohi.h
-include/firefox/stable/cryptoht.h
-include/firefox/stable/domstubs.h
-include/firefox/stable/ecl-exp.h
-include/firefox/stable/hasht.h
-include/firefox/stable/jar-ds.h
-include/firefox/stable/jar.h
-include/firefox/stable/jarfile.h
-include/firefox/stable/jni.h
-include/firefox/stable/jni_md.h
-include/firefox/stable/jri.h
-include/firefox/stable/jri_md.h
-include/firefox/stable/jritypes.h
-include/firefox/stable/key.h
-include/firefox/stable/keyhi.h
-include/firefox/stable/keyt.h
-include/firefox/stable/keythi.h
-include/firefox/stable/md/_aix32.cfg
-include/firefox/stable/md/_aix64.cfg
-include/firefox/stable/md/_beos.cfg
-include/firefox/stable/md/_bsdi.cfg
-include/firefox/stable/md/_darwin.cfg
-include/firefox/stable/md/_dgux.cfg
-include/firefox/stable/md/_freebsd.cfg
-include/firefox/stable/md/_hpux32.cfg
-include/firefox/stable/md/_hpux64.cfg
-include/firefox/stable/md/_irix32.cfg
-include/firefox/stable/md/_irix64.cfg
-include/firefox/stable/md/_linux.cfg
-include/firefox/stable/md/_ncr.cfg
-include/firefox/stable/md/_nec.cfg
-include/firefox/stable/md/_netbsd.cfg
-include/firefox/stable/md/_nextstep.cfg
-include/firefox/stable/md/_nto.cfg
-include/firefox/stable/md/_openbsd.cfg
-include/firefox/stable/md/_os2.cfg
-include/firefox/stable/md/_osf1.cfg
-include/firefox/stable/md/_qnx.cfg
-include/firefox/stable/md/_reliantunix.cfg
-include/firefox/stable/md/_riscos.cfg
-include/firefox/stable/md/_scoos.cfg
-include/firefox/stable/md/_solaris.cfg
-include/firefox/stable/md/_sony.cfg
-include/firefox/stable/md/_sunos4.cfg
-include/firefox/stable/md/_symbian.cfg
-include/firefox/stable/md/_unixware.cfg
-include/firefox/stable/md/_unixware7.cfg
-include/firefox/stable/md/_win95.cfg
-include/firefox/stable/md/_winnt.cfg
-include/firefox/stable/mozIJSSubScriptLoader.h
-include/firefox/stable/npapi.h
-include/firefox/stable/npfunctions.h
-include/firefox/stable/npruntime.h
-include/firefox/stable/nptypes.h
-include/firefox/stable/nsArrayEnumerator.h
-include/firefox/stable/nsArrayUtils.h
-include/firefox/stable/nsAutoLock.h
-include/firefox/stable/nsBaseHashtable.h
-include/firefox/stable/nsCOMArray.h
-include/firefox/stable/nsCOMPtr.h
-include/firefox/stable/nsCRTGlue.h
-include/firefox/stable/nsCategoryCache.h
-include/firefox/stable/nsClassHashtable.h
-include/firefox/stable/nsComponentManagerUtils.h
-include/firefox/stable/nsCycleCollectionParticipant.h
-include/firefox/stable/nsCycleCollector.h
-include/firefox/stable/nsDataHashtable.h
-include/firefox/stable/nsDebug.h
-include/firefox/stable/nsDeque.h
-include/firefox/stable/nsDirectoryServiceDefs.h
-include/firefox/stable/nsDirectoryServiceUtils.h
-include/firefox/stable/nsEmbedAPI.h
-include/firefox/stable/nsEmbedCID.h
-include/firefox/stable/nsEmbedString.h
-include/firefox/stable/nsEnumeratorUtils.h
-include/firefox/stable/nsError.h
-include/firefox/stable/nsGenericFactory.h
-include/firefox/stable/nsHashKeys.h
-include/firefox/stable/nsIASN1Object.h
-include/firefox/stable/nsIASN1Sequence.h
-include/firefox/stable/nsIArray.h
-include/firefox/stable/nsICRLInfo.h
-include/firefox/stable/nsICategoryManager.h
-include/firefox/stable/nsICertificateDialogs.h
-include/firefox/stable/nsIChannel.h
-include/firefox/stable/nsIClassInfo.h
-include/firefox/stable/nsIClassInfoImpl.h
-include/firefox/stable/nsIClipboardCommands.h
-include/firefox/stable/nsIComponentManager.h
-include/firefox/stable/nsIComponentRegistrar.h
-include/firefox/stable/nsIContextMenuListener.h
-include/firefox/stable/nsICookie.h
-include/firefox/stable/nsICookieManager.h
-include/firefox/stable/nsID.h
-include/firefox/stable/nsIDOM3DocumentEvent.h
-include/firefox/stable/nsIDOM3EventTarget.h
-include/firefox/stable/nsIDOMAbstractView.h
-include/firefox/stable/nsIDOMAttr.h
-include/firefox/stable/nsIDOMBarProp.h
-include/firefox/stable/nsIDOMCDATASection.h
-include/firefox/stable/nsIDOMCSSPrimitiveValue.h
-include/firefox/stable/nsIDOMCSSRule.h
-include/firefox/stable/nsIDOMCSSRuleList.h
-include/firefox/stable/nsIDOMCSSStyleDeclaration.h
-include/firefox/stable/nsIDOMCSSStyleSheet.h
-include/firefox/stable/nsIDOMCSSValue.h
-include/firefox/stable/nsIDOMCSSValueList.h
-include/firefox/stable/nsIDOMCharacterData.h
-include/firefox/stable/nsIDOMComment.h
-include/firefox/stable/nsIDOMDOMException.h
-include/firefox/stable/nsIDOMDOMImplementation.h
-include/firefox/stable/nsIDOMDocument.h
-include/firefox/stable/nsIDOMDocumentEvent.h
-include/firefox/stable/nsIDOMDocumentFragment.h
-include/firefox/stable/nsIDOMDocumentRange.h
-include/firefox/stable/nsIDOMDocumentStyle.h
-include/firefox/stable/nsIDOMDocumentType.h
-include/firefox/stable/nsIDOMDocumentView.h
-include/firefox/stable/nsIDOMElement.h
-include/firefox/stable/nsIDOMElementCSSInlineStyle.h
-include/firefox/stable/nsIDOMEntity.h
-include/firefox/stable/nsIDOMEntityReference.h
-include/firefox/stable/nsIDOMEvent.h
-include/firefox/stable/nsIDOMEventGroup.h
-include/firefox/stable/nsIDOMEventListener.h
-include/firefox/stable/nsIDOMEventTarget.h
-include/firefox/stable/nsIDOMHTMLAnchorElement.h
-include/firefox/stable/nsIDOMHTMLAppletElement.h
-include/firefox/stable/nsIDOMHTMLAreaElement.h
-include/firefox/stable/nsIDOMHTMLAudioElement.h
-include/firefox/stable/nsIDOMHTMLBRElement.h
-include/firefox/stable/nsIDOMHTMLBaseElement.h
-include/firefox/stable/nsIDOMHTMLBaseFontElement.h
-include/firefox/stable/nsIDOMHTMLBodyElement.h
-include/firefox/stable/nsIDOMHTMLButtonElement.h
-include/firefox/stable/nsIDOMHTMLByteRanges.h
-include/firefox/stable/nsIDOMHTMLCollection.h
-include/firefox/stable/nsIDOMHTMLDListElement.h
-include/firefox/stable/nsIDOMHTMLDirectoryElement.h
-include/firefox/stable/nsIDOMHTMLDivElement.h
-include/firefox/stable/nsIDOMHTMLDocument.h
-include/firefox/stable/nsIDOMHTMLElement.h
-include/firefox/stable/nsIDOMHTMLEmbedElement.h
-include/firefox/stable/nsIDOMHTMLFieldSetElement.h
-include/firefox/stable/nsIDOMHTMLFontElement.h
-include/firefox/stable/nsIDOMHTMLFormElement.h
-include/firefox/stable/nsIDOMHTMLFrameElement.h
-include/firefox/stable/nsIDOMHTMLFrameSetElement.h
-include/firefox/stable/nsIDOMHTMLHRElement.h
-include/firefox/stable/nsIDOMHTMLHeadElement.h
-include/firefox/stable/nsIDOMHTMLHeadingElement.h
-include/firefox/stable/nsIDOMHTMLHtmlElement.h
-include/firefox/stable/nsIDOMHTMLIFrameElement.h
-include/firefox/stable/nsIDOMHTMLImageElement.h
-include/firefox/stable/nsIDOMHTMLInputElement.h
-include/firefox/stable/nsIDOMHTMLIsIndexElement.h
-include/firefox/stable/nsIDOMHTMLLIElement.h
-include/firefox/stable/nsIDOMHTMLLabelElement.h
-include/firefox/stable/nsIDOMHTMLLegendElement.h
-include/firefox/stable/nsIDOMHTMLLinkElement.h
-include/firefox/stable/nsIDOMHTMLMapElement.h
-include/firefox/stable/nsIDOMHTMLMediaElement.h
-include/firefox/stable/nsIDOMHTMLMediaError.h
-include/firefox/stable/nsIDOMHTMLMenuElement.h
-include/firefox/stable/nsIDOMHTMLMetaElement.h
-include/firefox/stable/nsIDOMHTMLModElement.h
-include/firefox/stable/nsIDOMHTMLOListElement.h
-include/firefox/stable/nsIDOMHTMLObjectElement.h
-include/firefox/stable/nsIDOMHTMLOptGroupElement.h
-include/firefox/stable/nsIDOMHTMLOptionElement.h
-include/firefox/stable/nsIDOMHTMLOptionsCollection.h
-include/firefox/stable/nsIDOMHTMLParagraphElement.h
-include/firefox/stable/nsIDOMHTMLParamElement.h
-include/firefox/stable/nsIDOMHTMLPreElement.h
-include/firefox/stable/nsIDOMHTMLQuoteElement.h
-include/firefox/stable/nsIDOMHTMLScriptElement.h
-include/firefox/stable/nsIDOMHTMLSelectElement.h
-include/firefox/stable/nsIDOMHTMLSourceElement.h
-include/firefox/stable/nsIDOMHTMLStyleElement.h
-include/firefox/stable/nsIDOMHTMLTableCaptionElem.h
-include/firefox/stable/nsIDOMHTMLTableCellElement.h
-include/firefox/stable/nsIDOMHTMLTableColElement.h
-include/firefox/stable/nsIDOMHTMLTableElement.h
-include/firefox/stable/nsIDOMHTMLTableRowElement.h
-include/firefox/stable/nsIDOMHTMLTableSectionElem.h



Home | Main Index | Thread Index | Old Index