From 1d30d4c11ad7a5946008431619f6e238bebeaa6a Mon Sep 17 00:00:00 2001
From: Jeremy Messenger <mezz@FreeBSD.org>
Date: Sun, 1 Jun 2008 17:22:03 +0000
Subject: Update to 1.1.1 that can build with GCC 4.2.x.

---
 www/flock/files/patch-configure | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

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

diff --git a/www/flock/files/patch-configure b/www/flock/files/patch-configure
index 923cf5065f18..c32334efc048 100644
--- a/www/flock/files/patch-configure
+++ b/www/flock/files/patch-configure
@@ -1,15 +1,24 @@
---- configure.orig	Tue Oct  4 02:01:48 2005
-+++ configure	Wed Nov 23 11:07:17 2005
-@@ -10016,7 +10016,7 @@
+--- configure.orig	2008-04-23 11:21:20.000000000 -0500
++++ configure	2008-04-23 11:24:50.000000000 -0500
+@@ -1057,7 +1057,7 @@
+ 
+ MOZJPEG=62
+ MOZPNG=10217
+-MOZZLIB=1.2.3
++MOZZLIB=1.2.2
+ NSPR_VERSION=4
+ NSS_VERSION=3
+ 
+@@ -10353,7 +10353,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-liconv  $LIBS"
-+LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
++LIBS=-L$LOCALBASE/lib "-liconv  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 10022 "configure"
+ #line 10359 "configure"
  #include "confdefs.h"
-@@ -10047,7 +10047,7 @@
+@@ -10384,7 +10384,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -18,16 +27,16 @@
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
-@@ -10057,7 +10057,7 @@
+@@ -10394,7 +10394,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 10063 "configure"
+ #line 10400 "configure"
  #include "confdefs.h"
-@@ -10088,7 +10088,7 @@
+@@ -10425,7 +10425,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
-- 
cgit v1.2.3