Merge remote branch 'alpine/master'

4 files changed, 109 insertions, 8 deletions

diff --git a/testing/lua-imlib2/APKBUILD b/testing/lua-imlib2/APKBUILD
new file mode 100644
index 0000000000..4b8cea2f4e
--- /dev/null
+++ b/testing/lua-imlib2/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: 
+# Maintainer: 
+pkgname=lua-imlib2
+pkgver=0.1
+pkgrel=0
+pkgdesc="A LUA binding to the Imlib2 image manipulation library"
+url="http://asbradbury.org/projects/lua-imlib2/"
+license="MIT"
+depends=
+makedepends="lua-dev imlib2-dev"
+install=
+source="http://luaforge.net/frs/download.php/3042/lua-imlib2-$pkgver.tar.gz"
+
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	# apply patches here
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	install -D limlib2.so "$pkgdir"/usr/lib/lua/5.1/limlib2.so
+	install -D imlib2.lua "$pkgdir"/usr/share/lua/5.1/imlib2.lua
+}
+
+md5sums="f90d5d70ea8af6b66ee2e3071a08ec00  lua-imlib2-0.1.tar.gz"
diff --git a/testing/nagiosql/APKBUILD b/testing/nagiosql/APKBUILD
new file mode 100644
index 0000000000..65a9295dfa
--- /dev/null
+++ b/testing/nagiosql/APKBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Jeff Bilyk <jbilyk@gmail.com>
+pkgname=nagiosql
+pkgver=3.0.3
+_pkgverdown=303
+_pkgvermaj=3
+pkgrel=0
+pkgdesc="Web frontend to configure Nagios"
+url="http://www.nagiosql.org"
+license="GPL"
+depends="lighttpd mysql php php-gettext php-ftp php-pear"
+makedepends=
+source="http://downloads.sourceforge.net/$pkgname/${pkgname}${_pkgverdown}.tar.gz
+http://download.pear.php.net/package/HTML_Template_IT-1.3.0.tgz"
+
+_builddir="$srcdir"/${pkgname}${_pkgvermaj}
+
+build() {
+	cd "$_builddir"
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+	mkdir -p "$pkgdir"/usr/share/webapps/nagiosql
+	mkdir -p "$pkgdir"/usr/share/pear
+	cp -r "$srcdir"/HTML_Template_IT-1.3.0/* "$pkgdir"/usr/share/pear/
+	cp -r "$_builddir"/* "$pkgdir"/usr/share/webapps/nagiosql/
+	touch "$pkgdir"/usr/share/webapps/nagiosql/install/ENABLE_INSTALLER
+}
+
+md5sums="3b15650942cf0fea3b6bbec1700ace38  nagiosql303.tar.gz
+cbd2fcffd32a39da7b260397156bddbb  HTML_Template_IT-1.3.0.tgz"
diff --git a/testing/nload/APKBUILD b/testing/nload/APKBUILD
new file mode 100644
index 0000000000..90517ad3bf
--- /dev/null
+++ b/testing/nload/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Jeff Bilyk <jbilyk at gmail.com>
+# Maintainer:
+pkgname=nload
+pkgver=0.7.2
+pkgrel=1
+pkgdesc="Console network traffic and bandwidth monitor"
+url="http://www.roland-riegel.de/nload"
+license="GPL"
+depends=
+makedepends="ncurses-dev"
+install=
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="5b851ecf898edcd1f465946745e95eb6  nload-0.7.2.tar.gz"
diff --git a/testing/sircbot/APKBUILD b/testing/sircbot/APKBUILD
index 85035fc4f1..4271ac22b2 100644
--- a/testing/sircbot/APKBUILD
+++ b/testing/sircbot/APKBUILD
@@ -1,17 +1,16 @@
-# Contributor: 
-# Maintainer: 
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=sircbot
-pkgver=0.1
-pkgrel=1
+pkgver=0.2
+pkgrel=0
 pkgdesc="Minimalistic IRC bot"
 url="http://git.alpinelinux.org/cgit/sircbot/"
 license="GPL-2"
 pkgusers="sircbot"
 pkggroups="sircbot"
 depends=
-makedepends=
+makedepends="lua-dev"
 install="$pkgname.pre-install"
-subpackages=
+subpackages="lua-sircbot:luamod"
 source="http://git.alpinelinux.org/cgit/sircbot/snapshot/sircbot-$pkgver.tar.bz2
 	sircbot.initd
 	sircbot.confd
@@ -29,12 +28,18 @@ build() {
 
 package() {
 	cd "$_builddir"
-	install -m755 -D sircbot "$pkgdir"/usr/bin/sircbot
+	make install DESTDIR="$pkgdir" prefix=/usr
 	install -o sircbot -g sircbot -d "$pkgdir"/var/run/sircbot
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-md5sums="82e4cb6c7207761301e63c24d73afd2c  sircbot-0.1.tar.bz2
+luamod() {
+	pkgdesc="Luamodule for sirbot client"
+	mkdir -p "$subpkgdir"/usr/
+	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+}
+
+md5sums="a9d16db48c97ebfa30e1c84f37e70838  sircbot-0.2.tar.bz2
 16790493e7ce465fd776dcfadc002a7c  sircbot.initd
 8443ac189030c7b8beb8e579dc16ebc7  sircbot.confd"