From 6a319ec2e194ddc7cde7630a3a64ea1cd913035c Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 19 Nov 2019 14:49:11 +0000
Subject: [PATCH] update to Gargoyle 2019.1.1 (should be a noop for us)

---
 games/gargoyle/Makefile                       |  4 ++--
 games/gargoyle/distinfo                       |  4 ++--
 .../gargoyle/patches/patch-garglk_launchgtk_c | 21 +++++++------------
 games/gargoyle/pkg/PLIST                      |  6 +++---
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/games/gargoyle/Makefile b/games/gargoyle/Makefile
index c21703e0577..b45aa16d338 100644
--- a/games/gargoyle/Makefile
+++ b/games/gargoyle/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2019/11/04 15:01:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2019/11/19 14:49:11 sthen Exp $
 
 COMMENT =	cross-platform interactive fiction player
 
 GH_ACCOUNT =	garglk
 GH_PROJECT =	garglk
-GH_TAGNAME =	2019.1
+GH_TAGNAME =	2019.1.1
 EPOCH =		0
 
 CATEGORIES =	games x11
diff --git a/games/gargoyle/distinfo b/games/gargoyle/distinfo
index 9c2e6826976..1594c0a1caa 100644
--- a/games/gargoyle/distinfo
+++ b/games/gargoyle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (garglk-2019.1.tar.gz) = oyZYW89vWIz/UUIyzrglskwI8NnQrouVEBbMgqpq114=
-SIZE (garglk-2019.1.tar.gz) = 14702153
+SHA256 (garglk-2019.1.1.tar.gz) = bf32qVlbL13hlwLnjj5kYsnVSLTvgGpQ7sb+nFu6KcI=
+SIZE (garglk-2019.1.1.tar.gz) = 14700448
diff --git a/games/gargoyle/patches/patch-garglk_launchgtk_c b/games/gargoyle/patches/patch-garglk_launchgtk_c
index 6afa42808b3..08addff26c1 100644
--- a/games/gargoyle/patches/patch-garglk_launchgtk_c
+++ b/games/gargoyle/patches/patch-garglk_launchgtk_c
@@ -1,26 +1,19 @@
-$OpenBSD: patch-garglk_launchgtk_c,v 1.3 2019/06/05 12:54:03 sthen Exp $
+$OpenBSD: patch-garglk_launchgtk_c,v 1.4 2019/11/19 14:49:11 sthen Exp $
 
 Remove Linux'ism to figure out the libexec dir.
 
 Index: garglk/launchgtk.c
 --- garglk/launchgtk.c.orig
 +++ garglk/launchgtk.c
-@@ -180,6 +180,10 @@ static void winbrowsefile(char *buffer)
+@@ -185,7 +185,10 @@ static void winbrowsefile(char *buffer)
  
  void winpath(char *buffer)
  {
+-#ifdef __FreeBSD__
 +#if defined(__OpenBSD__)
 +    char exepath[MaxBuffer] = "${TRUEPREFIX}/libexec/gargoyle/";
 +    snprintf(buffer, sizeof(exepath), "%s", exepath );
-+#else
-     char exepath[MaxBuffer] = {0};
-     ssize_t exelen;
- 
-@@ -192,6 +196,7 @@ void winpath(char *buffer)
-     }
- 
-     strcpy(buffer, exepath);
-+#endif
- 
-     char *dirpos = strrchr(buffer, *DirSeparator);
-     if ( dirpos != NULL )
++#elif defined(__FreeBSD__)
+     int mib[4];
+     mib[0] = CTL_KERN;
+     mib[1] = KERN_PROC;
diff --git a/games/gargoyle/pkg/PLIST b/games/gargoyle/pkg/PLIST
index 843fd1ca0ba..75eda5a8b69 100644
--- a/games/gargoyle/pkg/PLIST
+++ b/games/gargoyle/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.6 2019/06/05 12:54:03 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.7 2019/11/19 14:49:11 sthen Exp $
 bin/gargoyle
-lib/libgarglk.so
+@so lib/libgarglk.so
 libexec/gargoyle/
 @bin libexec/gargoyle/advsys
 @bin libexec/gargoyle/agility
@@ -15,7 +15,7 @@ libexec/gargoyle/
 @bin libexec/gargoyle/hugo
 @bin libexec/gargoyle/jacl
 @bin libexec/gargoyle/level9
-libexec/gargoyle/libgarglk.so
+@so libexec/gargoyle/libgarglk.so
 @bin libexec/gargoyle/magnetic
 @bin libexec/gargoyle/nitfol
 @bin libexec/gargoyle/scare