Merge git://inari.aerdan.org/var/git/aports

14 files changed, 93 insertions, 96 deletions

diff --git a/testing/agg/APKBUILD b/testing/agg/APKBUILD
index 5ec08625d7..9fb8fa2bfe 100644
--- a/testing/agg/APKBUILD
+++ b/testing/agg/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
 pkgname=agg
 pkgver=2.5
-pkgrel=0
+pkgrel=1
 pkgdesc="A Rendering Engine for C++"
 url="http://antigrain.org/"
 license="GPL"
@@ -35,6 +35,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="${pkgdir}" install || return 1
+	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
 md5sums="0229a488bc47be10a2fee6cf0b2febd6  agg-2.5.tar.gz
diff --git a/testing/calibre/APKBUILD b/testing/calibre/APKBUILD
index 843eba3ae6..2282ad64d5 100644
--- a/testing/calibre/APKBUILD
+++ b/testing/calibre/APKBUILD
@@ -2,13 +2,16 @@
 # Maintainer:
 pkgname=calibre
 pkgver=0.8.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Ebook management application"
 url="http://calibre-ebook.com/"
 arch="all"
 license="GPL3"
 depends=
-depends_dev="python-dev imagemagick-dev py-qt py-sip py-imaging libusb-dev poppler-dev poppler-qt4-dev py-dbus py-pycountry py-lxml icu-dev desktop-file-utils py-sqlite sqlite-dev chmlib-dev podofo-dev py-sip-dev py-importlib py-dateutil py-cherrypy py-beautifulsoup py-mechanize"
+depends_dev="python-dev imagemagick-dev py-qt py-sip py-imaging libusb-dev
+	poppler-dev poppler-qt4-dev py-dbus py-pycountry py-lxml icu-dev
+	desktop-file-utils py-sqlite sqlite-dev chmlib-dev podofo-dev
+	py-sip-dev py-dateutil py-cherrypy py-beautifulsoup py-mechanize"
 makedepends="$depends_dev"
 install=""
 subpackages=""
diff --git a/testing/eeze/APKBUILD b/testing/eeze/APKBUILD
index 8f59b3f1b7..3eb881f7bc 100644
--- a/testing/eeze/APKBUILD
+++ b/testing/eeze/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=eeze
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Enlightenment's device library"
 url="http://trac.enlightenment.org/e/wiki/Eeze"
 arch="all"
@@ -39,7 +39,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	"$pkgdir"/usr/lib/*.la
+	rm "$pkgdir"/usr/lib/*.la
 }
 
 md5sums="e36b5e8ed444c8d13d27fd82d5f71659  eeze-1.0.1.tar.gz"
diff --git a/testing/fatback/APKBUILD b/testing/fatback/APKBUILD
new file mode 100644
index 0000000000..eec7e2f78f
--- /dev/null
+++ b/testing/fatback/APKBUILD
@@ -0,0 +1,32 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=fatback
+pkgver=1.3
+pkgrel=0
+pkgdesc="A tool for recovering files from FAT file systems"
+url="http://fatback.sourceforge.net/"
+arch="all"
+license="GPL2"
+depends=""
+makedepends="flex"
+install=""
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+_builddir="$srcdir"/$pkgname-$pkgver
+
+build() {
+	cd "$_builddir"
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="4f1beb13670a7eff5b66cff84e5fd42a  fatback-1.3.tar.gz"
diff --git a/testing/freeradius-client/APKBUILD b/testing/freeradius-client/APKBUILD
index c0f0cca2d2..01ff2e25aa 100644
--- a/testing/freeradius-client/APKBUILD
+++ b/testing/freeradius-client/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Natanael Copa <ncopa@alpinelinux.org>
 pkgname=freeradius-client
 pkgver=1.1.6
-pkgrel=0
+pkgrel=1
 pkgdesc="FreeRADIUS Client Software"
 url="http://wiki.freeradius.org/Radiusclient"
 arch="all"
@@ -29,7 +29,8 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
 md5sums="2e46564e450ae13aedb70dc133b158ac  freeradius-client-1.1.6.tar.bz2"
diff --git a/testing/gross-svn/APKBUILD b/testing/gross-svn/APKBUILD
deleted file mode 100644
index 4d76fc9de4..0000000000
--- a/testing/gross-svn/APKBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
-pkgname=gross-svn
-pkgver=511
-pkgrel=2
-pkgdesc="Greylisting of suspicious sources"
-url="http://code.google.com/p/gross/"
-arch="all"
-license="BSD"
-depends=
-makedepends="c-ares-dev"
-install="$pkgname.post-install $pkgname.pre-install"
-subpackages="$pkgname-doc $pkgname-dev"
-source="http://alpine.nethq.org/clandmeter/src/${pkgname}-${pkgver}.tar.bz2
-$pkgname.initd
-$pkgname.confd"
-
-build() {
-        cd "$srcdir/$pkgname-$pkgver"
-
-        ./configure --prefix=/usr \
-                --sysconfdir=/etc \
-                --mandir=/usr/share/man \
-                --infodir=/usr/share/info
-        make || return 1
-        make -j1 DESTDIR="$pkgdir" install
-
-        install -dD "$pkgdir"/var/run/gross
-        install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/gross
-        install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/gross
-}
-
-md5sums="f2488ced5b47f359c3a1127d9ba3453c  gross-svn-511.tar.bz2
-e8d7c8ce4760f8443ab13c3a4af80db0  gross-svn.initd
-5ca1c6e51c3243236e6564480b20279b  gross-svn.confd"
diff --git a/testing/gross-svn/gross-svn.confd b/testing/gross-svn/gross-svn.confd
deleted file mode 100644
index 646e12f9d7..0000000000
--- a/testing/gross-svn/gross-svn.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Specify daemon $OPTS here.
-#
-
-OPTS=""
-
diff --git a/testing/gross-svn/gross-svn.initd b/testing/gross-svn/gross-svn.initd
deleted file mode 100644
index 00ee33e560..0000000000
--- a/testing/gross-svn/gross-svn.initd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/runscript
-
-NAME="grossd"
-DAEMON="/usr/sbin/$NAME"
-USER="gross"
-GROUP="gross"
-
-depend() {
-	need net
-	after firewall
-}
-
-check_config() {
-	if [ ! -f /var/db/gross/state ] ; then
-		einfo "Generating Gross database..."
-		install -dD -o${USER} -g${GROUP} /var/db/gross
-		${DAEMON} -Cu ${USER} > /dev/null
-	fi
-}
-
-start() {
-	check_config || return 1
-	ebegin "Starting ${NAME}"
-	start-stop-daemon --start --quiet --background \
-		--exec ${DAEMON} -- \
-		-p /var/run/gross/grossd.pid \
-		-u ${USER} ${OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${NAME}"
-	start-stop-daemon --stop --pidfile /var/run/gross/grossd.pid
-	eend $?
-}
-
diff --git a/testing/gross-svn/gross-svn.post-install b/testing/gross-svn/gross-svn.post-install
deleted file mode 100644
index df06670a41..0000000000
--- a/testing/gross-svn/gross-svn.post-install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-chown -R gross:gross /var/run/gross
diff --git a/testing/gross-svn/gross-svn.pre-install b/testing/gross-svn/gross-svn.pre-install
deleted file mode 100644
index c3844d7a5e..0000000000
--- a/testing/gross-svn/gross-svn.pre-install
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-adduser -H -s /bin/false -D gross 2>/dev/null
-exit 0
diff --git a/testing/inotify-tools/APKBUILD b/testing/inotify-tools/APKBUILD
index a664b55d02..82bb0baabb 100644
--- a/testing/inotify-tools/APKBUILD
+++ b/testing/inotify-tools/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname="inotify-tools"
 pkgver=3.14
-pkgrel=0
+pkgrel=1
 pkgdesc="C library and CLI tools providing a simple interface to inotify"
 url="http://github.com/rvoicilas/inotify-tools"
 arch="all"
@@ -32,7 +32,8 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
 md5sums="b43d95a0fa8c45f8bab3aec9672cf30c  inotify-tools-3.14.tar.gz"
diff --git a/testing/libnetfilter_log/APKBUILD b/testing/libnetfilter_log/APKBUILD
index 5daf58885f..fed9886f48 100644
--- a/testing/libnetfilter_log/APKBUILD
+++ b/testing/libnetfilter_log/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=libnetfilter_log
 pkgver=0.0.16
-pkgrel=0
+pkgrel=1
 pkgdesc="interface to packets that have been logged by the kernel packet filter"
 url="http://www.netfilter.org/projects/libnetfilter_log/"
 arch="all"
@@ -14,14 +14,17 @@ source="http://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_lo
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
-	make DESTDIR="$pkgdir" install
+}
 
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 
 md5sums="4ffcf46dad9d0c81f6611dd185639694  libnetfilter_log-0.0.16.tar.bz2"
diff --git a/testing/libwmf/APKBUILD b/testing/libwmf/APKBUILD
index 95962efdf6..ddfc4f16e7 100644
--- a/testing/libwmf/APKBUILD
+++ b/testing/libwmf/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libwmf
 pkgver=0.2.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)."
 url="http://wvware.sourceforge.net/libwmf.html"
 arch="all"
@@ -30,7 +30,8 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" install
+	make -j1 DESTDIR="$pkgdir" install || return 1
+	rm "$pkgdir"/usr/lib/*.la || return 1
 }
 md5sums="d1177739bf1ceb07f57421f0cee191e0  libwmf-0.2.8.4.tar.gz
 33d3c07a1be9f99fd88de220930c5550  libpng14.patch"
diff --git a/testing/perl-local-lib/APKBUILD b/testing/perl-local-lib/APKBUILD
new file mode 100644
index 0000000000..96b27e2794
--- /dev/null
+++ b/testing/perl-local-lib/APKBUILD
@@ -0,0 +1,37 @@
+# Automatically generated by apkbuild-cpan, template 1
+# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+pkgname=perl-local-lib
+_pkgreal=local-lib
+pkgver=1.008004
+pkgrel=0
+pkgdesc="create and use a local lib/ for perl modules with PERL5LIB"
+url="http://search.cpan.org/dist/local-lib/"
+arch="noarch"
+license="GPL PerlArtistic"
+cpandepends=""
+cpanmakedepends=""
+depends="$cpandepends"
+makedepends="perl-dev $cpanmakedepends"
+subpackages="$pkgname-doc"
+source="http://search.cpan.org/CPAN/authors/id/A/AP/APEIRON/$_pkgreal-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_pkgreal-$pkgver"
+
+prepare() {
+	cd "$_builddir"
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+}
+
+build() {
+	cd "$_builddir"
+	make && make test
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
+}
+
+md5sums="6244fa9d77e818594acbaf572aece326  local-lib-1.008004.tar.gz"