aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Findeisen <you@hanez.org>2016-11-18 20:25:16 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2016-12-05 16:12:21 +0000
commit8e66643b26e958ab57aa9507d5ebd0ad9fa719a2 (patch)
treefe82af300ba8e655425521f78d7d5d48ca93cdde
parent1b30f2804b6f5c59ab10eec4d850332a762a15e3 (diff)
downloadaports-8e66643b26e958ab57aa9507d5ebd0ad9fa719a2.tar.bz2
aports-8e66643b26e958ab57aa9507d5ebd0ad9fa719a2.tar.xz
testing/daemontools: made APKBUILD more consistent
* fixed small errors in APKBUILD * switched to openrc-run in init script
-rw-r--r--testing/daemontools/0.76-errno.patch (renamed from unmaintained/daemontools/0.76-errno.patch)0
-rw-r--r--testing/daemontools/0.76-warnings.patch (renamed from unmaintained/daemontools/0.76-warnings.patch)0
-rw-r--r--testing/daemontools/APKBUILD50
-rw-r--r--testing/daemontools/svscan.initd (renamed from unmaintained/daemontools/svscan.initd)2
-rw-r--r--unmaintained/daemontools/APKBUILD50
5 files changed, 51 insertions, 51 deletions
diff --git a/unmaintained/daemontools/0.76-errno.patch b/testing/daemontools/0.76-errno.patch
index 3af157c462..3af157c462 100644
--- a/unmaintained/daemontools/0.76-errno.patch
+++ b/testing/daemontools/0.76-errno.patch
diff --git a/unmaintained/daemontools/0.76-warnings.patch b/testing/daemontools/0.76-warnings.patch
index f558bb18b1..f558bb18b1 100644
--- a/unmaintained/daemontools/0.76-warnings.patch
+++ b/testing/daemontools/0.76-warnings.patch
diff --git a/testing/daemontools/APKBUILD b/testing/daemontools/APKBUILD
new file mode 100644
index 0000000000..d21ce8be1f
--- /dev/null
+++ b/testing/daemontools/APKBUILD
@@ -0,0 +1,50 @@
+# Maintainer: Johannes Findeisen <you@hanez.org>
+pkgname=daemontools
+pkgver=0.76
+pkgrel=0
+pkgdesc="Collection of tools for managing UNIX services"
+url="http://cr.yp.to/daemontools.html"
+arch="all"
+license="public-domain"
+depends=
+# The makefile need GNU cat for 'cat -v'
+makedepends="coreutils"
+
+source="http://cr.yp.to/daemontools/$pkgname-$pkgver.tar.gz
+ 0.76-errno.patch
+ 0.76-warnings.patch
+ svscan.initd
+ "
+
+builddir="$srcdir"/admin/$pkgname-$pkgver/src
+
+build() {
+ cd "$builddir"
+ echo "${CC:-"gcc"} ${CFLAGS}" > conf-cc
+ echo "${CC:-"gcc"} ${LDFLAGS}" > conf-ld
+ touch home
+ make PATH="/usr/bin:/bin" || return 1
+}
+
+package() {
+ local f
+ cd "$builddir"
+ mkdir -p "$pkgdir"/usr/bin "$pkgdir"/service
+ for f in $(cat ../package/commands); do
+ cp $f "$pkgdir"/usr/bin/$f
+ done
+ install -Dm755 "$srcdir"/svscan.initd "$pkgdir"/etc/init.d/svscan
+}
+
+md5sums="1871af2453d6e464034968a0fbcb2bfc daemontools-0.76.tar.gz
+c75438b1c3b9d9f67691bd10cf3c8e52 0.76-errno.patch
+ad68177f50bfffb6a1cbf8c668de6a55 0.76-warnings.patch
+39641f3d432b6f8d3259c867b5ad3a0a svscan.initd"
+sha256sums="a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f daemontools-0.76.tar.gz
+1afaa3b5a26e7382cfe1c9880ddf3910fde4ded6fa815440ef087506543a3947 0.76-errno.patch
+42bfcc27660ef6459d39fbaaa9f1852313baadf7b96201872e4deb12804f4833 0.76-warnings.patch
+1b1c739f4adff56f902df5b1eb324a057cf3ef6353555a509351f2a8abb29056 svscan.initd"
+sha512sums="e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7 daemontools-0.76.tar.gz
+76664b71e16ba4dbb081604a1a8c9ddc58a603777dccc0a53b0af9442ff8f0cdfce9ef8b05926dac62b81b2c805262df6a7e4df65920c00583132dbf136ba85e 0.76-errno.patch
+13288c5d1fc5f775cff9286b5cb4c711c5e6e52ef9c714b377cec0328c887b065385c464ca27b2dbe921e66956c20b5f3205cc36d7d2e81c383b5765cbd554aa 0.76-warnings.patch
+a2c3b35c7d253b9f2ffc5051663fdfacc5bd57385ce95d5d623f1f773d7bfe445b6837c7c1fe5565587387bdee0437761272f06902e166e95e2d00c19f8c6995 svscan.initd"
diff --git a/unmaintained/daemontools/svscan.initd b/testing/daemontools/svscan.initd
index bf7af28fa4..0b855ee730 100644
--- a/unmaintained/daemontools/svscan.initd
+++ b/testing/daemontools/svscan.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/files/svscan.init-0.76-r7,v 1.1 2008/12/07 06:59:37 robbat2 Exp $
diff --git a/unmaintained/daemontools/APKBUILD b/unmaintained/daemontools/APKBUILD
deleted file mode 100644
index bc1e1cab7d..0000000000
--- a/unmaintained/daemontools/APKBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=daemontools
-pkgver=0.76
-pkgrel=1
-pkgdesc="Collection of tools for managing UNIX services"
-url="http://cr.yp.to/daemontools.html"
-arch="all"
-license="public-domain"
-depends=
-# The makefile need GNU cat for 'cat -v'
-makedepends="coreutils"
-
-source="http://cr.yp.to/daemontools/$pkgname-$pkgver.tar.gz
- 0.76-errno.patch
- 0.76-warnings.patch
- svscan.initd
- "
-
-_builddir="$srcdir"/admin/$pkgname-$pkgver/src
-
-prepare() {
- cd "$_builddir"
- for i in "$srcdir"/*.patch; do
- msg "Applying $i"
- patch -p1 -i $i || return 1
- done
-}
-
-build() {
- cd "$_builddir"
- echo "${CC:-"gcc"} ${CFLAGS}" > conf-cc
- echo "${CC:-"gcc"} ${LDFLAGS}" > conf-ld
- touch > home
- make PATH="/usr/bin:/bin" || return 1
-}
-
-package() {
- local f
- cd "$_builddir"
- mkdir -p "$pkgdir"/usr/bin "$pkgdir"/service
- for f in $(cat ../package/commands); do
- cp $f "$pkgdir"/usr/bin/$f
- done
- install -Dm755 "$srcdir"/svscan.initd "$pkgdir"/etc/init.d/svscan
-}
-
-md5sums="1871af2453d6e464034968a0fbcb2bfc daemontools-0.76.tar.gz
-c75438b1c3b9d9f67691bd10cf3c8e52 0.76-errno.patch
-ad68177f50bfffb6a1cbf8c668de6a55 0.76-warnings.patch
-c6e4ace205400be062d3ba82315cbcd1 svscan.initd"