some finishing tweaks. random segfaults, hopefully git version fares better

3 files changed, 54 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3e2d5ed6bad..4cb806e3c1a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,18 @@
 # Generated by mksrcinfo v8
-# Sun Apr 16 22:51:15 UTC 2017
+# Sun Apr 16 23:44:53 UTC 2017
 pkgbase = q2pro
 	pkgdesc = An enhanced Quake 2 client and server
 	pkgver = 1093
-	pkgrel = 1
+	pkgrel = 2
 	url = http://skuller.net/q2pro/
+	install = q2pro.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	makedepends = libpng12
+	makedepends = libjpeg6-turbo
+	makedepends = curl
+	makedepends = openal
 	optdepends = quake2: additional mods (symlink to ~/.q2pro)
 	conflicts = q2pro-git
 	source = https://github.com/AndreyNazarov/q2pro/archive/r1093.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index 03ce706429e2..14f438a4e381 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 # News updates for packages can be followed at https://devblog.square-r00t.net
 pkgname=q2pro
 pkgver=1093
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced Quake 2 client and server"
 arch=( 'i686' 'x86_64' )
 url="http://skuller.net/q2pro/"
@@ -13,7 +13,8 @@ _pkgname=q2pro
 conflicts=('q2pro-git')
 requires=('sdl' 'zlib')
 optdepends=('quake2: additional mods (symlink to ~/.q2pro)')
-install=
+makedepends=('libpng12' 'libjpeg6-turbo' 'curl' 'openal')
+install=q2pro.install
 changelog=
 noextract=()
 source=("https://github.com/AndreyNazarov/q2pro/archive/r1093.tar.gz"
@@ -32,8 +33,6 @@ build() {
 	#--enable-baseq2
 	#--disable-client
 	#--enable-server
-	#--enable-openal
-	#--enable-dsound
 	#--enable-dinput
 	#--enable-lirc
 	#--disable-tga
@@ -48,19 +47,31 @@ build() {
 	--enable-server \
 	--enable-curl \
 	--enable-jpg \
+	--enable-dinput \
+	--enable-openal \
+	--enable-dsound \
 	--enable-anticheat \
 	--enable-fps \
 	--bindir=/bin \
-	--libdir=/lib
+	--libdir=/lib \
+	--mandir=/share/man/man6
 	#--enable-png \  # broken in 1093
 	#--datadir=/usr/share/games/q2pro \
+
+	# TODO: see "Mouse input on Linux" in INSTALL.
+
 	make
 
 }
 package() {
-	install -d -m0755 ${pkgdir}/usr/share/games/q2pro
         cd "${srcdir}/${_pkgname}-r${pkgver}"
 	make DESTDIR="${pkgdir}/" install
-        #install -D -m755 ${srcdir}/${_pkgname}/src/${_pkgname} ${pkgdir}/usr/bin/${_pkgname}
-        #install -D -m644 ${srcdir}/${_pkgname}/docs/README.html.en ${pkgdir}/usr/share/doc/${_pkgname}/README.html
+	install -D -m 0644 ${srcdir}/${_pkgname}-r${pkgver}/README ${pkgdir}/usr/share/doc/${_pkgname}/README
+	install -D -m 0644 ${srcdir}/${_pkgname}-r${pkgver}/INSTALL ${pkgdir}/usr/share/doc/${_pkgname}/INSTALL
+	cp -a ${srcdir}/${_pkgname}-r${pkgver}/doc/* ${pkgdir}/usr/share/doc/${_pkgname}/.
+	# r1093 doesn't seem to honor manpage installation
+	install -d -m 0755 ${pkgdir}/usr/share/man/man6
+	gzip -c ${srcdir}/${_pkgname}-r${pkgver}/man/q2pro.6.txt > ${pkgdir}/usr/share/man/man6/q2pro.6.gz
+	gzip -c ${srcdir}/${_pkgname}-r${pkgver}/man/q2proded.6.txt > ${pkgdir}/usr/share/man/man6/q2proded.6.gz
+
 }
diff --git a/q2pro.install b/q2pro.install
new file mode 100644
index 000000000000..6385b2dee5ac
--- /dev/null
+++ b/q2pro.install
@@ -0,0 +1,28 @@
+post_install() {
+	echo "To play Quake 2, you need the following files from the disc:
+copy <cdromdir>/Install/Data/baseq2/pak*.pak to /usr/share/games/q2pro2/baseq2/
+copy <cdromdir>/Install/Data/baseq2/video/ to /usr/share/games/q2pro2/baseq2/"
+
+## not yet implemented
+#To play The Reckoning, you need the following files from the disc:
+#copy <cdromdir>/Data/all/pak0.pak to /usr/share/games/q2pro2/xatrix/
+#copy <cdromdir>/Data/max/xatrix/video/ to /usr/share/games/q2pro2/xatrix/
+#
+## not yet implemented
+#To play Ground Zero, you need the following files from the disc:
+#copy <cdromdir>/Data/all/pak0.pak to /usr/share/games/q2pro2/rogue/
+#copy <cdromdir>/Data/max/Rogue/video/ to /usr/share/games/q2pro2/rogue/ (optional)
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+pre_remove() {
+    /bin/true
+}
+
+op=$1
+shift
+
+$op $*