From 7695cd835a5577fa515125a60b661ba01d0b2632 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Mon, 13 Sep 2010 11:47:52 +0200
Subject: bugfix: use GNU Patch under FreeBSD  (by Tony Theodore)

---
 Makefile       | 3 ++-
 doc/index.html | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index f41e78e..fbd12a7 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ TOP_DIR    := $(patsubst %/,%,$(dir $(MAKEFILE)))
 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 @@ build-only-$(1):
 	    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)'
 	    ,)
diff --git a/doc/index.html b/doc/index.html
index 6ae0b63..d8fc0d9 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -589,8 +589,8 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
 
     <!-- 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:
-- 
cgit v0.12