Fix collision with netpbm (#155670). Install mgetty executable in /sbin (#119078). Don't install useless ct program (#106337). Stable on amd64.

(Portage version: 2.1.1-r1)

2 files changed, 84 insertions, 0 deletions

diff --git a/net-dialup/mgetty/files/digest-mgetty-1.1.35-r2 b/net-dialup/mgetty/files/digest-mgetty-1.1.35-r2
new file mode 100644
index 000000000000..f3024fb0c652
--- /dev/null
+++ b/net-dialup/mgetty/files/digest-mgetty-1.1.35-r2
@@ -0,0 +1,3 @@
+MD5 6805f8e31423bb777be80e3a856001cb mgetty1.1.35-Feb22.tar.gz 1023412
+RMD160 835fc090835e3838e7d4c77a7f06a4c59869b3ab mgetty1.1.35-Feb22.tar.gz 1023412
+SHA256 0846bfdc49f535842be033a3080b2b08499fabeec8de644c34470243d799f928 mgetty1.1.35-Feb22.tar.gz 1023412
diff --git a/net-dialup/mgetty/files/mgetty-1.1.35-netpbm-collision.patch b/net-dialup/mgetty/files/mgetty-1.1.35-netpbm-collision.patch
new file mode 100644
index 000000000000..6d72af95e65b
--- /dev/null
+++ b/net-dialup/mgetty/files/mgetty-1.1.35-netpbm-collision.patch
@@ -0,0 +1,81 @@
+diff -Nru mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.man mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.man
+--- mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.man	1996-02-04 16:35:33.000000000 +0200
++++ mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.man	2006-11-20 21:36:03.318452515 +0200
+@@ -99,7 +99,7 @@
+ 
+ and
+ 
+-     g3topbm $f | pbmtolps | lpr &
++     g32pbm $f | pbmtolps | lpr &
+ 
+ The
+ .I Return
+@@ -177,7 +177,7 @@
+ .B mgetty(1)
+ (it takes less than a second to display an average fax page).
+ 
+-.B g3topbm(1)
++.B g32pbm(1)
+ from the
+ .BR pbmplus ,\  netpbm
+ or
+diff -Nru mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.tcl mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.tcl
+--- mgetty-1.1.35.orig/frontends/tcl/faxview-0.2/faxview.tcl	1997-01-09 22:47:07.000000000 +0200
++++ mgetty-1.1.35/frontends/tcl/faxview-0.2/faxview.tcl	2006-11-20 21:36:13.923115265 +0200
+@@ -42,7 +42,7 @@
+ # variable `$f' will be replaced with the selected file name(s).
+ #
+ set view_command {viewfax $f &}
+-set print_command {g3topbm $f | pbmtolps | lpr &}
++set print_command {g32pbm $f | pbmtolps | lpr &}
+ 
+ # Shall `$f' be replaced with multiple file names or with a single
+ # one?
+diff -Nru mgetty-1.1.35.orig/frontends/www/nph-vf-gif.in mgetty-1.1.35/frontends/www/nph-vf-gif.in
+--- mgetty-1.1.35.orig/frontends/www/nph-vf-gif.in	2004-11-24 15:46:17.000000000 +0200
++++ mgetty-1.1.35/frontends/www/nph-vf-gif.in	2006-11-20 21:35:42.225134263 +0200
+@@ -121,7 +121,7 @@
+     errormessage( "\$indexpage : not configured - please look at the configuration-Files and configure the URL for my main-index-page (\$indexpage)");
+ }
+ 
+-checkprogram($g3topbm, "g3topbm");
++checkprogram($g3topbm, "g32pbm");
+ checkprogram($ppmquant, "ppmquant");
+ checkprogram($pnmscale, "pnmscale");
+ checkprogram($ppmtogif, "ppmtogif");
+diff -Nru mgetty-1.1.35.orig/frontends/www/wwwgui.cfg.in mgetty-1.1.35/frontends/www/wwwgui.cfg.in
+--- mgetty-1.1.35.orig/frontends/www/wwwgui.cfg.in	2004-11-24 15:46:17.000000000 +0200
++++ mgetty-1.1.35/frontends/www/wwwgui.cfg.in	2006-11-20 21:37:51.205195012 +0200
+@@ -52,7 +52,7 @@
+ #
+ 
+ # convert G3 image to PBM
+-$g3topbm='@BINDIR@/g32pbm';
++$g3topbm='/usr/bin/g32pbm';
+ 
+ # convert PBM image to GIF (could be "ppmtogif" or "pnmtogif")
+ $ppmtogif='@BINDIR@/ppmtogif';
+diff -Nru mgetty-1.1.35.orig/frontends/X11/viewfax/viewfax.man mgetty-1.1.35/frontends/X11/viewfax/viewfax.man
+--- mgetty-1.1.35.orig/frontends/X11/viewfax/viewfax.man	2004-11-14 14:14:29.000000000 +0200
++++ mgetty-1.1.35/frontends/X11/viewfax/viewfax.man	2006-11-20 21:36:23.399707512 +0200
+@@ -274,7 +274,7 @@
+ .B hylafax
+ (http://www.hylafax.org/) is a full-function fax client/server system.
+ 
+-.B g3topbm(1)
++.B g32pbm(1)
+ and
+ .B xv(1)
+ can be used in a pipeline to view faxes.  This will usually be slower
+diff -Nru mgetty-1.1.35.orig/g3/Makefile mgetty-1.1.35/g3/Makefile
+--- mgetty-1.1.35.orig/g3/Makefile	2006-11-20 21:35:21.711852263 +0200
++++ mgetty-1.1.35/g3/Makefile	2006-11-20 21:10:47.325515539 +0200
+@@ -45,8 +45,6 @@
+ #
+ # make symlink for "g3topbm" (so third-party fax viewers won't fail)
+ #
+-	-cd $(BINDIR) ; \
+-	test -x g3topbm || ln -s g32pbm g3topbm
+ 
+ 
+ # test suite