head	1.11;
access;
symbols
	RELEASE_4_5_0:1.10
	RELEASE_4_4_0:1.8
	RELEASE_4_3_0:1.5
	RELEASE_4_2_0:1.3
	RELEASE_4_1_1:1.3
	RELEASE_4_1_0:1.3
	RELEASE_3_5_0:1.3
	RELEASE_4_0_0:1.2
	RELEASE_3_4_0:1.1;
locks; strict;
comment	@# @;


1.11
date	2002.02.16.23.46.00;	author sumikawa;	state dead;
branches;
next	1.10;

1.10
date	2001.12.28.14.31.08;	author sumikawa;	state Exp;
branches;
next	1.9;

1.9
date	2001.11.27.17.13.38;	author sumikawa;	state Exp;
branches;
next	1.8;

1.8
date	2001.08.09.14.09.25;	author sumikawa;	state Exp;
branches;
next	1.7;

1.7
date	2001.07.02.16.13.09;	author sumikawa;	state Exp;
branches;
next	1.6;

1.6
date	2001.05.18.17.47.01;	author sumikawa;	state Exp;
branches;
next	1.5;

1.5
date	2001.02.19.17.53.59;	author sumikawa;	state Exp;
branches;
next	1.4;

1.4
date	2001.01.18.16.35.51;	author sumikawa;	state Exp;
branches;
next	1.3;

1.3
date	2000.04.21.02.36.51;	author reg;	state Exp;
branches;
next	1.2;

1.2
date	2000.01.29.08.51.37;	author reg;	state Exp;
branches;
next	1.1;

1.1
date	99.11.11.20.16.20;	author jim;	state Exp;
branches;
next	;


desc
@@


1.11
log
@Remove this port.

Now www/mozilla works correctly on both IPv6 and IPv4 environment so
we don't need mozilla+ipv6 anymore.
@
text
@
$FreeBSD: ports/www/mozilla+ipv6/files/patch-qt,v 1.10 2001/12/28 14:31:08 sumikawa Exp $

--- configure.orig	Wed Dec 12 10:12:41 2001
+++ configure	Tue Dec 25 15:21:43 2001
@@@@ -6186,6 +6186,9 @@@@
 os2*)
     LIBS=
     ;;
+freebsd*)
+    CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
+    ;;
 esac
 for ac_hdr in sys/byteorder.h compat.h getopt.h
 do
@@@@ -7357,8 +7360,6 @@@@
 	if test $? -eq 0; then
 		if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
 			ac_cv_have_dash_pthread=yes
-			CFLAGS="$CFLAGS -pthread"
-			CXXFLAGS="$CXXFLAGS -pthread"
 		fi
 	fi
 	rm -f conftest*
@@@@ -7392,7 +7393,7 @@@@
 EOF
 
 						if test "$ac_cv_have_dash_pthread" = "yes"; then
-				_PTHREAD_LDFLAGS=""
+				_PTHREAD_LDFLAGS="-pthread"
 			else
 				_PTHREAD_LDFLAGS="-lc_r"
 			fi
@@@@ -9839,7 +9840,7 @@@@
     fi
     MOC=$HOST_MOC
 
-    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
+    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
 
     # Check whether --with-static-qt or --without-static-qt was given.
@@@@ -13711,6 +13712,7 @@@@
     echo "configure: warning: Recreating autoconf.mk with updated nspr-config output" 1>&2
     if test ! "$VACPP" && test -z "$_WIN32_MSVC"; then
         NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
+	NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
         $PERL -pi.bak -e "s {^NSPR_LIBS\s*=.*} {NSPR_LIBS = $NSPR_LIBS }" config/autoconf.mk
     fi
     if test -z "$_WIN32_MSVC"; then
@


1.10
log
@Upgrade to 0.9.7.
@
text
@d2 1
a2 1
$FreeBSD: ports/www/mozilla+ipv6/files/patch-qt,v 1.9 2001/11/27 17:13:38 sumikawa Exp $
@


1.9
log
@Upgrade to 0.9.6.
@
text
@d2 1
a2 1
$FreeBSD: ports/www/mozilla+ipv6/files/patch-qt,v 1.8 2001/08/09 14:09:25 sumikawa Exp $
d4 3
a6 3
--- configure.orig	Fri Nov  9 05:13:03 2001
+++ configure	Wed Nov 21 14:22:13 2001
@@@@ -5931,6 +5931,9 @@@@
d16 1
a16 1
@@@@ -6987,8 +6990,6 @@@@
d25 1
a25 1
@@@@ -7022,7 +7023,7 @@@@
d34 1
a34 9
@@@@ -8365,6 +8366,7 @@@@
         ;;
     *)
         NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
+        NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
         ;;
     esac
 fi
@@@@ -9421,7 +9423,7 @@@@
d43 3
a45 3
@@@@ -13233,6 +13235,7 @@@@
         ;;
     *)
d49 2
a50 2
         ;;
     esac
@


1.8
log
@Upgrade to 0.9.3.

PR:		ports/29540
Submitted by:	pat@@databits.net
@
text
@d2 1
a2 1
$FreeBSD: ports/www/mozilla+ipv6/files/patch-qt,v 1.7 2001/07/02 16:13:09 sumikawa Exp $
d4 3
a6 12
--- configure.orig	Wed Jul 25 08:44:09 2001
+++ configure	Sat Aug  4 11:18:33 2001
@@@@ -6528,7 +6528,7 @@@@
     echo "$ac_t""$HOST_MOC" 1>&6
     MOC=$HOST_MOC
 
-    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
+    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
 
     # Check whether --with-static-qt or --without-static-qt was given.
@@@@ -8587,6 +8587,9 @@@@
d16 1
a16 1
@@@@ -9316,8 +9319,6 @@@@
d25 1
a25 1
@@@@ -9351,7 +9352,7 @@@@
d34 18
a51 1
@@@@ -13701,6 +13702,7 @@@@
@


1.7
log
@Upgrade to 0.9.2.
@
text
@d2 1
a2 1
$FreeBSD: ports/www/mozilla+ipv6/files/patch-qt,v 1.6 2001/05/18 17:47:01 sumikawa Exp $
d4 3
a6 3
--- configure.orig	Wed Jun 27 01:21:19 2001
+++ configure	Mon Jul  2 10:51:16 2001
@@@@ -6681,7 +6681,7 @@@@
d15 1
a15 1
@@@@ -8777,6 +8777,9 @@@@
d25 1
a25 1
@@@@ -9506,8 +9509,6 @@@@
d34 1
a34 1
@@@@ -9541,7 +9542,7 @@@@
d43 1
a43 1
@@@@ -14107,6 +14108,7 @@@@
@


1.6
log
@Upgrade to 0.9.
@
text
@d2 1
a2 1
$FreeBSD$
d4 5
a8 4
--- configure.orig	Tue Apr 24 01:59:58 2001
+++ configure	Mon May 14 21:48:26 2001
@@@@ -6596,7 +6596,7 @@@@
 fi
d10 1
a10 2
 
-    QT_CFLAGS="-I${QTDIR}/include -DQT_GENUINE_STR"
d15 1
a15 1
@@@@ -8703,6 +8703,9 @@@@
d25 1
a25 1
@@@@ -9392,8 +9395,6 @@@@
d34 1
a34 1
@@@@ -9427,7 +9428,7 @@@@
d43 1
a43 1
@@@@ -13902,6 +13903,7 @@@@
@


1.5
log
@Upgrade to 0.8.

Submitted by:	ume
@
text
@d1 7
a7 5
--- configure.orig	Sat Sep 30 23:16:14 2000
+++ configure	Thu Dec 21 00:49:23 2000
@@@@ -6020,7 +6020,7 @@@@
 	echo $ac_n "checking for Qt insanity""... $ac_c" 1>&6
 echo "configure:6022: checking for Qt insanity" >&5
d9 3
a11 2
-    QT_CFLAGS="-I${QTDIR}/include/qt"
+    QT_CFLAGS="-I${QTDIR}/include/X11/qt"
d15 1
a15 1
@@@@ -8052,6 +8052,9 @@@@
d25 1
a25 1
@@@@ -8702,8 +8705,6 @@@@
d34 1
a34 1
@@@@ -8737,7 +8738,7 @@@@
d43 8
@


1.4
log
@Upgrade to 0.7 and sync with www/mozilla

Submitted by:	ume
@
text
@d3 1
a3 1
@@@@ -5786,7 +5786,7 @@@@
d5 1
a5 1
 echo "configure:5788: checking for Qt insanity" >&5
d12 1
a12 1
@@@@ -7702,6 +7702,9 @@@@
d22 1
a22 1
@@@@ -8655,8 +8658,6 @@@@
d31 1
a31 1
@@@@ -8672,7 +8673,7 @@@@
d36 1
a36 1
+				_PTHREAD_LDFLAGS="-pthread -lgcc_r"
@


1.3
log
@Update to M15.
@
text
@d1 3
a3 3
--- configure.orig	Thu Apr 13 19:18:25 2000
+++ configure	Thu Apr 20 09:07:57 2000
@@@@ -5618,7 +5618,7 @@@@
d5 1
a5 1
 echo "configure:5620: checking for Qt insanity" >&5
d12 1
a12 2
@@@@ -7108,6 +7108,9 @@@@
 case "$target_os" in
d15 1
a15 1
+    ;;
d18 1
a18 1
     ;;
d21 19
@


1.2
log
@Update to M13.  Gentlemen, start your T1s.
@
text
@d1 3
a3 3
--- configure.orig	Tue Jan 18 04:16:15 2000
+++ configure	Fri Jan 28 23:28:19 2000
@@@@ -5403,7 +5403,7 @@@@
d5 1
a5 1
 echo "configure:5405: checking for Qt insanity" >&5
d12 9
a20 5
@@@@ -6683,6 +6683,7 @@@@
   echo "$ac_t""no" 1>&6
 fi
 
+CPPFLAGS="${CPPFLAGS} ${X_CFLAGS}"
a21 2
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
@


1.1
log
@Update to Milestone 10.

PR:		14272
Submitted by:	Mikhail Teterin <mi@@aldan.algebra.com>
@
text
@d1 6
a6 6
This patch is not neccessary, since the Qt support in Mozilla appears
broken anyway (Perhaps, it needs Qt-2?). But it should stir the
configure to the right direction...
--- configure.orig	Tue Sep 28 17:46:31 1999
+++ configure	Mon Oct 11 15:12:52 1999
@@@@ -5342 +5342 @@@@
d9 11
@

