From 4c355488aa4876aeee63a5c983405379dafc716a Mon Sep 17 00:00:00 2001
From: Jimmy Thrasher <jimmy@jimmythrasher.com>
Date: Thu, 11 Feb 2016 08:49:18 -0500
Subject: Turn off xmllint for a2x.py

The docbook DTD is not locally available in OSX, and the a2x.py
command calls xmllint with `--nonet` so it can't fetch the DTD.
Easier to just turn off linting.
---
 src/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index 382a7a6e..f27d927d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -72,14 +72,14 @@ kak : $(objects)
 
 # Generate the man page
 ../doc/kak.1.gz: ../doc/kak.1.txt
-	$(A2X) -f manpage $<
+	$(A2X) --no-xmllint -f manpage $<
 	gzip -f $(basename $<)
 
 # Generate the editor's documentation pages
 # Since `a2x` won't generate man pages if some sections are missing (which we don't need),
 # we generate the pages, patch them and then compress them
 ../doc/manpages/%.gz: ../doc/manpages/%.asciidoc
-	$(A2X) -f manpage $<
+	$(A2X) --no-xmllint -f manpage $<
 	sed -i -r -e "s,^\.TH .+,.TH KAKOUNE 1 \"\" \"\" \"$(basename $(notdir $<))\"," \
 	-e "/^\.SH \"NAME\"/,+1d" $(@:.gz=.1)
 	gzip -f $(@:.gz=.1)
-- 
cgit v1.2.3


From 311d7852a6dbf9ef5706ffbd54ec6b4bc5246b59 Mon Sep 17 00:00:00 2001
From: Jimmy Thrasher <jimmy@jimmythrasher.com>
Date: Thu, 11 Feb 2016 08:50:33 -0500
Subject: Convert GNU sed extension into more general expression to work with
 BSD/OSX

---
 src/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index f27d927d..238cdba1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -81,7 +81,7 @@ kak : $(objects)
 ../doc/manpages/%.gz: ../doc/manpages/%.asciidoc
 	$(A2X) --no-xmllint -f manpage $<
 	sed -i -r -e "s,^\.TH .+,.TH KAKOUNE 1 \"\" \"\" \"$(basename $(notdir $<))\"," \
-	-e "/^\.SH \"NAME\"/,+1d" $(@:.gz=.1)
+	-e "/^\.SH \"NAME\"/{N;d;}" $(@:.gz=.1)
 	gzip -f $(@:.gz=.1)
 	mv $(@:.gz=.1.gz) $@
 
-- 
cgit v1.2.3


From 3485de717eac4923c2c40b07b5cca8ee554028b8 Mon Sep 17 00:00:00 2001
From: Jimmy Thrasher <jimmy@jimmythrasher.com>
Date: Thu, 11 Feb 2016 13:26:08 -0500
Subject: Remove A2X variable from Makefile since it doesn't fix the OSX
 homebrew problem

Per suggestion by @lenormf
---
 src/Makefile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index 238cdba1..694bad1e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -37,7 +37,6 @@ os := $(shell uname)
 
 ifeq ($(os),Darwin)
     LIBS += -lncurses -lboost_regex-mt
-    A2X ?= a2x.py
 else ifeq ($(os),FreeBSD)
     LIBS += -ltinfow -lncursesw -lboost_regex
     CPPFLAGS += -I/usr/local/include
@@ -56,10 +55,6 @@ else
     LDFLAGS += -rdynamic
 endif
 
-# The `a2x` tool is used as-is (`a2x.py`) in some distributions, or as a symlink in others (`a2x` → `a2x.py`)
-# Picking the right name is done in the system detection switch above
-A2X ?= a2x
-
 CXXFLAGS += -std=gnu++11 -g -Wall -Wno-reorder -Wno-sign-compare
 
 kak : $(objects)
@@ -72,14 +67,14 @@ kak : $(objects)
 
 # Generate the man page
 ../doc/kak.1.gz: ../doc/kak.1.txt
-	$(A2X) --no-xmllint -f manpage $<
+	a2x --no-xmllint -f manpage $<
 	gzip -f $(basename $<)
 
 # Generate the editor's documentation pages
 # Since `a2x` won't generate man pages if some sections are missing (which we don't need),
 # we generate the pages, patch them and then compress them
 ../doc/manpages/%.gz: ../doc/manpages/%.asciidoc
-	$(A2X) --no-xmllint -f manpage $<
+	a2x --no-xmllint -f manpage $<
 	sed -i -r -e "s,^\.TH .+,.TH KAKOUNE 1 \"\" \"\" \"$(basename $(notdir $<))\"," \
 	-e "/^\.SH \"NAME\"/{N;d;}" $(@:.gz=.1)
 	gzip -f $(@:.gz=.1)
-- 
cgit v1.2.3