diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-24 00:10:42 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-11-24 00:10:42 +0800 |
commit | 22cfb1ad5f6abcdd672e1dfee89263fdd387e287 (patch) | |
tree | 036ef8f111828e4118907c959263db96528505fe /www/firefox10 | |
parent | be87f2ee071bc2055371c06a030ae6cbe4e25ac9 (diff) | |
download | marcuscom-ports-22cfb1ad5f6abcdd672e1dfee89263fdd387e287.tar marcuscom-ports-22cfb1ad5f6abcdd672e1dfee89263fdd387e287.tar.gz marcuscom-ports-22cfb1ad5f6abcdd672e1dfee89263fdd387e287.tar.bz2 marcuscom-ports-22cfb1ad5f6abcdd672e1dfee89263fdd387e287.tar.lz marcuscom-ports-22cfb1ad5f6abcdd672e1dfee89263fdd387e287.tar.xz marcuscom-ports-22cfb1ad5f6abcdd672e1dfee89263fdd387e287.tar.zst marcuscom-ports-22cfb1ad5f6abcdd672e1dfee89263fdd387e287.zip |
Link Forefox against pangox to fix undefined symbol problems.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5193 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/firefox10')
-rw-r--r-- | www/firefox10/Makefile | 4 | ||||
-rw-r--r-- | www/firefox10/files/patch-configure | 33 |
2 files changed, 27 insertions, 10 deletions
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile index 70cb812b3..f05bcbadf 100644 --- a/www/firefox10/Makefile +++ b/www/firefox10/Makefile @@ -3,12 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/firefox/Makefile,v 1.22 2005/11/22 21:29:14 ahze Exp $ +# $MCom: ports/www/firefox/Makefile,v 1.23 2005/11/23 04:54:58 ahze Exp $ # PORTNAME= firefox DISTVERSION= 1.5rc3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} diff --git a/www/firefox10/files/patch-configure b/www/firefox10/files/patch-configure index 9e60372ad..b69920507 100644 --- a/www/firefox10/files/patch-configure +++ b/www/firefox10/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ +--- configure.orig Tue Oct 4 02:01:48 2005 ++++ configure Wed Nov 23 11:07:17 2005 +@@ -10016,7 +10016,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-liconv $LIBS" +LIBS="-L$LOCALBASE/lib -liconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 9187 "configure" + #line 10022 "configure" #include "confdefs.h" -@@ -9212,7 +9212,7 @@ +@@ -10047,7 +10047,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -18,16 +18,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ +@@ -10057,7 +10057,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-liconv $LIBS" +LIBS="-L$LOCALBASE/lib -liconv $LIBS" cat > conftest.$ac_ext <<EOF - #line 9228 "configure" + #line 10063 "configure" #include "confdefs.h" -@@ -9253,7 +9253,7 @@ +@@ -10088,7 +10088,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -36,3 +36,20 @@ else echo "$ac_t""no" 1>&6 fi +@@ -12148,14 +12148,14 @@ + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 + echo "configure:12151: checking MOZ_GTK2_CFLAGS" >&5 +- MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` ++ MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"` + echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 + + echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 + echo "configure:12156: checking MOZ_GTK2_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic +- MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\"`" ++ MOZ_GTK2_LIBS="`$PKG_CONFIG --libs-only-L \"gtk+-2.0 >= 1.3.7\" \"pangox >= 1.1.0\"` `$PKG_CONFIG --libs-only-l \"gtk+-2.0 >= 1.3.7\" \"pangox >= 1.1.0\"`" + echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 + else + MOZ_GTK2_CFLAGS="" |