Date: Thu, 24 Mar 2016 17:12:09 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411805 - head/devel/netsurf-buildsystem/files Message-ID: <201603241712.u2OHC9AR081456@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Mar 24 17:12:09 2016 New Revision: 411805 URL: https://svnweb.freebsd.org/changeset/ports/411805 Log: devel/netsurf-buildsystem: Fix DF-support patch typo I appreciate the attempt to have the new version of NetSurf support DragonFly. Unfortunately it appears that the editor may have autowrapped when it should not have, breaking the build system on DragonFly. I've regenerated the patch to put it as it was intended. Approved by: just-fix-it Modified: head/devel/netsurf-buildsystem/files/patch-makefiles_Makefile.tools Modified: head/devel/netsurf-buildsystem/files/patch-makefiles_Makefile.tools ============================================================================== --- head/devel/netsurf-buildsystem/files/patch-makefiles_Makefile.tools Thu Mar 24 16:39:08 2016 (r411804) +++ head/devel/netsurf-buildsystem/files/patch-makefiles_Makefile.tools Thu Mar 24 17:12:09 2016 (r411805) @@ -1,6 +1,6 @@ --- makefiles/Makefile.tools.orig 2016-02-14 22:21:24 UTC +++ makefiles/Makefile.tools -@@ -109,6 +109,18 @@ ifeq ($(BUILD),$(HOST)) +@@ -109,6 +109,17 @@ ifeq ($(BUILD),$(HOST)) CFLAGS := $(CFLAGS) -I$(GCCSDK_INSTALL_ENV)/include -I/usr/local/include CXXFLAGS := $(CXXFLAGS) -I$(GCCSDK_INSTALL_ENV)/include -I/usr/local/include LDFLAGS := $(LDFLAGS) -L$(GCCSDK_INSTALL_ENV)/lib -L/usr/local/lib @@ -9,17 +9,16 @@ + endif + + ifeq ($(findstring dragonfly,$(HOST)),dragonfly) -+ # Building on+for FreeBSD ++ # Building on+for DragonFly BSD + CFLAGS := $(CFLAGS) -I$(GCCSDK_INSTALL_ENV)/include -I/usr/local/include + CXXFLAGS := $(CXXFLAGS) -I$(GCCSDK_INSTALL_ENV)/include -I/usr/local/include + LDFLAGS := $(LDFLAGS) -L$(GCCSDK_INSTALL_ENV)/lib -L/usr/local/lib + -+ PKGCONFIG ?= PKG_CONFIG_PATH="$(PREFIX)/libdata/pkgconfig:$(PKG_CONFIG_PATH) -+" pkgconf ++ PKGCONFIG ?= PKG_CONFIG_PATH="$(PREFIX)/libdata/pkgconfig:$(PKG_CONFIG_PATH)" pkgconf endif ifeq ($(findstring arwin,$(HOST)),arwin) -@@ -130,7 +142,7 @@ else +@@ -130,7 +141,7 @@ else endif # Search the path for the compiler @@ -28,7 +27,7 @@ ifeq ($(toolpath_),) toolpath_ := /opt/netsurf/$(HOST)/cross/bin/ CC__ := $(toolpath_)$(HOST)-gcc -@@ -141,7 +153,7 @@ else +@@ -141,7 +152,7 @@ else toolpath_ := $(dir $(CC__)) toolprefix_ := $(subst :,/,$(dir $(subst -,/,$(subst /,:,$(CC__))))) ifeq ($(origin AR),default)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603241712.u2OHC9AR081456>