From 36353c589f868095c2c4e18fcdee86c8345cc2fc Mon Sep 17 00:00:00 2001
From: Michael Johnson <ahze@FreeBSD.org>
Date: Tue, 29 Nov 2005 21:12:28 +0000
Subject: - Update firefox to 1.5 - Add Makefile.common   o A new build/install
 system for gecko ports, Makefile.common     includes many generic routines
 and common tasks.   o Fix ld-run-path in all gecko's by using
 -Wl,-rpath,${moz_libdir}     thus removing the need to have a startup script
 for ports that     depend on gecko. [2]   o Use system libm, nss, nspr in all
 gecko ports

- Add bsd.gecko.mk
  o This is the predecessor to WITH_MOZILLA=[mozilla|firefox|...]
    with a more robust way of detecting a gecko a end user wishs to
    use.
  o bsd.gecko.mk abstracts the selection of gecko-based backends. It
    allows users and porters to support any available gecko backend
    without needing to build many conditional tests. ${USE_GECKO} is the
    list of backends that your port can handle, and ${GECKO} is set by
    bsd.gecko.mk to be the chosen backend. Users set ${WITH_GECKO} to the
    list of gecko backends they want on their system.

  Port Makefile example:

  USE_GECKO=firefox mozilla seamonkey thunderbird
  .include <bsd.port.pre.mk>
  .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"

  End user example:
  WITH_GECKO=seamonkey firefox

  We highly recommend moving away from using WITH_MOZILLA and switching to
  USE/WITH_GECKO.

PR:		89052 [2]
Submitted by:	vs [2]
Obtained from:	www/firefox
Thanks to:	adamw, marcus, and mezz for ideas, bug squashing, and more
		sajd from irc.freenode.org/#FreeBSD-Gnome for
		 pointing out many bugs
---
 www/flock/files/patch-configure | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'www/flock/files/patch-configure')

diff --git a/www/flock/files/patch-configure b/www/flock/files/patch-configure
index 9e60372adb33..923cf5065f18 100644
--- a/www/flock/files/patch-configure
+++ b/www/flock/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
-- 
cgit v1.2.3