surf2-git: import surf2-0.0 as wip/surf2-git

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Wed Sep 14 22:45:29 2016 +0200
Changeset:	ef1460219fac64a97a0d2a6dfec3e17ecaf23dfd

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

Log Message:
surf2-git: import surf2-0.0 as wip/surf2-git

surf is a simple web browser based on WebKit/GTK+. It is able to display
websites and follow links. It supports the XEmbed protocol which makes it
possible to embed it in another application. Furthermore, one can point
surf to another URI by setting its XProperties.

This version is based on the WebKit2 API.

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

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

diffstat:
 Makefile                         |  1 +
 surf2-git/DESCR                  |  6 ++++++
 surf2-git/Makefile               | 37 ++++++++++++++++++++++++++++++++
 surf2-git/PLIST                  |  3 +++
 surf2-git/distinfo               |  3 +++
 surf2-git/patches/patch-Makefile | 21 ++++++++++++++++++
 surf2-git/patches/patch-surf.c   | 46 ++++++++++++++++++++++++++++++++++++++++
 7 files changed, 117 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 8009547..e65a06d 100644
--- a/Makefile
+++ b/Makefile
@@ -3953,6 +3953,7 @@ SUBDIR+=	superchic
 SUBDIR+=	superlfv
 SUBDIR+=	supermodel
 SUBDIR+=	surf
+SUBDIR+=	surf2-git
 SUBDIR+=	suse121_32_libbz2
 SUBDIR+=	suse121_32_libgcrypt
 SUBDIR+=	suse121_32_libgpg-error
diff --git a/surf2-git/DESCR b/surf2-git/DESCR
new file mode 100644
index 0000000..29bc9da
--- /dev/null
+++ b/surf2-git/DESCR
@@ -0,0 +1,6 @@
+surf is a simple web browser based on WebKit/GTK+. It is able to display
+websites and follow links. It supports the XEmbed protocol which makes it
+possible to embed it in another application. Furthermore, one can point
+surf to another URI by setting its XProperties.
+
+This version is based on the WebKit2 API.
diff --git a/surf2-git/Makefile b/surf2-git/Makefile
new file mode 100644
index 0000000..7adbc44
--- /dev/null
+++ b/surf2-git/Makefile
@@ -0,0 +1,37 @@
+# $NetBSD: Makefile,v 1.6 2015/07/13 11:10:36 leot1990 Exp $
+
+DISTNAME=	surf2-0.0
+CATEGORIES=	www
+MASTER_SITES=	http://dl.suckless.org/surf/
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://surf.suckless.org/
+COMMENT=	Surf is a fast and minimalistic web browser based on WebKit/GTK+
+LICENSE=	mit
+
+GIT_REPOSITORIES=	surf
+GIT_REPO.surf=		http://git.suckless.org/surf
+GIT_BRANCH.surf=	surf-webkit2
+WRKSRC=			${WRKDIR}/surf
+
+MAKE_JOBS_SAFE=	no
+
+USE_TOOLS+=		pkg-config
+
+SUBST_CLASSES+=		configmk
+SUBST_STAGE.configmk=	pre-configure
+SUBST_MESSAGE.configmk=	Fixing config.mk
+SUBST_FILES.configmk=	config.mk
+SUBST_SED.configmk+=	-e 's,/usr/local,${PREFIX},g'
+SUBST_SED.configmk+=	-e 's,share/man,${PKGMANDIR},g'
+SUBST_SED.configmk+=	-e 's,/usr/X11R6,${X11BASE},g'
+SUBST_SED.configmk+=	-e 's,^CFLAGS *= ,CFLAGS += ,'
+SUBST_SED.configmk+=	-e 's,^LDFLAGS *= ,LDFLAGS += ,'
+SUBST_SED.configmk+=	-e 's/cc/${CC:Q}/'
+
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+
+.include "../../www/webkit-gtk/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../wip/mk/git-package.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/surf2-git/PLIST b/surf2-git/PLIST
new file mode 100644
index 0000000..2d738b7
--- /dev/null
+++ b/surf2-git/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD$
+bin/surf2
+man/man1/surf2.1
diff --git a/surf2-git/distinfo b/surf2-git/distinfo
new file mode 100644
index 0000000..551513c
--- /dev/null
+++ b/surf2-git/distinfo
@@ -0,0 +1,3 @@
+$
+SHA1 (patch-Makefile) = 04e99ec614c011019de98d3a6b7c29348d2870c4
+SHA1 (patch-surf.c) = 5dc5ee919289bddd978068d82da59b0835972ed7
diff --git a/surf2-git/patches/patch-Makefile b/surf2-git/patches/patch-Makefile
new file mode 100644
index 0000000..b6de59c
--- /dev/null
+++ b/surf2-git/patches/patch-Makefile
@@ -0,0 +1,21 @@
+$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
new file mode 100644
index 0000000..55550893
--- /dev/null
+++ b/surf2-git/patches/patch-surf.c
@@ -0,0 +1,46 @@
+$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)
+ {