svn commit: r543247 - in head/games/powwow: . files
Kurt Jaeger
pi at FreeBSD.org
Fri Jul 24 15:17:02 UTC 2020
Author: pi
Date: Fri Jul 24 15:17:00 2020
New Revision: 543247
URL: https://svnweb.freebsd.org/changeset/ports/543247
Log:
games/powwow: update 1.2.17 -> 1.2.22
PR: 247902
Submitted by: Juraj Lutter <juraj at lutter.sk> (maintainer)
Relnotes: https://www.hoopajoo.net/projects/powwow.html
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=247902#c0
Added:
head/games/powwow/files/patch-src_follow.c (contents, props changed)
head/games/powwow/files/patch-src_ptr.c (contents, props changed)
head/games/powwow/files/patch-src_ptr.h (contents, props changed)
head/games/powwow/files/patch-src_tty.c (contents, props changed)
head/games/powwow/files/patch-src_utils.c (contents, props changed)
Deleted:
head/games/powwow/files/patch-follow.c
head/games/powwow/files/patch-ptr.c
head/games/powwow/files/patch-ptr.h
head/games/powwow/files/patch-tty.c
Modified:
head/games/powwow/Makefile
head/games/powwow/distinfo
head/games/powwow/pkg-plist
Modified: head/games/powwow/Makefile
==============================================================================
--- head/games/powwow/Makefile Fri Jul 24 15:04:40 2020 (r543246)
+++ head/games/powwow/Makefile Fri Jul 24 15:17:00 2020 (r543247)
@@ -2,32 +2,35 @@
# $FreeBSD$
PORTNAME= powwow
-PORTVERSION= 1.2.17
-PORTREVISION= 1
+PORTVERSION= 1.2.22
CATEGORIES= games
-MASTER_SITES= http://hoopajoo.net/static/projects/ \
- ftp://ftp.wilbury.sk/pub/FreeBSD/local/distfiles/
+MASTER_SITES= https://hoopajoo.net/static/projects/ \
+ https://ftp.sk.FreeBSD.org/pub/FreeBSD/local/distfiles/
MAINTAINER= juraj at lutter.sk
COMMENT= Client to play MUDs
-USES= ncurses
+LICENSE= GPLv2
+
+USES= gmake ncurses
GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-bsd
-pre-build:
- @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/defines.h \
- ${WRKSRC}/list.c ${WRKSRC}/main.c ${WRKSRC}/cmd2.c ${WRKSRC}/beam.c
- @${REINPLACE_CMD} -e 's|^DEFS = |DEFS = -DPOSIX |' ${WRKSRC}/Makefile
+OPTIONS_DEFINE= DOCS
+OPTIONS_SUB= 1
+.include <bsd.port.options.mk>
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/powwow ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/powwow-movieplay ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/powwow-muc ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/catrw ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/follow ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/powwow.6 ${STAGEDIR}${PREFIX}/man/man6
- @${MKDIR} ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/powwow.doc ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/powwow.help ${STAGEDIR}${DATADIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/powwow ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/powwow-movieplay ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/powwow-muc ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/catrw ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/follow ${STAGEDIR}${PREFIX}/bin
+ ${MKDIR} ${STAGEDIR}${MAN6PREFIX}/man/man6
+ ${INSTALL_MAN} ${WRKSRC}/man/powwow.6 ${STAGEDIR}${MAN6PREFIX}/man/man6
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/powwow.doc ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/powwow.help ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
Modified: head/games/powwow/distinfo
==============================================================================
--- head/games/powwow/distinfo Fri Jul 24 15:04:40 2020 (r543246)
+++ head/games/powwow/distinfo Fri Jul 24 15:17:00 2020 (r543247)
@@ -1,2 +1,3 @@
-SHA256 (powwow-1.2.17.tar.gz) = e8dee1fe9cd6b59cfa20e3e7ef4eb49775b72b80d1d298e23172337cbc78baf6
-SIZE (powwow-1.2.17.tar.gz) = 308660
+TIMESTAMP = 1594413553
+SHA256 (powwow-1.2.22.tar.gz) = 77b1158a26a907a5f7c07c619605c99c572a3c46ba46d3d26a1bbdfed10a218a
+SIZE (powwow-1.2.22.tar.gz) = 339521
Added: head/games/powwow/files/patch-src_follow.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/powwow/files/patch-src_follow.c Fri Jul 24 15:17:00 2020 (r543247)
@@ -0,0 +1,13 @@
+--- src/follow.c.orig 2020-07-10 21:06:39 UTC
++++ src/follow.c
+@@ -8,6 +8,10 @@
+ *
+ */
+
++#ifdef BSD_LIKE
++#define COMPAT_43TTY
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
Added: head/games/powwow/files/patch-src_ptr.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/powwow/files/patch-src_ptr.c Fri Jul 24 15:17:00 2020 (r543247)
@@ -0,0 +1,29 @@
+--- src/ptr.c.orig 2020-07-01 02:48:35 UTC
++++ src/ptr.c
+@@ -10,6 +10,10 @@
+ *
+ */
+
++#ifdef BSD_LIKE
++#define __BSD_VISIBLE 1
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -415,6 +419,7 @@ char *ptrchr(ptr p, char c)
+ return (char*)p; /* shortcut for NULL */
+ }
+
++#ifdef _GNU_SOURCE
+ /*
+ * find last occurrence of c in p
+ * return NULL if none found.
+@@ -435,6 +440,7 @@ char *memrchr(char *p, int lenp, char c)
+ else
+ return NULL;
+ }
++#endif
+
+ char *ptrrchr(ptr p, char c)
+ {
Added: head/games/powwow/files/patch-src_ptr.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/powwow/files/patch-src_ptr.h Fri Jul 24 15:17:00 2020 (r543247)
@@ -0,0 +1,16 @@
+--- src/ptr.h.orig 2020-07-10 20:58:54 UTC
++++ src/ptr.h
+@@ -64,12 +64,12 @@ char *memchrs(char *p, int lenp, char *q, int lenq);
+ char *memrchrs(char *p, int lenp, char *q, int lenq);
+ #ifdef _GNU_SOURCE
+ # define memfind memmem
++char *memrchr(char *p, int lenp, char c);
+ #else
+ char *memfind(char *hay, int haylen, char *needle, int needlelen);
+ /* TODO: watch memrchr, it is defined differently here than under _GNU_SOURCE,
+ * so it could cause bizarre results if a module makes use of a library that
+ * uses it */
+-char *memrchr(char *p, int lenp, char c);
+ #endif
+
+ #endif /* _PTR_H_ */
Added: head/games/powwow/files/patch-src_tty.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/powwow/files/patch-src_tty.c Fri Jul 24 15:17:00 2020 (r543247)
@@ -0,0 +1,84 @@
+--- src/tty.c.orig 2019-11-06 05:25:17 UTC
++++ src/tty.c
+@@ -9,7 +9,12 @@
+ * (at your option) any later version.
+ *
+ */
+-#include <alloca.h>
++
++#ifdef BSD_LIKE
++#define COMPAT_43TTY 1
++#define __BSD_VISIBLE 1
++#endif
++
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -847,31 +852,25 @@ again:
+
+ int tty_printf(const char *format, ...)
+ {
+- char buf[1024], *bufp = buf;
++ char *bufp;
++ char *old_locale;
+ va_list va;
+ int res;
+
+- char *old_locale = strdup(setlocale(LC_ALL, NULL));
++ if ((old_locale = strdup(setlocale(LC_ALL, NULL))) == NULL)
++ return -1;
+
+ setlocale(LC_ALL, "C");
+-
+ va_start(va, format);
+- res = vsnprintf(buf, sizeof buf, format, va);
++ res = vasprintf(&bufp, format, va);
+ va_end(va);
+-
+- if (res >= sizeof buf) {
+- bufp = alloca(res + 1);
+- va_start(va, format);
+- vsprintf(bufp, format, va);
+- assert(strlen(bufp) == res);
+- va_end(va);
+- }
+-
++ if (res < 0)
++ goto out;
+ setlocale(LC_ALL, old_locale);
+- free(old_locale);
+-
+ tty_puts(bufp);
+-
++ free(bufp);
++out:
++ free(old_locale);
+ return res;
+ }
+
+@@ -968,16 +967,23 @@ int tty_read(char *buf, size_t count)
+
+ void tty_gets(char *s, int size)
+ {
+- wchar_t *ws = alloca(size * sizeof *ws);
++ wchar_t *ws = NULL;
+
++ if ((ws = malloc(size * sizeof *ws)) == NULL)
++ goto out;;
++
+ if (!fgetws(ws, size, stdin))
+- return;
++ goto out;
+
+ while (*ws) {
+ if (!(*ws & ~0xff))
+ *s++ = (unsigned char)*ws;
+ ++ws;
+ }
++out:
++ if (ws != NULL)
++ free(ws);
++ return;
+ }
+
+ void tty_flush(void)
Added: head/games/powwow/files/patch-src_utils.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/powwow/files/patch-src_utils.c Fri Jul 24 15:17:00 2020 (r543247)
@@ -0,0 +1,14 @@
+--- src/utils.c.orig 2020-07-10 20:54:00 UTC
++++ src/utils.c
+@@ -12,9 +12,9 @@
+
+ #ifdef BSD_LIKE
+ /* Needed for SIGWINCH on OpenBSD. */
+-# define _BSD_SOURCE
++# define _BSD_SOURCE 1
+ /* Needed for SIGWINCH on FreeBSD. */
+-# define __BSD_VISIBLE
++# define __BSD_VISIBLE 1
+ /* Needed for SIGWINCH on Darwin. */
+ # define _DARWIN_C_SOURCE 1
+ #endif
Modified: head/games/powwow/pkg-plist
==============================================================================
--- head/games/powwow/pkg-plist Fri Jul 24 15:04:40 2020 (r543246)
+++ head/games/powwow/pkg-plist Fri Jul 24 15:17:00 2020 (r543247)
@@ -4,5 +4,5 @@ bin/powwow
bin/powwow-movieplay
bin/powwow-muc
man/man6/powwow.6.gz
-%%DATADIR%%/powwow.doc
-%%DATADIR%%/powwow.help
+%%PORTDOCS%%%%DOCSDIR%%/powwow.doc
+%%PORTDOCS%%%%DOCSDIR%%/powwow.help
More information about the svn-ports-all
mailing list