[arch-commits] Commit in notion/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Friday, June 21, 2013 @ 15:19:26
  Author: spupykin
Revision: 92995

names fixes

Modified:
  notion/trunk/PKGBUILD

----------+
 PKGBUILD |   37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-21 13:00:51 UTC (rev 92994)
+++ PKGBUILD	2013-06-21 13:19:26 UTC (rev 92995)
@@ -4,7 +4,7 @@
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20130422
+pkgver=20130621
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
@@ -16,15 +16,15 @@
 	     '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,11 +35,18 @@
          '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
+}
+
 build() {
   cd ${srcdir}
 
   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
@@ -57,7 +64,7 @@
     (cd $i && make -j1 TOPDIR=.. all)
   done
 
-  (cd notion-doc && make -j1 TOPDIR=.. all)
+#  (cd notion-doc && make -j1 TOPDIR=.. all)
 }
 
 package() {
@@ -70,12 +77,12 @@
   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