UPDATE: x11/i3lock 2.9.1

Hello ports@,

This updates x11/i3lock from some commmit to 2.9.1. All of jasper@'s
patches were accepted upstream, so there is no need for them.

They did revert an old commit which ended up readding -lpam in the
Makefile, unconditionally, so we still have to patch that out. I will
submit a PR upstream and hopefully the next release will be
patch-free.

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/i3lock/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 15 Apr 2017 12:53:02 -0000 1.1.1.1
+++ Makefile 9 Jul 2017 15:17:58 -0000
@@ -2,11 +2,11 @@

COMMENT = improved screen locker

+VERSION = 2.9.1
GH_ACCOUNT = i3
GH_PROJECT = i3lock
-# XXX: Remove when upgrading
-GH_COMMIT = 80d4452ec680bcb0e57418f69d44d88ded82047c
-DISTNAME = i3lock-2.9
+GH_TAGNAME = ${VERSION}
+DISTNAME = i3lock-${VERSION}

CATEGORIES = x11

Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/i3lock/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 6 May 2017 15:10:18 -0000 1.2
+++ distinfo 9 Jul 2017 15:17:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (i3lock-2.9-80d4452e.tar.gz) = IrR9TeilPaU6myyezcWpbQhB3iQHNGAR+ycutlEBZRE=
-SIZE (i3lock-2.9-80d4452e.tar.gz) = 23692
+SHA256 (i3lock-2.9.1.tar.gz) = mY50R3gTvJxti9V6lFVBQA996Ny4mE8U1Lb4pSje7/c=
+SIZE (i3lock-2.9.1.tar.gz) = 24108
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/x11/i3lock/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 15 Apr 2017 12:53:02 -0000 1.1.1.1
+++ patches/patch-Makefile 9 Jul 2017 15:17:58 -0000
@@ -1,29 +1,11 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/04/15 12:53:02 jasper Exp $
-
-Add bsd_auth(3) support.
-
---- Makefile.orig Sun Mar 26 15:01:23 2017
-+++ Makefile Fri Apr 14 19:44:10 2017
-@@ -1,4 +1,5 @@
- TOPDIR=$(shell pwd)
-+UNAME=$(shell uname)
-
- INSTALL=install
- PREFIX=/usr
-@@ -16,9 +17,15 @@ CFLAGS += -Wall
+$OpenBSD$
+--- Makefile.orig Sun Jul 9 16:45:41 2017
++++ Makefile Sun Jul 9 16:45:53 2017
+@@ -17,7 +17,6 @@ CFLAGS += -Wall
CPPFLAGS += -D_GNU_SOURCE
- CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-composite xcb-dpms xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
- LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-composite xcb-dpms xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+ LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
-LIBS += -lpam
LIBS += -lev
LIBS += -lm
-+
-+# OpenBSD lacks PAM, use bsd_auth(3) instead.
-+ifeq ($(UNAME),OpenBSD)
-+ CPPFLAGS += -DUSE_BSDAUTH
-+else
-+ LIBS += -lpam
-+endif

- FILES:=$(wildcard *.c)
- FILES:=$(FILES:.c=.o)
Index: patches/patch-i3lock_c
===================================================================
RCS file: patches/patch-i3lock_c
diff -N patches/patch-i3lock_c
--- patches/patch-i3lock_c 15 Apr 2017 12:53:02 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,231 +0,0 @@
-$OpenBSD: patch-i3lock_c,v 1.1.1.1 2017/04/15 12:53:02 jasper Exp $
-
-Add bsd_auth(3) support.
-
---- i3lock.c.orig Sun Mar 26 15:01:23 2017
-+++ i3lock.c Fri Apr 14 19:42:14 2017
-@@ -18,7 +18,12 @@
- #include <xcb/xkb.h>
- #include <err.h>
- #include <assert.h>
-+#ifdef USE_BSDAUTH
-+#include <login_cap.h>
-+#include <bsd_auth.h>
-+#else
- #include <security/pam_appl.h>
-+