From owner-svn-ports-all@freebsd.org Wed Oct 21 10:44:00 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 843EFA1A973; Wed, 21 Oct 2015 10:44:00 +0000 (UTC) (envelope-from johans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5BB5C114C; Wed, 21 Oct 2015 10:44:00 +0000 (UTC) (envelope-from johans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9LAhxrt025382; Wed, 21 Oct 2015 10:43:59 GMT (envelope-from johans@FreeBSD.org) Received: (from johans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9LAhxWJ025380; Wed, 21 Oct 2015 10:43:59 GMT (envelope-from johans@FreeBSD.org) Message-Id: <201510211043.t9LAhxWJ025380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: johans set sender to johans@FreeBSD.org using -f From: Johan van Selst Date: Wed, 21 Oct 2015 10:43:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399900 - in head/net/tinyfugue: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Oct 2015 10:44:00 -0000 Author: johans Date: Wed Oct 21 10:43:59 2015 New Revision: 399900 URL: https://svnweb.freebsd.org/changeset/ports/399900 Log: Use modern pcre library from ports, to avoid bugs in ancient bundled version Submitted by: Jonathan Myers Obtained from: http://sourceforge.net/p/tinyfugue/bugs-and-support/29/ Added: head/net/tinyfugue/files/ head/net/tinyfugue/files/patch-modern-pcre (contents, props changed) Modified: head/net/tinyfugue/Makefile Modified: head/net/tinyfugue/Makefile ============================================================================== --- head/net/tinyfugue/Makefile Wed Oct 21 10:36:49 2015 (r399899) +++ head/net/tinyfugue/Makefile Wed Oct 21 10:43:59 2015 (r399900) @@ -3,18 +3,21 @@ PORTNAME= tf PORTVERSION= 5.0b8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net games MASTER_SITES= SF/tinyfugue/tinyfugue/5.0%20beta%208 -DISTVERSION= ${PORTVERSION:S/.//} -DISTNAME= ${PORTNAME}-${DISTVERSION} +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//} MAINTAINER= johans@FreeBSD.org COMMENT= Popular programmable MUD client, with macro support and more +LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre + GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-manpage --enable-version --enable-symlink --datadir=${PREFIX}/lib +CONFIGURE_ARGS= --enable-manpage --enable-version --enable-symlink \ + --datadir=${PREFIX}/lib --with-inclibpfx=${LOCALBASE} USE_OPENSSL= yes +LDFLAGS+= -L${LOCALBASE} PLIST_SUB= DISTNAME=${DISTNAME} @@ -22,4 +25,7 @@ post-patch: @${REINPLACE_CMD} 's:@.*dir@:$${DESTDIR}&:' ${WRKSRC}/unix/vars.mak.in @${REINPLACE_CMD} '/ln -s/s@(TF)@(TF:T)@' ${WRKSRC}/unix/unix.mak +post-build: + @${STRIP_CMD} ${WRKSRC}/src/tf + .include Added: head/net/tinyfugue/files/patch-modern-pcre ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/tinyfugue/files/patch-modern-pcre Wed Oct 21 10:43:59 2015 (r399900) @@ -0,0 +1,61 @@ +From f61b5859d69c2d99264182f60f5ae1e430812b59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0abata?= +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 +--- + 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 ++++ 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 ++++ 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 ++++ src/pattern.h +@@ -10,7 +10,7 @@ + #ifndef PATTERN_H + #define PATTERN_H + +-#include "pcre-2.08/pcre.h" ++#include + + typedef struct RegInfo { + pcre *re; +-- +1.7.7.6 +