From 57bb75d94d2ad7f103e4afc4bda29b6095da4f6a Mon Sep 17 00:00:00 2001
From: Manuel Friedli <manuel@fritteli.ch>
Date: Thu, 19 Jul 2012 02:39:47 +0000
Subject: [PATCH] tweak

---
 net-im/punjab/Manifest           |  4 ++--
 net-im/punjab/files/punjab-initd |  3 ++-
 net-im/punjab/punjab-9999.ebuild | 18 +++++++++---------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/net-im/punjab/Manifest b/net-im/punjab/Manifest
index cbc5c7e..7252686 100644
--- a/net-im/punjab/Manifest
+++ b/net-im/punjab/Manifest
@@ -1,3 +1,3 @@
 AUX punjab-confd 67 RMD160 b7dd013fc40f4cc5befd9ecaaf5ef9f22876ba65 SHA1 5ae63a5af2c0fdeefa42846126fc2724398b87c6 SHA256 2951827630ccbd793922d32f7f61416747c50ebb2cd542062f1dd82dc9ec94c7
-AUX punjab-initd 600 RMD160 e9da7f93fab1db4ccb91af63dde33a1d27c65b4b SHA1 e561b6c3f78b109dfe597933d937899ef66e901d SHA256 e4f26151fa0c98c7ae29c04ed6a21acf2c2b273179de4f135798cbea75fa1ed8
-EBUILD punjab-9999.ebuild 1181 RMD160 56e26a9961452f35430a9d54d91b19ea39034159 SHA1 83b8ff1b0848c5279df1f8a41a844c47deeda75a SHA256 bb2558285f532f35d449910902c06305edeb5d0b6097508550863cd0595b9e9d
+AUX punjab-initd 621 RMD160 fc29c2e3091907470c897462a0530ef517bba5d0 SHA1 bfb13a5b5fe47627a333620a6b852e9e71b55bfa SHA256 4263b2f8a2abad5317d1555005ec7038478494fa450918e80f065a488ac80e04
+EBUILD punjab-9999.ebuild 1166 RMD160 3df7523b63af1192d4cc973823c66ecc1729b3f1 SHA1 685c4f5b8977ef1d3d9b910a5165346b90b626b6 SHA256 50206c523ad2a79601f17cf1f6622fc3ad7509e979af5a3ffc0665358e90552e
diff --git a/net-im/punjab/files/punjab-initd b/net-im/punjab/files/punjab-initd
index 5aa07ef..7f383a5 100644
--- a/net-im/punjab/files/punjab-initd
+++ b/net-im/punjab/files/punjab-initd
@@ -12,7 +12,8 @@ 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 -- -l /var/log/jabber/punjab.log --pidfile /var/run/jabber/punjab.pid \
-		punjab -c ${CONFIG}
+		-y /etc/jabber/punjab.tac
+# -c ${CONFIG}
 	eend $?
 }
 
diff --git a/net-im/punjab/punjab-9999.ebuild b/net-im/punjab/punjab-9999.ebuild
index da0cb6f..64877ab 100644
--- a/net-im/punjab/punjab-9999.ebuild
+++ b/net-im/punjab/punjab-9999.ebuild
@@ -31,20 +31,20 @@ src_compile() {
 src_install() {
 	distutils_src_install
 
-#	insinto /etc/jabber
-#	newins example-config.xml ${PN}.xml
-#	fperms 600 /etc/jabber/${PN}.xml
-#	fowners jabber:jabber /etc/jabber/${PN}.xml
+	insinto /etc/jabber
+	newins punjab.tac ${PN}.tac
+	fperms 600 /etc/jabber/${PN}.tac
+	fowners jabber:jabber /etc/jabber/${PN}.tac
 #	dosed \
 #		"s:<spool>[^\<]*</spool>:<spool>/var/spool/jabber</spool>:" \
 #		/etc/jabber/${PN}.xml
 
 	newinitd "${FILESDIR}/${PN}-initd" ${PN}
-	newconfd "${FILESDIR}/${PN}-confd" ${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."
-#}
+pkg_postinst() {
+	einfo "A sample config file has been installed into /etc/jabber/${PN}.tac."
+	einfo "Please adjust the settings as needed."
+}