Adding opt and contrib repositories, thanks Alad.

2 files changed, 29 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 596ec7f4ea17..2ae2b22255de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = wmutils-git
 	pkgdesc = A set of tools for X windows manipulation.
-	pkgver = 1.0.r23.g1be37b6
+	pkgver = 1.0.r25.g7b86e8b
 	pkgrel = 1
 	url = https://github.com/wmutils/core
 	arch = i686
@@ -8,7 +8,11 @@ pkgbase = wmutils-git
 	license = ISC
 	depends = libxcb
 	source = wmutils-git::git+https://github.com/wmutils/core.git
-	sha1sums = SKIP
+	source = git+https://github.com/wmutils/opt.git
+	source = git+https://github.com/wmutils/contrib.git
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = wmutils-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8ef499baf4aa..71ae1e9cfd69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,43 @@
 # Contributor: Camille <onodera@rizon>
+# Contributor: Alad <alad@archlinux.info>
 # Maintainer: aksr <aksr at t-com dot me>
 pkgname=wmutils-git
-pkgver=1.0.r23.g1be37b6
+pkgver=1.0.r25.g7b86e8b
 pkgrel=1
 pkgdesc="A set of tools for X windows manipulation."
 url="https://github.com/wmutils/core"
 arch=('i686' 'x86_64')
 license=('ISC')
 depends=('libxcb')
-source=("$pkgname::git+https://github.com/wmutils/core.git")
-sha1sums=('SKIP')
+source=("$pkgname::git+https://github.com/wmutils/core.git"
+        'git+https://github.com/wmutils/opt.git'
+        'git+https://github.com/wmutils/contrib.git')
+md5sums=('SKIP' 'SKIP' 'SKIP')
 
 pkgver() {
   cd "$srcdir/$pkgname"
-  git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/^v//g'
+  git describe --long --tags | sed -r 's/^v//g;s/([^-]*-g)/r\1/;s/-/./g'
 }
 build() {
-  cd "$srcdir/$pkgname"
-  make
+  cd "$srcdir/$pkgname"; make
+  cd "$srcdir/opt"; make
+  cd "$srcdir/contrib/killwa"; make
 }
 
 package() {
+  prefix="/usr/local"
+  manprefix="$prefix/share/man"
+  licenseprefix="/usr"
+
   cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir" PREFIX="/usr/local" install
+  make DESTDIR="$pkgdir" PREFIX="$prefix" MANPREFIX="$manprefix" install
+  install -Dm644 LICENSE $pkgdir/$licenseprefix/share/licenses/$pkgname/LICENSE
+
+  cd "$srcdir/opt"
+  make DESTDIR="$pkgdir" PREFIX="$prefix" MANPREFIX="$manprefix" install
+
+  mkdir -p "$pkgdir/$prefix/share/doc/wmutils/examples"
+  install -Dm644 ../contrib/*.sh $pkgdir/$prefix/share/doc/wmutils/examples
+  install -m755 ../contrib/killwa/killwa $pkgdir/$prefix/bin/killwa
 }