Fix bash-completion

3 files changed, 36 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0ac68378c6d..725f9721807c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Jan  1 21:13:49 UTC 2018
+# Sat Jan 27 13:02:02 UTC 2018
 pkgbase = chocolate-doom
 	pkgdesc = Historically-accurate Doom, Heretic, Hexen, and Strife ports.
 	pkgver = 3.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.chocolate-doom.org/
 	arch = i686
 	arch = x86_64
@@ -15,8 +15,10 @@ pkgbase = chocolate-doom
 	depends = sdl2_net
 	source = http://chocolate-doom.org/downloads/3.0.0/chocolate-doom-3.0.0.tar.gz
 	source = http://chocolate-doom.org/downloads/3.0.0/chocolate-doom-3.0.0.tar.gz.asc
+	source = 0001_fix-bash-completion.patch
 	sha512sums = 41f235c0d84ef21070636ad0610e97898dfd366fae7f9244bd2aebf8974db98dcf55f70bcab2f93589b9bf31dd421db32e8af88e0f8e0a655d2b9f1d4ead2afd
 	sha512sums = SKIP
+	sha512sums = 5da61fcabd332698b3a8934670195d42f9d9db949fd666c3a670c47252af0376cf8cd0e3f2d78c9d6593446d68dab02b3db14b995a9fa8c973859cd2fd8bc3d0
 
 pkgname = chocolate-doom
 	pkgdesc = Doom port accurately reproducing the original DOS EXEs.
diff --git a/0001_fix-bash-completion.patch b/0001_fix-bash-completion.patch
new file mode 100644
index 000000000000..19be54525af8
--- /dev/null
+++ b/0001_fix-bash-completion.patch
@@ -0,0 +1,27 @@
+diff -ur chocolate-doom-3.0.0.orig/man/bash-completion/Makefile.in chocolate-doom-3.0.0/man/bash-completion/Makefile.in
+--- chocolate-doom-3.0.0.orig/man/bash-completion/Makefile.in	2017-12-30 13:22:42.000000000 -0800
++++ chocolate-doom-3.0.0/man/bash-completion/Makefile.in	2018-01-27 04:59:41.032103406 -0800
+@@ -519,19 +519,19 @@
+ 
+ 
+ @HAVE_PYTHON_TRUE@@PROGRAM_PREFIX@doom: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
+-@HAVE_PYTHON_TRUE@	$(DOCGEN) -g doom -b $(MANDIR)/doom.template \
++@HAVE_PYTHON_TRUE@	$(DOCGEN) -g doom -b doom.template \
+ @HAVE_PYTHON_TRUE@                  $(top_srcdir)/src $(top_srcdir)/src/doom > $@
+ 
+ @HAVE_PYTHON_TRUE@@PROGRAM_PREFIX@heretic: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
+-@HAVE_PYTHON_TRUE@	$(DOCGEN) -g heretic -b $(MANDIR)/heretic.template \
++@HAVE_PYTHON_TRUE@	$(DOCGEN) -g heretic -b heretic.template \
+ @HAVE_PYTHON_TRUE@                  $(top_srcdir)/src $(top_srcdir)/src/heretic > $@
+ 
+ @HAVE_PYTHON_TRUE@@PROGRAM_PREFIX@hexen: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
+-@HAVE_PYTHON_TRUE@	$(DOCGEN) -g hexen -b $(MANDIR)/hexen.template \
++@HAVE_PYTHON_TRUE@	$(DOCGEN) -g hexen -b hexen.template \
+ @HAVE_PYTHON_TRUE@                  $(top_srcdir)/src $(top_srcdir)/src/hexen > $@
+ 
+ @HAVE_PYTHON_TRUE@@PROGRAM_PREFIX@strife: $(top_srcdir)/src $(DOCGEN) $(BASH_COMPLETION_TEMPLATES)
+-@HAVE_PYTHON_TRUE@	$(DOCGEN) -g strife -b $(MANDIR)/strife.template \
++@HAVE_PYTHON_TRUE@	$(DOCGEN) -g strife -b strife.template \
+ @HAVE_PYTHON_TRUE@                  $(top_srcdir)/src $(top_srcdir)/src/strife > $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/PKGBUILD b/PKGBUILD
index c9e2a67f1db1..20e811d28999 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,17 @@ pkgname=(chocolate-{doom,heretic,hexen,strife,common})
 pkgbase=${pkgname[0]}
 pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports."
 pkgver=3.0.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.chocolate-doom.org/"
 license=('GPL2')
 depends=('libpng' 'libsamplerate' 'sdl2_mixer' 'sdl2_net')
 makedepends=('python')
-source=(http://chocolate-doom.org/downloads/${pkgver}/${pkgbase}-${pkgver}.tar.gz{,.asc})
+source=(http://chocolate-doom.org/downloads/${pkgver}/${pkgbase}-${pkgver}.tar.gz{,.asc}
+        0001_fix-bash-completion.patch)
 sha512sums=('41f235c0d84ef21070636ad0610e97898dfd366fae7f9244bd2aebf8974db98dcf55f70bcab2f93589b9bf31dd421db32e8af88e0f8e0a655d2b9f1d4ead2afd'
-            'SKIP')
+            'SKIP'
+            '5da61fcabd332698b3a8934670195d42f9d9db949fd666c3a670c47252af0376cf8cd0e3f2d78c9d6593446d68dab02b3db14b995a9fa8c973859cd2fd8bc3d0')
 validpgpkeys=('6D2C117E0310664497AA9546F6C2EE9C23354344')
 
 prepare() {