surf2-git: Adjust with upstream changes

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Oct 8 15:37:41 2018 +0200
Changeset:	faa723176d61d0001fc75d73fdde63de262f5e03

Modified Files:
	surf2-git/Makefile
	surf2-git/PLIST
	surf2-git/distinfo
Removed Files:
	surf2-git/patches/patch-Makefile
	surf2-git/patches/patch-surf.c

Log Message:
surf2-git: Adjust with upstream changes

- Remove no longer needed patches: patch-surf.c seems no longer
  needed and we can just define a `post-install:' target, similarly to
  wip/surf2, instead of patching Makefile (less intrusive!)
- Add new dependency to wip/gcr

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

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

diffstat:
 surf2-git/Makefile               |  6 ++++++
 surf2-git/PLIST                  |  1 +
 surf2-git/distinfo               |  2 --
 surf2-git/patches/patch-Makefile | 21 ------------------
 surf2-git/patches/patch-surf.c   | 46 ----------------------------------------
 5 files changed, 7 insertions(+), 69 deletions(-)

diffs:
diff --git a/surf2-git/Makefile b/surf2-git/Makefile
index db24fc18b5..7da8dd85db 100644
--- a/surf2-git/Makefile
+++ b/surf2-git/Makefile
@@ -25,7 +25,13 @@ SUBST_SED.configmk+=	-e 's,^CFLAGS *= ,CFLAGS += ,'
 SUBST_SED.configmk+=	-e 's,^LDFLAGS *= ,LDFLAGS += ,'
 SUBST_SED.configmk+=	-e 's/cc/${CC:Q}/'
 
+# Install binary and man page as surf2 to avoid conflicts with wip/surf
+post-install:
+	${MV} ${DESTDIR}${PREFIX}/bin/surf ${DESTDIR}${PREFIX}/bin/surf2
+	${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/surf.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/surf2.1
+
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
+.include "../../wip/gcr/buildlink3.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/surf2-git/PLIST b/surf2-git/PLIST
index 2d738b73b9..3723ed6b9f 100644
--- a/surf2-git/PLIST
+++ b/surf2-git/PLIST
@@ -1,3 +1,4 @@
 @comment $NetBSD$
 bin/surf2
+lib/surf/libsurf-webext.so
 man/man1/surf2.1
diff --git a/surf2-git/distinfo b/surf2-git/distinfo
index 551513c1b6..857f13ad1b 100644
--- a/surf2-git/distinfo
+++ b/surf2-git/distinfo
@@ -1,3 +1 @@
 $
-SHA1 (patch-Makefile) = 04e99ec614c011019de98d3a6b7c29348d2870c4
-SHA1 (patch-surf.c) = 5dc5ee919289bddd978068d82da59b0835972ed7
diff --git a/surf2-git/patches/patch-Makefile b/surf2-git/patches/patch-Makefile
deleted file mode 100644
index b6de59c60f..0000000000
--- a/surf2-git/patches/patch-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
---- Makefile.orig	2016-09-12 08:04:20.000000000 +0000
-+++ Makefile
-@@ -45,12 +45,12 @@ dist: clean
- install: all
- 	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
- 	@mkdir -p ${DESTDIR}${PREFIX}/bin
--	@cp -f surf ${DESTDIR}${PREFIX}/bin
--	@chmod 755 ${DESTDIR}${PREFIX}/bin/surf
-+	@cp -f surf ${DESTDIR}${PREFIX}/bin/surf2
-+	@chmod 755 ${DESTDIR}${PREFIX}/bin/surf2
- 	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
- 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
--	@sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf.1
--	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf.1
-+	@sed "s/VERSION/${VERSION}/g" < surf.1 > ${DESTDIR}${MANPREFIX}/man1/surf2.1
-+	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/surf2.1
- 
- uninstall:
- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
diff --git a/surf2-git/patches/patch-surf.c b/surf2-git/patches/patch-surf.c
deleted file mode 100644
index 555508931c..0000000000
--- a/surf2-git/patches/patch-surf.c
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-Revert the kbd patch to support older gtk3.
-
---- surf.c.orig	2016-09-12 08:04:23.000000000 +0000
-+++ surf.c
-@@ -174,6 +174,7 @@ static void destroyclient(Client *c);
- static void cleanup(void);
- 
- /* GTK/WebKit */
-+static GdkDevice *getkbdevice(void);
- static WebKitWebView *newview(Client *c, WebKitWebView *rv);
- static GtkWidget *createview(WebKitWebView *v, WebKitNavigationAction *a,
-                              Client *c);
-@@ -287,7 +288,7 @@ setup(void)
- 	scriptfile = buildfile(scriptfile);
- 	cachedir   = buildpath(cachedir);
- 
--	gdkkb = gdk_seat_get_keyboard(gdk_display_get_default_seat(gdpy));
-+	gdkkb = getkbdevice();
- 
- 	if (!stylefile) {
- 		styledir = buildpath(styledir);
-@@ -902,6 +903,22 @@ cleanup(void)
- 	g_free(cachedir);
- }
- 
-+static GdkDevice *
-+getkbdevice(void)
-+{
-+	GList *l, *gdl = gdk_device_manager_list_devices(
-+	           gdk_display_get_device_manager(gdk_display_get_default()),
-+		   GDK_DEVICE_TYPE_MASTER);
-+	GdkDevice *gd = NULL;
-+
-+	for (l = gdl; l != NULL; l = l->next)
-+		if (gdk_device_get_source(l->data) == GDK_SOURCE_KEYBOARD)
-+			gd = l->data;
-+
-+	g_list_free(gdl);
-+	return gd;
-+}
-+
- WebKitWebView *
- newview(Client *c, WebKitWebView *rv)
- {