stdin

stdin.txt

diff -pruN /home/romster/var/cwd/remote/projects/crux/opt/firefox/firefox-install-dir.patch /usr/ports/opt/firefox/firefox-install-dir.patch
--- /home/romster/var/cwd/remote/projects/crux/opt/firefox/firefox-install-dir.patch	1970-01-01 10:00:00.000000000 +1000
+++ /usr/ports/opt/firefox/firefox-install-dir.patch	2013-12-04 01:19:22.227751504 +1100
@@ -0,0 +1,30 @@
+diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
+--- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
++++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
+@@ -1,9 +1,9 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++includedir := $(includedir)/$(MOZ_APP_NAME)
++idldir = $(datadir)/idl/$(MOZ_APP_NAME)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ DIST = $(DEPTH)/dist
+ 
+ # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
+diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
+--- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
++++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
+@@ -1,7 +1,7 @@
+ INCLUDED_AUTOCONF_MK = 1
+ 
+-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir = $(libdir)/$(MOZ_APP_NAME)
++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ ifneq (,$(filter /%,$(TOP_DIST)))
+ DIST = $(TOP_DIST)
diff -pruN /home/romster/var/cwd/remote/projects/crux/opt/firefox/.md5sum /usr/ports/opt/firefox/.md5sum
--- /home/romster/var/cwd/remote/projects/crux/opt/firefox/.md5sum	2013-11-20 23:37:01.000000000 +1100
+++ /usr/ports/opt/firefox/.md5sum	2013-12-04 01:23:48.291773422 +1100
@@ -1,3 +1,5 @@
 b5b57d3ea937a339e0ed7ebea604b430  firefox-25.0.1.source.tar.bz2
+150ac0fb3ac7b2114c8e8851a9e0516c  firefox-install-dir.patch
 cf6971669f70b440cb6ff8df8b2722ae  firefox.desktop
-b7f56881c56579646a7eec79c9670dc8  mozconfig
+240fd8acbb6bbb306c50670f0d89fcc5  mozconfig
+c382e35315047e4ca368d09383b39b8d  vendor.js
diff -pruN /home/romster/var/cwd/remote/projects/crux/opt/firefox/mozconfig /usr/ports/opt/firefox/mozconfig
--- /home/romster/var/cwd/remote/projects/crux/opt/firefox/mozconfig	2013-09-21 11:12:50.000000000 +1000
+++ /usr/ports/opt/firefox/mozconfig	2013-12-04 01:23:34.461772283 +1100
@@ -1,26 +1,32 @@
+# grab the defaults from the firefox tarball
+. $topsrcdir/browser/config/mozconfig
+
 # use an OBJDIR
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/firefox-shared
 
 # inherit possible makeflags from pkgmk.
 mk_add_options MOZ_MAKE_FLAGS="#MAKEFLAGS#"
 
-# grab the defaults from the firefox tarball
-. $topsrcdir/browser/config/mozconfig
-
 # crux options
 
 ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
 #ac_add_options --with-system-jpeg
+ac_add_options --with-system-bz2
 ac_add_options --with-system-zlib
 ac_add_options --with-system-mng
 ac_add_options --with-system-png
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
+ac_add_options --with-system-libevent
+ac_add_options --with-pthreads
+
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-pixman
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-cairo
-ac_add_options --with-pthreads
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --enable-optimize="#CFLAGS#"
 ac_add_options --enable-official-branding
 ac_add_options --enable-extensions=default,-gnomevfs
@@ -34,7 +40,7 @@ ac_add_options --enable-storage
 ac_add_options --enable-places_bookmarks
 ac_add_options --enable-image-encoder=all
 ac_add_options --enable-xft
-#ac_add_options --enable-gstreamer
+
 ac_add_options --disable-static
 ac_add_options --disable-tests
 ac_add_options --disable-mochitest
diff -pruN /home/romster/var/cwd/remote/projects/crux/opt/firefox/Pkgfile /usr/ports/opt/firefox/Pkgfile
--- /home/romster/var/cwd/remote/projects/crux/opt/firefox/Pkgfile	2013-11-20 23:37:01.000000000 +1100
+++ /usr/ports/opt/firefox/Pkgfile	2013-12-04 01:18:50.051748854 +1100
@@ -5,47 +5,34 @@
 
 name=firefox
 version=25.0.1
-release=1
+release=2
 source=(ftp://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.bz2
-        mozconfig firefox.desktop)
+        mozconfig firefox.desktop vendor.js firefox-install-dir.patch)
 
 build() {
-    export MOZ_CO_PROJECT=browser
-    export BUILD_OFFICIAL=1
-    export MOZILLA_OFFICIAL=1
-    export MOZILLA_FIVE_HOME=/usr/lib/firefox
-
     cd mozilla-release
 
+    patch -p 1 -i $SRC/firefox-install-dir.patch
     export CFLAGS="$CFLAGS -mno-avx"
-    sed -e "s/#CFLAGS#/$CFLAGS/" $SRC/mozconfig > .mozconfig
-    ./configure
-
-    mkdir $SRC/mozilla-release/js/src/.deps
 
-    make
+    sed \
+        -e "s/#CFLAGS#/$CFLAGS/" \
+        -e "s|#MAKEFLAGS#|$MAKEFLAGS|" \
+        $SRC/mozconfig > .mozconfig
 
-    install -d \
-        $PKG$MOZILLA_FIVE_HOME \
-        $PKG/usr/bin \
-        $PKG/usr/share/idl/firefox \
-        $PKG/usr/include/firefox
+    make -f client.mk build
+    make -f client.mk DESTDIR=$PKG install
 
-    cp -rL dist/bin/* $PKG$MOZILLA_FIVE_HOME
-    ln -s /usr/lib/firefox/firefox $PKG/usr/bin/firefox
-
-    # devel stuff
-    cp -frL dist/idl/* $PKG/usr/share/idl/firefox/
-    cp -frL dist/include/* $PKG/usr/include/firefox/
+    install -m 0644 -D $SRC/vendor.js \
+        $PKG/usr/lib/firefox/browser/defaults/preferences/vendor.js
 
     install -d $PKG/etc/ld.so.conf.d
     echo "/usr/lib/$name" > $PKG/etc/ld.so.conf.d/$name.conf
 
-    # cleanup
-    #find $PKG -name .mkdir.done -delete
-    find $PKG -type f -empty -delete
     # desktop stuff
-    mkdir -p $PKG/usr/share/pixmaps
-    ln -s /usr/lib/firefox/browser/chrome/browser/content/branding/icon48.png $PKG/usr/share/pixmaps/firefox_default48.png
+    install -d -m 0755 $PKG/usr/share/pixmaps
+    ln -s /usr/lib/firefox/browser/chrome/browser/content/branding/icon48.png \
+        $PKG/usr/share/pixmaps/firefox_default48.png
+
     install -D -m 0644 $SRC/firefox.desktop $PKG/usr/share/applications/firefox.desktop
 }
diff -pruN /home/romster/var/cwd/remote/projects/crux/opt/firefox/vendor.js /usr/ports/opt/firefox/vendor.js
--- /home/romster/var/cwd/remote/projects/crux/opt/firefox/vendor.js	1970-01-01 10:00:00.000000000 +1000
+++ /usr/ports/opt/firefox/vendor.js	2013-12-04 01:19:15.262750930 +1100
@@ -0,0 +1,5 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default browser checking.
+pref("browser.shell.checkDefaultBrowser", false);