diff options
| -rw-r--r-- | www/mozilla/Makefile | 4 | ||||
| -rw-r--r-- | www/mozilla/files/patch-qt | 33 |
2 files changed, 26 insertions, 11 deletions
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 2b68c6e0d..b0a4c47be 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -3,12 +3,12 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports/www/mozilla/Makefile,v 1.28 2005/11/22 21:29:15 ahze Exp $ +# $MCom: ports/www/mozilla/Makefile,v 1.29 2005/11/23 04:54:58 ahze Exp $ # PORTNAME= mozilla PORTVERSION= 1.7.12 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH= 2 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt index 6b72f3f00..d1cb9f9f7 100644 --- a/www/mozilla/files/patch-qt +++ b/www/mozilla/files/patch-qt @@ -1,15 +1,15 @@ ---- configure.orig Tue Apr 20 21:39:17 2004 -+++ configure Thu Apr 29 14:01:52 2004 -@@ -9362,7 +9362,7 @@ +--- configure.orig Tue Oct 12 00:13:29 2004 ++++ configure Wed Nov 23 01:48:55 2005 +@@ -9368,7 +9368,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 9368 "configure" + #line 9374 "configure" #include "confdefs.h" -@@ -9393,7 +9393,7 @@ +@@ -9399,7 +9399,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 -@@ -9403,7 +9403,7 @@ +@@ -9409,7 +9409,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 9409 "configure" + #line 9415 "configure" #include "confdefs.h" -@@ -9434,7 +9434,7 @@ +@@ -9440,7 +9440,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -36,7 +36,22 @@ else echo "$ac_t""no" 1>&6 fi -@@ -12298,9 +12298,9 @@ +@@ -11401,12 +11401,12 @@ + + echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 + echo "configure:11404: 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:11409: checking MOZ_GTK2_LIBS" >&5 +- MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"` ++ MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"` + echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 + else + MOZ_GTK2_CFLAGS="" +@@ -12344,9 +12344,9 @@ |