surf2-git: Use pkg-config for X11{INC,LIB} too

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

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Oct 9 21:21:56 2018 +0200
Changeset:	340e7d88817945b409acca587e26ce0316456782

Modified Files:
	surf2-git/distinfo
Added Files:
	surf2-git/patches/patch-config.mk

Log Message:
surf2-git: Use pkg-config for X11{INC,LIB} too

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

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

diffstat:
 surf2-git/distinfo                |  1 +
 surf2-git/patches/patch-config.mk | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diffs:
diff --git a/surf2-git/distinfo b/surf2-git/distinfo
index 857f13ad1b..cb09a22fe8 100644
--- a/surf2-git/distinfo
+++ b/surf2-git/distinfo
@@ -1 +1,2 @@
 $
+SHA1 (patch-config.mk) = 3e28a75ca33d1aeb16deb10023f3e21c7b9c2a8b
diff --git a/surf2-git/patches/patch-config.mk b/surf2-git/patches/patch-config.mk
new file mode 100644
index 0000000000..95e2a66b25
--- /dev/null
+++ b/surf2-git/patches/patch-config.mk
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Use pkg-config for X11{INC,LIB} too.
+
+--- config.mk.orig	2018-10-08 12:22:47.000000000 +0000
++++ config.mk
+@@ -9,8 +9,8 @@ MANPREFIX = $(PREFIX)/share/man
+ LIBPREFIX = $(PREFIX)/lib
+ LIBDIR = $(LIBPREFIX)/surf
+ 
+-X11INC = /usr/X11R6/include
+-X11LIB = /usr/X11R6/lib
++X11INC = `pkg-config --cflags x11`
++X11LIB = `pkg-config --libs x11`
+ 
+ GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0`
+ GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0`
+@@ -18,8 +18,8 @@ WEBEXTINC = `pkg-config --cflags webkit2
+ WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0`
+ 
+ # includes and libs
+-INCS = -I$(X11INC) $(GTKINC)
+-LIBS = -L$(X11LIB) -lX11 $(GTKLIB) -lgthread-2.0
++INCS = $(X11INC) $(GTKINC)
++LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0
+ 
+ # flags
+ CPPFLAGS = -DVERSION=\"$(VERSION)\" -DWEBEXTDIR=\"$(LIBDIR)\" \