Merge remote branch 'clandmeter/master'

4 files changed, 25 insertions, 48 deletions

diff --git a/extra/irssi-svn/APKBUILD b/extra/irssi-svn/APKBUILD
deleted file mode 100644
index 301c8832..00000000
--- a/extra/irssi-svn/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Carlo Landmeter <clandmeter at gmail.com>
-pkgname=irssi-svn
-pkgver=20090104
-pkgrel=0
-pkgdesc="A modular textUI IRC client with IPv6 support"
-url="http://irssi.org"
-license='GPL'
-depends="glib ncurses openssl"
-makedepends="glib-dev openssl-dev ncurses-dev"
-source="http://www.irssi.org/files/snapshots/irssi-20090104.tar.gz"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-perl"
-
-build() {
-	cd "$srcdir"/irssi-0.8.13-svn
-
-        ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --mandir=/usr/share/man \
-        --with-perl=module
-        make || return 1
-        make DESTDIR="$pkgdir/" install
-
-}
-
-perl() {
-	depends="$pkgname perl"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
-	mkdir -p "$subpkgdir"/usr/share/irssi
-	mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi/
-}
-
-md5sums="27dcecc11b971d428e5783b4088e1c49  irssi-20090104.tar.gz"
diff --git a/extra/irssi/APKBUILD b/extra/irssi/APKBUILD
index eb12e945..c0dcc72d 100644
--- a/extra/irssi/APKBUILD
+++ b/extra/irssi/APKBUILD
@@ -1,24 +1,34 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=irssi
-pkgver=0.8.12
+pkgver=0.8.13_rc1
+_pkgver=0.8.13-rc1
 pkgrel=0
 pkgdesc="A modular textUI IRC client with IPv6 support"
 url="http://irssi.org/"
 license='GPL'
 depends="glib ncurses openssl"
-makedepends="glib-dev openssl-dev ncurses-dev"
-source="http://irssi.org/files/irssi-0.8.12.tar.bz2"
-subpackages="$pkgname-doc"
+makedepends="glib-dev openssl-dev ncurses-dev perl-dev pkgconfig"
+source="http://irssi.org/files/irssi-${_pkgver}.tar.bz2"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-perl"
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$pkgname-${_pkgver}"
 
 	./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --mandir=/usr/share/man \
-        --with-perl=no
-        make || return 1
-        make DESTDIR="$pkgdir/" install
+	--sysconfdir=/etc \
+	--mandir=/usr/share/man \
+	--with-perl=module
+	make || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-md5sums="e407b557b3cfc7c91ce4de2571dd79cb  irssi-0.8.12.tar.bz2"
+perl() {
+	depends="$pkgname perl"
+	mkdir -p "$subpkgdir"/usr/share/irssi
+	mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi/
+	mkdir -p "$subpkgdir"/usr/lib/irssi
+	mv "$pkgdir"/usr/lib/irssi/modules "$subpkgdir"/usr/lib/irssi/
+	mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/
+}
+
+md5sums="b7543c08d6709b148a1907e2a3fb6f10  irssi-0.8.13-rc1.tar.bz2"
diff --git a/extra/libnfnetlink/APKBUILD b/extra/libnfnetlink/APKBUILD
index 924f62e1..63519aec 100644
--- a/extra/libnfnetlink/APKBUILD
+++ b/extra/libnfnetlink/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libnfnetlink
-pkgver=0.0.40
+pkgver=0.0.41
 pkgrel=0
 pkgdesc="low-level library for netfilter related kernel/userspace communication"
 url="http://www.netfilter.org/projects/libnfnetlink/"
@@ -21,4 +21,4 @@ build() {
 	make || return 1
 	make DESTDIR="$pkgdir" install
 }
-md5sums="3fe19dc4b05ba7e7e6216123097c2819  libnfnetlink-0.0.40.tar.bz2"
+md5sums="5d844ea1f557bad0364d5b85cd10c796  libnfnetlink-0.0.41.tar.bz2"
diff --git a/extra/logrotate/APKBUILD b/extra/logrotate/APKBUILD
index 4ff47f22..e29b27e1 100644
--- a/extra/logrotate/APKBUILD
+++ b/extra/logrotate/APKBUILD
@@ -6,9 +6,9 @@ pkgdesc="Tool to rotate logfiles"
 url="https://fedorahosted.org/logrotate/"
 license="GPL"
 depends="uclibc popt"
-makedepends="popt-dev"
+makedepends="popt-dev wget"
 subpackages="$pkgname-doc"
-source="http://alpine.nethq.org/clandmeter/src/logrotate-3.7.8.tar.gz"
+source="https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.8.tar.gz"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"