pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pipes-c: Update games/pipes-c to 1.2.0



Module Name:	pkgsrc-wip
Committed By:	Travis Paul <tr%vispaul.me@localhost>
Pushed By:	tpaul
Date:		Thu Jun 28 06:44:27 2018 +0000
Changeset:	5e491667d0d4bfe7384315e520f77be3fc368f0b

Modified Files:
	pipes-c/Makefile
	pipes-c/distinfo
Added Files:
	pipes-c/patches/patch-tap_tap.c
Removed Files:
	pipes-c/patches/patch-src_pipe.c
	pipes-c/patches/patch-src_pipe.h

Log Message:
pipes-c: Update games/pipes-c to 1.2.0

This release adds the following features:
-m / --max: Specify a maximum length for a pipe.
-C / --chars: Specify a custom list of characters for pipes.
This release also moves to libtap for unit testing.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5e491667d0d4bfe7384315e520f77be3fc368f0b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pipes-c/Makefile                 |  4 ++--
 pipes-c/distinfo                 | 11 +++++------
 pipes-c/patches/patch-src_pipe.c | 34 ----------------------------------
 pipes-c/patches/patch-src_pipe.h | 20 --------------------
 pipes-c/patches/patch-tap_tap.c  | 19 +++++++++++++++++++
 5 files changed, 26 insertions(+), 62 deletions(-)

diffs:
diff --git a/pipes-c/Makefile b/pipes-c/Makefile
index fc25c2bc32..6961ee1b29 100644
--- a/pipes-c/Makefile
+++ b/pipes-c/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD$
 
 GITHUB_PROJECT=	pipes.c
-DISTNAME=	pipes-c-1.1.0
+DISTNAME=	pipes-c-1.2.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=pipeseroni/}
-GITHUB_RELEASE=	v1.1.0
+GITHUB_RELEASE=	v1.2.0
 DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	tr%vispaul.me@localhost
diff --git a/pipes-c/distinfo b/pipes-c/distinfo
index 626a2a9b98..565ac3d684 100644
--- a/pipes-c/distinfo
+++ b/pipes-c/distinfo
@@ -1,8 +1,7 @@
 $NetBSD$
 
-SHA1 (pipes.c/pipes-c-1.1.0.tar.gz) = a0e2ebf294358d6781837476b34157fb753309e7
-RMD160 (pipes.c/pipes-c-1.1.0.tar.gz) = 2745285ab146bf942acd99ec1c29bd2c8179bb4d
-SHA512 (pipes.c/pipes-c-1.1.0.tar.gz) = c3ccac2fa65d9a34fed9cc283098b3221d49c2e12d74ec6582db94cbad35f154b7309a5c4919b6422a12c02bbc4ffac125ae56fbc3e6650db91cf2d44d4514ab
-Size (pipes.c/pipes-c-1.1.0.tar.gz) = 142924 bytes
-SHA1 (patch-src_pipe.c) = a56934c8b9858af0333aa985076cff55574b8a06
-SHA1 (patch-src_pipe.h) = 9e11c204f76c01a4e95c22a578321dd8f3a8a2c5
+SHA1 (pipes.c/pipes-c-1.2.0.tar.gz) = 9548be13d41ea886330e2f1b241c82ad1855abd8
+RMD160 (pipes.c/pipes-c-1.2.0.tar.gz) = f67e737184a2eaaa57a9890fae0d6d63423a0252
+SHA512 (pipes.c/pipes-c-1.2.0.tar.gz) = 97f38226e9629e5ea3cc2efd0bcfc30d33bbdda9678902d719b07b24fe81170b5d4903ff45ed6a34277ebd201ccd145354f545e04b4e7879baff794d329e588e
+Size (pipes.c/pipes-c-1.2.0.tar.gz) = 157048 bytes
+SHA1 (patch-tap_tap.c) = 83c5c1b1e1b3a2710d4b3c5c2d277938382cf760
diff --git a/pipes-c/patches/patch-src_pipe.c b/pipes-c/patches/patch-src_pipe.c
deleted file mode 100644
index d3b4a98efc..0000000000
--- a/pipes-c/patches/patch-src_pipe.c
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD$
-# Add a CPIPES_ prefix to each member of the DIRECTIONS enum to prevent termcap.h conflict
-# Fixed upstream awaiting new release: https://github.com/pipeseroni/pipes.c/pull/25
---- src/pipe.c.orig	2018-04-16 23:07:46.000000000 +0000
-+++ src/pipe.c
-@@ -266,20 +266,20 @@ void assign_matrices(char *pipe_chars,
-                 break;
-             // Transition chars go ┓,┛,┗,┏
-             case 2:
--                transition[RIGHT * 4 + DOWN] = c;
--                transition[UP * 4 + LEFT] = c;
-+                transition[CPIPES_RIGHT * 4 + CPIPES_DOWN] = c;
-+                transition[CPIPES_UP * 4 + CPIPES_LEFT] = c;
-                 break;
-             case 3:
--                transition[RIGHT * 4 + UP] = c;
--                transition[DOWN * 4 + LEFT] = c;
-+                transition[CPIPES_RIGHT * 4 + CPIPES_UP] = c;
-+                transition[CPIPES_DOWN * 4 + CPIPES_LEFT] = c;
-                 break;
-             case 4:
--                transition[LEFT * 4 + UP] = c;
--                transition[DOWN * 4 + RIGHT] = c;
-+                transition[CPIPES_LEFT * 4 + CPIPES_UP] = c;
-+                transition[CPIPES_DOWN * 4 + CPIPES_RIGHT] = c;
-                 break;
-             case 5:
--                transition[LEFT * 4 + DOWN] = c;
--                transition[UP * 4 + RIGHT] = c;
-+                transition[CPIPES_LEFT * 4 + CPIPES_DOWN] = c;
-+                transition[CPIPES_UP * 4 + CPIPES_RIGHT] = c;
-                 break;
-             default:
-                 // No way to reach here.
diff --git a/pipes-c/patches/patch-src_pipe.h b/pipes-c/patches/patch-src_pipe.h
deleted file mode 100644
index 7157217843..0000000000
--- a/pipes-c/patches/patch-src_pipe.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-# Add a CPIPES_ prefix to each member of the DIRECTIONS enum to prevent termcap.h conflict
-# Fixed upstream awaiting new release: https://github.com/pipeseroni/pipes.c/pull/25
---- src/pipe.h.orig	2018-04-16 23:07:46.000000000 +0000
-+++ src/pipe.h
-@@ -26,10 +26,10 @@ struct pipe {
- };
- 
- enum DIRECTIONS {
--    RIGHT = 0,
--    DOWN = 1,
--    LEFT = 2,
--    UP = 3
-+    CPIPES_RIGHT = 0,
-+    CPIPES_DOWN = 1,
-+    CPIPES_LEFT = 2,
-+    CPIPES_UP = 3
- };
- struct palette;
- 
diff --git a/pipes-c/patches/patch-tap_tap.c b/pipes-c/patches/patch-tap_tap.c
new file mode 100644
index 0000000000..e9e3538767
--- /dev/null
+++ b/pipes-c/patches/patch-tap_tap.c
@@ -0,0 +1,19 @@
+$NetBSD$
+# Only define define MAP_ANONYMOUS when necessary
+# PR: https://github.com/zorgnax/libtap/pull/33
+--- tap/tap.c.orig	2018-04-16 23:43:28.000000000 +0000
++++ tap/tap.c
+@@ -298,8 +298,12 @@ tap_end_todo () {
+ #include <sys/param.h>
+ #include <regex.h>
+ 
+-#if defined __APPLE__ || defined BSD
++#ifndef MAP_ANONYMOUS
++#ifdef MAP_ANON
+ #define MAP_ANONYMOUS MAP_ANON
++#else
++#error "System does not support mapping anonymous pages"
++#endif
+ #endif
+ 
+ /* Create a shared memory int to keep track of whether a piece of code executed


Home | Main Index | Thread Index | Old Index