[93763] trunk/dports/devel/pcre

[ryandesign at macports.org]

Revision: 93763
          https://trac.macports.org/changeset/93763
Author:   ryandesign at macports.org
Date:     2012-05-30 02:43:12 -0700 (Wed, 30 May 2012)
Log Message:
-----------
pcre: ensure readline does not get used instead of libedit (#34670)

Modified Paths:
--------------
    trunk/dports/devel/pcre/Portfile
    trunk/dports/devel/pcre/files/configure.patch

Modified: trunk/dports/devel/pcre/Portfile
===================================================================
--- trunk/dports/devel/pcre/Portfile	2012-05-30 09:30:06 UTC (rev 93762)
+++ trunk/dports/devel/pcre/Portfile	2012-05-30 09:43:12 UTC (rev 93763)
@@ -5,6 +5,7 @@
 
 name            pcre
 version         8.30
+revision        1
 categories      devel
 license         BSD
 platforms       darwin freebsd

Modified: trunk/dports/devel/pcre/files/configure.patch
===================================================================
--- trunk/dports/devel/pcre/files/configure.patch	2012-05-30 09:30:06 UTC (rev 93762)
+++ trunk/dports/devel/pcre/files/configure.patch	2012-05-30 09:43:12 UTC (rev 93763)
@@ -1,5 +1,5 @@
 --- configure.orig	2012-02-04 06:55:43.000000000 -0600
-+++ configure	2012-05-08 17:05:19.000000000 -0500
++++ configure	2012-05-30 04:40:09.000000000 -0500
 @@ -16647,37 +16647,13 @@
  
  # Check for the availabiity of libreadline
@@ -41,6 +41,108 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
+@@ -16708,16 +16684,16 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
+ $as_echo "$ac_cv_lib_readline_readline" >&6; }
+ if test "x$ac_cv_lib_readline_readline" = xyes; then :
+-  LIBREADLINE="-lreadline"
++  LIBREADLINE="-ledit"
+ else
+   unset ac_cv_lib_readline_readline;
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+-$as_echo_n "checking for readline in -lreadline... " >&6; }
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
++$as_echo_n "checking for readline in -ledit... " >&6; }
+ if ${ac_cv_lib_readline_readline+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline -ltinfo $LIBS"
++LIBS="-ledit -ltinfo $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16751,13 +16727,13 @@
+   LIBREADLINE="-ltinfo"
+ else
+   unset ac_cv_lib_readline_readline;
+-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+-$as_echo_n "checking for readline in -lreadline... " >&6; }
++     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
++$as_echo_n "checking for readline in -ledit... " >&6; }
+ if ${ac_cv_lib_readline_readline+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline -lcurses $LIBS"
++LIBS="-ledit -lcurses $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16791,13 +16767,13 @@
+   LIBREADLINE="-lcurses"
+ else
+   unset ac_cv_lib_readline_readline;
+-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+-$as_echo_n "checking for readline in -lreadline... " >&6; }
++       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
++$as_echo_n "checking for readline in -ledit... " >&6; }
+ if ${ac_cv_lib_readline_readline+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline -lncurses $LIBS"
++LIBS="-ledit -lncurses $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16831,13 +16807,13 @@
+   LIBREADLINE="-lncurses"
+ else
+   unset ac_cv_lib_readline_readline;
+-	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+-$as_echo_n "checking for readline in -lreadline... " >&6; }
++	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
++$as_echo_n "checking for readline in -ledit... " >&6; }
+ if ${ac_cv_lib_readline_readline+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline -lncursesw $LIBS"
++LIBS="-ledit -lncursesw $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16871,13 +16847,13 @@
+   LIBREADLINE="-lncursesw"
+ else
+   unset ac_cv_lib_readline_readline;
+-	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+-$as_echo_n "checking for readline in -lreadline... " >&6; }
++	   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
++$as_echo_n "checking for readline in -ledit... " >&6; }
+ if ${ac_cv_lib_readline_readline+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline -ltermcap $LIBS"
++LIBS="-ledit -ltermcap $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16925,9 +16901,9 @@
+ 
+ 
+ if test -n "$LIBREADLINE"; then
+-  if test "$LIBREADLINE" != "-lreadline"; then
+-    echo "-lreadline needs $LIBREADLINE"
+-    LIBREADLINE="-lreadline $LIBREADLINE"
++  if test "$LIBREADLINE" != "-ledit"; then
++    echo "-ledit needs $LIBREADLINE"
++    LIBREADLINE="-ledit $LIBREADLINE"
+   fi
+ fi
+ 
 @@ -17140,14 +17116,6 @@
  # Similarly for --enable-pcretest-readline
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120530/9cfaffab/attachment.html>