summaryrefslogtreecommitdiff
path: root/www/mozilla-devel/files/patch-qt
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-10-20 06:19:25 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-10-20 06:19:25 +0000
commit8a276b984ded9bb7b0c52a7cf56755aa2172c6ff (patch)
tree9919f12d22b23182d83b9ef80a1cd5a2a88b8556 /www/mozilla-devel/files/patch-qt
parentUse the real FreeBSD SCM ID, not who knows who's. (diff)
Update to 1.2a.
Notes
Notes: svn path=/head/; revision=68396
Diffstat (limited to 'www/mozilla-devel/files/patch-qt')
-rw-r--r--www/mozilla-devel/files/patch-qt41
1 files changed, 28 insertions, 13 deletions
diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt
index acec8e26f297..d7b8248d7a34 100644
--- a/www/mozilla-devel/files/patch-qt
+++ b/www/mozilla-devel/files/patch-qt
@@ -1,6 +1,9 @@
---- configure.orig Wed May 8 22:24:05 2002
-+++ configure Mon May 13 01:18:53 2002
-@@ -7489,7 +7489,7 @@
+
+$FreeBSD$
+
+--- configure.orig Wed Sep 4 01:40:24 2002
++++ configure Sat Oct 19 17:57:59 2002
+@@ -7899,7 +7899,7 @@
EOF
if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -9,7 +12,7 @@
else
_PTHREAD_LDFLAGS="-lc_r"
fi
-@@ -9967,7 +9967,7 @@
+@@ -10561,7 +10561,7 @@
fi
MOC=$HOST_MOC
@@ -18,19 +21,31 @@
QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
# Check whether --with-static-qt or --without-static-qt was given.
-@@ -10836,13 +10836,13 @@
+@@ -11422,9 +11422,9 @@
--MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc universalchardet"
-+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector universalchardet"
+-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc universalchardet typeaheadfind"
++MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector universalchardet typeaheadfind"
- if test -n "$SUNCTL"; then
- MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl"
- fi
-
--MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm access-builtin ctl p3p interfaceinfo"
-+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl p3p interfaceinfo"
+-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm access-builtin p3p interfaceinfo datetime finger"
++MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin p3p interfaceinfo datetime finger"
# Check whether --enable-extensions or --disable-extensions was given.
if test "${enable_extensions+set}" = set; then
+@@ -15704,10 +15704,11 @@
+ *) # Relative path.
+ ac_sub_cache_file="$ac_dots$cache_file" ;;
+ esac
+- case "$ac_given_INSTALL" in
+- [/$]*) INSTALL="$ac_given_INSTALL" ;;
+- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+- esac
++ INSTALL=""
++# case "$ac_given_INSTALL" in
++# [/$]*) INSTALL="$ac_given_INSTALL" ;;
++# *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++# esac
+
+ echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+ # The eval makes quoting arguments work.