Fix broken nofax.patch and yet another parallelization bug in the main Makefile (#282674).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 73 insertions, 59 deletions

diff --git a/net-dialup/mgetty/ChangeLog b/net-dialup/mgetty/ChangeLog
index f1536e6491cd..72b99d0770be 100644
--- a/net-dialup/mgetty/ChangeLog
+++ b/net-dialup/mgetty/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/mgetty
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.97 2009/08/22 08:51:39 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/mgetty/ChangeLog,v 1.98 2009/08/31 18:41:35 mrness Exp $
+
+  31 Aug 2009; Alin Năstac <mrness@gentoo.org>
+  files/mgetty-1.1.36-nofax.patch, files/mgetty-1.1.36-qa-fixes.patch:
+  Fix broken nofax.patch and yet another parallelization bug in the main
+  Makefile (#282674).
 
   22 Aug 2009; Alin Năstac <mrness@gentoo.org>
   files/mgetty-1.1.36-qa-fixes.patch, mgetty-1.1.36-r3.ebuild:
diff --git a/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch b/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch
index 7fcf7a44655e..a65f867edf64 100644
--- a/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch
+++ b/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch
@@ -31,7 +31,7 @@ diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile
 @@ -362,9 +362,7 @@
  # subdirectories...
  
- subdirs:
+ subdirs: sedscript
 -	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
@@ -66,15 +66,15 @@ diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile
 -# fax spool directories
 -#
 -	test -d $(spool) || \
--		( mkdir $(spool) && chmod 755 $(spool) )
+-		( ./mkidirs $(spool) && chmod 755 $(spool) )
 -	test -d $(FAX_SPOOL) || \
--		( mkdir $(FAX_SPOOL) && \
+-		( ./mkidirs $(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) )
+-		( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
 -	test -d $(FAX_SPOOL_OUT) || \
--		  mkdir $(FAX_SPOOL_OUT)
+-		  ./mkidirs $(FAX_SPOOL_OUT)
 -	chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
 -	chmod 755 $(FAX_SPOOL_OUT)
 -#
diff --git a/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch b/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch
index c43a8724dc3f..69ae072fd696 100644
--- a/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch
+++ b/net-dialup/mgetty/files/mgetty-1.1.36-qa-fixes.patch
@@ -1,29 +1,6 @@
-diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile
---- mgetty-1.1.36.orig/Makefile	2009-08-22 10:37:19.000000000 +0200
-+++ mgetty-1.1.36/Makefile	2009-08-22 10:43:31.000000000 +0200
-@@ -617,15 +617,15 @@
- # fax spool directories
- #
- 	test -d $(spool) || \
--		( mkdir $(spool) && chmod 755 $(spool) )
-+		( ./mkidirs $(spool) && chmod 755 $(spool) )
- 	test -d $(FAX_SPOOL) || \
--		( mkdir $(FAX_SPOOL) && \
-+		( ./mkidirs $(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) )
-+		( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
- 	test -d $(FAX_SPOOL_OUT) || \
--		  mkdir $(FAX_SPOOL_OUT)
-+		  ./mkidirs $(FAX_SPOOL_OUT)
- 	chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
- 	chmod 755 $(FAX_SPOOL_OUT)
- #
 diff -Nru mgetty-1.1.36.orig/doc/Makefile mgetty-1.1.36/doc/Makefile
---- mgetty-1.1.36.orig/doc/Makefile	2009-08-22 09:25:53.000000000 +0200
-+++ mgetty-1.1.36/doc/Makefile	2009-08-22 09:35:54.000000000 +0200
+--- mgetty-1.1.36.orig/doc/Makefile	2006-02-22 18:35:02.000000000 +0100
++++ mgetty-1.1.36/doc/Makefile	2009-08-31 20:31:01.000000000 +0200
 @@ -63,7 +63,7 @@
  	      *.man *.[1-9] mgetty.texi
  
@@ -54,27 +31,9 @@ diff -Nru mgetty-1.1.36.orig/doc/Makefile mgetty-1.1.36/doc/Makefile
  	../sedscript <$< >$*.8
  
  #
-diff -Nru mgetty-1.1.36.orig/frontends/www/Makefile mgetty-1.1.36/frontends/www/Makefile
---- mgetty-1.1.36.orig/frontends/www/Makefile	2006-02-22 18:25:32.000000000 +0100
-+++ mgetty-1.1.36/frontends/www/Makefile	2009-08-22 09:39:03.000000000 +0200
-@@ -125,12 +125,12 @@
- #
- .SUFFIXES: .in .cgi .html
- 
--.in.cgi:
-+.in.cgi: ../../sedscript
- 	rm -f $*.cgi
- 	../../sedscript <$< >$*.cgi
- 	chmod +x $*.cgi
- 
--.in.html:
-+.in.html: ../../sedscript
- 	rm -f $*.html
- 	../../sedscript <$< | \
- 		sed -e "s!@CGI_HREF@!$(CGI_HREF)!" >$*.html
 diff -Nru mgetty-1.1.36.orig/fax/Makefile mgetty-1.1.36/fax/Makefile
---- mgetty-1.1.36.orig/fax/Makefile	2006-02-22 19:25:30.000000000 +0200
-+++ mgetty-1.1.36/fax/Makefile	2007-09-14 23:02:58.000000000 +0300
+--- mgetty-1.1.36.orig/fax/Makefile	2006-02-22 18:25:30.000000000 +0100
++++ mgetty-1.1.36/fax/Makefile	2009-08-31 20:31:01.000000000 +0200
 @@ -36,7 +36,7 @@
  	@cd .. ; $(MAKE) sedscript
  
@@ -85,8 +44,8 @@ diff -Nru mgetty-1.1.36.orig/fax/Makefile mgetty-1.1.36/fax/Makefile
  faxq-helper.o: faxq-helper.c ../sedscript
  	$(CC) $(CFLAGS) -DFAX_SPOOL_OUT=\"$(FAX_SPOOL_OUT)\" \
 diff -Nru mgetty-1.1.36.orig/fax_lib.h mgetty-1.1.36/fax_lib.h
---- mgetty-1.1.36.orig/fax_lib.h	2007-06-15 09:44:36.000000000 +0300
-+++ mgetty-1.1.36/fax_lib.h	2007-09-14 22:29:47.000000000 +0300
+--- mgetty-1.1.36.orig/fax_lib.h	2007-06-15 08:44:36.000000000 +0200
++++ mgetty-1.1.36/fax_lib.h	2009-08-31 20:31:01.000000000 +0200
 @@ -41,6 +41,7 @@
  int fax_set_fdcc _PROTO(( int fd, int fine, int maxsp, int minsp ));
  int fax_set_bor  _PROTO(( int fd, int bit_order ));
@@ -95,9 +54,27 @@ diff -Nru mgetty-1.1.36.orig/fax_lib.h mgetty-1.1.36/fax_lib.h
  int mdm_identify _PROTO(( int fd ));
  void fax2_incoming_nsf _PROTO(( char * nsf_hex ));
  void fax1_incoming_nsf _PROTO(( uch * nsf_bin, int len ));
+diff -Nru mgetty-1.1.36.orig/frontends/www/Makefile mgetty-1.1.36/frontends/www/Makefile
+--- mgetty-1.1.36.orig/frontends/www/Makefile	2006-02-22 18:25:32.000000000 +0100
++++ mgetty-1.1.36/frontends/www/Makefile	2009-08-31 20:31:01.000000000 +0200
+@@ -125,12 +125,12 @@
+ #
+ .SUFFIXES: .in .cgi .html
+ 
+-.in.cgi:
++.in.cgi: ../../sedscript
+ 	rm -f $*.cgi
+ 	../../sedscript <$< >$*.cgi
+ 	chmod +x $*.cgi
+ 
+-.in.html:
++.in.html: ../../sedscript
+ 	rm -f $*.html
+ 	../../sedscript <$< | \
+ 		sed -e "s!@CGI_HREF@!$(CGI_HREF)!" >$*.html
 diff -Nru mgetty-1.1.36.orig/logfile.c mgetty-1.1.36/logfile.c
---- mgetty-1.1.36.orig/logfile.c	2005-11-26 15:48:16.000000000 +0200
-+++ mgetty-1.1.36/logfile.c	2007-09-14 22:25:13.000000000 +0300
+--- mgetty-1.1.36.orig/logfile.c	2005-11-26 14:48:16.000000000 +0100
++++ mgetty-1.1.36/logfile.c	2009-08-31 20:31:01.000000000 +0200
 @@ -58,10 +58,10 @@
  /* Most systems have these variables but do not declare them. On many
     of those systems that _do_ declare them, it won't hurt */
@@ -142,9 +119,41 @@ diff -Nru mgetty-1.1.36.orig/logfile.c mgetty-1.1.36/logfile.c
  #ifdef SYSLOG
  	syslog( level == L_FATAL? LOG_ALERT: LOG_ERR, "%s: %m", ws );
  #endif
+diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile
+--- mgetty-1.1.36.orig/Makefile	2009-08-31 20:30:33.000000000 +0200
++++ mgetty-1.1.36/Makefile	2009-08-31 20:32:08.000000000 +0200
+@@ -361,7 +361,7 @@
+ 
+ # subdirectories...
+ 
+-subdirs:
++subdirs: sedscript
+ 	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
+@@ -617,15 +617,15 @@
+ # fax spool directories
+ #
+ 	test -d $(spool) || \
+-		( mkdir $(spool) && chmod 755 $(spool) )
++		( ./mkidirs $(spool) && chmod 755 $(spool) )
+ 	test -d $(FAX_SPOOL) || \
+-		( mkdir $(FAX_SPOOL) && \
++		( ./mkidirs $(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) )
++		( ./mkidirs $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
+ 	test -d $(FAX_SPOOL_OUT) || \
+-		  mkdir $(FAX_SPOOL_OUT)
++		  ./mkidirs $(FAX_SPOOL_OUT)
+ 	chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
+ 	chmod 755 $(FAX_SPOOL_OUT)
+ #
 diff -Nru mgetty-1.1.36.orig/t/t_g3f_c.c mgetty-1.1.36/t/t_g3f_c.c
---- mgetty-1.1.36.orig/t/t_g3f_c.c	2007-05-05 15:03:03.000000000 +0300
-+++ mgetty-1.1.36/t/t_g3f_c.c	2007-09-14 22:26:36.000000000 +0300
+--- mgetty-1.1.36.orig/t/t_g3f_c.c	2007-05-05 14:03:03.000000000 +0200
++++ mgetty-1.1.36/t/t_g3f_c.c	2009-08-31 20:31:01.000000000 +0200
 @@ -19,6 +19,7 @@
  #include "fax_lib.h"
  
@@ -154,8 +163,8 @@ diff -Nru mgetty-1.1.36.orig/t/t_g3f_c.c mgetty-1.1.36/t/t_g3f_c.c
  #include <errno.h>
  #include <stdlib.h>
 diff -Nru mgetty-1.1.36.orig/t/t_ring.c mgetty-1.1.36/t/t_ring.c
---- mgetty-1.1.36.orig/t/t_ring.c	2005-03-23 11:56:21.000000000 +0200
-+++ mgetty-1.1.36/t/t_ring.c	2007-09-14 22:25:07.000000000 +0300
+--- mgetty-1.1.36.orig/t/t_ring.c	2005-03-23 10:56:21.000000000 +0100
++++ mgetty-1.1.36/t/t_ring.c	2009-08-31 20:31:01.000000000 +0200
 @@ -24,6 +24,7 @@
  
  #include "mgetty.h"