testing/dkimproxy: separate in/out initd, fix perllibdir and sysconfdir

4 files changed, 40 insertions, 44 deletions

diff --git a/testing/dkimproxy/APKBUILD b/testing/dkimproxy/APKBUILD
index c815497a5..3f236f3eb 100644
--- a/testing/dkimproxy/APKBUILD
+++ b/testing/dkimproxy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=dkimproxy
 pkgver=1.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="SMTP-proxy that signs and/or verifies emails, using the Mail::DKIM module"
 url="http://dkimproxy.sourceforge.net/"
 arch="noarch"
@@ -12,7 +12,10 @@ depends_dev=
 makedepends="$depends_dev"
 install=
 subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	dkimproxy.in.initd
+	dkimproxy.out.initd
+	"
 
 
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -24,8 +27,9 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
+	eval local $(perl -V:vendorlib)
+	perllibdir="$vendorlib" ./configure --prefix=/usr \
+		--sysconfdir=/etc/dkimproxy \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--bindir=/usr/bin
@@ -39,7 +43,13 @@ package() {
 	#FIXME
 	mkdir -p "$pkgdir"/usr/sbin
 	mv "$pkgdir"/usr/bin/$pkgname.* "$pkgdir"/usr/sbin/
-	install -D -m755 ../../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+
+	install -D -m755 "$srcdir"/$pkgname.in.initd \
+		"$pkgdir"/etc/init.d/$pkgname.in
+	install -D -m755 "$srcdir"/$pkgname.out.initd \
+		"$pkgdir"/etc/init.d/$pkgname.out
 }
 
-md5sums="3ecaa38a8c865a5b7682f7f261354218  dkimproxy-1.4.1.tar.gz"
+md5sums="3ecaa38a8c865a5b7682f7f261354218  dkimproxy-1.4.1.tar.gz
+fe974cf486e0aee1eddd65a5a36fdb83  dkimproxy.in.initd
+f7e1fbcf11ebf04d0127a8e97a85fa67  dkimproxy.out.initd"
diff --git a/testing/dkimproxy/dkimproxy.in.initd b/testing/dkimproxy/dkimproxy.in.initd
new file mode 100644
index 000000000..1649f66da
--- /dev/null
+++ b/testing/dkimproxy/dkimproxy.in.initd
@@ -0,0 +1,12 @@
+#!/sbin/runscript
+
+command="/usr/sbin/${RC_SVCNAME}"
+command_args="${OPTS}"
+pidfile="/var/run/${RC_SVCNAME}.pid"
+description="SMTP proxy that verifies signature on incomming messages"
+
+depend() {
+	need net
+	after firewall
+}
+
diff --git a/testing/dkimproxy/dkimproxy.initd b/testing/dkimproxy/dkimproxy.initd
deleted file mode 100644
index 9e8862813..000000000
--- a/testing/dkimproxy/dkimproxy.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-
-NAME=dkimproxy
-
-depend() {
-	need net
-	after firewall
-}
-
-launch() {
-	ebegin "Starting ${DAEMON}"
-		start-stop-daemon --start --quiet \
-			--pidfile /var/run/${DAEMON}.pid \
-			--exec ${DAEMON} -- ${OPTS}
-	eend $?
-}
-
-terminate() {
-	ebegin "Stopping ${DAEMON}"
-		start-stop-daemon --stop --quiet \
-			--exec ${DAEMON} \
-			--pidfile /var/run/${DAEMON}.pid \
-	eend $?
-}
-
-start() {
-	DAEMON="${NAME}.in"
-	launch
-	DAEMON="${NAME}.out"
-	launch
-}
-
-stop() {
-	DAEMON="${NAME}.in"
-	terminate
-	DAEMON="${NAME}.out"
-	terminate
-}
diff --git a/testing/dkimproxy/dkimproxy.out.initd b/testing/dkimproxy/dkimproxy.out.initd
new file mode 100644
index 000000000..7e395412f
--- /dev/null
+++ b/testing/dkimproxy/dkimproxy.out.initd
@@ -0,0 +1,12 @@
+#!/sbin/runscript
+
+command="/usr/sbin/${RC_SVCNAME}"
+command_args="${OPTS}"
+pidfile="/var/run/${RC_SVCNAME}.pid"
+description="SMTP proxy that signs outgoing messages"
+
+depend() {
+	need net
+	after firewall
+}
+