From 55731213f2144166316157fbfa00265f2fe686b1 Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Mon, 26 Jan 1998 10:14:48 +0000 Subject: Upgrade to 1.1.11, enable voice extension. --- comms/mgetty+sendfax/Makefile | 14 +-- comms/mgetty+sendfax/distinfo | 2 +- comms/mgetty+sendfax/files/patch-aa | 44 +++---- comms/mgetty+sendfax/files/patch-ab | 221 ++++++++++++++++-------------------- comms/mgetty+sendfax/files/patch-ac | 19 ++++ comms/mgetty+sendfax/files/patch-ad | 30 ++--- comms/mgetty+sendfax/pkg-plist | 35 +++++- 7 files changed, 182 insertions(+), 183 deletions(-) create mode 100644 comms/mgetty+sendfax/files/patch-ac (limited to 'comms') diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index 291d8c4ae312..9c64616b6dff 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,25 +1,25 @@ # New ports collection makefile for: mgetty+sendfax -# Version required: 1.0.0 +# Version required: 1.1.11 # Date created: 21 September 1994 # Whom: jmz # -# $Id: Makefile,v 1.20 1997/11/10 09:05:06 asami Exp $ +# $Id: Makefile,v 1.21 1997/11/11 01:33:22 asami Exp $ # -DISTNAME= mgetty1.1.9-Aug17 -PKGNAME= mgetty-1.1.9 +DISTNAME= mgetty1.1.11-Dec16 +PKGNAME= mgetty-1.1.11 CATEGORIES= comms MASTER_SITES= ftp://ftp.leo.org/pub/comp/networking/communication/modem/mgetty/ MAINTAINER= jmz@FreeBSD.org -WRKSRC= ${WRKDIR}/mgetty-1.1.9 +WRKSRC= ${WRKDIR}/mgetty-1.1.11 MAKE_FLAGS= prefix=${PREFIX} -f MAN1= coverpg.1 fax.1 faxq.1 faxrm.1 faxrunq.1 faxspool.1 \ - g3cat.1 g32pbm.1 pbm2g3.1 + g3cat.1 g32pbm.1 pbm2g3.1 pvf.1 zplay.1 MAN4= mgettydefs.4 MAN5= faxqueue.5 -MAN8= sendfax.8 mgetty.8 callback.8 +MAN8= sendfax.8 mgetty.8 callback.8 faxrunqd.8 pre-install: @(cd ${WRKSRC}/doc; ${MAKE} manpages) diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo index b3e859dc05fc..34d966917c63 100644 --- a/comms/mgetty+sendfax/distinfo +++ b/comms/mgetty+sendfax/distinfo @@ -1 +1 @@ -MD5 (mgetty1.1.9-Aug17.tar.gz) = e29b4a3dcb6f0b7daf29288ce9757f10 +MD5 (mgetty1.1.11-Dec16.tar.gz) = 4bcbbf1baf7b915876c50de1fa2a15c0 diff --git a/comms/mgetty+sendfax/files/patch-aa b/comms/mgetty+sendfax/files/patch-aa index 0de9d3f812c3..089b30176afa 100644 --- a/comms/mgetty+sendfax/files/patch-aa +++ b/comms/mgetty+sendfax/files/patch-aa @@ -1,27 +1,17 @@ -*** fax/faxspool.in.orig Sat Apr 5 02:58:15 1997 ---- fax/faxspool.in Sat Apr 5 02:59:21 1997 -*************** -*** 299,309 **** - # user name (for authentification) - ########## - -! if user=`logname 2>/dev/null` -! then : - else - id=`id` -! user=`expr "$id" : "[^( ]*(\([^)]*\)"` - fi - test -z "$user" && user=$LOGNAME - test -z "$user" && user=$USER ---- 299,309 ---- - # user name (for authentification) - ########## - -! if [ `id -u` = 0 ]; then -! user=root - else - id=`id` -! user=`logname` - fi - test -z "$user" && user=$LOGNAME - test -z "$user" && user=$USER +--- fax/faxspool.in.orig Fri Aug 8 21:43:55 1997 ++++ fax/faxspool.in Mon Dec 29 22:31:59 1997 +@@ -299,11 +299,11 @@ + # user name (for authentification) + ########## + +-if user=`logname 2>/dev/null` +-then : ++if [ `id -u` = 0 ]; then ++ user=root + else + id=`id` +- user=`expr "$id" : "[^( ]*(\([^)]*\)"` ++ user=`logname` + fi + test -z "$user" && user=$LOGNAME + test -z "$user" && user=$USER diff --git a/comms/mgetty+sendfax/files/patch-ab b/comms/mgetty+sendfax/files/patch-ab index 32713aa02421..1b8f538642f7 100644 --- a/comms/mgetty+sendfax/files/patch-ab +++ b/comms/mgetty+sendfax/files/patch-ab @@ -1,126 +1,95 @@ -*** Makefile.orig Sun Aug 17 21:36:47 1997 ---- Makefile Thu Oct 30 23:14:09 1997 -*************** -*** 4,11 **** - # - # this is the C compiler to use (on SunOS, the standard "cc" does not - # grok my code, so please use gcc there. On ISC 4.0, use "icc".). -! CC=gcc -! #CC=cc - # - #### C Compiler Flags #### - # ---- 4,11 ---- - # - # this is the C compiler to use (on SunOS, the standard "cc" does not - # grok my code, so please use gcc there. On ISC 4.0, use "icc".). -! #CC=gcc -! CC=cc - # - #### C Compiler Flags #### - # -*************** -*** 108,114 **** - # prompt first. Don't forget to activate the /AutoPPP/ line in login.config! - # - #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL -! CFLAGS=-O2 -Wall -pipe - #CFLAGS=-O -DSVR4 - #CFLAGS=-O -DSVR4 -DSVR42 - #CFLAGS=-O -DUSE_POLL ---- 108,114 ---- - # prompt first. Don't forget to activate the /AutoPPP/ line in login.config! - # - #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL -! #CFLAGS=-O2 -Wall -pipe - #CFLAGS=-O -DSVR4 - #CFLAGS=-O -DSVR4 -DSVR42 - #CFLAGS=-O -DUSE_POLL -*************** -*** 151,157 **** - # For Linux, add "-lutil" if the linker complains about "updwtmp". - # - LDFLAGS= -! LIBS= - #LIBS=-lprot -lsocket # SCO Unix - #LIBS=-lsocket - #LIBS=-lbsd # OSF/1 ---- 151,157 ---- - # For Linux, add "-lutil" if the linker complains about "updwtmp". - # - LDFLAGS= -! LIBS=-lutil - #LIBS=-lprot -lsocket # SCO Unix - #LIBS=-lsocket - #LIBS=-lbsd # OSF/1 -*************** -*** 260,268 **** - # please use the "mg.echo" program provided in the compat/ subdirectory. - # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo - # -! ECHO="echo" - # -! # INSTALL_MECHO=mg.echo - - # - # for mgetty, that's it. If you want to use the voice ---- 260,268 ---- - # please use the "mg.echo" program provided in the compat/ subdirectory. - # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo - # -! ECHO="mg.echo" - # -! INSTALL_MECHO=mg.echo - - # - # for mgetty, that's it. If you want to use the voice -*************** -*** 555,566 **** - install: install.bin install.doc - - install.bin: mgetty sendfax newslock \ -! login.config mgetty.config sendfax.config - # - # binaries - # - -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) -! $(INSTALL) -m 755 newslock $(BINDIR) - - -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) - -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old ---- 555,566 ---- - install: install.bin install.doc - - install.bin: mgetty sendfax newslock \ -! login.config #mgetty.config sendfax.config - # - # binaries - # - -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) -! $(INSTALL) -s -m 755 newslock $(BINDIR) - - -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) - -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old -*************** -*** 576,585 **** - ( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR)) - test -f $(CONFDIR)/login.config || \ - $(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 || \ ---- 576,585 ---- - ( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR)) - test -f $(CONFDIR)/login.config || \ - $(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 || \ +--- Makefile.orig Tue Dec 16 21:44:14 1997 ++++ Makefile Mon Dec 29 22:41:35 1997 +@@ -4,8 +4,8 @@ + # + # this is the C compiler to use (on SunOS, the standard "cc" does not + # grok my code, so please use gcc there. On ISC 4.0, use "icc".). +-CC=gcc +-#CC=cc ++#CC=gcc ++CC=cc + # + #### C Compiler Flags #### + # +@@ -108,7 +108,7 @@ + # prompt first. Don't forget to activate the /AutoPPP/ line in login.config! + # + #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL +-CFLAGS=-O2 -Wall -pipe ++#CFLAGS=-O2 -Wall -pipe + #CFLAGS=-O -DSVR4 + #CFLAGS=-O -DSVR4 -DSVR42 + #CFLAGS=-O -DUSE_POLL +@@ -151,7 +151,7 @@ + # For Linux, add "-lutil" if the linker complains about "updwtmp". + # + LDFLAGS= +-LIBS= ++LIBS=-lutil + #LIBS=-lprot -lsocket # SCO Unix + #LIBS=-lsocket + #LIBS=-lbsd # OSF/1 +@@ -261,9 +261,9 @@ + # please use the "mg.echo" program provided in the compat/ subdirectory. + # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo + # +-ECHO="echo" ++ECHO="mg.echo" + # +-# INSTALL_MECHO=mg.echo ++INSTALL_MECHO=mg.echo + + # + # for mgetty, that's it. If you want to use the voice +@@ -271,7 +271,7 @@ + + # To maintain security, I recommend creating a new group for + # users who are allowed to manipulate the recorded voice messages. +-PHONE_GROUP=phone ++PHONE_GROUP=uucp + PHONE_PERMS=770 + + # Add -DNO_STRSTR to CFLAGS if you don't have strstr(). +@@ -303,7 +303,7 @@ + + all: bin-all doc-all + +-bin-all: mgetty sendfax newslock subdirs call-back ++bin-all: mgetty sendfax newslock subdirs call-back vgetty + + # a few C files need extra compiler arguments + +@@ -562,15 +562,15 @@ + cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz * + + +-install: install.bin install.doc ++install: install.bin install.doc install-vgetty + + install.bin: mgetty sendfax newslock \ +- login.config mgetty.config sendfax.config ++ login.config #mgetty.config sendfax.config + # + # binaries + # + -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) +- $(INSTALL) -m 755 newslock $(BINDIR) ++ $(INSTALL) -s -m 755 newslock $(BINDIR) + + -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) + -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old +@@ -586,10 +586,10 @@ + ( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR)) + test -f $(CONFDIR)/login.config || \ + $(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)/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 || \ diff --git a/comms/mgetty+sendfax/files/patch-ac b/comms/mgetty+sendfax/files/patch-ac new file mode 100644 index 000000000000..7890b81826bb --- /dev/null +++ b/comms/mgetty+sendfax/files/patch-ac @@ -0,0 +1,19 @@ +--- voice/Makefile.orig Mon Dec 29 23:06:36 1997 ++++ voice/Makefile Mon Dec 29 23:07:18 1997 +@@ -89,11 +89,11 @@ + done + $(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR) + $(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR) +- cd $(MAN1DIR); \ +- for i in $(PVFTOOLS); \ +- do \ +- $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \ +- done ++# cd $(MAN1DIR); \ ++# for i in $(PVFTOOLS); \ ++# 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 diff --git a/comms/mgetty+sendfax/files/patch-ad b/comms/mgetty+sendfax/files/patch-ad index 093ca6c8acbf..24ded4ca74e0 100644 --- a/comms/mgetty+sendfax/files/patch-ad +++ b/comms/mgetty+sendfax/files/patch-ad @@ -1,19 +1,11 @@ -*** doc/Makefile.orig Sat Apr 5 03:00:23 1997 ---- doc/Makefile Sat Apr 5 03:00:48 1997 -*************** -*** 26,32 **** - - all: - -! doc-all: mgetty.asc mgetty.info mgetty.dvi mgetty.ps fmt-manpages $(MANSRC) - - manpages: $(MANSRC) - ---- 26,32 ---- - - all: - -! doc-all: mgetty.asc mgetty.info fmt-manpages $(MANSRC) - - manpages: $(MANSRC) - +--- doc/Makefile.orig Fri Nov 28 04:33:26 1997 ++++ doc/Makefile Mon Dec 29 22:31:59 1997 +@@ -26,7 +26,7 @@ + + all: + +-doc-all: mgetty.asc mgetty.info mgetty.dvi mgetty.ps fmt-manpages $(MANSRC) ++doc-all: mgetty.asc mgetty.info fmt-manpages $(MANSRC) + + manpages: $(MANSRC) + diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist index cbf7003a3c52..2c106655347f 100644 --- a/comms/mgetty+sendfax/pkg-plist +++ b/comms/mgetty+sendfax/pkg-plist @@ -1,15 +1,40 @@ +bin/autopvf +bin/basictopvf bin/faxspool bin/faxq bin/faxrm bin/faxrunq bin/g3cat bin/g32pbm +bin/g3topbm bin/newslock +bin/lintopvf bin/mg.echo bin/pbm2g3 +bin/pvfamp +bin/pvfcut +bin/pvfecho +bin/pvffft +bin/pvffile +bin/pvfmix +bin/pvfreverse +bin/pvfsine +bin/pvfspeed +bin/pvftoau +bin/pvftobasic +bin/pvftolin +bin/pvftormd +bin/pvftovoc +bin/pvftowav +bin/rmdfile +bin/rmdtopvf +bin/vm +bin/voctopvf +bin/wavtopvf etc/mgetty+sendfax/dialin.config etc/mgetty+sendfax/faxrunq.config etc/mgetty+sendfax/login.config +etc/mgetty+sendfax/voice.conf-dist @unexec rm -f %D/etc/mgetty+sendfax/faxheader %D/etc/mgetty+sendfax/mgetty.config* %D/etc/mgetty+sendfax/sendfax.config* @unexec install-info --delete %D/info/mgetty.info %D/info/dir info/mgetty.info @@ -30,13 +55,17 @@ man/man1/faxspool.1.gz man/man1/g3cat.1.gz man/man1/g32pbm.1.gz man/man1/pbm2g3.1.gz +man/man1/pvf.1.gz +man/man1/zplay.1.gz man/man4/mgettydefs.4.gz man/man5/faxqueue.5.gz -man/man8/sendfax.8.gz -man/man8/mgetty.8.gz man/man8/callback.8.gz +man/man8/faxrunqd.8.gz +man/man8/mgetty.8.gz +man/man8/sendfax.8.gz +sbin/faxrunqd sbin/mgetty sbin/sendfax -sbin/faxrunqd +sbin/vgetty @dirrm etc/mgetty+sendfax @dirrm lib/mgetty+sendfax -- cgit v1.2.3