package builds

2 files changed, 48 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bfe502478d05..f3e2d5ed6bad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
-# Generated by aurpkgs
-# Sun Apr 16 21:57:50 UTC 2017
+# Generated by mksrcinfo v8
+# Sun Apr 16 22:51:15 UTC 2017
 pkgbase = q2pro
 	pkgdesc = An enhanced Quake 2 client and server
 	pkgver = 1093
@@ -8,9 +8,12 @@ pkgbase = q2pro
 	arch = i686
 	arch = x86_64
 	license = GPL2
+	optdepends = quake2: additional mods (symlink to ~/.q2pro)
+	conflicts = q2pro-git
 	source = https://github.com/AndreyNazarov/q2pro/archive/r1093.tar.gz
 	source = r1093.tar.gz.sig
 	sha512sums = 2cca3504681ff9a2cab6c1061245c660f1bfbfd1ec4acf91a798b697ed62b029d0cda969830d7ad282e5cbbd004b766285212e723340c5c98a31ddef0e034aa1
 	sha512sums = SKIP
 
 pkgname = q2pro
+
diff --git a/PKGBUILD b/PKGBUILD
index de96dad9a23e..03ce706429e2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,9 @@ arch=( 'i686' 'x86_64' )
 url="http://skuller.net/q2pro/"
 license=( 'GPL2' )
 _pkgname=q2pro
-conflicts=( 'pkg''pkg')
+conflicts=('q2pro-git')
+requires=('sdl' 'zlib')
+optdepends=('quake2: additional mods (symlink to ~/.q2pro)')
 install=
 changelog=
 noextract=()
@@ -18,11 +20,47 @@ source=("https://github.com/AndreyNazarov/q2pro/archive/r1093.tar.gz"
         "r1093.tar.gz.sig")
 sha512sums=('2cca3504681ff9a2cab6c1061245c660f1bfbfd1ec4acf91a798b697ed62b029d0cda969830d7ad282e5cbbd004b766285212e723340c5c98a31ddef0e034aa1'
             'SKIP')
+
 build() {
-        cd "${srcdir}/${_pkgname}/src"
-        make prefix=${pkgdir}/usr
+        cd "${srcdir}/${_pkgname}-r${pkgver}"
+	if [ ! -f VERSION ];
+	then
+		echo "${pkgver}" > VERSION
+	fi
+	# Extended configure options, useful if sdl isn't available etc.
+	#./configure --prefix=/usr ...
+	#--enable-baseq2
+	#--disable-client
+	#--enable-server
+	#--enable-openal
+	#--enable-dsound
+	#--enable-dinput
+	#--enable-lirc
+	#--disable-tga
+	#--disable-md3
+	#--disable-ui
+	#--disable-mvd-server
+	#--disable-mvd-client
+	#--disable-icmp
+	#--single-user
+	./configure --prefix=/usr \
+	--enable-baseq2 \
+	--enable-server \
+	--enable-curl \
+	--enable-jpg \
+	--enable-anticheat \
+	--enable-fps \
+	--bindir=/bin \
+	--libdir=/lib
+	#--enable-png \  # broken in 1093
+	#--datadir=/usr/share/games/q2pro \
+	make
+
 }
 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
+	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
 }