diff options
| -rw-r--r-- | comms/mgetty+sendfax/Makefile | 11 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/distinfo | 16 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-ab | 41 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-ac | 9 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-ad | 10 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-an | 13 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-ao | 13 |
7 files changed, 41 insertions, 72 deletions
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index c3f18068095..fd732825ab6 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.41 2004/10/03 00:13:16 tv Exp $ +# $NetBSD: Makefile,v 1.42 2005/02/23 16:57:28 jwise Exp $ # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp # -DISTNAME= mgetty1.1.30-Dec16 -PKGNAME= mgetty-1.1.30 -PKGREVISION= 3 +DISTNAME= mgetty1.1.31-Jul24 +PKGNAME= mgetty-1.1.31 CATEGORIES= comms MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ \ ftp://alpha.greenie.net/pub/mgetty/source/1.1/ @@ -36,7 +35,9 @@ PKG_SYSCONFSUBDIR= mgetty+sendfax faxrunq.config \ faxspool.rules.sample \ login.config \ - mgetty.config + mgetty.config \ + voice.conf + CONF_FILES+= ${_EXAMPLES_DIR}/${cfg} ${PKG_SYSCONFDIR}/${cfg} . endfor .endif diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo index c49dd7efba1..3e604496b60 100644 --- a/comms/mgetty+sendfax/distinfo +++ b/comms/mgetty+sendfax/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.16 2005/02/23 16:05:30 agc Exp $ +$NetBSD: distinfo,v 1.17 2005/02/23 16:57:28 jwise Exp $ -SHA1 (mgetty1.1.30-Dec16.tar.gz) = aea2a4c999f167e2311e797b164d4797baf328c4 -RMD160 (mgetty1.1.30-Dec16.tar.gz) = 9e15cb925a946dee144b9c6869943293715695ba -Size (mgetty1.1.30-Dec16.tar.gz) = 969967 bytes +SHA1 (mgetty1.1.31-Jul24.tar.gz) = a6f20da26b49bbfa695791edec7d0a2247b79e2d +RMD160 (mgetty1.1.31-Jul24.tar.gz) = 255eec0838ce5bfad04c53d478a4505e74111a07 +Size (mgetty1.1.31-Jul24.tar.gz) = 998462 bytes SHA1 (patch-aa) = 249ec3d2425d359a5d89241978ff9ac6122d0eb6 -SHA1 (patch-ab) = ef88867f22b963015b9decaac69829653348c852 -SHA1 (patch-ac) = 1ff9866dd8a54fca4fa59d5144117fa3b46a9b4f -SHA1 (patch-ad) = 27fcebfe959a1d24657f504b89017fa3a58ae6c1 +SHA1 (patch-ab) = 3bdb7de77f03124ea46f19dead8a199209dd7cc1 +SHA1 (patch-ac) = 473d1017b50454d6fed40e3ed05a3d38d07b36fe +SHA1 (patch-ad) = be309a4f19039d678e202302e6ef14a534a6571e SHA1 (patch-ae) = f274db8059463f8b915c2d2faa86aa0e956e5a2c SHA1 (patch-af) = 9c4c62ba7f509cbdd4735fe1f08e488cfa769403 SHA1 (patch-ag) = 943aa837a285663ff6cf5ab07c3f908f499c2074 @@ -16,5 +16,3 @@ SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475 SHA1 (patch-al) = 2a6dcf13d65446d2064228b1024517e599892a60 SHA1 (patch-am) = 6b7516b3f857f65c0ecc7963f39e433e4ef8771d -SHA1 (patch-an) = 36be41aa6002d6c0bb387be4a0fc46a1701f0b11 -SHA1 (patch-ao) = 64a8b1f390dffc0b20eba18ba7d242084dc909dd diff --git a/comms/mgetty+sendfax/patches/patch-ab b/comms/mgetty+sendfax/patches/patch-ab index e074adcccb1..7bec0cacaa1 100644 --- a/comms/mgetty+sendfax/patches/patch-ab +++ b/comms/mgetty+sendfax/patches/patch-ab @@ -1,7 +1,5 @@ -$NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ - ---- Makefile.orig Sun Feb 25 06:33:49 2001 -+++ Makefile +--- Makefile.orig 2004-07-24 14:53:47.000000000 -0400 ++++ Makefile 2005-02-23 11:07:40.000000000 -0500 @@ -4,8 +4,8 @@ # # this is the C compiler to use (on SunOS, the standard "cc" does not @@ -13,16 +11,16 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ # #### C Compiler Flags #### # -@@ -107,7 +107,7 @@ - # prompt first. Don't forget to activate the /AutoPPP/ line in login.config! +@@ -102,7 +102,7 @@ + # USTAT - ustat(), no statfs etc. # #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL -CFLAGS=-O2 -Wall -pipe -+CFLAGS+=-DAUTO_PPP -DPREFIX=\"${PREFIX}\" ++CFLAGS=-O2 -Wall -pipe -DAUTO_PPP -DPREFIX=\"${PREFIX}\" #CFLAGS=-O -DSVR4 #CFLAGS=-O -DSVR4 -DSVR42 #CFLAGS=-O -DUSE_POLL -@@ -149,7 +149,7 @@ +@@ -144,7 +144,7 @@ # For Linux, add "-lutil" if the linker complains about "updwtmp". # LDFLAGS= @@ -31,7 +29,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ #LIBS=-lprot -lsocket # SCO Unix #LIBS=-lsocket #LIBS=-lbsd # OSF/1 -@@ -169,15 +169,15 @@ +@@ -164,15 +164,15 @@ # # if your systems doesn't have one, use the shell script that I provide # in "inst.sh" (taken from X11R5). Needed on IRIX5.2 @@ -50,7 +48,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ # # prefix for all the spool directories (usually /usr/spool or /var/spool) # -@@ -185,20 +185,20 @@ +@@ -180,20 +180,20 @@ # # where the mgetty + sendfax binaries live (used for "make install") # @@ -76,7 +74,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ # # # where mgetty PID files (mgetty.pid) go to -@@ -224,20 +224,20 @@ FAX_OUT_USER=fax +@@ -220,20 +220,20 @@ # # # Where section 1 manual pages should be placed @@ -102,7 +100,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ # # # A shell that understands bourne-shell syntax -@@ -254,7 +254,7 @@ +@@ -258,7 +258,7 @@ # If you have Perl with TK extentions, define it here. This may be the # same as PERL=... above, or different, if you have TkPerl statically # linked. @@ -111,7 +109,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ # # # An echo program that understands escapes like "\n" for newline or -@@ -266,9 +266,9 @@ +@@ -270,9 +270,9 @@ # please use the "mg.echo" program provided in the compat/ subdirectory. # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo # @@ -123,7 +121,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ # # for mgetty, that's it. If you want to use the voice -@@ -276,7 +276,7 @@ +@@ -280,7 +280,7 @@ # To maintain security, I recommend creating a new group for # users who are allowed to manipulate the recorded voice messages. @@ -132,7 +130,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ PHONE_PERMS=770 # Add -DNO_STRSTR to CFLAGS if you don't have strstr(). -@@ -308,7 +308,7 @@ +@@ -312,7 +312,7 @@ all: bin-all doc-all @@ -141,7 +139,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ # a few C files need extra compiler arguments -@@ -559,8 +559,8 @@ +@@ -564,8 +564,8 @@ # internal: use this to create a "clean" mgetty+sendfax tree bindist: all doc-all sedscript -rm -rf bindist @@ -152,7 +150,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ BINDIR=$$bd$(BINDIR) SBINDIR=$$bd$(SBINDIR) \ LIBDIR=$$bd$(LIBDIR) CONFDIR=$$bd$(CONFDIR) \ spool=$$bd$(spool) FAX_SPOOL=$$bd$(FAX_SPOOL) \ -@@ -572,7 +572,7 @@ +@@ -577,7 +577,7 @@ cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz * @@ -161,7 +159,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ install.bin: mgetty sendfax newslock \ login.config mgetty.config sendfax.config -@@ -580,7 +580,7 @@ +@@ -585,7 +585,7 @@ # binaries # -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) @@ -170,12 +168,12 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old -@@ -592,18 +592,13 @@ +@@ -597,18 +597,14 @@ # test -d $(LIBDIR) || \ - ( ./mkidirs $(LIBDIR) ; chmod 755 $(LIBDIR) ) + ( ./mkidirs $(LIBDIR) && chmod 755 $(LIBDIR) ) - test -d $(CONFDIR) || \ -- ( ./mkidirs $(CONFDIR); chmod 755 $(CONFDIR)) +- ( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR)) - test -f $(CONFDIR)/login.config || \ - $(INSTALL) -o root -m 600 login.config $(CONFDIR)/ - test -f $(CONFDIR)/mgetty.config || \ @@ -193,6 +191,7 @@ $NetBSD: patch-ab,v 1.6 2003/09/20 16:39:38 fredb Exp $ + $(INSTALL) -o root -m 644 sendfax.config $(CONF_EXAMPLES_DIR)/ + $(INSTALL) -o root -m 600 dialin.config $(CONF_EXAMPLES_DIR)/ + $(INSTALL) -o root -m 644 faxrunq.config $(CONF_EXAMPLES_DIR)/ ++ # # test for outdated stuff # diff --git a/comms/mgetty+sendfax/patches/patch-ac b/comms/mgetty+sendfax/patches/patch-ac index 8e6604ee52c..fd2e4baaae9 100644 --- a/comms/mgetty+sendfax/patches/patch-ac +++ b/comms/mgetty+sendfax/patches/patch-ac @@ -1,8 +1,6 @@ -$NetBSD: patch-ac,v 1.3 2002/03/09 17:17:06 fredb Exp $ - ---- voice/Makefile.orig Sun Dec 23 09:08:13 2001 -+++ voice/Makefile -@@ -92,11 +92,11 @@ +--- voice/Makefile.orig 2001-12-23 10:08:13.000000000 -0500 ++++ voice/Makefile 2005-02-23 11:48:08.000000000 -0500 +@@ -92,11 +92,12 @@ $(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR) $(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR) $(INSTALL) -m 644 man/man8/vgetty.8 $(MAN8DIR) @@ -11,6 +9,7 @@ $NetBSD: patch-ac,v 1.3 2002/03/09 17:17:06 fredb Exp $ - do \ - $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \ - done ++ $(INSTALL) -m 644 voice.conf-dist $(CONF_EXAMPLES_DIR)/voice.conf +# cd $(MAN1DIR); \ +# for i in $(PVFTOOLS); \ +# do \ diff --git a/comms/mgetty+sendfax/patches/patch-ad b/comms/mgetty+sendfax/patches/patch-ad index 8a0e388af84..06a520d2405 100644 --- a/comms/mgetty+sendfax/patches/patch-ad +++ b/comms/mgetty+sendfax/patches/patch-ad @@ -1,13 +1,11 @@ -$NetBSD: patch-ad,v 1.4 2002/03/06 19:19:02 fredb Exp $ - ---- doc/Makefile.orig Thu Nov 27 14:33:26 1997 -+++ doc/Makefile +--- doc/Makefile.orig 2004-07-17 11:21:19.000000000 -0400 ++++ doc/Makefile 2005-02-23 11:10:20.000000000 -0500 @@ -6,7 +6,7 @@ NROFF=nroff # # --MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 fax.1 \ -+MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 sendfax.1 \ +-MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 sff2g3.1 fax.1 \ ++MAN1PAGES=g32pbm.1 g3cat.1 pbm2g3.1 sff2g3.1 sendfax.1 \ faxspool.1 faxrunq.1 faxq.1 faxrm.1 coverpg.1 MAN4PAGES=mgettydefs.4 MAN5PAGES=faxqueue.5 diff --git a/comms/mgetty+sendfax/patches/patch-an b/comms/mgetty+sendfax/patches/patch-an deleted file mode 100644 index cde00266944..00000000000 --- a/comms/mgetty+sendfax/patches/patch-an +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-an,v 1.1 2003/12/20 20:06:38 fredb Exp $ - ---- fax/faxq.in.orig 2002-11-23 12:57:59.000000000 -0600 -+++ fax/faxq.in -@@ -21,7 +21,7 @@ AWK=@AWK@ - - # - # helper program for privileged queue access --FAXQ_HELPER=/usr/local/lib/mgetty+sendfax/faxq-helper -+FAXQ_HELPER=@LIBDIR@/faxq-helper - - if cd $FAX_SPOOL_OUT - then : diff --git a/comms/mgetty+sendfax/patches/patch-ao b/comms/mgetty+sendfax/patches/patch-ao deleted file mode 100644 index 433839a5f49..00000000000 --- a/comms/mgetty+sendfax/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2003/12/20 20:06:38 fredb Exp $ - ---- fax/faxrm.in.orig 2002-11-16 16:16:51.000000000 -0600 -+++ fax/faxrm.in -@@ -16,7 +16,7 @@ FAX_SPOOL_OUT=@FAX_SPOOL_OUT@ - echo="@ECHO@" - # - # helper program for privileged queue access --FAXQ_HELPER=/usr/local/lib/mgetty+sendfax/faxq-helper -+FAXQ_HELPER=@LIBDIR@/faxq-helper - # - - if [ ! -d $FAX_SPOOL_OUT ] |