diff options
author | Johannes Findeisen <you@hanez.org> | 2016-11-18 20:25:16 +0100 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-05 16:12:21 +0000 |
commit | 8e66643b26e958ab57aa9507d5ebd0ad9fa719a2 (patch) | |
tree | fe82af300ba8e655425521f78d7d5d48ca93cdde | |
parent | 1b30f2804b6f5c59ab10eec4d850332a762a15e3 (diff) | |
download | alpine_aports-8e66643b26e958ab57aa9507d5ebd0ad9fa719a2.tar.bz2 alpine_aports-8e66643b26e958ab57aa9507d5ebd0ad9fa719a2.tar.xz alpine_aports-8e66643b26e958ab57aa9507d5ebd0ad9fa719a2.zip |
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/APKBUILD | 50 | ||||
-rw-r--r-- | testing/daemontools/svscan.initd (renamed from unmaintained/daemontools/svscan.initd) | 2 | ||||
-rw-r--r-- | unmaintained/daemontools/APKBUILD | 50 |
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 @@ | |||
1 | # Maintainer: Johannes Findeisen <you@hanez.org> | ||
2 | pkgname=daemontools | ||
3 | pkgver=0.76 | ||
4 | pkgrel=0 | ||
5 | pkgdesc="Collection of tools for managing UNIX services" | ||
6 | url="http://cr.yp.to/daemontools.html" | ||
7 | arch="all" | ||
8 | license="public-domain" | ||
9 | depends= | ||
10 | # The makefile need GNU cat for 'cat -v' | ||
11 | makedepends="coreutils" | ||
12 | |||
13 | source="http://cr.yp.to/daemontools/$pkgname-$pkgver.tar.gz | ||
14 | 0.76-errno.patch | ||
15 | 0.76-warnings.patch | ||
16 | svscan.initd | ||
17 | " | ||
18 | |||
19 | builddir="$srcdir"/admin/$pkgname-$pkgver/src | ||
20 | |||
21 | build() { | ||
22 | cd "$builddir" | ||
23 | echo "${CC:-"gcc"} ${CFLAGS}" > conf-cc | ||
24 | echo "${CC:-"gcc"} ${LDFLAGS}" > conf-ld | ||
25 | touch home | ||
26 | make PATH="/usr/bin:/bin" || return 1 | ||
27 | } | ||
28 | |||
29 | package() { | ||
30 | local f | ||
31 | cd "$builddir" | ||
32 | mkdir -p "$pkgdir"/usr/bin "$pkgdir"/service | ||
33 | for f in $(cat ../package/commands); do | ||
34 | cp $f "$pkgdir"/usr/bin/$f | ||
35 | done | ||
36 | install -Dm755 "$srcdir"/svscan.initd "$pkgdir"/etc/init.d/svscan | ||
37 | } | ||
38 | |||
39 | md5sums="1871af2453d6e464034968a0fbcb2bfc daemontools-0.76.tar.gz | ||
40 | c75438b1c3b9d9f67691bd10cf3c8e52 0.76-errno.patch | ||
41 | ad68177f50bfffb6a1cbf8c668de6a55 0.76-warnings.patch | ||
42 | 39641f3d432b6f8d3259c867b5ad3a0a svscan.initd" | ||
43 | sha256sums="a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f daemontools-0.76.tar.gz | ||
44 | 1afaa3b5a26e7382cfe1c9880ddf3910fde4ded6fa815440ef087506543a3947 0.76-errno.patch | ||
45 | 42bfcc27660ef6459d39fbaaa9f1852313baadf7b96201872e4deb12804f4833 0.76-warnings.patch | ||
46 | 1b1c739f4adff56f902df5b1eb324a057cf3ef6353555a509351f2a8abb29056 svscan.initd" | ||
47 | sha512sums="e4a7938352b745a03ccc41acdddba1e6782f0ca245e5cae060de62ab6c5a23c841a994c30140298d274405a7f26d53ba7e84e5810a3d185b2c01e4c0feffe6c7 daemontools-0.76.tar.gz | ||
48 | 76664b71e16ba4dbb081604a1a8c9ddc58a603777dccc0a53b0af9442ff8f0cdfce9ef8b05926dac62b81b2c805262df6a7e4df65920c00583132dbf136ba85e 0.76-errno.patch | ||
49 | 13288c5d1fc5f775cff9286b5cb4c711c5e6e52ef9c714b377cec0328c887b065385c464ca27b2dbe921e66956c20b5f3205cc36d7d2e81c383b5765cbd554aa 0.76-warnings.patch | ||
50 | 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 @@ | |||
1 | #!/sbin/runscript | 1 | #!/sbin/openrc-run |
2 | # Copyright 1999-2004 Gentoo Foundation | 2 | # Copyright 1999-2004 Gentoo Foundation |
3 | # Distributed under the terms of the GNU General Public License v2 | 3 | # Distributed under the terms of the GNU General Public License v2 |
4 | # $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 $ | 4 | # $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 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | ||
2 | pkgname=daemontools | ||
3 | pkgver=0.76 | ||
4 | pkgrel=1 | ||
5 | pkgdesc="Collection of tools for managing UNIX services" | ||
6 | url="http://cr.yp.to/daemontools.html" | ||
7 | arch="all" | ||
8 | license="public-domain" | ||
9 | depends= | ||
10 | # The makefile need GNU cat for 'cat -v' | ||
11 | makedepends="coreutils" | ||
12 | |||
13 | source="http://cr.yp.to/daemontools/$pkgname-$pkgver.tar.gz | ||
14 | 0.76-errno.patch | ||
15 | 0.76-warnings.patch | ||
16 | svscan.initd | ||
17 | " | ||
18 | |||
19 | _builddir="$srcdir"/admin/$pkgname-$pkgver/src | ||
20 | |||
21 | prepare() { | ||
22 | cd "$_builddir" | ||
23 | for i in "$srcdir"/*.patch; do | ||
24 | msg "Applying $i" | ||
25 | patch -p1 -i $i || return 1 | ||
26 | done | ||
27 | } | ||
28 | |||
29 | build() { | ||
30 | cd "$_builddir" | ||
31 | echo "${CC:-"gcc"} ${CFLAGS}" > conf-cc | ||
32 | echo "${CC:-"gcc"} ${LDFLAGS}" > conf-ld | ||
33 | touch > home | ||
34 | make PATH="/usr/bin:/bin" || return 1 | ||
35 | } | ||
36 | |||
37 | package() { | ||
38 | local f | ||
39 | cd "$_builddir" | ||
40 | mkdir -p "$pkgdir"/usr/bin "$pkgdir"/service | ||
41 | for f in $(cat ../package/commands); do | ||
42 | cp $f "$pkgdir"/usr/bin/$f | ||
43 | done | ||
44 | install -Dm755 "$srcdir"/svscan.initd "$pkgdir"/etc/init.d/svscan | ||
45 | } | ||
46 | |||
47 | md5sums="1871af2453d6e464034968a0fbcb2bfc daemontools-0.76.tar.gz | ||
48 | c75438b1c3b9d9f67691bd10cf3c8e52 0.76-errno.patch | ||
49 | ad68177f50bfffb6a1cbf8c668de6a55 0.76-warnings.patch | ||
50 | c6e4ace205400be062d3ba82315cbcd1 svscan.initd" | ||