From 2c69dcff507c230a51ddabac2607a1120348aa1c Mon Sep 17 00:00:00 2001
From: Kim Holviala <kim@holviala.com>
Date: Tue, 29 Dec 2015 10:46:48 +0200
Subject: [PATCH] Fixed installation for Mac OSX 10.11 El Capitan

---
 INSTALL                      | 32 +++++++++++++++++---------------
 Makefile                     |  5 +++--
 README.Gophermap             |  2 +-
 org.gophernicus.server.plist |  2 +-
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/INSTALL b/INSTALL
index edff0aa..aaef7fe 100644
--- a/INSTALL
+++ b/INSTALL
@@ -94,19 +94,21 @@ include them into the next release.
 
 Tested (and semi-supported) platforms include:
 
-  OS            Arch          Compiler
- +-------------+-------------+-------------+
-  AIX 5         POWER3        gcc 4
-  AIX 6         POWER4        gcc 4
-  AIX 7         POWER5        gcc 4
-  CentOS 5      x86_64        gcc 4
-  Debian Linux  i386          gcc 4
-  Debian Linux  armv5tel      gcc 4
-  Maemo 5       armv7l        gcc 4
-  MacOSX 10.5   i386          gcc 4
-  MacOSX 10.7   x86_64        llvm-gcc 4
-  MacOSX 10.8   x86_64        clang 3
-  MacOSX 10.10  x86_64        clang 6
-  NetBSD 5      x86_64        gcc 4
-  Haiku R1      i386          gcc 2
+  OS              Arch          Compiler
+ +---------------+-------------+-------------+
+  AIX 5           POWER3        gcc 4
+  AIX 6           POWER4        gcc 4
+  AIX 7           POWER5        gcc 4
+  CentOS 5        x86_64        gcc 4
+  Debian Wheezy   i386          gcc 4
+  Debian Wheezy   x86_64        gcc 4
+  Debian Squeeze  armv5tel      gcc 4
+  Maemo 5         armv7l        gcc 4
+  MacOSX 10.5     i386          gcc 4
+  MacOSX 10.7     x86_64        llvm-gcc 4
+  MacOSX 10.8     x86_64        clang 3
+  MacOSX 10.10    x86_64        clang 6
+  MacOSX 10.11    x86_64        clang 7
+  NetBSD 5        x86_64        gcc 4
+  Haiku R1        i386          gcc 2
 
diff --git a/Makefile b/Makefile
index ddc9d50..e688d92 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ DOCS    = LICENSE README INSTALL TODO ChangeLog README.Gophermap gophertag
 
 INSTALL = PATH=$$PATH:/usr/sbin ./install-sh -o 0 -g 0
 DESTDIR = /usr
+OSXDEST = /usr/local
 SBINDIR = $(DESTDIR)/sbin
 DOCDIR  = $(DESTDIR)/share/doc/$(PACKAGE)
 
@@ -46,7 +47,7 @@ LDFLAGS =
 #
 all:
 	@case `uname` in \
-		Darwin)  $(MAKE) ROOT="$(OSXROOT)" $(BINARY); ;; \
+		Darwin)  $(MAKE) ROOT="$(OSXROOT)" DESTDIR="$(OSXDEST)" $(BINARY); ;; \
 		Haiku)   $(MAKE) EXTRA_LDFLAGS="-lnetwork" $(BINARY); ;; \
 		*)       $(MAKE) $(BINARY); ;; \
 	esac
@@ -123,7 +124,7 @@ clean-deb:
 #
 install: ChangeLog
 	@case `uname` in \
-		Darwin)  $(MAKE) ROOT="$(OSXROOT)" install-files install-docs install-root install-osx install-done; ;; \
+		Darwin)  $(MAKE) ROOT="$(OSXROOT)" DESTDIR="$(OSXDEST)" install-files install-docs install-root install-osx install-done; ;; \
 		Haiku)   $(MAKE) SBINDIR=/boot/common/bin DOCDIR=/boot/common/share/doc/$(PACKAGE) \
 		                 install-files install-docs install-root install-haiku install-done; ;; \
 		*)       $(MAKE) install-files install-docs install-root; ;; \
diff --git a/README.Gophermap b/README.Gophermap
index cf6ff06..7e0e852 100644
--- a/README.Gophermap
+++ b/README.Gophermap
@@ -59,7 +59,7 @@ Valid filetypes include:
 Additional type characters supported by Gophernicus:
    #          comment - rest of the line is ignored
    !title     menu title (use on the first line)
-   -file      hide the file from listings
+   -file      hide file from listings
    :ext=type  change filetype (for this directory only)
    ~          include a list of users with valid ~/public_gopher
    %          include a list of available virtual hosts
diff --git a/org.gophernicus.server.plist b/org.gophernicus.server.plist
index 70ba442..f2ed949 100644
--- a/org.gophernicus.server.plist
+++ b/org.gophernicus.server.plist
@@ -6,7 +6,7 @@
 	<string>org.gophernicus.server</string>
 	<key>ProgramArguments</key>
 	<array>
-		<string>/usr/sbin/in.gophernicus</string>
+		<string>/usr/local/sbin/in.gophernicus</string>
 		<string>-h@HOSTNAME@</string>
 		<string>-r/Library/GopherServer</string>
 	</array>