diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /games-mud/tf | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'games-mud/tf')
-rw-r--r-- | games-mud/tf/Manifest | 8 | ||||
-rw-r--r-- | games-mud/tf/files/tf-50_beta8-pcre.patch | 61 | ||||
-rw-r--r-- | games-mud/tf/files/tf-50_beta8-stdarg.patch | 30 | ||||
-rw-r--r-- | games-mud/tf/metadata.xml | 16 | ||||
-rw-r--r-- | games-mud/tf/tf-50_beta8-r2.ebuild | 70 |
5 files changed, 185 insertions, 0 deletions
diff --git a/games-mud/tf/Manifest b/games-mud/tf/Manifest new file mode 100644 index 000000000000..1d1977656ea7 --- /dev/null +++ b/games-mud/tf/Manifest @@ -0,0 +1,8 @@ +AUX tf-50_beta8-pcre.patch 1917 BLAKE2B 547218b46b5c6cb4c8991e98cbac6871f90d4f8440ff52140b86b311f10d8f0b6aa5a4dfb1e1ba27baf0016fb476c57d4302a26edd7e8fb17b5c6b42acb0e5dd SHA512 942574f4a24f5c2660124caf6cc41438e42fb20b5d1781c60341da96ace2338a3b69a744454e5c2319d83d83a8de21af26029ec6f328a50facbc56db7091c092 +AUX tf-50_beta8-stdarg.patch 1074 BLAKE2B b1a40c283919ee717181bd9851563c8fa8b972fb041b172a9b3851188f8bd60914926c19cbd3d32823339d3a47b64b004589a157bc7ff7cfde94e166d452c50d SHA512 ad8e051cf1fbfd6bc5e038a6ac252c1e61619dd96b5d0f72d25af7fba1754dd1c5d6b1557611b3ea322b030be1db89b2b3740e9137ab3fe6135bd5ce0d4e62b7 +DIST tf-50b8-help.tar.gz 175591 BLAKE2B b4b5d2be336206fa00db870367369454d33a7e32c0aed83a3eed107feba9a5737ad6c7963b8c570cede6e3de80b211edb4ed6dd818b4ca90e23e8bab99a92725 SHA512 fd0fcf7e96772cbb61a97d24d0327c45b31b280bca329dfe6c680137cc25b7db5b4b79c0f608ad213cd24a0f2a67ee471ce7ee1c405b039f52033d7d87974b74 +DIST tf-50b8.tar.gz 719553 BLAKE2B 3218878cdc4a2049fd7f2a8e0426ec589bf304e0bb24ad557e5bea39cbaba76e6a1c52f064860e499623abb51bc9f14a0c8388b927fd15a66a7945fe5eaccf84 SHA512 3b99c039d7a9c6ab7ee7b1040ff7c99fe39cbe991f373333ea7c130d54383f102f14ae33303a415f5419cd43238caffc46114e842c6964329c0999e0f506e3d0 +DIST tf-allrootpatch.txt 3349 BLAKE2B ca57b7ddfdbaa377c69ad07427185a3952368d35231f4bca77c78a5ed7b5c1c362f4ef1512e23c248b96810739056e8f53c4d41320a1c1dc320b1fd22d965199 SHA512 3fe44e7291d133abd04040f0f8258da6a2b7f67cab79cb1628897a4a483a0998495b6cf97eaf29ee447a650fdb16a48c846599807e570f687a256bb58179495e +DIST tf-allsrcpatch.txt 10392 BLAKE2B 9a24f99d6bdaa835b4cc2588d87824ea07a12fee38d576ec63f48493f5b92c7155ad959fa80599edf28a39f76d85ba8a2a19e1ff2b03c7893fe4d7b4b7d9af97 SHA512 3ac2447e05911d156509bb44e8809c06c4b1a92cbc8067d196c7e5f688fccd5186a9073001958ca0e757c9db20e9f96889fe7a5b6255495539f23208f72ec613 +EBUILD tf-50_beta8-r2.ebuild 1720 BLAKE2B ab5afd5b09818b93cffbc72d1746e4df0652db2ea3f8186123825d99992667ee2c37555388a790959fc832cc9e5d2f6a327064c76f47a664463f84390f7ec898 SHA512 44892161b87ef2eb53d26d54dacce3652ce85317ae2913479b97cf05f62dec44acd4e12a635103edb2e593fa5faf6939345fc8359e25d2d8882f444d105f105d +MISC metadata.xml 527 BLAKE2B c02bbc61246899c14aef26cf8533fa21b350ee978514bbdfe286e8130a4823f57dbfe468bca4badcce9bf2fa867bb56d1d162ddad6685df5e56f09e66fec5db5 SHA512 6449cb8a605dad5d0c5f2f825e38a4f972b61be1033087cc906d293a10129d88a803d9f5755b413df8f700aad3eb50eacc668d508365090ca5d01c61d884d833 diff --git a/games-mud/tf/files/tf-50_beta8-pcre.patch b/games-mud/tf/files/tf-50_beta8-pcre.patch new file mode 100644 index 000000000000..4ff5e44db91b --- /dev/null +++ b/games-mud/tf/files/tf-50_beta8-pcre.patch @@ -0,0 +1,61 @@ +From f61b5859d69c2d99264182f60f5ae1e430812b59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@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@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 +--- a/src/macro.c ++++ b/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 +--- a/src/pattern.c ++++ b/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 +--- a/src/pattern.h ++++ b/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 + diff --git a/games-mud/tf/files/tf-50_beta8-stdarg.patch b/games-mud/tf/files/tf-50_beta8-stdarg.patch new file mode 100644 index 000000000000..a34b70abe1fd --- /dev/null +++ b/games-mud/tf/files/tf-50_beta8-stdarg.patch @@ -0,0 +1,30 @@ +diff -U5 -r a/src/tfio.c b/src/tfio.c +--- a/src/tfio.c 2007-01-13 18:12:39.000000000 -0500 ++++ b/src/tfio.c 2007-02-02 16:50:12.000000000 -0500 +@@ -495,10 +495,11 @@ + const char *q, *sval; + char *specptr, quote; + const conString *Sval; + int len, min, max, leftjust, stars; + attr_t attrs = buf->attrs; ++ va_list aq; + + if (!(flags & SP_APPEND) && buf->data) Stringtrunc(buf, 0); + while (*fmt) { + if (*fmt != '%' || *++fmt == '%') { + for (q = fmt + 1; *q && *q != '%'; q++); +@@ -520,11 +521,13 @@ + switch (*fmt) { + case 'd': case 'i': + case 'x': case 'X': case 'u': case 'o': + case 'f': case 'e': case 'E': case 'g': case 'G': + case 'p': +- vsprintf(tempbuf, spec, ap); ++ va_copy(aq, ap); ++ vsprintf(tempbuf, spec, aq); ++ va_end(aq); + Stringcat(buf, tempbuf); + /* eat the arguments used by vsprintf() */ + while (stars--) (void)va_arg(ap, int); + switch (*fmt) { + case 'd': case 'i': diff --git a/games-mud/tf/metadata.xml b/games-mud/tf/metadata.xml new file mode 100644 index 000000000000..f351406f3216 --- /dev/null +++ b/games-mud/tf/metadata.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>games@gentoo.org</email> + <name>Gentoo Games Project</name> + </maintainer> + <use> + <flag name="atcp">enable ATCP support.</flag> + <flag name="gmcp">enable GMCP support.</flag> + <flag name="option102">enable telnet option 102 support.</flag> + </use> + <upstream> + <remote-id type="sourceforge">tinyfugue</remote-id> + </upstream> +</pkgmetadata> diff --git a/games-mud/tf/tf-50_beta8-r2.ebuild b/games-mud/tf/tf-50_beta8-r2.ebuild new file mode 100644 index 000000000000..1009fb07dc03 --- /dev/null +++ b/games-mud/tf/tf-50_beta8-r2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_P="${P/_beta/b}" + +DESCRIPTION="A small, flexible, screen-oriented MUD client (aka TinyFugue)" +HOMEPAGE="http://tinyfugue.sourceforge.net/" +SRC_URI=" + mirror://sourceforge/tinyfugue/${MY_P}.tar.gz + http://homepage.mac.com/mikeride/abelinc/scripts/allrootpatch.txt -> tf-allrootpatch.txt + http://homepage.mac.com/mikeride/abelinc/scripts/allsrcpatch.txt -> tf-allsrcpatch.txt + doc? ( mirror://sourceforge/tinyfugue/${MY_P}-help.tar.gz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+atcp debug doc +gmcp ipv6 +option102 ssl" + +RDEPEND=" + ssl? ( dev-libs/openssl:0= ) + dev-libs/libpcre" +DEPEND=${RDEPEND} + +S=${WORKDIR}/${MY_P} + +PATCHES=( + "${DISTDIR}"/tf-allrootpatch.txt + "${DISTDIR}"/tf-allsrcpatch.txt + "${FILESDIR}"/${P}-pcre.patch + "${FILESDIR}"/${P}-stdarg.patch +) + +src_configure() { + STRIP=: econf \ + $(use_enable atcp) \ + $(use_enable gmcp) \ + $(use_enable option102) \ + $(use_enable ssl) \ + $(use_enable debug core) \ + $(use_enable ipv6 inet6) \ + --enable-manpage +} + +src_install() { + dobin src/tf + newman src/tf.1.nroffman tf.1 + + use doc && HTML_DOCS=( ../${MY_P}-help/{*.html,commands,topics} ) + einstalldocs + + insinto /usr/share/${PN}-lib + # the application looks for this file here if /changes is called. + # see comments on bug #23274 + doins CHANGES + insopts -m0755 + doins -r tf-lib/. +} + +pkg_postinst() { + if use ipv6; then + ewarn + ewarn "You have merged TinyFugue with IPv6-support." + ewarn "Support for IPv6 is still being experimental." + ewarn "If you experience problems with connecting to hosts," + ewarn "try re-merging this package with USE="-ipv6"" + ewarn + fi +} |