Added nofax flag, for resolving collision between mgetty and hylafax (#195467).

(Portage version: 2.1.3.16)

3 files changed, 132 insertions, 13 deletions

diff --git a/net-dialup/mgetty/ChangeLog b/net-dialup/mgetty/ChangeLog
index 856172668b21..62a2dc3fe6a7 100644
--- a/net-dialup/mgetty/ChangeLog
+++ b/net-dialup/mgetty/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/mgetty
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.74 2007/09/14 20:33:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.75 2007/11/25 08:21:35 mrness Exp $
+
+  25 Nov 2007; Alin Năstac <mrness@gentoo.org>
+  +files/mgetty-1.1.36-nofax.patch, mgetty-1.1.36.ebuild:
+  Added nofax flag, for resolving collision between mgetty and hylafax (#195467).
 
 *mgetty-1.1.36 (14 Sep 2007)
 
diff --git a/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch b/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch
new file mode 100644
index 000000000000..7fcf7a44655e
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch
@@ -0,0 +1,110 @@
+diff -Nru mgetty-1.1.36.orig/doc/Makefile mgetty-1.1.36/doc/Makefile
+--- mgetty-1.1.36.orig/doc/Makefile	2007-11-25 09:31:56.000000000 +0200
++++ mgetty-1.1.36/doc/Makefile	2007-11-25 09:28:02.000000000 +0200
+@@ -6,11 +6,10 @@
+ NROFF=nroff
+ #
+ #
+-MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 sff2g3.1 fax.1 \
+-	  faxspool.1 faxrunq.1 faxq.1 faxrm.1 coverpg.1
++MAN1PAGES=
+ MAN4PAGES=mgettydefs.4
+-MAN5PAGES=faxqueue.5
+-MAN8PAGES=sendfax.8 mgetty.8 callback.8 faxrunqd.8 faxq-helper.8
++MAN5PAGES=
++MAN8PAGES=mgetty.8 callback.8
+ MANSRC=$(MAN1PAGES) $(MAN4PAGES) $(MAN5PAGES) $(MAN8PAGES)
+ MAN1DIR=/usr/local/man/man1
+ MAN4DIR=/usr/local/man/man4
+diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile
+--- mgetty-1.1.36.orig/Makefile	2007-11-25 09:31:58.000000000 +0200
++++ mgetty-1.1.36/Makefile	2007-11-25 09:34:45.000000000 +0200
+@@ -317,7 +317,7 @@
+ 
+ all:	bin-all doc-all
+ 
+-bin-all: mgetty sendfax newslock sedscript subdirs call-back 
++bin-all: mgetty newslock sedscript subdirs call-back 
+ 
+ # a few C files need extra compiler arguments
+ 
+@@ -362,9 +362,7 @@
+ # subdirectories...
+ 
+ subdirs:
+-	cd g3 ;    $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
+ 	cd tools ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
+-	cd fax ;   $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" "FAX_SPOOL_OUT=$(FAX_SPOOL_OUT)" "FAX_OUT_USER=$(FAX_OUT_USER)" "CONFDIR=$(CONFDIR)" all
+ 
+ call-back:
+ 	@$(MAKE) mgetty
+@@ -585,7 +583,6 @@
+ 
+ 	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
+ 	$(INSTALL) -m 700 mgetty $(SBINDIR)
+-	$(INSTALL) -m 755 sendfax $(SBINDIR)
+ #
+ # data files + directories
+ #
+@@ -597,12 +594,8 @@
+ 		$(INSTALL) -o root -m 600 login.config $(CONFDIR)/
+ 	test -f $(CONFDIR)/mgetty.config || \
+ 		$(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/
+-	test -f $(CONFDIR)/sendfax.config || \
+-		$(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/
+ 	test -f $(CONFDIR)/dialin.config || \
+ 		$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
+-	test -f $(CONFDIR)/faxrunq.config || \
+-		$(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/
+ #
+ # test for outdated stuff
+ #
+@@ -614,34 +607,6 @@
+ 	    echo "" ;\
+ 	fi
+ #
+-# fax spool directories
+-#
+-	test -d $(spool) || \
+-		( mkdir $(spool) && chmod 755 $(spool) )
+-	test -d $(FAX_SPOOL) || \
+-		( mkdir $(FAX_SPOOL) && \
+-		  chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
+-		  chmod 755 $(FAX_SPOOL) )
+-	test -d $(FAX_SPOOL_IN) || \
+-		( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
+-	test -d $(FAX_SPOOL_OUT) || \
+-		  mkdir $(FAX_SPOOL_OUT)
+-	chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
+-	chmod 755 $(FAX_SPOOL_OUT)
+-#
+-# g3 tool programs
+-#
+-	cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \
+-				BINDIR=$(BINDIR) \
+-				LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
+-#
+-# fax programs / scripts / font file
+-#
+-	cd fax ; $(MAKE) install INSTALL="$(INSTALL)" \
+-				FAX_OUT_USER=$(FAX_OUT_USER) \
+-				BINDIR=$(BINDIR) SBINDIR=$(SBINDIR) \
+-				LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
+-#
+ # compatibility
+ #
+ 	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
+diff -Nru mgetty-1.1.36.orig/t/Makefile mgetty-1.1.36/t/Makefile
+--- mgetty-1.1.36.orig/t/Makefile	2006-09-26 01:32:10.000000000 +0300
++++ mgetty-1.1.36/t/Makefile	2007-11-25 09:32:28.000000000 +0200
+@@ -8,8 +8,8 @@
+ CFLAGS=-O2 -I.. -g  #-DT_LOG_VERBOSE
+ 
+ TEST_PROGRAMS=t_config t_ring
+-TEST_HELP_PGM=t_g3f_c
+-TEST_SCRIPTS=t_echo t_trap t_g3file
++TEST_HELP_PGM=
++TEST_SCRIPTS=t_echo t_trap
+ 
+ test: $(TEST_PROGRAMS) $(TEST_HELP_PGM)
+ 	@for f in $(TEST_PROGRAMS) ; \
diff --git a/net-dialup/mgetty/mgetty-1.1.36.ebuild b/net-dialup/mgetty/mgetty-1.1.36.ebuild
index 6413dcbc888e..a4570746e2e9 100644
--- a/net-dialup/mgetty/mgetty-1.1.36.ebuild
+++ b/net-dialup/mgetty/mgetty-1.1.36.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.36.ebuild,v 1.1 2007/09/14 20:33:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/mgetty-1.1.36.ebuild,v 1.2 2007/11/25 08:21:35 mrness Exp $
 
 inherit toolchain-funcs flag-o-matic eutils
 
-DESCRIPTION="Fax and Voice modem programs."
+DESCRIPTION="fax and voice modem programs"
 SRC_URI="ftp://mgetty.greenie.net/pub/mgetty/source/1.1/${PN}${PV}-Jun15.tar.gz"
 HOMEPAGE="http://mgetty.greenie.net/"
 
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="doc fidonet"
+IUSE="doc fidonet nofax"
 
 pkg_setup() {
 	enewgroup fax
@@ -36,6 +36,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-qa-fixes.patch"
 	epatch "${FILESDIR}/${P}-callback.patch" # add callback install to Makefile
 	epatch "${FILESDIR}/Lucent.c.patch" # Lucent modem CallerID patch - bug #80366
+	use nofax && epatch "${FILESDIR}/${P}-nofax.patch" # don't install fax related files - bug #195467
 
 	sed -e 's:var/log/mgetty:var/log/mgetty/mgetty:' \
 		-e 's:var/log/sendfax:var/log/mgetty/sendfax:' \
@@ -113,12 +114,14 @@ src_install () {
 	docinto vgetty/doc
 	dodoc voice/doc/*
 
-	mv samples/new_fax.all samples_new_fax.all || die "move failed."
-	docinto samples
-	dodoc samples/*
+	if ! use nofax; then
+		mv samples/new_fax.all samples_new_fax.all || die "move failed."
+		docinto samples
+		dodoc samples/*
 
-	docinto samples/new_fax
-	dodoc samples_new_fax.all/*
+		docinto samples/new_fax
+		dodoc samples_new_fax.all/*
+	fi
 
 	insinto /usr/share/${PN}
 	doins -r patches frontends
@@ -129,10 +132,12 @@ src_install () {
 	dodir /var/spool/voice
 	keepdir /var/spool/voice/incoming
 	keepdir /var/spool/voice/messages
-	dodir /var/spool/fax
-	dodir /var/spool/fax/outgoing
-	keepdir /var/spool/fax/outgoing/locks
-	keepdir /var/spool/fax/incoming
+	if ! use nofax; then
+		dodir /var/spool/fax
+		dodir /var/spool/fax/outgoing
+		keepdir /var/spool/fax/outgoing/locks
+		keepdir /var/spool/fax/incoming
+	fi
 }
 
 pkg_postinst() {