[92918] trunk/dports/net/tf

[ryandesign at macports.org]

Revision: 92918
          https://trac.macports.org/changeset/92918
Author:   ryandesign at macports.org
Date:     2012-05-10 13:16:00 -0700 (Thu, 10 May 2012)
Log Message:
-----------
tf: fix build with pcre 8.30; see http://sourceforge.net/tracker/?func=detail&aid=3486514&group_id=186112&atid=915972

Modified Paths:
--------------
    trunk/dports/net/tf/Portfile

Added Paths:
-----------
    trunk/dports/net/tf/files/tf-508b-Fix-build-with-PCRE-8.30.patch

Modified: trunk/dports/net/tf/Portfile
===================================================================
--- trunk/dports/net/tf/Portfile	2012-05-10 18:47:50 UTC (rev 92917)
+++ trunk/dports/net/tf/Portfile	2012-05-10 20:16:00 UTC (rev 92918)
@@ -27,7 +27,8 @@
                 --disable-ssl
 
 patchfiles      patch-src-malloc.c.diff patch-src__signals.c \
-                patch-src__socket.c amd64_vSprintf_fix.patch
+                patch-src__socket.c amd64_vSprintf_fix.patch \
+                tf-508b-Fix-build-with-PCRE-8.30.patch
 
 post-configure {
     system "ed - ${worksrcpath}/src/tfconfig.h < ${filespath}/tfconfig.h.ed"

Added: trunk/dports/net/tf/files/tf-508b-Fix-build-with-PCRE-8.30.patch
===================================================================
--- trunk/dports/net/tf/files/tf-508b-Fix-build-with-PCRE-8.30.patch	                        (rev 0)
+++ trunk/dports/net/tf/files/tf-508b-Fix-build-with-PCRE-8.30.patch	2012-05-10 20:16:00 UTC (rev 92918)
@@ -0,0 +1,61 @@
+From f61b5859d69c2d99264182f60f5ae1e430812b59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk at redhat.com>
+Date: Fri, 10 Feb 2012 13:55:46 +0100
+Subject: [PATCH] Fix build with PCRE-8.30+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch fixes build with the latest PCRE release which removes some
+obsolete code tinyfugue still uses, namely pcre_info().
+
+Signed-off-by: Petr Šabata <contyk at redhat.com>
+---
+ src/macro.c   |    3 ++-
+ src/pattern.c |    2 +-
+ src/pattern.h |    2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/macro.c b/src/macro.c
+index ac28fc9..b492717 100644
+--- src/macro.c.orig
++++ src/macro.c
+@@ -893,7 +893,8 @@ static int complete_macro(Macro *spec, unsigned int hash, int num,
+     }
+     spec->attr &= ~F_NONE;
+     if (spec->nsubattr) {
+-	int n = pcre_info(spec->trig.ri->re, NULL, NULL);
++	int n;
++	pcre_fullinfo(spec->trig.ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+ 	for (i = 0; i < spec->nsubattr; i++) {
+ 	    spec->subattr[i].attr &= ~F_NONE;
+ 	    if (spec->subattr[i].subexp > n) {
+diff --git a/src/pattern.c b/src/pattern.c
+index 047a44a..a7228ff 100644
+--- src/pattern.c.orig
++++ src/pattern.c
+@@ -151,7 +151,7 @@ static RegInfo *tf_reg_compile_fl(const char *pattern, int optimize,
+ 	    emsg ? emsg : "unknown error");
+ 	goto tf_reg_compile_error;
+     }
+-    n = pcre_info(ri->re, NULL, NULL);
++    pcre_fullinfo(ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+     if (n < 0) goto tf_reg_compile_error;
+     ri->ovecsize = 3 * (n + 1);
+     ri->ovector = dmalloc(NULL, sizeof(int) * ri->ovecsize, file, line);
+diff --git a/src/pattern.h b/src/pattern.h
+index 1eec0f9..cbe9af9 100644
+--- src/pattern.h.orig
++++ src/pattern.h
+@@ -10,7 +10,7 @@
+ #ifndef PATTERN_H
+ #define PATTERN_H
+ 
+-#include "pcre-2.08/pcre.h"
++#include <pcre.h>
+ 
+ typedef struct RegInfo {
+     pcre *re;
+-- 
+1.7.7.6
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120510/2646862b/attachment.html>