[84236] trunk/dports/devel/pcre

[jmr at macports.org]

Revision: 84236
          http://trac.macports.org/changeset/84236
Author:   jmr at macports.org
Date:     2011-09-21 01:47:36 -0700 (Wed, 21 Sep 2011)
Log Message:
-----------
pcre: use libedit instead of readline

Modified Paths:
--------------
    trunk/dports/devel/pcre/Portfile

Added Paths:
-----------
    trunk/dports/devel/pcre/files/
    trunk/dports/devel/pcre/files/configure.patch
    trunk/dports/devel/pcre/files/pcretest.c.patch

Modified: trunk/dports/devel/pcre/Portfile
===================================================================
--- trunk/dports/devel/pcre/Portfile	2011-09-21 07:49:14 UTC (rev 84235)
+++ trunk/dports/devel/pcre/Portfile	2011-09-21 08:47:36 UTC (rev 84236)
@@ -5,6 +5,7 @@
 
 name            pcre
 version         8.12
+revision        1
 categories      devel
 license         BSD
 platforms       darwin freebsd
@@ -29,11 +30,13 @@
                     sha1    2219b372bff53ee29a7e44ecf5977ad15df01cea \
                     rmd160  ec7978604cdf92d8dbd98e0d0c360fe35eb62021
 
-depends_lib     port:readline \
+depends_lib     port:libedit \
                 port:zlib \
                 port:bzip2
 
-configure.args  --docdir=${prefix}/share/doc/${name}-${version} \
+patchfiles      configure.patch pcretest.c.patch
+
+configure.args  --docdir=${prefix}/share/doc/${name} \
                 --enable-unicode-properties \
                 --enable-pcretest-libreadline \
                 --enable-pcregrep-libz \

Added: trunk/dports/devel/pcre/files/configure.patch
===================================================================
--- trunk/dports/devel/pcre/files/configure.patch	                        (rev 0)
+++ trunk/dports/devel/pcre/files/configure.patch	2011-09-21 08:47:36 UTC (rev 84236)
@@ -0,0 +1,69 @@
+--- configure.orig	2011-01-15 22:27:58.000000000 +1100
++++ configure	2011-09-21 18:33:45.000000000 +1000
+@@ -15635,37 +15635,13 @@
+ 
+ # Check for the availabiity of libreadline
+ 
+-for ac_header in readline/readline.h
+-do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
+-if test "x$ac_cv_header_readline_readline_h" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_READLINE_READLINE_H 1
+-_ACEOF
+- HAVE_READLINE_H=1
+-fi
+-
+-done
+-
+-for ac_header in readline/history.h
+-do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
+-if test "x$ac_cv_header_readline_history_h" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_READLINE_HISTORY_H 1
+-_ACEOF
+- HAVE_HISTORY_H=1
+-fi
+-
+-done
+-
+-{ $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 test "${ac_cv_lib_readline_readline+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lreadline  $LIBS"
++LIBS="-ledit  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -15868,15 +15844,7 @@
+ # Similarly for --enable-pcretest-readline
+ 
+ if test "$enable_pcretest_libreadline" = "yes"; then
+-  if test "$HAVE_READLINE_H" != "1"; then
+-    echo "** Cannot --enable-pcretest-readline because readline/readline.h was not found."
+-    exit 1
+-  fi
+-  if test "$HAVE_HISTORY_H" != "1"; then
+-    echo "** Cannot --enable-pcretest-readline because readline/history.h was not found."
+-    exit 1
+-  fi
+-  LIBREADLINE="-lreadline"
++  LIBREADLINE="-ledit"
+ fi
+ 
+ 
+@@ -18564,7 +18532,7 @@
+     Build static libs ............... : ${enable_static}
+     Link pcregrep with libz ......... : ${enable_pcregrep_libz}
+     Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}
+-    Link pcretest with libreadline .. : ${enable_pcretest_libreadline}
++    Link pcretest with libedit ...... : ${enable_pcretest_libreadline}
+ 
+ EOF
+ 

Added: trunk/dports/devel/pcre/files/pcretest.c.patch
===================================================================
--- trunk/dports/devel/pcre/files/pcretest.c.patch	                        (rev 0)
+++ trunk/dports/devel/pcre/files/pcretest.c.patch	2011-09-21 08:47:36 UTC (rev 84236)
@@ -0,0 +1,12 @@
+--- pcretest.c.orig	2010-11-26 22:11:25.000000000 +1100
++++ pcretest.c	2011-09-21 18:27:20.000000000 +1000
+@@ -52,8 +52,7 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
+-#include <readline/readline.h>
+-#include <readline/history.h>
++#include <editline/readline.h>
+ #endif
+ 
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110921/21f6cfbf/attachment.html>