cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build of updated libnsgif/libnsbmp.

Browse Source 
Failing build pointed out by nigel@.
This commit is contained in:
bentley 2016-01-15 08:56:26 +00:00
parent 39c0e77aef
commit da6d24ef6d
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/netsurf/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.11 2016/01/11 09:35:45 ajacoutot Exp $
# $OpenBSD: Makefile.inc,v 1.12 2016/01/15 08:56:26 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.3
BUILD_DEPENDS += www/netsurf/buildsystem>=1.3p0
MAKE_FLAGS += Q= \
VQ= \
CCOPT= \

14
www/netsurf/buildsystem/patches/patch-makefiles_Makefile_tools Normal file
View File

@ -0,0 +1,14 @@
$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
###############################################################################

19
www/netsurf/buildsystem/patches/patch-makefiles_Makefile_top
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-makefiles_Makefile_top,v 1.2 2014/04/28 09:02:15 bentley Exp $
--- makefiles/Makefile.top.orig Sat Apr 26 21:37:19 2014
+++ makefiles/Makefile.top Sat Apr 26 21:38:30 2014
@@ -186,8 +186,8 @@ endif
$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
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.2 2014/04/28 09:02:15 bentley Exp $
else
OUTPUT := $(BUILDDIR)/lib$(COMPONENT)$(LIBEXT)
endif
@@ -202,14 +202,6 @@ endif
@@ -204,14 +204,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.2 2014/04/28 09:02:15 bentley Exp $
# Default target
all: $(PRE_TARGETS) $(OUTPUT) $(POST_TARGETS)
@@ -286,7 +278,7 @@ __required = $(if $(REQUIRED_PKGS),Requires: $(subst $
@@ -290,11 +282,12 @@ __libraries = $(if $(REQUIRED_LIBS),-l$(subst $(__spac
define install_pkgconfig
$(Q)$(ECHO) $(ECHOFLAGS) "sed -e... $1 >$(BUILDDIR)/$(1:.in=)"
$(Q)$(SED) \
@ -36,7 +36,12 @@ $OpenBSD: patch-makefiles_Makefile_top,v 1.2 2014/04/28 09:02:15 bentley Exp $
-e 's#LIBDIR#$(LIBDIR)#' \
-e 's#MAJOR#$(major-version)#' \
-e 's#MINOR#$(minor-version)#' \
@@ -302,8 +294,6 @@ endef
-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
# TODO: Is this scheme portable?
define install_shared_lib
$(INSTALL) $(INSTALLFLAGS) -m 755 $1 $2/$(notdir $1)