From e0d90020266a8c58d0e8ae530e7b5d2cbf0bd518 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Wed, 24 Apr 2024 23:09:14 -0500 Subject: [PATCH] net/tinyfugue-unicode: Update port --- cdn/ports/net/tinyfugue-unicode/Makefile | 8 ++- cdn/ports/net/tinyfugue-unicode/distinfo | 6 +- .../tinyfugue-unicode/files/patch-modern-pcre | 61 ------------------- 3 files changed, 8 insertions(+), 67 deletions(-) delete mode 100644 cdn/ports/net/tinyfugue-unicode/files/patch-modern-pcre diff --git a/cdn/ports/net/tinyfugue-unicode/Makefile b/cdn/ports/net/tinyfugue-unicode/Makefile index d296c69..800213a 100644 --- a/cdn/ports/net/tinyfugue-unicode/Makefile +++ b/cdn/ports/net/tinyfugue-unicode/Makefile @@ -5,7 +5,7 @@ CATEGORIES= net games USE_GITHUB= yes GH_ACCOUNT= kruton GH_PROJECT= tinyfugue -GH_TAGNAME= fe8fa3242d1eabff56c3af584bc92d60a33ad583 +GH_TAGNAME= 9d18c6b4e3b7a4617f0328364e1472fecfbc6bb5 MAINTAINER= dinoex@FreeBSD.org COMMENT= Popular programmable MUD client, with macro support and more @@ -14,9 +14,10 @@ WWW= https://tinyfugue.sourceforge.net/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpcre.so:devel/pcre +LIB_DEPENDS= libpcre.so:devel/pcre \ + libicui18n.so:devel/icu -USES= ssl +USES= ssl gmake GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-manpage --enable-version --enable-symlink \ --datadir=${PREFIX}/lib --with-inclibpfx=${LOCALBASE} @@ -27,6 +28,7 @@ PLIST_SUB= DISTNAME=tf-50b8 post-patch: ${REINPLACE_CMD} 's:@.*dir@:$${DESTDIR}&:' ${WRKSRC}/unix/vars.mak.in ${REINPLACE_CMD} '/ln -s/s@(TF)@(TF:T)@' ${WRKSRC}/unix/unix.mak + ${REINPLACE_CMD} 's:$$(SYMLINK):$${DESTDIR}&:g' ${WRKSRC}/unix/unix.mak post-build: ${STRIP_CMD} ${WRKSRC}/src/tf diff --git a/cdn/ports/net/tinyfugue-unicode/distinfo b/cdn/ports/net/tinyfugue-unicode/distinfo index be2caf8..ac09b58 100644 --- a/cdn/ports/net/tinyfugue-unicode/distinfo +++ b/cdn/ports/net/tinyfugue-unicode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535995762 -SHA256 (kruton-tinyfugue-5.0b8-fe8fa3242d1eabff56c3af584bc92d60a33ad583_GH0.tar.gz) = a43854bcca66ebb32af54b2e11f5c8099510ac5edcd28652a7789b4762463ed5 -SIZE (kruton-tinyfugue-5.0b8-fe8fa3242d1eabff56c3af584bc92d60a33ad583_GH0.tar.gz) = 720803 +TIMESTAMP = 1662977540 +SHA256 (kruton-tinyfugue-5.0b8-9d18c6b4e3b7a4617f0328364e1472fecfbc6bb5_GH0.tar.gz) = 3adba0b078d105e618c49bb2059c22b6ad44b06224fbfe38e7ffe0aa5e2ea6d7 +SIZE (kruton-tinyfugue-5.0b8-9d18c6b4e3b7a4617f0328364e1472fecfbc6bb5_GH0.tar.gz) = 499307 diff --git a/cdn/ports/net/tinyfugue-unicode/files/patch-modern-pcre b/cdn/ports/net/tinyfugue-unicode/files/patch-modern-pcre deleted file mode 100644 index dbb257d..0000000 --- a/cdn/ports/net/tinyfugue-unicode/files/patch-modern-pcre +++ /dev/null @@ -1,61 +0,0 @@ -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 - -- 2.45.0