diff --git a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.1.recipe similarity index 67% rename from dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe rename to dev-util/netsurf_buildsystem/netsurf_buildsystem-1.1.recipe index 00f6e381a..cf3ccaa98 100644 --- a/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.0_git.recipe +++ b/dev-util/netsurf_buildsystem/netsurf_buildsystem-1.1.recipe @@ -2,8 +2,9 @@ SUMMARY="NetSurf build framework" DESCRIPTION=" NetSurf build framework for compiling some of their libraries. " -HOMEPAGE="http://www.netsurf-browser.org/" -SRC_URI="git://git.netsurf-browser.org/buildsystem.git" +HOMEPAGE="http://git.netsurf-browser.org/buildsystem.git/" +SRC_URI="http://git.netsurf-browser.org/buildsystem.git/snapshot/release/1.1.tar.gz" +CHECKSUM_SHA256="e95e40d4e4e4bea2ffb391c0df1d84f81c83b1d21af992fbda0406d4d57e7dc1" REVISION="1" LICENSE="MIT" COPYRIGHT="2009 - 2013 The NetSurf Browser project" @@ -29,12 +30,12 @@ BUILD_PREREQUIRES=" cmd:make " - +SOURCE_DIR="release/1.1" +PATCHES="netsurf_buildsystem-1.1.patchset" BUILD() { # no-op - # make - : + true } INSTALL() diff --git a/dev-util/netsurf_buildsystem/patches/netsurf_buildsystem-1.1.patchset b/dev-util/netsurf_buildsystem/patches/netsurf_buildsystem-1.1.patchset new file mode 100644 index 000000000..71289b99f --- /dev/null +++ b/dev-util/netsurf_buildsystem/patches/netsurf_buildsystem-1.1.patchset @@ -0,0 +1,44 @@ +From 4a0ea106ab2a23af3798b7a3114c969f7339c05a Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Sun, 8 Jun 2014 18:12:27 +0200 +Subject: Add support for INCLUDEDIR in pkg-config files. + + +diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools +index 5b76f23..2f21be0 100644 +--- a/makefiles/Makefile.tools ++++ b/makefiles/Makefile.tools +@@ -21,6 +21,8 @@ + # (defaults to /usr/local) + # LIBDIR Library installation directory in ${PREFIX} + # (defaults to lib) ++# INCLUDEDIR Header installation directory in ${PREFIX} ++# (defaults to include) + # + + ############################################################################### +@@ -373,6 +375,9 @@ PREFIX ?= /usr/local + # Default libdir + LIBDIR ?= lib + ++# Default includedir ++INCLUDEDIR ?= include ++ + ############################################################################### + # Tool defaults + ############################################################################### +diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top +index 6329c47..bd51ecd 100644 +--- a/makefiles/Makefile.top ++++ b/makefiles/Makefile.top +@@ -291,6 +291,7 @@ define install_pkgconfig + -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)#' \ + $1 >$(BUILDDIR)/$(1:.in=) +-- +1.8.3.4 +