From 857c69c34c0cb503bf5c0ecd0fc7d0beeab0b16a Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Thu, 17 May 2012 08:19:50 +0000
Subject: main/awall: upgrade to 0.1.2 installer Makefile taken into use

---
 main/awall/APKBUILD | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

(limited to 'main')

diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index df7d371f7..51220ccc3 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 pkgname=awall
-pkgver=0.1.1
+pkgver=0.1.2
 pkgrel=0
 pkgdesc="Alpine Wall"
 url=http://git.alpinelinux.org/cgit/kunkku/awall/
@@ -12,7 +12,6 @@ subpackages=$pkgname-nat
 source="${url}snapshot/awall-${pkgver}.tar.bz2"
 
 _builddir=$srcdir/awall-${pkgver}
-_luadir=usr/share/lua/5.1
 
 prepare() {
 	:
@@ -24,35 +23,17 @@ build() {
 
 package() {
 	cd "$_builddir"
-	local dir=$pkgdir/$_luadir/awall
-	local bindir=$pkgdir/usr/sbin
-	local poldir=$pkgdir/usr/share/awall
-
-	install -d "$poldir/mandatory"
-	install -d "$poldir/optional"
-	install -d "$poldir/sample"
-
-	install -d "$bindir"
-	install -d "$dir/modules"
-	install -d "$pkgdir/etc/awall"
-	install -d "$pkgdir/var/run/awall"
-
-	install awall-cli "$bindir/awall"
-	install -m 644 awall/*.lua "$dir"
-	install -m 644 awall/modules/filter.lua "$dir/modules"
-
-	install -m 644 json/services.json "$poldir/mandatory"
-	install -m 644 sample-policy.json "$poldir/sample"
+	make "ROOT_DIR=$pkgdir" install
 }
 
 nat() {
 	depends=awall
 	cd "$_builddir"
-	local moddir=$subpkgdir/$_luadir/awall/modules
-	local poldir=$subpkgdir/usr/share/awall/mandatory
-	install -d "$moddir" "$poldir"
-	install -m 644 json/masquerade.json "$poldir"
-	install -m 644 awall/modules/nat.lua "$moddir"
+	for file in lua/5.1/awall/modules/nat.lua awall/mandatory/masquerade.json; do	    	
+		local path=usr/share/$file
+		install -d "$subpkgdir/$(dirname $path)"
+		mv "$pkgdir/$path" "$subpkgdir/$path"
+	done
 }
 
-md5sums="de2ae6f4b2825b523873ca82bd1f7c48  awall-0.1.1.tar.bz2"
+md5sums="59b22dcb5a14e5292dbc2814d970b3b9  awall-0.1.2.tar.bz2"
-- 
cgit v1.2.3