cosmetic issues (binary is hxd, package and gentoo install are calledmhxd)

4 files changed, 36 insertions, 24 deletions

diff --git a/net-p2p/mhxd/ChangeLog b/net-p2p/mhxd/ChangeLog
index 731fb634d925..fecf48767645 100644
--- a/net-p2p/mhxd/ChangeLog
+++ b/net-p2p/mhxd/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for net-p2p/mhxd
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mhxd/ChangeLog,v 1.1 2004/06/06 22:10:25 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mhxd/ChangeLog,v 1.2 2004/06/07 20:28:53 kang Exp $
 
 *mhxd-0.4.9 (05 Jun 2004)
 
+  07 Jun 2004; Guillaume Destuynder <kang@gentoo.org>:
+  Minor cosmetic changes, seeing if the cvs var/home bug is also fixed
+
   05 Jun 2004; Guillaume Destuynder <kang@gentoo.org>:
   Initial import.  Ebuild submitted by myself.
diff --git a/net-p2p/mhxd/Manifest b/net-p2p/mhxd/Manifest
index abe13dccf68e..e87d93dd14f6 100644
--- a/net-p2p/mhxd/Manifest
+++ b/net-p2p/mhxd/Manifest
@@ -1,5 +1,5 @@
-MD5 5045a0b44e16c46f2eb2d41602f17107 ChangeLog 332
 MD5 4c80a328afc724eabbec779a403c2664 metadata.xml 512
-MD5 7e9c660bccd62269333f8fa1fea27cda mhxd-0.4.9.ebuild 1866
-MD5 263e07d7b6e0692f95a9126ce487b78d files/hxd.rc 395
+MD5 4cc1068c617f1070a16e12c2e8f471cd ChangeLog 459
+MD5 f5c986e79446554002e4b1ab9355dcc2 mhxd-0.4.9.ebuild 2036
 MD5 3fd74d28e2f7311b6bd55accaf024e5b files/digest-mhxd-0.4.9 62
+MD5 e56412a973ad481315ba909cb7abb86c files/hxd.rc 405
diff --git a/net-p2p/mhxd/files/hxd.rc b/net-p2p/mhxd/files/hxd.rc
index 6b3f968c3cb6..cb04195b9540 100644
--- a/net-p2p/mhxd/files/hxd.rc
+++ b/net-p2p/mhxd/files/hxd.rc
@@ -4,21 +4,24 @@ depend() {
 	need net
 }
 
+# Note: stop-start-daemon is not "compatible" with mhxd, doing things the old
+# fashioned way.
+
 start() {
-	ebegin Starting hxd
-	cd /home/hxd
-	start-stop-daemon --quiet --start -c hxd --pidfile /var/run/hxd.pid --startas /usr/sbin/hxd -f /etc/hxd.conf
+	ebegin Starting mhxd
+	cd /var/mhxd
+	su hxd -c "/usr/sbin/hxd -f /etc/mhxd/hxd.conf -d 2> /dev/null"
 	eend $?
 }
 
 stop() {
-	ebegin Stopping hxd
-	start-stop-daemon --quiet --stop -c hxd --pidfile /var/run/hxd.pid 
+	ebegin Stopping mhxd
+	su hxd -c "killall hxd"
 	eend $?
 }
 
 reload() {
-	ebegin Reloading hxd
+	ebegin Reloading mhxd
 	su hxd -c "killall -HUP hxd"
 	eend $?
 }
diff --git a/net-p2p/mhxd/mhxd-0.4.9.ebuild b/net-p2p/mhxd/mhxd-0.4.9.ebuild
index f05b3cae6260..a81938090c1f 100644
--- a/net-p2p/mhxd/mhxd-0.4.9.ebuild
+++ b/net-p2p/mhxd/mhxd-0.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mhxd/mhxd-0.4.9.ebuild,v 1.1 2004/06/06 22:10:26 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mhxd/mhxd-0.4.9.ebuild,v 1.2 2004/06/07 20:28:53 kang Exp $
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
@@ -20,10 +20,13 @@ SLOT="0"
 
 src_compile() {
 	econf \
-	`use_enable ssl idea cipher hope compress` \
+	`use_enable ssl idea` \
+	`use_enable ssl cipher` \
+	`use_enable ssl hope` \
+	`use_enable ssl compress` \
 	`use_enable ipv6` \
 	`use_enable mysql sql` \
-	--enable-acctedit --enable-irc || die "bad configure"
+	--enable-acctedit || die "bad configure"
 	emake || die "compile problem"
 	make install || die "compile problem"
 }
@@ -33,21 +36,23 @@ src_install() {
 	dodoc AUTHORS INSTALL PROBLEMS README* ChangeLog TODO NEWS run/hxd/hxd.conf
 
 	cpdirs="accounts files newsdir etc exec lib"
-	insinto /etc; doins run/hxd/hxd.conf
+	dodir /etc/mhxd
+	insinto /etc/mhxd; doins run/hxd/hxd.conf
 	dosbin run/hxd/bin/hxd
 	dobin run/hxd/bin/acctedit
 
-	dodir /var/hxd
+	dodir /var/mhxd
 	for d in ${cpdirs} ; do
-		insinto /var/hxd
-		cp -R run/hxd/${d} ${D}/var/hxd/${d}
+		insinto /var/mhxd
+		cp -R run/hxd/${d} ${D}/var/mhxd/${d}
 	done
-	insinto /var/hxd ; doins run/hxd/news
-	insinto /var/hxd; doins run/hxd/agreement
+	insinto /var/mhxd ; doins run/hxd/news
+	insinto /var/mhxd; doins run/hxd/agreement
+	insinto /var/mhxd; doins run/hxd/.common
 
-	keepdir /var/hxd/files
-	keepdir /var/hxd/lib
-	exeinto /etc/init.d ; newexe ${FILESDIR}/hxd.rc hxd
+	keepdir /var/mhxd/files
+	keepdir /var/mhxd/lib
+	exeinto /etc/init.d ; newexe ${FILESDIR}/hxd.rc mhxd
 }
 
 pkg_preinst() {
@@ -57,16 +62,17 @@ pkg_preinst() {
 	fi
 
 	if ! id hxd; then
-		useradd -s /dev/null -d /var/hxd -c "hxd added by portage" -g hxd hxd
+		useradd -d /var/hxd -c "hxd added by portage" -g hxd hxd
 		assert "Failed to create hxd user"
 	fi
 }
 
 pkg_postinst() {
 	#fowners don't do directories :(
-	chown -R hxd:hxd /var/hxd
+	chown -R hxd:hxd /var/mhxd
 	einfo
 	einfo "Welcome to Horline!"
+	einfo "Do '/etc/init.d/mhxd start' to start the server, then"
 	einfo "Login as admin and no password to your hotline server, and change the password"
 	einfo
 }