From 65eeff79fff8a1bfdf67ca51d147384f46f4d5c0 Mon Sep 17 00:00:00 2001
From: Nicolás Reynolds <fauno@endefensadelsl.org>
Date: Fri, 27 Dec 2013 23:55:53 +0000
Subject: Fri Dec 27 23:54:04 UTC 2013

---
 community/notion/PKGBUILD | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

(limited to 'community/notion/PKGBUILD')

diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index a94cee35b..067b21921 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88793 2013-04-22 10:31:24Z spupykin $
+# $Id: PKGBUILD 102889 2013-12-23 13:28:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20130422
+pkgver=20131223
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
@@ -16,15 +16,15 @@ makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr'
 	     'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra')
 provides=('libtu' 'libextl')
 changelog=ChangleLog
-source=("git://notion.git.sourceforge.net/gitroot/notion/notion"
-	"git://notion.git.sourceforge.net/gitroot/notion/libtu"
-	"git://notion.git.sourceforge.net/gitroot/notion/libextl"
-	"git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
-	"git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama"
-	"git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
-	"git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr"
-	"git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux"
-	"git://notion.git.sourceforge.net/gitroot/notion/contrib")
+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")
 md5sums=('SKIP'
          'SKIP'
          'SKIP'
@@ -35,22 +35,30 @@ md5sums=('SKIP'
          'SKIP'
          'SKIP')
 
-build() {
+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
-    cp -r  ${srcdir}/$i ${srcdir}/notion/
+    mkdir -p ${srcdir}/notion/$i
+    cp -r ${srcdir}/$pkgname-$i/* ${srcdir}/notion/$i/
   done
 
-  # build notion
   cd ${srcdir}/notion
-  msg "Starting make..."
   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
-  make INCLUDES=-I${srcdir}/notion
+}
+
+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
@@ -70,12 +78,12 @@ package() {
   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}/mod_xinerama/*.lua $pkgdir/etc/notion/
-  cp ${srcdir}/mod_xkbevents/*.lua $pkgdir/etc/notion/
+  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}/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