From c0103033fbd2b2f7c989bbe524c8e56209929fd2 Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Thu, 19 Jul 2012 01:37:40 +0000
Subject: [PATCH] updated ebuild to not use tap-crap

---
 net-im/punjab/Manifest           | 5 +++--
 net-im/punjab/files/punjab-confd | 2 ++
 net-im/punjab/files/punjab-initd | 4 ++--
 net-im/punjab/punjab-9999.ebuild | 9 +--------
 4 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100644 net-im/punjab/files/punjab-confd

diff --git a/net-im/punjab/Manifest b/net-im/punjab/Manifest
index 2845abb..34cbfe6 100644
--- a/net-im/punjab/Manifest
+++ b/net-im/punjab/Manifest
@@ -1,2 +1,3 @@
-AUX punjab-initd 606 RMD160 7fe2a63a91ba0894dea5545e4baca2c5b235b446 SHA1 9136218bb3e5c25b9f9646ad5d98eae317501814 SHA256 54127766b552e792bf1f84d5e5fc473319b0667223dcbc4b423983ef9880610c
-EBUILD punjab-9999.ebuild 1405 RMD160 355062c1dc42c969610a36f57233facd691cef82 SHA1 abdb66cd2b0f50871cdbb6a384e70b614425b67c SHA256 2553ea692e8aeadd7541e8d61c50cf9c18bc0054d5477a9e5abd63aa02736305
+AUX punjab-confd 67 RMD160 b7dd013fc40f4cc5befd9ecaaf5ef9f22876ba65 SHA1 5ae63a5af2c0fdeefa42846126fc2724398b87c6 SHA256 2951827630ccbd793922d32f7f61416747c50ebb2cd542062f1dd82dc9ec94c7
+AUX punjab-initd 600 RMD160 e9da7f93fab1db4ccb91af63dde33a1d27c65b4b SHA1 e561b6c3f78b109dfe597933d937899ef66e901d SHA256 e4f26151fa0c98c7ae29c04ed6a21acf2c2b273179de4f135798cbea75fa1ed8
+EBUILD punjab-9999.ebuild 1135 RMD160 9fe5ee8a623e152578d5f22bf4d85a4a197d9f82 SHA1 4984164f0f294c8359ebddfa941aef70597e0f87 SHA256 a8c6c509f017656fd788e7a12c6d213b7a67e3bf197e899fa5edc5a0bf154291
diff --git a/net-im/punjab/files/punjab-confd b/net-im/punjab/files/punjab-confd
new file mode 100644
index 0000000..f0120a8
--- /dev/null
+++ b/net-im/punjab/files/punjab-confd
@@ -0,0 +1,2 @@
+# location of the configuration file
+CONFIG=/etc/jabber/punjab.xml
diff --git a/net-im/punjab/files/punjab-initd b/net-im/punjab/files/punjab-initd
index 3ab13a8..5aa07ef 100644
--- a/net-im/punjab/files/punjab-initd
+++ b/net-im/punjab/files/punjab-initd
@@ -11,8 +11,8 @@ depend() {
 start() {
 	ebegin "Starting Punjab BOSH connection manager"
 	start-stop-daemon --start --pidfile /var/run/jabber/punjab.pid -u jabber -g jabber \
-		--exec /usr/bin/twistd -- -f /etc/jabber/punjab.tap -l /var/log/jabber/punjab.log \
-		--pidfile /var/run/jabber/punjab.pid
+		--exec /usr/bin/twistd -- -l /var/log/jabber/punjab.log --pidfile /var/run/jabber/punjab.pid \
+		punjab -c ${CONFIG}
 	eend $?
 }
 
diff --git a/net-im/punjab/punjab-9999.ebuild b/net-im/punjab/punjab-9999.ebuild
index 0cb191e..e56107f 100644
--- a/net-im/punjab/punjab-9999.ebuild
+++ b/net-im/punjab/punjab-9999.ebuild
@@ -38,19 +38,12 @@ src_install() {
 		"s:<spool>[^\<]*</spool>:<spool>/var/spool/jabber</spool>:" \
 		/etc/jabber/${PN}.xml
 
-#	dosed \
-#		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
-#		/etc/jabber/${PN}.xml
-
 	newinitd "${FILESDIR}/${PN}-initd" ${PN}
-#	dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
+	newconfd "${FILESDIR}/${PN}-confd" ${PN}
 
 }
 
 pkg_postinst() {
 	einfo "A sample config file has been installed into /etc/jabber/${PN}.xml."
 	einfo "Please adjust the settings as needed."
-	einfo "After that, you MUST create a TAP-file for twisted in order to start Punjab, like this:"
-	einfo "# cd /etc/jabber"
-	einfo "# mktap punjab -c punjab.xml"
 }