Make pkgver auto-update, and don’t build the demos.

1 files changed, 11 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 705a279dc826..cf51a8c6e7da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgbase="freeglut"
 pkgbase="$_pkgbase-svn"
 pkgname=("$_pkgbase-x11-svn" "$_pkgbase-wayland-svn")
-pkgver=1559
+pkgver=r1768
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://freeglut.sourceforge.net/"
@@ -13,6 +13,12 @@ conflicts=('glut' 'freeglut' 'freeglut-svn')
 source=("svn+https://freeglut.svn.sourceforge.net/svnroot/freeglut/trunk/freeglut/freeglut/")
 md5sums=('SKIP')
 
+pkgver() {
+  cd "$srcdir/$_pkgbase"
+  local ver="$(svnversion)"
+  echo "r${ver//[[:alpha:]]}"
+}
+
 prepare() {
   mkdir -p "$srcdir/$_pkgbase/build-x11"
   mkdir -p "$srcdir/$_pkgbase/build-wayland"
@@ -23,11 +29,10 @@ package_freeglut-x11-svn() {
   pkgdesc="Provides functionality for small OpenGL programs; X11 version"
 
   cd "$srcdir/$_pkgbase/build-x11"
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DFREEGLUT_BUILD_DEMOS=OFF
   make all
   make DESTDIR="$pkgdir/" install
-  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/${pkgname%-svn}/LICENSE"
-  test -d "$pkgdir/usr/lib64" && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true
+  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$_pkgbase/LICENSE"
 }
 
 package_freeglut-wayland-svn() {
@@ -35,9 +40,8 @@ package_freeglut-wayland-svn() {
   pkgdesc="Provides functionality for small OpenGL programs; Wayland version"
 
   cd "$srcdir/$_pkgbase/build-wayland"
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DFREEGLUT_WAYLAND=ON
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DFREEGLUT_BUILD_DEMOS=OFF -DFREEGLUT_WAYLAND=ON
   make all
   make DESTDIR="$pkgdir/" install
-  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/${pkgname%-svn}/LICENSE"
-  test -d "$pkgdir/usr/lib64" && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true
+  install -Dm644 ../COPYING "$pkgdir/usr/share/licenses/$_pkgbase/LICENSE"
 }