Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv13609
Modified Files:
tenfourfox.info tenfourfox.patch
Log Message:
uses fink-package-precedence to determine exact/actual bdep/deps
force use of system-openssl to avoid fink's openssl
private shlibs use install_name with @executable_path
update comments and description fields
Index: tenfourfox.patch
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/tenfourfox.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tenfourfox.patch 29 Dec 2010 19:33:36 -0000 1.8
+++ tenfourfox.patch 30 Dec 2010 04:05:42 -0000 1.9
@@ -30,12 +30,12 @@
+ac_add_options --pref...@finkprefix@
+#ac_add_options --enable-official-branding
+#ac_add_options --enable-default-toolkit=cairo-gtk2
-+ac_add_options --x-libraries=/usr/X11R6/lib
-+ac_add_options --x-includes=/usr/X11R6/include
-+ac_add_options --disable-gnomevfs
-+ac_add_options --disable-gnomeui
-+ac_add_options --enable-dbus
-+ac_add_options --enable-extensions=default,-gnomevfs
++#ac_add_options --x-libraries=/usr/X11R6/lib
++#ac_add_options --x-includes=/usr/X11R6/include
++#ac_add_options --disable-gnomevfs
++#ac_add_options --disable-gnomeui
++#ac_add_options --enable-dbus
++#ac_add_options --enable-extensions=default,-gnomevfs
+
+#ac_add_options --disable-dependency-tracking
+ac_add_options --disable-crashreporter
Index: tenfourfox.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/tenfourfox.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tenfourfox.info 30 Dec 2010 02:34:02 -0000 1.14
+++ tenfourfox.info 30 Dec 2010 04:05:42 -0000 1.15
@@ -4,21 +4,21 @@
Revision: 0.b8.1
Distribution: 10.4, 10.5
Architecture: powerpc
-Description: Port of Firefox 4 to 10.4 and powerpc
+Description: Port of Firefox 4 to 10.4 and PowerPC
License: OSI-Approved
Maintainer: David Fang <fang...@users.sourceforge.net>
Depends: <<
# %N-shlibs (= %v-%r),
- atk1-shlibs (>= 1.20.0-1),
- bzip2-shlibs,
+# atk1-shlibs (>= 1.20.0-1),
+# bzip2-shlibs,
# cairo-shlibs (>= 1.6-1),
fontconfig2-shlibs (>= 2.4.1-1),
freetype219-shlibs (>= 2.3.7-7),
- glib2-shlibs (>= 2.14.0-1),
- gtk+2-shlibs (>= 2.12.0-1),
- libgettext8-shlibs,
- pango1-xft2-ft219-shlibs (>= 1.20.0-3),
- x11
+# glib2-shlibs (>= 2.14.0-1),
+# gtk+2-shlibs (>= 2.12.0-1),
+# libgettext8-shlibs,
+# pango1-xft2-ft219-shlibs (>= 1.20.0-3)
+# x11
<<
BuildConflicts: <<
autoconf,
@@ -29,33 +29,35 @@
nspr
<<
BuildDepends: <<
- atk1 (>= 1.20.0-1),
+# atk1 (>= 1.20.0-1),
autoconf2.13,
bzip2-dev,
# cairo (>= 1.6-1),
- dbus-dev,
+# dbus-dev,
fink (>= 0.28-1),
+ fink-package-precedence,
flag-sort,
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
# gcc4.2 (>= 4.2.1-5574),
- glib2-dev (>= 2.14.0-1),
- glitz,
- gtk+2-dev (>= 2.12.0-1),
- libgettext8-dev,
+# glib2-dev (>= 2.14.0-1),
+# glitz,
+# gtk+2-dev (>= 2.12.0-1),
+# libgettext8-dev,
libidl2 (>= 0.8.9-1),
libjpeg8,
- libnotify (>= 0.4-1),
+# libnotify (>= 0.4-1),
make,
- pango1-xft2-ft219-dev (>= 1.20.0-3),
- pixman (>= 0.10.0-1),
+# pango1-xft2-ft219-dev (>= 1.20.0-3),
+# pixman (>= 0.10.0-1),
pkgconfig (>= 0.21-1),
- python27,
- system-sdk-10.4,
+ python (>= 2.5),
+ system-openssl-dev,
+ system-sdk-10.4
# system-sdk-10.5,
- x11-dev,
- xft2-dev,
- yasm
+# x11-dev,
+# xft2-dev,
+# yasm
<<
Source:
http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%vb8/source/firefox-%vb8.source.tar.bz2
SourceDirectory: mozilla-central
@@ -63,7 +65,7 @@
Source2:
http://tenfourfox.googlecode.com/files/TenFourFox-changesets-20101215.zip
Source2-MD5: 862b09c04f7e7e56c251a058d72f60d5
PatchFile: %n.patch
-PatchFile-MD5: 60fd736423955bf0c7117faa330b44c0
+PatchFile-MD5: 8454cd92a1984d8320d74b8bbe93d596
PatchScript: <<
#!/bin/sh -ev
# apply patchset from TenFourFox:
@@ -79,9 +81,9 @@
# configure inputs were patched, hence regeneration
autoconf
<<
-SetLDFLAGS: -L%p/lib/fontconfig2/lib -lfontconfig
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/lib/fontconfig2/include -I%p/include -I/usr/X11R6/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib/fontconfig2/lib -lfontconfig
+# NoSetCPPFLAGS: true
+SetCPPFLAGS: -I%p/lib/system-openssl/include -I%p/lib/fontconfig2/include
-I%p/include -I/usr/X11R6/include
GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
@@ -91,15 +93,22 @@
echo "open -a TenFourFox.app \"$...@\"" ;} > tenfourfox
chmod +x tenfourfox
+export PKG_CONFIG_PATH=%p/lib/system-openssl/lib/pkgconfig:$PKG_CONFIG_PATH
+
$make -w -f client.mk build
-#%p/bin/fink-package-precedence --depfile-ext=.pp .
+objdir=obj-%m-apple-darwin`uname -r`
+pushd $objdir
+fink-package-precedence --headers --depfile-ext=.pp .
+fink-package-precedence --libs .
#--depfile-ext=.pp .
# --no-headers .
+popd
<<
InstallScript: <<
#!/bin/sh -ev
echo Deferring installation to AppBundles script.
-ln -s obj-%m-apple-darwin`uname -r`/dist UninstalledAppDir
+objdir=obj-%m-apple-darwin`uname -r`
+ln -s $objdir/dist UninstalledAppDir
# make=/usr/bin/make
make=%p/bin/make
if false
@@ -185,13 +194,13 @@
# fontconfig2-shlibs (>= 2.4.1-1),
# freetype219-shlibs (>= 2.3.7-7),
# glib2-shlibs (>= 2.14.0-1),
-# gtk+2-shlibs (>= 2.12.0-1),
+## gtk+2-shlibs (>= 2.12.0-1),
# libgettext8-shlibs,
# libjpeg8-shlibs,
# libnotify-shlibs (>= 0.4-1),
# pango1-xft2-ft219-shlibs (>= 1.20.0-3),
-# python27-shlibs,
-# x11-shlibs
+## python27-shlibs,
+## x11-shlibs
# <<
# Description: Lightweight browser from mozilla.org (shared libraries)
# DocFiles: LEGAL LICENSE README.txt
@@ -221,20 +230,20 @@
# <<
#<<
Shlibs: <<
- !%p/Applications/TenFourFox.app/Contents/MacOS/libfreebl3.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libmozalloc.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libmozsqlite3.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libnspr4.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libnss3.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libnssckbi.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libnssdbm3.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libnssutil3.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libplc4.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libplds4.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libsmime3.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libsoftokn3.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libssl3.dylib
- !%p/Applications/TenFourFox.app/Contents/MacOS/libxpcom.dylib
+ !...@executable_path/libfreebl3.dylib
+ !...@executable_path/libmozalloc.dylib
+ !...@executable_path/libmozsqlite3.dylib
+ !...@executable_path/libnspr4.dylib
+ !...@executable_path/libnss3.dylib
+ !...@executable_path/libnssckbi.dylib
+ !...@executable_path/libnssdbm3.dylib
+ !...@executable_path/libnssutil3.dylib
+ !...@executable_path/libplc4.dylib
+ !...@executable_path/libplds4.dylib
+ !...@executable_path/libsmime3.dylib
+ !...@executable_path/libsoftokn3.dylib
+ !...@executable_path/libssl3.dylib
+ !...@executable_path/libxpcom.dylib
<<
Homepage: http://www.floodgap.com:80/software/tenfourfox/
DescDetail: <<
@@ -244,37 +253,28 @@
10.4, nor PowerPC.
<<
DescUsage: <<
-%p/bin/firefox
+command line: %p/bin/tenfourfox
-The user-accessible 'firefox' executable in installed by the
-splitoff package 'firefox' and is no longer contained within the
-parent package %N.
+or drag %p/Applications/TenFourFox.app onto your dock.
<<
DescPackaging: <<
-As of firefox3-3.1-b3.6, includes a splitoff 'firefox' that includes
-the main user interaction files to simplify upgrading between major
-versions.
-
-Moved chrome* components* greprefs* res* to -shlibs because gecko needs
-those files when loaded by a third party.
+For the most part, follow's upstream's instructions for building.
+http://code.google.com/p/tenfourfox/wiki/HowToBuild
-The directory %p/lib/%N-devel is removed because it only contains
-symlinks to files found under %p/lib/%N.
+Uses default toolkit cairo-cocoa, instead of gtk+2.
+SplitOffs have been punted until there is actual interest.
+Uses system-openssl instead of fink's openssl.
<<
DescPort: <<
Needs autoconf2.13 to regenerate configure after patch from tenfourfox.
BuildConflicts with automake1.11 to temporarily remove to allow autoconf2.13.
-GTK+2 build of the Mozilla Firefox browser for Mac OS X/X11. Compiled
-without built-in support for GNOME (except for an app launcher button).
-
ac_add_options --enable-macos-target=foo in patch file (.mozconfig) is
for the minimum OS version that this will compile in, so usually the
lowest Distribution used in the Fink tree this lives in.
Using system-provided libraries:
--------------------------------
-. system-cairo (>= 1.6) can be used when --disable-quartz-image is removed
from its %c (otherwise Fx build fails looking for gfxQuartzSurface.h)
. system-png cannot be used because it lacks APNG (upstream won't include it)
. system-sqlite needs >= 3.6.23.1, but with extra options compiled in.
<<
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
