Update i3-gaps to 4.17. Sync Makefile with x11/i3 and regen WANTLIB.
Works fine on amd64. OK?
RS
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/i3-gaps/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile 12 Jul 2019 20:51:14 -0000 1.3
+++ Makefile 18 Aug 2019 15:02:36 -0000
@@ -2,7 +2,7 @@
COMMENT = improved dynamic tiling window manager, fork with gaps
-V = 4.16.1
+V = 4.17
DISTNAME = i3-gaps-${V}
CATEGORIES = x11
@@ -15,8 +15,8 @@ PERMIT_PACKAGE = Yes
# uses pledge()
WANTLIB += c cairo ev glib-2.0 gobject-2.0 iconv intl m pango-1.0
WANTLIB += pangocairo-1.0 pcre pthread startup-notification-1
-WANTLIB += xcb xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-util
-WANTLIB += xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
+WANTLIB += xcb xcb-cursor xcb-icccm xcb-keysyms xcb-randr xcb-shape
+WANTLIB += xcb-util xcb-xinerama xcb-xkb xcb-xrm xkbcommon xkbcommon-x11
WANTLIB += yajl
MASTER_SITES = https://github.com/Airblader/i3/
@@ -26,9 +26,8 @@ DISTFILES = gaps-{releases/download/${V}
BUILD_DEPENDS = textproc/asciidoc \
textproc/xmlto
-
LIB_DEPENDS = devel/libev \
- devel/libyajl \
+ devel/libyajl>=2.0.0 \
devel/pango \
devel/pcre \
devel/startup-notification \
@@ -49,12 +48,16 @@ WRKDIST = ${WRKDIR}/${DISTNAME:S/-gaps//
SEPARATE_BUILD =Yes
USE_GMAKE = Yes
CONFIGURE_STYLE =gnu
-CONFIGURE_ARGS =--enable-builddir=${WRKBUILD} \
- --enable-debug=no
+CONFIGURE_ARGS =--enable-builddir=${WRKBUILD}
+
CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include \
-I${LOCALBASE}/include" \
LDFLAGS="-L${X11BASE}/lib \
-L${LOCALBASE}/lib"
+
+.if defined(DEBUG)
+CONFIGURE_ARGS +=--enable-debug
+.endif
pre-configure:
${SUBST_CMD} ${WRKSRC}/etc/config \
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/i3-gaps/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 7 Mar 2019 19:34:32 -0000 1.1.1.1
+++ distinfo 18 Aug 2019 15:02:36 -0000
@@ -1,2 +1,2 @@
-SHA256 (gaps-i3-4.16.1.tar.bz2) = 3u0ByEUA9Qq4GpBthDzbVJNDWVUxT8nGE+TInLARt2A=
-SIZE (gaps-i3-4.16.1.tar.bz2) = 1228703
+SHA256 (gaps-i3-4.17.tar.bz2) = jtXMGNRmzr3MU2hB6U+h0EGKQBUrywITBwlOn9qit0A=
+SIZE (gaps-i3-4.17.tar.bz2) = 1240135
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/x11/i3-gaps/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 7 Mar 2019 19:34:32 -0000 1.1.1.1
+++ patches/patch-Makefile_in 18 Aug 2019 15:02:36 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -753,10 +753,7 @@ i3include_HEADERS = \
+@@ -809,10 +809,7 @@ i3include_HEADERS = \
dist_bin_SCRIPTS = \
i3-dmenu-desktop \
i3-migrate-config-to-v4 \
@@ -14,7 +14,7 @@ Index: Makefile.in
i3confdir = $(sysconfdir)/i3
dist_i3conf_DATA = \
-@@ -912,9 +909,6 @@ docs_poddir = ${docdir}
+@@ -968,9 +965,6 @@ docs_poddir = ${docdir}
@BUILD_MANS_TRUE@ man/i3-nagbar.1 \
@BUILD_MANS_TRUE@ man/i3-config-wizard.1 \
@BUILD_MANS_TRUE@ man/i3-migrate-config-to-v4.1 \
@@ -24,7 +24,7 @@ Index: Makefile.in
@BUILD_MANS_TRUE@ man/i3-dump-log.1
@BUILD_MANS_TRUE@pod_MANS = \
-@@ -3216,7 +3210,7 @@ distclean-tags:
+@@ -3279,7 +3273,7 @@ distclean-tags:
# Leading 'am--fnord' is there to ensure the list of targets does not
# expand to empty, as could happen e.g. with make check TESTS=''.
@@ -33,7 +33,7 @@ Index: Makefile.in
am--force-recheck:
@:
-@@ -3782,7 +3776,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
+@@ -4012,7 +4006,7 @@ i3-config-parser.stamp: parser/$(dirstamp) generate-co
################################################################################
anyevent-i3.stamp: AnyEvent-I3/lib/AnyEvent/I3.pm
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/x11/i3-gaps/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 7 Mar 2019 19:34:32 -0000 1.1.1.1
+++ patches/patch-configure 18 Aug 2019 15:02:36 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2019
Index: configure
--- configure.orig
+++ configure
-@@ -6380,7 +6380,7 @@ char iconv_open ();
+@@ -6388,7 +6388,7 @@ char iconv_open ();
int
main ()
{
Index: patches/patch-etc_config
===================================================================
RCS file: /cvs/ports/x11/i3-gaps/patches/patch-etc_config,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-etc_config
--- patches/patch-etc_config 7 Mar 2019 19:34:32 -0000 1.1.1.1
+++ patches/patch-etc_config 18 Aug 2019 15:02:36 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-etc_config,v 1.1.1.1 2019/03/07 19:34:32 rsadowski Exp $
---- etc/config.orig Sun Mar 29 19:07:08 2015
-+++ etc/config Mon Mar 30 14:13:25 2015
-@@ -35,13 +35,13 @@ set $right semicolon
+Index: etc/config
+--- etc/config.orig
++++ etc/config
+@@ -44,13 +44,13 @@ set $right semicolon
floating_modifier Mod1
# start a terminal
Index: patches/patch-etc_config_keycodes
===================================================================
RCS file: /cvs/ports/x11/i3-gaps/patches/patch-etc_config_keycodes,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-etc_config_keycodes
--- patches/patch-etc_config_keycodes 7 Mar 2019 19:34:32 -0000 1.1.1.1
+++ patches/patch-etc_config_keycodes 18 Aug 2019 15:02:36 -0000
@@ -6,7 +6,7 @@ different between Linux and OpenBSD.
Index: etc/config.keycodes
--- etc/config.keycodes.orig
+++ etc/config.keycodes
-@@ -29,13 +29,13 @@ font pango:monospace 8
+@@ -38,13 +38,13 @@ bindsym XF86AudioMute exec --no-startup-id pactl set-s
floating_modifier $mod
# start a terminal
@@ -22,7 +22,7 @@ Index: etc/config.keycodes
# There also is the (new) i3-dmenu-desktop which only displays applications
# shipping a .desktop file. It is a wrapper around dmenu, so you need that
# installed.
-@@ -48,10 +48,10 @@ bindcode $mod+46 focus up
+@@ -57,10 +57,10 @@ bindcode $mod+46 focus up
bindcode $mod+47 focus right
# alternatively, you can use the cursor keys:
@@ -37,7 +37,7 @@ Index: etc/config.keycodes
# move focused window
bindcode $mod+Shift+44 move left
-@@ -60,10 +60,10 @@ bindcode $mod+Shift+46 move up
+@@ -69,10 +69,10 @@ bindcode $mod+Shift+46 move up
bindcode $mod+Shift+47 move right
# alternatively, you can use the cursor keys:
@@ -52,7 +52,7 @@ Index: etc/config.keycodes
# split in horizontal orientation
bindcode $mod+43 split h
-@@ -149,10 +149,10 @@ mode "resize" {
+@@ -158,10 +158,10 @@ mode "resize" {
bindcode 47 resize grow width 10 px or 10 ppt
# same bindings, but for the arrow keys
