diff options
| author | Beat Gaetzi <beat@FreeBSD.org> | 2010-08-08 08:56:06 +0000 |
|---|---|---|
| committer | Beat Gaetzi <beat@FreeBSD.org> | 2010-08-08 08:56:06 +0000 |
| commit | ab0a516e661ae48fb407ef8b80022d443cf346c6 (patch) | |
| tree | 5e64dfeb065ed4bdd55d8630ac90a8b36370a169 /www/libxul/files/patch-configure | |
| parent | - Add DIST_SUBDIR for Haskell Cabal ports (with default of "cabal") (diff) | |
- Update to 1.9.2.8
PR: ports/149044
Expr-run by: pav@
Thanks to: Andreas Tobler <andreast-list AT fgznet.ch>, decke@
Notes
Notes:
svn path=/head/; revision=258911
Diffstat (limited to '')
| -rw-r--r-- | www/libxul/files/patch-configure | 38 | ||||
| -rw-r--r-- | www/libxul/files/patch-configure.in | 22 |
2 files changed, 22 insertions, 38 deletions
diff --git a/www/libxul/files/patch-configure b/www/libxul/files/patch-configure deleted file mode 100644 index 768a178142d2..000000000000 --- a/www/libxul/files/patch-configure +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.orig 2008-05-28 11:31:02.000000000 -0700 -+++ configure 2008-07-26 07:27:03.712894513 -0700 -@@ -10808,7 +10808,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 10814 "configure" - #include "confdefs.h" -@@ -10839,7 +10839,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10849,7 +10849,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 10855 "configure" - #include "confdefs.h" -@@ -10880,7 +10880,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/www/libxul/files/patch-configure.in b/www/libxul/files/patch-configure.in new file mode 100644 index 000000000000..aab5aa4ba2df --- /dev/null +++ b/www/libxul/files/patch-configure.in @@ -0,0 +1,22 @@ +--- configure.in.orig 2009-10-29 23:11:31.000000000 +0100 ++++ configure.in 2009-11-16 19:51:19.000000000 +0100 +@@ -1352,7 +1352,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -3582,8 +3582,8 @@ + *) + + AC_CHECK_LIB(c, iconv, [_ICONV_LIBS="$_ICONV_LIBS"], +- AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"], +- AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"]))) ++ AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"], ++ AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"]))) + _SAVE_LIBS=$LIBS + LIBS="$LIBS $_ICONV_LIBS" + AC_CACHE_CHECK( |