From 86a5624291a8a72d9a0a2c51fcc64bf6e221524b Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 14 Feb 2014 03:37:58 +0000
Subject: Fri Feb 14 03:35:43 UTC 2014

---
 community/notion/PKGBUILD | 66 +++++++++++++----------------------------------
 1 file changed, 18 insertions(+), 48 deletions(-)

(limited to 'community/notion/PKGBUILD')

diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index 067b21921..87ab1d721 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102889 2013-12-23 13:28:04Z spupykin $
+# $Id: PKGBUILD 105675 2014-02-13 14:16:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20131223
+pkgver=20140213
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
@@ -17,73 +17,43 @@ makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr'
 provides=('libtu' 'libextl')
 changelog=ChangleLog
 source=("notion::git://notion.git.sourceforge.net/gitroot/notion/notion"
-	"$pkgname-libtu::git://notion.git.sourceforge.net/gitroot/notion/libtu"
-	"$pkgname-libextl::git://notion.git.sourceforge.net/gitroot/notion/libextl"
-	"$pkgname-notion-doc::git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
-	"$pkgname-mod_xinerama::git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama"
-	"$pkgname-mod_xkbevents::git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
-	"$pkgname-mod_xrandr::git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr"
-	"$pkgname-mod_notionflux::git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux"
-	"$pkgname-contrib::git://notion.git.sourceforge.net/gitroot/notion/contrib")
+	"notion-doc::git://notion.git.sourceforge.net/gitroot/notion/notion-doc")
 md5sums=('SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
          'SKIP')
 
 prepare() {
   cd ${srcdir}
-  sed -i 's|lua5.2|lua|g' notion/system-autodetect.mk
-  sed -i 's|luac5.2|luac|g' notion{,-libextl}/system-autodetect.mk
-
-  for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do
-    mkdir -p ${srcdir}/notion/$i
-    cp -r ${srcdir}/$pkgname-$i/* ${srcdir}/notion/$i/
-  done
-
-  cd ${srcdir}/notion
-  sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \
-	-e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \
-	-e 's/^\(LUA_DIR=\).*$/\1\/usr/' \
-	-e 's/^\(X11_PREFIX=\).*/\1\/usr/' \
-	-e 's|/usr/local|/usr|g' \
-	-i system-autodetect.mk
+  cat >notion/build/lua-detect.mk <<EOF
+LUA_VERSION := 5.2
+LUA_LIBS     := $(pkg-config --libs lua)
+LUA_INCLUDES := $(pkg-config --cflags lua)
+LUA          := $(which lua)
+LUAC         := $(which luac)
+EOF
 }
 
 build() {
   cd ${srcdir}/notion
-
-  # build notion
-  make INCLUDES=-I${srcdir}/notion PREFIX=/usr ETCDIR=/etc/notion
-
-  # build doc and modules
-  for i in mod_xinerama mod_xkbevents mod_xrandr; do
-    (cd $i && make -j1 TOPDIR=.. all)
-  done
-
-  (cd notion-doc && make -j1 TOPDIR=.. all)
+  make INCLUDES=-I${srcdir}/notion LUA_VERSION=5.2 PREFIX=/usr ETCDIR=/etc/notion
+  cd ${srcdir}/notion-doc
+  make -j1 all
 }
 
 package() {
   cd ${srcdir}/notion
+  make DESTDIR=$pkgdir LUA_VERSION=5.2 PREFIX=/usr ETCDIR=/etc/notion install
 
-  # notion
-  make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install
+  # doc
+  cd ${srcdir}/notion-doc
+  make PREFIX=$pkgdir/usr ETCDIR=/etc/notion install
 
   # modules
-  for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do
-    (cd $i && make  PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install)
-  done
   cp ${srcdir}/notion/mod_xinerama/*.lua $pkgdir/etc/notion/
   cp ${srcdir}/notion/mod_xkbevents/*.lua $pkgdir/etc/notion/
 
   # contrib
   mkdir -p $pkgdir/usr/share/notion/contrib
-  cp -a ${srcdir}/$pkgname-contrib/* $pkgdir/usr/share/notion/contrib
+  cp -a ${srcdir}/$pkgname/contrib/* $pkgdir/usr/share/notion/contrib
 
   # license
   install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/notion/LICENSE
-- 
cgit v1.2.3-54-g00ecf