Mercurial > mxe-octave
changeset 1132:d4ccfc3cfdd4
bugfix: use GNU Patch under FreeBSD (by Tony Theodore)
| author | Volker Grabsch <vog@notjusthosting.com> |
|---|---|
| date | Mon, 13 Sep 2010 11:47:52 +0200 |
| parents | 3f88f82599dc |
| children | 29c9cdad5011 |
| files | Makefile doc/index.html |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Sun Sep 12 19:44:33 2010 +0200 +++ b/Makefile Mon Sep 13 11:47:52 2010 +0200 @@ -16,6 +16,7 @@ PATH := $(PREFIX)/bin:$(PATH) SHELL := bash SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed +PATCH := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install LIBTOOLIZE := $(shell glibtoolize --help >/dev/null 2>&1 && echo g)libtoolize VERSION := $(shell $(SED) -n 's,^.*<span id="latest-version">\([^<]*\)</span>.*$$,\1,p' '$(TOP_DIR)/doc/index.html') @@ -125,7 +126,7 @@ cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1)) cd '$(2)/$($(1)_SUBDIR)' $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/$(1)-*.patch)), - (cd '$(2)/$($(1)_SUBDIR)' && patch -p1 -u) < $(PKG_PATCH)) + (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) $$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test) rm -rfv '$(2)' ,)
--- a/doc/index.html Sun Sep 12 19:44:33 2010 +0200 +++ b/doc/index.html Mon Sep 13 11:47:52 2010 +0200 @@ -589,8 +589,8 @@ <!-- http://www.freebsd.org/ports/ --> <pre>pkg_add -r automake110 autoconf262 bash bison cmake \ - flex gmake gsed libtool openssl perl \ - pkg-config scons unzip wget xz</pre> + flex gmake gsed libtool openssl patch perl \ + pkg-config scons unzip wget</pre> <p> Ensure that /usr/local/bin preceeds /usr/bin in your $PATH: