oasis

commit: 88ca4f8ade07aa5db8348b0d4bad0a699ba84e09
parent ee93c40a6f1707df13d6175a9d96ad0cf84c8c9d
Author: Michael Forney <mforney@mforney.org>
Date:   Mon,  1 Jun 2020 15:44:39 -0700

catgirl: Update to 1.0

Diffstat:
M
pkg/catgirl/patch/0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch
18
+++++++++---------
M
pkg/catgirl/ver
2
+-

2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pkg/catgirl/patch/0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch b/pkg/catgirl/patch/0001-Revert-Use-gnu-case-range-and-gnu-conditional-omitte.patch
@@ -1,4 +1,4 @@
-From d3dfb345b89602e1cbb382b1a8fa473f48bc3cfa Mon Sep 17 00:00:00 2001
+From bd523867fe3b82fe34d63969d8785113f19eee41 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Thu, 7 May 2020 00:36:14 -0700
 Subject: [PATCH] Revert "Use gnu-case-range and
@@ -14,17 +14,17 @@ This reverts commit 75a6aa9258270169f43f56e063f1bfb57eebe56b.
  5 files changed, 46 insertions(+), 32 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 68e673b..4a610b7 100644
+index 8bf93ab..553eda9 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,8 +1,7 @@
- PREFIX = /usr/local
- MANDIR = ${PREFIX}/share/man
+@@ -4,8 +4,7 @@ MANDIR ?= ${PREFIX}/share/man
+ CFLAGS += -I${PREFIX}/include
+ LDFLAGS += -L${PREFIX}/lib
  
 -CEXTS = gnu-case-range gnu-conditional-omitted-operand
 -CFLAGS += -std=c11 -Wall -Wextra -Wpedantic ${CEXTS:%=-Wno-%}
 +CFLAGS += -std=c11 -Wall -Wextra -Wpedantic
- LDLIBS = -lcrypto -ltls -lncursesw
+ LDLIBS = -lncursesw -ltls
  
  -include config.mk
 diff --git a/command.c b/command.c
@@ -283,10 +283,10 @@ index ef3f2b5..1410acc 100644
  			return true;
  		}
 diff --git a/ui.c b/ui.c
-index 6fe7061..dc801d6 100644
+index fd9bfab..be1c17a 100644
 --- a/ui.c
 +++ b/ui.c
-@@ -927,7 +927,6 @@ static void keyCode(int code) {
+@@ -960,7 +960,6 @@ static void keyCode(int code) {
  		break; case KeyMetaGt: windowScroll(window, -WindowLines);
  		break; case KeyMetaLt: windowScroll(window, +WindowLines);
  
@@ -294,7 +294,7 @@ index 6fe7061..dc801d6 100644
  		break; case KeyMetaA: showAuto();
  		break; case KeyMetaB: edit(id, EditPrevWord, 0);
  		break; case KeyMetaD: edit(id, EditDeleteNextWord, 0);
-@@ -951,6 +950,12 @@ static void keyCode(int code) {
+@@ -984,6 +983,12 @@ static void keyCode(int code) {
  		break; case KEY_SEND: windowScroll(window, -WindowLines);
  		break; case KEY_SHOME: windowScroll(window, +WindowLines);
  		break; case KEY_UP: windowScroll(window, +1);
diff --git a/pkg/catgirl/ver b/pkg/catgirl/ver
@@ -1 +1 @@
-d8ef021506 r0
+1.0 r0