fixing installation bug #80366 and #80739 - adding additional scripts

(Portage version: 2.0.51.16)

4 files changed, 26 insertions, 69 deletions

diff --git a/net-dialup/mgetty/ChangeLog b/net-dialup/mgetty/ChangeLog
index dba3025ee3e3..1f998625fe2f 100644
--- a/net-dialup/mgetty/ChangeLog
+++ b/net-dialup/mgetty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/mgetty
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.42 2005/02/10 13:14:36 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.43 2005/02/14 22:47:01 tove Exp $
+
+  14 Feb 2005; Torsten Veller <tove@gentoo.org>
+  files/mgetty-1.1.31-r1-gentoo.diff, mgetty-1.1.31-r1.ebuild:
+  Doesn't install /var/spool/voice/.code and /var/spool/voice/messages/Index
+  any longer. Added sample scripts to /usr/share/mgetty on request (#80366).
 
 *mgetty-1.1.31-r1 (10 Feb 2005)
 
diff --git a/net-dialup/mgetty/Manifest b/net-dialup/mgetty/Manifest
index 26b230db07da..d22530c5307a 100644
--- a/net-dialup/mgetty/Manifest
+++ b/net-dialup/mgetty/Manifest
@@ -5,8 +5,8 @@ MD5 bc75a4320bc728bf322a4c13852b24ed mgetty-1.1.30.ebuild 3348
 MD5 257d235065484c5dd1a0f3c700cc06c1 mgetty-1.1.30-r3.ebuild 3814
 MD5 cf1cb8fad1876275c79c6afe33730ed0 mgetty-1.1.30-r2.ebuild 3549
 MD5 d38aaeecbf142081ba96f86e29d25a33 mgetty-1.1.31.ebuild 3776
-MD5 cd3eff8c1ec053a33baa58f4708bd3bc mgetty-1.1.31-r1.ebuild 4016
-MD5 8c77afcaec054b7f86b40b4103a90603 ChangeLog 6370
+MD5 1306fbf21236e35ac621199b530d2422 mgetty-1.1.31-r1.ebuild 3850
+MD5 be2e30734e2fa0512c077f7f5453634f ChangeLog 6636
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 bc47f96a12b21b779d57c0c2ad4b6837 files/mgetty-1.1.30-gentoo.diff 2771
 MD5 98aeee2f59082edadd2c9f85e0fe4fde files/mgetty-1.1.31-logfile.c.diff 1581
@@ -14,7 +14,7 @@ MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30-r2 70
 MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30-r3 70
 MD5 892ea03975cbf5145ed6ab5f42424461 files/digest-mgetty-1.1.31-r1 70
 MD5 9b39643283b470533c7e4832364aa168 files/mgetty-1.1.31-gentoo.diff 2782
-MD5 2eaba23e070a3e2edd7b10fb2ae7441f files/mgetty-1.1.31-r1-gentoo.diff 2357
+MD5 90e6cd2de64fc408ab4103ce1800133f files/mgetty-1.1.31-r1-gentoo.diff 931
 MD5 4e57a595747a3348f58b9e0acb19b5b7 files/mgetty-1.1.31-callback.diff 989
 MD5 c9b070dfabf7bd139d53d263f869b4f0 files/digest-mgetty-1.1.30 70
 MD5 892ea03975cbf5145ed6ab5f42424461 files/digest-mgetty-1.1.31 70
@@ -22,7 +22,7 @@ MD5 503ed4bbf18bb0b46850cb173873e16a files/Lucent.c.patch 814
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCC158V3J2n04EauwRAh1pAKDWlQw9hv1+6s9FWsUDWT5hoovXQwCfcuJL
-Py+WliBQrUkzzOVUrZmBFXI=
-=vPD2
+iD8DBQFCESm7V3J2n04EauwRAhT1AJ4uwbb+0JvI4LkJISz2YnNRx+cG1QCdFLvT
+bDU7ZCSogXG1BQym3Q1a3fM=
+=6oBi
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/mgetty/files/mgetty-1.1.31-r1-gentoo.diff b/net-dialup/mgetty/files/mgetty-1.1.31-r1-gentoo.diff
index 1da197b88bfd..9d1fc43afe7d 100644
--- a/net-dialup/mgetty/files/mgetty-1.1.31-r1-gentoo.diff
+++ b/net-dialup/mgetty/files/mgetty-1.1.31-r1-gentoo.diff
@@ -24,40 +24,3 @@ diff -Naur mgetty-1.1.31-old/voice/Makefile mgetty-1.1.31/voice/Makefile
  	for i in $(PVFTOOLS); \
  	do \
  	     $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \
-@@ -97,21 +98,21 @@
- 	do \
- 	     $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \
- 	done
--#	[ -d $(VOICE_DIR) ] || mkdir $(VOICE_DIR)
--#	[ -d $(VOICE_DIR)/incoming ] || mkdir $(VOICE_DIR)/incoming
--#	chown 0 $(VOICE_DIR)/incoming
--#	chgrp $(PHONE_GROUP) $(VOICE_DIR)/incoming
--#	chmod $(PHONE_PERMS) $(VOICE_DIR)/incoming
--#	[ -d $(VOICE_DIR)/messages ] || mkdir $(VOICE_DIR)/messages
--#	for i in $(SHELLSCRIPTS); do \
--#		$(INSTALL) -m 755 $$i $(VOICE_DIR) ;\
--#	done
--#	[ -f $(VOICE_DIR)/.code ] || echo '12345' >$(VOICE_DIR)/.code
--#	chgrp $(PHONE_GROUP) $(VOICE_DIR)/.code
--#	chmod $(PHONE_PERMS) $(VOICE_DIR)/.code
--#	chmod 660 $(VOICE_DIR)/.code
--#	[ -f $(VOICE_DIR)/messages/Index ] || \
--#	 echo 'put_filename_here' >$(VOICE_DIR)/messages/Index
-+	[ -d $(VOICE_DIR) ] || mkdir $(VOICE_DIR)
-+	[ -d $(VOICE_DIR)/incoming ] || mkdir $(VOICE_DIR)/incoming
-+	chown 0 $(VOICE_DIR)/incoming
-+	chgrp $(PHONE_GROUP) $(VOICE_DIR)/incoming
-+	chmod $(PHONE_PERMS) $(VOICE_DIR)/incoming
-+	[ -d $(VOICE_DIR)/messages ] || mkdir $(VOICE_DIR)/messages
-+	for i in $(SHELLSCRIPTS); do \
-+		$(INSTALL) -m 755 $$i $(VOICE_DIR) ;\
-+	done
-+	[ -f $(VOICE_DIR)/.code ] || echo '12345' >$(VOICE_DIR)/.code
-+	chgrp $(PHONE_GROUP) $(VOICE_DIR)/.code
-+	chmod $(PHONE_PERMS) $(VOICE_DIR)/.code
-+	chmod 660 $(VOICE_DIR)/.code
-+	[ -f $(VOICE_DIR)/messages/Index ] || \
-+	 echo 'put_filename_here' >$(VOICE_DIR)/messages/Index
- 
- clean:
- 	@echo "Cleaning..."
diff --git a/net-dialup/mgetty/mgetty-1.1.31-r1.ebuild b/net-dialup/mgetty/mgetty-1.1.31-r1.ebuild
index ef57ee2b6893..83c21f153c74 100644
--- a/net-dialup/mgetty/mgetty-1.1.31-r1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.1.31-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.31-r1.ebuild,v 1.1 2005/02/10 13:14:36 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.31-r1.ebuild,v 1.2 2005/02/14 22:47:01 tove Exp $
 
 inherit toolchain-funcs flag-o-matic eutils
 
@@ -57,10 +57,6 @@ src_unpack() {
 		-e "/mv -f \$(SBINDIR)/d" \
 		-i ${S}/Makefile
 
-	# update patch
-	sed -e 's/-f \$(VOICE_DIR)\//-f \/var\/spool\/voice\//' \
-		-i ${S}/voice/Makefile
-
 	sed -e "/^doc-all:/s/mgetty.asc mgetty.info mgetty.dvi mgetty.ps/mgetty.info/" \
 		-i ${S}/doc/Makefile
 	if use doc; then
@@ -100,7 +96,7 @@ src_install () {
 		PHONE_GROUP=fax \
 		PHONE_PERMS=755 \
 		spool=${D}/var/spool \
-		install vgetty-install install-callback || die
+		install vgetty-install install-callback || die "make install failed."
 
 	cd ${S}
 	dodoc BUGS ChangeLog README.1st Recommend THANKS TODO \
@@ -124,25 +120,18 @@ src_install () {
 	docinto samples/new_fax
 	dodoc samples_new_fax.all/*
 
-	#generate missing fonts if any.
-	if [ -f ${S}/doc/missfont.log ] ; then
-		echo '#!/bin/bash' >genfonts.sh
-		cat missfont.log >>genfonts.sh
-		chmod +x genfonts.sh
-		dodoc genfonts.sh
-	fi
-}
+	insinto /usr/share/"${PN}"
+	doins -r patches frontends
+	insinto /usr/share/"${PN}"/voice
+	doins -r voice/{contrib,Perl,scripts}
 
+	keepdir /var/spool/voice/messages
+	keepdir /var/spool/fax/outgoing/locks
+	keepdir /var/spool/fax/incoming
+	diropts -m 0755 -o root -g fax
+	keepdir /var/spool/voice/incoming
+}
 pkg_postinst() {
-	#generate missing fonts if any.
-	if [ -x {$ROOT}/usr/share/doc/${PF}/genfonts.sh ]; then
-		{$ROOT}/usr/share/doc/${PF}/genfonts.sh
-	fi
-
-	if [ ! -d ${ROOT}/var/spool/fax/incoming ]; then
-		mkdir -p ${ROOT}/var/spool/fax/incoming
-	fi
-	if [ ! -d ${ROOT}/var/spool/fax/outgoing/locks ]; then
-		mkdir -p ${ROOT}/var/spool/fax/outgoing/locks
-	fi
+	einfo "${ROOT}/var/spool/voice/.code and ${ROOT}/var/spool/voice/messages/Index"
+	einfo "are not longer created by this automatically!"
 }