| 1 |
mrness 07/11/25 08:21:36 |
| 2 |
|
| 3 |
Added: mgetty-1.1.36-nofax.patch |
| 4 |
Log: |
| 5 |
Added nofax flag, for resolving collision between mgetty and hylafax (#195467). |
| 6 |
(Portage version: 2.1.3.16) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-dialup/mgetty/files/mgetty-1.1.36-nofax.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: mgetty-1.1.36-nofax.patch |
| 15 |
=================================================================== |
| 16 |
diff -Nru mgetty-1.1.36.orig/doc/Makefile mgetty-1.1.36/doc/Makefile |
| 17 |
--- mgetty-1.1.36.orig/doc/Makefile 2007-11-25 09:31:56.000000000 +0200 |
| 18 |
+++ mgetty-1.1.36/doc/Makefile 2007-11-25 09:28:02.000000000 +0200 |
| 19 |
@@ -6,11 +6,10 @@ |
| 20 |
NROFF=nroff |
| 21 |
# |
| 22 |
# |
| 23 |
-MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 sff2g3.1 fax.1 \ |
| 24 |
- faxspool.1 faxrunq.1 faxq.1 faxrm.1 coverpg.1 |
| 25 |
+MAN1PAGES= |
| 26 |
MAN4PAGES=mgettydefs.4 |
| 27 |
-MAN5PAGES=faxqueue.5 |
| 28 |
-MAN8PAGES=sendfax.8 mgetty.8 callback.8 faxrunqd.8 faxq-helper.8 |
| 29 |
+MAN5PAGES= |
| 30 |
+MAN8PAGES=mgetty.8 callback.8 |
| 31 |
MANSRC=$(MAN1PAGES) $(MAN4PAGES) $(MAN5PAGES) $(MAN8PAGES) |
| 32 |
MAN1DIR=/usr/local/man/man1 |
| 33 |
MAN4DIR=/usr/local/man/man4 |
| 34 |
diff -Nru mgetty-1.1.36.orig/Makefile mgetty-1.1.36/Makefile |
| 35 |
--- mgetty-1.1.36.orig/Makefile 2007-11-25 09:31:58.000000000 +0200 |
| 36 |
+++ mgetty-1.1.36/Makefile 2007-11-25 09:34:45.000000000 +0200 |
| 37 |
@@ -317,7 +317,7 @@ |
| 38 |
|
| 39 |
all: bin-all doc-all |
| 40 |
|
| 41 |
-bin-all: mgetty sendfax newslock sedscript subdirs call-back |
| 42 |
+bin-all: mgetty newslock sedscript subdirs call-back |
| 43 |
|
| 44 |
# a few C files need extra compiler arguments |
| 45 |
|
| 46 |
@@ -362,9 +362,7 @@ |
| 47 |
# subdirectories... |
| 48 |
|
| 49 |
subdirs: |
| 50 |
- cd g3 ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all |
| 51 |
cd tools ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all |
| 52 |
- 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 |
| 53 |
|
| 54 |
call-back: |
| 55 |
@$(MAKE) mgetty |
| 56 |
@@ -585,7 +583,6 @@ |
| 57 |
|
| 58 |
-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) |
| 59 |
$(INSTALL) -m 700 mgetty $(SBINDIR) |
| 60 |
- $(INSTALL) -m 755 sendfax $(SBINDIR) |
| 61 |
# |
| 62 |
# data files + directories |
| 63 |
# |
| 64 |
@@ -597,12 +594,8 @@ |
| 65 |
$(INSTALL) -o root -m 600 login.config $(CONFDIR)/ |
| 66 |
test -f $(CONFDIR)/mgetty.config || \ |
| 67 |
$(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/ |
| 68 |
- test -f $(CONFDIR)/sendfax.config || \ |
| 69 |
- $(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/ |
| 70 |
test -f $(CONFDIR)/dialin.config || \ |
| 71 |
$(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/ |
| 72 |
- test -f $(CONFDIR)/faxrunq.config || \ |
| 73 |
- $(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/ |
| 74 |
# |
| 75 |
# test for outdated stuff |
| 76 |
# |
| 77 |
@@ -614,34 +607,6 @@ |
| 78 |
echo "" ;\ |
| 79 |
fi |
| 80 |
# |
| 81 |
-# fax spool directories |
| 82 |
-# |
| 83 |
- test -d $(spool) || \ |
| 84 |
- ( mkdir $(spool) && chmod 755 $(spool) ) |
| 85 |
- test -d $(FAX_SPOOL) || \ |
| 86 |
- ( mkdir $(FAX_SPOOL) && \ |
| 87 |
- chown $(FAX_OUT_USER) $(FAX_SPOOL) && \ |
| 88 |
- chmod 755 $(FAX_SPOOL) ) |
| 89 |
- test -d $(FAX_SPOOL_IN) || \ |
| 90 |
- ( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) ) |
| 91 |
- test -d $(FAX_SPOOL_OUT) || \ |
| 92 |
- mkdir $(FAX_SPOOL_OUT) |
| 93 |
- chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT) |
| 94 |
- chmod 755 $(FAX_SPOOL_OUT) |
| 95 |
-# |
| 96 |
-# g3 tool programs |
| 97 |
-# |
| 98 |
- cd g3 ; $(MAKE) install INSTALL="$(INSTALL)" \ |
| 99 |
- BINDIR=$(BINDIR) \ |
| 100 |
- LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) |
| 101 |
-# |
| 102 |
-# fax programs / scripts / font file |
| 103 |
-# |
| 104 |
- cd fax ; $(MAKE) install INSTALL="$(INSTALL)" \ |
| 105 |
- FAX_OUT_USER=$(FAX_OUT_USER) \ |
| 106 |
- BINDIR=$(BINDIR) SBINDIR=$(SBINDIR) \ |
| 107 |
- LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) |
| 108 |
-# |
| 109 |
# compatibility |
| 110 |
# |
| 111 |
if [ ! -z "$(INSTALL_MECHO)" ] ; then \ |
| 112 |
diff -Nru mgetty-1.1.36.orig/t/Makefile mgetty-1.1.36/t/Makefile |
| 113 |
--- mgetty-1.1.36.orig/t/Makefile 2006-09-26 01:32:10.000000000 +0300 |
| 114 |
+++ mgetty-1.1.36/t/Makefile 2007-11-25 09:32:28.000000000 +0200 |
| 115 |
@@ -8,8 +8,8 @@ |
| 116 |
CFLAGS=-O2 -I.. -g #-DT_LOG_VERBOSE |
| 117 |
|
| 118 |
TEST_PROGRAMS=t_config t_ring |
| 119 |
-TEST_HELP_PGM=t_g3f_c |
| 120 |
-TEST_SCRIPTS=t_echo t_trap t_g3file |
| 121 |
+TEST_HELP_PGM= |
| 122 |
+TEST_SCRIPTS=t_echo t_trap |
| 123 |
|
| 124 |
test: $(TEST_PROGRAMS) $(TEST_HELP_PGM) |
| 125 |
@for f in $(TEST_PROGRAMS) ; \ |
| 126 |
|
| 127 |
|
| 128 |
|
| 129 |
-- |
| 130 |
gentoo-commits@g.o mailing list |
Archives