Update to netsurf-buildsystem-1.4.

www/netsurf/Makefile.inc

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.13 2016/01/15 20:09:12 naddy Exp $
+# $OpenBSD: Makefile.inc,v 1.14 2016/01/16 09:04:13 bentley Exp $
 
 CATEGORIES +=	www
 
@@ -28,7 +28,7 @@ MAKE_FLAGS +=	COMPONENT_TYPE=lib-shared \
 .endfor
 
 .if ${NETSURF_PROJECT} != "buildsystem"
-BUILD_DEPENDS +=	www/netsurf/buildsystem>=1.3p1
+BUILD_DEPENDS +=	www/netsurf/buildsystem>=1.4
 MAKE_FLAGS +=		Q= \
 			VQ= \
 			CCOPT= \

www/netsurf/buildsystem/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2016/01/15 20:09:12 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2016/01/16 09:04:13 bentley Exp $
 
 COMMENT =		makefiles for building NetSurf
 
 NETSURF_PROJECT =	buildsystem
-NETSURF_VERSION =	1.3
+NETSURF_VERSION =	1.4
 DISTNAME =		${NETSURF_PROJECT}-${NETSURF_VERSION}
 PKGNAME =		netsurf-${NETSURF_PROJECT}-${NETSURF_VERSION}
-REVISION =		1
 
 HOMEPAGE =		http://www.netsurf-browser.org/
 

www/netsurf/buildsystem/distinfo

@@ -1,2 +1,2 @@
-SHA256 (buildsystem-1.3.tar.gz) = ELvpW6B0diCNpgR708dGhbbmG6mQSXW11cmix5qErHk=
-SIZE (buildsystem-1.3.tar.gz) = 37906
+SHA256 (buildsystem-1.4.tar.gz) = 5mt/CekaxHjp8sXBqvHzbs6d8MO7sduRDNTARhxH960=
+SIZE (buildsystem-1.4.tar.gz) = 38067

www/netsurf/buildsystem/patches/patch-makefiles_Makefile_tools

@@ -1,14 +0,0 @@
-$OpenBSD: patch-makefiles_Makefile_tools,v 1.1 2016/01/15 08:56:26 bentley Exp $
-Backport INCLUDEDIR from cdde8cbaed88f06c373f6d5add7273fd97e77d21.
---- makefiles/Makefile.tools.orig	Fri Jan 15 01:41:18 2016
-+++ makefiles/Makefile.tools	Fri Jan 15 01:41:57 2016
-@@ -241,6 +241,9 @@ PREFIX ?= /usr/local
- # Default libdir
- LIBDIR ?= lib
- 
-+# Default includedir
-+INCLUDEDIR ?= include
-+
- ###############################################################################
- # Tool defaults
- ###############################################################################

www/netsurf/buildsystem/patches/patch-makefiles_Makefile_top

@@ -1,7 +1,7 @@
-$OpenBSD: patch-makefiles_Makefile_top,v 1.3 2016/01/15 08:56:26 bentley Exp $
---- makefiles/Makefile.top.orig	Sun Mar  8 06:05:58 2015
-+++ makefiles/Makefile.top	Fri Jan 15 01:42:26 2016
-@@ -188,8 +188,8 @@ endif
+$OpenBSD: patch-makefiles_Makefile_top,v 1.4 2016/01/16 09:04:13 bentley Exp $
+--- makefiles/Makefile.top.orig	Fri Dec 18 02:38:25 2015
++++ makefiles/Makefile.top	Fri Jan 15 11:54:05 2016
+@@ -187,8 +187,8 @@ endif
  ifeq ($(findstring lib,$(COMPONENT_TYPE)),lib)
    ifeq ($(findstring lib-shared,$(COMPONENT_TYPE)),lib-shared)
      SHAREDLIBNAME := lib$(COMPONENT)$(LIBEXT)
@@ -12,7 +12,7 @@ $OpenBSD: patch-makefiles_Makefile_top,v 1.3 2016/01/15 08:56:26 bentley Exp $
    else
      OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
    endif
-@@ -204,14 +204,6 @@ endif
+@@ -203,14 +203,6 @@ endif
  .PHONY: all test coverage profile docs clean distclean install uninstall \
  	__default __precov __partial_clean __postshared
  
@@ -27,7 +27,7 @@ $OpenBSD: patch-makefiles_Makefile_top,v 1.3 2016/01/15 08:56:26 bentley Exp $
  # Default target
  all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
  
-@@ -290,11 +282,12 @@ __libraries = $(if $(REQUIRED_LIBS),-l$(subst $(__spac
+@@ -289,7 +281,7 @@ __libraries = $(if $(REQUIRED_LIBS),-l$(subst $(__spac
  define install_pkgconfig
  	$(Q)$(ECHO) $(ECHOFLAGS) "sed -e... $1 >$(BUILDDIR)/$(1:.in=)"
  	$(Q)$(SED) \
@@ -36,12 +36,7 @@ $OpenBSD: patch-makefiles_Makefile_top,v 1.3 2016/01/15 08:56:26 bentley Exp $
  		-e 's#LIBDIR#$(LIBDIR)#' \
  		-e 's#MAJOR#$(major-version)#' \
  		-e 's#MINOR#$(minor-version)#' \
- 		-e 's#PATCH#$(patch-version)#' \
-+		-e 's#INCLUDEDIR#$(INCLUDEDIR)#' \
- 		-e 's#VERSION#$(COMPONENT_VERSION)#' \
- 		-e 's#REQUIRED#$(__required)#' \
- 		-e 's#LIBRARIES#$(__libraries)#' \
-@@ -307,8 +300,6 @@ endef
+@@ -307,8 +299,6 @@ endef
  # TODO: Is this scheme portable?
  define install_shared_lib
    $(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)