working install

3 files changed, 93 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0f9ea592f93..3f89b623690b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,24 @@
-# Generated by aurpkgs
-# Sun Apr 16 22:02:24 UTC 2017
+# Generated by mksrcinfo v8
+# Mon Apr 17 01:32:57 UTC 2017
 pkgbase = q2pro-git
 	pkgdesc = An enhanced Quake 2 client and server (Git/source build)
-	pkgver = False
+	pkgver = r1504
 	pkgrel = 1
 	url = http://skuller.net/q2pro/
+	install = q2pro.install
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	makedepends = libpng12
+	makedepends = libjpeg6-turbo
+	makedepends = curl
+	makedepends = openal
+	depends = sdl
+	depends = zlib
+	optdepends = quake2: additional mods (symlink to ~/.q2pro)
+	conflicts = q2pro
 	source = q2pro::git+https://github.com/AndreyNazarov/q2pro.git
 	sha512sums = SKIP
-	sha512sums = SKIP
 
 pkgname = q2pro-git
+
diff --git a/PKGBUILD b/PKGBUILD
index 7fc556840c20..30278559afd7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,18 @@ validpgpkeys=('748231EBCBD808A14F5E85D28C004C2F93481F6B')
 # Bug reports can be filed at https://bugs.square-r00t.net/index.php?project=3
 # News updates for packages can be followed at https://devblog.square-r00t.net
 pkgname=q2pro-git
-pkgver=0.0001
+pkgver=r1504
 pkgrel=1
 pkgdesc="An enhanced Quake 2 client and server (Git/source build)"
 arch=( 'i686' 'x86_64' )
 url="http://skuller.net/q2pro/"
 license=( 'GPL2' )
-makedepends=( 'sdl' 'zlib' )
+depends=( 'sdl' 'zlib' )
+optdepends=('quake2: additional mods (symlink to ~/.q2pro)')
+makedepends=('libpng12' 'libjpeg6-turbo' 'curl' 'openal')
 _pkgname=q2pro
-conflicts=( 'pkg''pkg')
-install=
+conflicts=('q2pro')
+install=q2pro.install
 changelog=
 noextract=()
 source=("q2pro::git+https://github.com/AndreyNazarov/q2pro.git")
@@ -21,7 +23,8 @@ sha512sums=('SKIP')
 pkgver() {
   cd "${srcdir}/${_pkgname}"
   # no tags, so number of revisions e.g. r1142.a17a017
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  #printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  printf "r%s" "$(git rev-list --count HEAD)"
   ## most recent annotated tag e.g. 2.0.r6.ga17a017
   #git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
   ## most recent un-annotated tag e.g. 0.71.r115.gd95ee07
@@ -37,10 +40,49 @@ pkgver() {
   #)
 }
 build() {
-        cd "${srcdir}/${_pkgname}/src"
-        make prefix=${pkgdir}/usr
+	cd "${srcdir}/${_pkgname}"
+	make clean
+        if [ ! -f VERSION ];
+        then
+                echo "${pkgver}" > VERSION
+        fi
+	# TODO: maybe just distribute a .config as part of the snapshot tarball?
+	cp ${srcdir}/${_pkgname}/doc/examples/buildconfig ${srcdir}/${_pkgname}/.config
+	# note: VARIABLE_SERVER_FPS is experimental
+	for opt in PNG JPEG HTTP OPENAL DIRECT_SOUND DIRECT_INPUT X11 ANTICHEAT_SERVER MVD_SERVER MVD_CLIENT X86_GAME_ABI_HACK VARIABLE_SERVER_FPS PATH_HOME;
+	do
+		optname=CONFIG_${opt}
+		sed -i -re "s/^[[:space:]]*#[[:space:]]*(${optname}[[:space:]]*=.*)/\1/g" ${srcdir}/${_pkgname}/.config
+	done
+	# Paths
+	for pathname in DATA LIB;
+	do
+		pathname=CONFIG_PATH_${pathname}
+		sed -i -re "s/^[[:space:]]*#[[:space:]]*(${pathname}[[:space:]]*=.*)/\1/g" ${srcdir}/${_pkgname}/.config
+	done
+	sed -i -re 's@/usr/local@/usr@g' ${srcdir}/${_pkgname}/.config
+	sed -i -re 's@lib/games@lib@g' ${srcdir}/${_pkgname}/.config
+
+        # TODO: see "Mouse input on Linux" in INSTALL.
+
+        make
+	make strip
+
 }
 package() {
-        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
+	cd "${srcdir}/${_pkgname}"
+	#make DESTDIR="${pkgdir}/" install
+	install -D -m 0644 ${srcdir}/${_pkgname}/README ${pkgdir}/usr/share/doc/${_pkgname}/README
+	install -D -m 0644 ${srcdir}/${_pkgname}/INSTALL ${pkgdir}/usr/share/doc/${_pkgname}/INSTALL
+	cp -a ${srcdir}/${_pkgname}/doc/* ${pkgdir}/usr/share/doc/${_pkgname}/.
+	install -d -m 0755 ${pkgdir}/usr/share/games/${_pkgname}/baseq2
+	install -d -m 0755 ${pkgdir}/usr/lib/${_pkgname}/baseq2
+	install -d -m 0755 ${pkgdir}/usr/bin
+	# r1093 doesn't seem to honor manpage installation
+	install -d -m 0755 ${pkgdir}/usr/share/man/man6
+	gzip -c ${srcdir}/${_pkgname}/man/q2pro.6.txt > ${pkgdir}/usr/share/man/man6/q2pro.6.gz
+	gzip -c ${srcdir}/${_pkgname}/man/q2proded.6.txt > ${pkgdir}/usr/share/man/man6/q2proded.6.gz
+	install -D -m 0644 ${srcdir}/${_pkgname}/src/client/ui/q2pro.menu ${pkgdir}/usr/share/games/${_pkgname}/baseq2/q2pro.menu
+	cp -a ${srcdir}/${_pkgname}/game*.so ${pkgdir}/usr/lib/${_pkgname}/baseq2/.
+	cp -a ${srcdir}/${_pkgname}/${_pkgname}{,ded} ${pkgdir}/usr/bin/.
 }
diff --git a/q2pro.install b/q2pro.install
new file mode 100644
index 000000000000..e6c8b56581c9
--- /dev/null
+++ b/q2pro.install
@@ -0,0 +1,29 @@
+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/players 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 $*