aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Thomsen <oss@cogitri.dev>2019-05-08 07:11:59 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2019-06-05 17:48:01 +0000
commit815d46044815e090806f9f0c729ede697013584b (patch)
treec5910b29c70f24c33008c74ebb4d61a0507d6291
parent1b1801a0870bae9e2b35b661cc09c183477ef920 (diff)
downloadaports-815d46044815e090806f9f0c729ede697013584b.tar.gz
aports-815d46044815e090806f9f0c729ede697013584b.tar.bz2
aports-815d46044815e090806f9f0c729ede697013584b.tar.xz
community/sane: move from testing
It's required for simple-scanner. Modernize the APKBUILD while I'm at it.
-rw-r--r--community/sane/APKBUILD (renamed from testing/sane/APKBUILD)30
-rw-r--r--community/sane/check.patch (renamed from testing/sane/check.patch)0
-rw-r--r--community/sane/include.patch (renamed from testing/sane/include.patch)0
-rw-r--r--community/sane/network.patch (renamed from testing/sane/network.patch)0
-rw-r--r--community/sane/pidfile.patch (renamed from testing/sane/pidfile.patch)0
-rw-r--r--community/sane/sane-saned.initd (renamed from testing/sane/sane-saned.initd)0
-rw-r--r--community/sane/sane-saned.pre-install (renamed from testing/sane/sane-saned.pre-install)0
-rw-r--r--community/sane/sane.pre-install (renamed from testing/sane/sane.pre-install)0
8 files changed, 12 insertions, 18 deletions
diff --git a/testing/sane/APKBUILD b/community/sane/APKBUILD
index 4a77e35ffe..25370810c0 100644
--- a/testing/sane/APKBUILD
+++ b/community/sane/APKBUILD
@@ -9,8 +9,6 @@ pkgdesc="Scanner Access Now Easy - universal scanner interface"
url="http://www.sane-project.org/"
arch="x86 x86_64 aarch64 armv7 armhf"
license="GPL-2.0-or-later GPL-2.0-or-later-with-sane-exception Public-Domain"
-depends=""
-depends_dev=""
makedepends="diffutils file libtool libusb-dev v4l-utils-dev net-snmp-dev avahi-dev libpng-dev
libjpeg-turbo-dev tiff-dev libgphoto2-dev linux-headers"
install="$pkgname-saned.pre-install $pkgname.pre-install"
@@ -43,34 +41,30 @@ source="https://alioth-archive.debian.org/releases/$pkgname/$_pkgname/$pkgver/$_
builddir="$srcdir"/$_pkgname-$pkgver
build() {
- cd "$builddir"
./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --with-docdir=/usr/share/doc/$pkgname \
- --with-usb \
- --enable-avahi \
- --disable-rpath \
- --disable-locking \
- || return 1
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-docdir=/usr/share/doc/$pkgname \
+ --with-usb \
+ --enable-avahi \
+ --disable-rpath \
+ --disable-locking
make
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
echo -n "" > "$pkgdir"/etc/$pkgname.d/dll.conf
install -Dm644 backend/dll.aliases "$pkgdir"/etc/$pkgname.d/dll.aliases
}
doc() {
- default_doc || return 1
- mkdir -p "$subpkgdir"/usr/share/licenses/$_pkgname || return 1
+ default_doc
+ mkdir -p "$subpkgdir"/usr/share/licenses/$_pkgname
mv "$subpkgdir"/usr/share/doc/$_pkgname/LICENSE \
"$subpkgdir"/usr/share/licenses/$_pkgname
}
@@ -95,7 +89,7 @@ udev() {
pkgdesc="$pkgdesc (udev rules)"
install_if="$pkgname=$pkgver-r$pkgrel udev"
install -Dm644 "$builddir"/tools/udev/lib$pkgname.rules \
- "$subpkgdir"/usr/lib/udev/rules.d/49-$pkgname.rules || return 1
+ "$subpkgdir"/usr/lib/udev/rules.d/49-$pkgname.rules
sed -i 's|NAME="%k", ||g' "$subpkgdir"/usr/lib/udev/rules.d/49-$pkgname.rules
}
@@ -123,7 +117,7 @@ _backend() {
mkdir -p "$subpkgdir"/usr/lib/$pkgname \
"$subpkgdir"/etc/$pkgname.d/dll.d
mv "$pkgdir"/usr/lib/$pkgname/lib$pkgname-$name.* \
- "$subpkgdir"/usr/lib/$pkgname || return 1
+ "$subpkgdir"/usr/lib/$pkgname
echo "$name" > "$subpkgdir"/etc/$pkgname.d/dll.d/$name
if [ -f "$pkgdir"/etc/$pkgname.d/$name.conf ]; then
mv "$pkgdir"/etc/$pkgname.d/$name.conf \
diff --git a/testing/sane/check.patch b/community/sane/check.patch
index afbc7ef4ce..afbc7ef4ce 100644
--- a/testing/sane/check.patch
+++ b/community/sane/check.patch
diff --git a/testing/sane/include.patch b/community/sane/include.patch
index 518d3b4d5c..518d3b4d5c 100644
--- a/testing/sane/include.patch
+++ b/community/sane/include.patch
diff --git a/testing/sane/network.patch b/community/sane/network.patch
index 4e422e28d2..4e422e28d2 100644
--- a/testing/sane/network.patch
+++ b/community/sane/network.patch
diff --git a/testing/sane/pidfile.patch b/community/sane/pidfile.patch
index 457755bdb8..457755bdb8 100644
--- a/testing/sane/pidfile.patch
+++ b/community/sane/pidfile.patch
diff --git a/testing/sane/sane-saned.initd b/community/sane/sane-saned.initd
index 6482073ef4..6482073ef4 100644
--- a/testing/sane/sane-saned.initd
+++ b/community/sane/sane-saned.initd
diff --git a/testing/sane/sane-saned.pre-install b/community/sane/sane-saned.pre-install
index caad990d96..caad990d96 100644
--- a/testing/sane/sane-saned.pre-install
+++ b/community/sane/sane-saned.pre-install
diff --git a/testing/sane/sane.pre-install b/community/sane/sane.pre-install
index b75c867de9..b75c867de9 100644
--- a/testing/sane/sane.pre-install
+++ b/community/sane/sane.pre-install