diff options
| -rw-r--r-- | comms/mgetty+sendfax/Makefile | 34 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/distinfo | 9 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-ab | 72 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/patches/patch-ai | 31 | ||||
| -rwxr-xr-x | comms/mgetty+sendfax/pkg/INSTALL | 10 | ||||
| -rw-r--r-- | comms/mgetty+sendfax/pkg/PLIST | 18 |
6 files changed, 134 insertions, 40 deletions
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile index c5a3efbfc36..4b4e73869d7 100644 --- a/comms/mgetty+sendfax/Makefile +++ b/comms/mgetty+sendfax/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.14 2001/02/16 13:56:17 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2001/06/21 17:02:23 fredb Exp $ # FreeBSD Id: Makefile,v 1.25 1998/07/16 06:44:37 vanilla Exp # -DISTNAME= mgetty1.1.22-Aug17 -PKGNAME= mgetty-1.1.22 +DISTNAME= mgetty1.1.26-Apr16 +PKGNAME= mgetty-1.1.26 CATEGORIES= comms -MASTER_SITES= ftp://alpha.greenie.net/pub/mgetty/source/1.1/ +MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ \ + ftp://alpha.greenie.net/pub/mgetty/source/1.1/ MAINTAINER= packages@netbsd.org HOMEPAGE= http://alpha.greenie.net/mgetty/ @@ -17,13 +18,26 @@ CONFLICTS= hylafax-* WRKSRC= ${WRKDIR}/${PKGNAME} INFO_FILES= mgetty.info +INSTALL_FILE= ${WRKDIR}/INSTALL -post-configure: - @cd ${WRKSRC}; \ - ${MV} faxrunq.config faxrunq.config.old; \ - ${SED} -e 's#/usr/local#${PREFIX}#' <faxrunq.config.old >faxrunq.config +MGETTY_CONFDIR= ${PREFIX}/etc/mgetty+sendfax +#MGETTY_CONFDIR=/etc/mgetty +MAKE_ENV+= MGETTY_CONFDIR=${MGETTY_CONFDIR} -pre-install: - @(cd ${WRKSRC}/doc; ${MAKE} manpages) +post-configure: + ${SED} -e 's#$${INSTALL_DATA_DIR}#${INSTALL_DATA_DIR}#' \ + -e 's#$${MGETTY_CONFDIR}#${MGETTY_CONFDIR}#' \ + -e 's#$${PAX}#${PAX}#' \ + -e 's#$${PREFIX}#${PREFIX}#' \ + ${PKGDIR}/INSTALL > ${INSTALL_FILE} + cd ${WRKSRC}; \ + ${MV} faxrunq.config faxrunq.config.old; \ + ${SED} 's#/usr/local#${PREFIX}#' \ + faxrunq.config.old > faxrunq.config + +post-install: + ${INSTALL_DATA_DIR} ${MGETTY_CONFDIR} + cd ${PREFIX}/share/examples/mgetty+sendfax; \ + ${PAX} -r -w -pe -k * ${MGETTY_CONFDIR} .include "../../mk/bsd.pkg.mk" diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo index 9a7da0b2bd5..b0cea2047c1 100644 --- a/comms/mgetty+sendfax/distinfo +++ b/comms/mgetty+sendfax/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 09:04:22 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/06/21 17:02:23 fredb Exp $ -SHA1 (mgetty1.1.22-Aug17.tar.gz) = d04a749265ca11ec9ad451646b1e04b8cb49fb04 -Size (mgetty1.1.22-Aug17.tar.gz) = 948803 bytes +SHA1 (mgetty1.1.26-Apr16.tar.gz) = c36926dad8849f14e617f207cb7729f8e4c7f089 +Size (mgetty1.1.26-Apr16.tar.gz) = 948245 bytes SHA1 (patch-aa) = 249ec3d2425d359a5d89241978ff9ac6122d0eb6 -SHA1 (patch-ab) = c5fbc193735f4afa864f91e261935068c8428276 +SHA1 (patch-ab) = ca2ff2961b045b66a3aedf692ce83e8fc6ecdd09 SHA1 (patch-ac) = f37ba8521f18957931f5180c8c90f3ec0b6a707f SHA1 (patch-ad) = c31a50209e83d9082cd4a026c0d3e1517d96a336 SHA1 (patch-ae) = bf1dde04e3c3ae0b0683481cf1bd2e590d1dddd8 SHA1 (patch-af) = 418e87beca4f3a52ae0c6f7e337d119f86766d6c SHA1 (patch-ag) = 943aa837a285663ff6cf5ab07c3f908f499c2074 SHA1 (patch-ah) = 7724a401625d25b00ba88782eeffc3cdc03387c6 +SHA1 (patch-ai) = 98eba401e1b422e2f759eca00132a75e68518f4d diff --git a/comms/mgetty+sendfax/patches/patch-ab b/comms/mgetty+sendfax/patches/patch-ab index a41b06b39b7..6da8c531f93 100644 --- a/comms/mgetty+sendfax/patches/patch-ab +++ b/comms/mgetty+sendfax/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ +$NetBSD: patch-ab,v 1.5 2001/06/21 17:02:24 fredb Exp $ ---- Makefile.orig Sun Nov 22 00:19:06 1998 -+++ Makefile Mon Aug 23 22:57:53 1999 +--- Makefile.orig Sun Feb 25 06:33:49 2001 ++++ Makefile @@ -4,8 +4,8 @@ # # this is the C compiler to use (on SunOS, the standard "cc" does not @@ -31,7 +31,17 @@ $NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ #LIBS=-lprot -lsocket # SCO Unix #LIBS=-lsocket #LIBS=-lbsd # OSF/1 -@@ -177,7 +177,7 @@ +@@ -169,15 +169,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 +-INSTALL=install -c -o bin -g bin +-#INSTALL=install -c -o root -g wheel # NeXT/BSD ++#INSTALL=install -c -o bin -g bin ++INSTALL=install -c -o root -g wheel # NeXT/BSD + #INSTALL=/usr/ucb/install -c -o bin -g bin # AIX, Solaris 2.x + #INSTALL=installbsd -c -o bin -g bin # OSF/1, AIX 4.1, 4.2 + #INSTALL=/usr/bin/X11/bsdinst -c -o bin # IRIX # # prefix, where most (all?) of the stuff lives, usually /usr/local or /usr # @@ -40,7 +50,7 @@ $NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ # # prefix for all the spool directories (usually /usr/spool or /var/spool) # -@@ -185,19 +185,19 @@ +@@ -185,20 +185,20 @@ # # where the mgetty + sendfax binaries live (used for "make install") # @@ -60,11 +70,13 @@ $NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ # where the configuration files (*.config, aliases, fax.allow/deny) go to # -CONFDIR=$(prefix)/etc/mgetty+sendfax -+CONFDIR=${PREFIX}/etc/mgetty+sendfax - #CONFDIR=/etc/default/ +-#CONFDIR=/etc/default/ ++CONFDIR=${MGETTY_CONFDIR} ++CONF_EXAMPLES_DIR=${PREFIX}/share/examples/mgetty+sendfax # # -@@ -209,20 +209,20 @@ + # where PID and status files (mgetty.pid, faxrunqd.pid, +@@ -216,20 +216,20 @@ # # # Where section 1 manual pages should be placed @@ -90,7 +102,7 @@ $NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ # # # A shell that understands bourne-shell syntax -@@ -247,7 +247,7 @@ +@@ -254,7 +254,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. @@ -99,7 +111,7 @@ $NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ # # # An echo program that understands escapes like "\n" for newline or -@@ -259,9 +259,9 @@ +@@ -266,9 +266,9 @@ # please use the "mg.echo" program provided in the compat/ subdirectory. # Set ECHO="mg.echo" and INSTALL_MECHO to mg.echo # @@ -111,7 +123,7 @@ $NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ # # for mgetty, that's it. If you want to use the voice -@@ -269,7 +269,7 @@ +@@ -276,7 +276,7 @@ # To maintain security, I recommend creating a new group for # users who are allowed to manipulate the recorded voice messages. @@ -120,7 +132,7 @@ $NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ PHONE_PERMS=770 # Add -DNO_STRSTR to CFLAGS if you don't have strstr(). -@@ -301,7 +301,7 @@ +@@ -308,7 +308,7 @@ all: bin-all doc-all @@ -129,18 +141,18 @@ $NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ # a few C files need extra compiler arguments -@@ -547,8 +547,8 @@ +@@ -559,8 +559,8 @@ # internal: use this to create a "clean" mgetty+sendfax tree bindist: all doc-all sedscript -rm -rf bindist - ./mkidirs bindist$(prefix) bindist$(spool) - bd=`pwd`/bindist; PATH=`pwd`:"$$PATH" $(MAKE) prefix=$$bd$(prefix) \ -+ ./mkidirs bindist${PREFIX} bindist$(spool) -+ bd=`pwd`/bindist; PATH=`pwd`:"$$PATH" $(MAKE) prefix=$$bd${PREFIX} \ ++ ./mkidirs bindist${PREFIX}/ bindist$(spool) ++ bd=`pwd`/bindist; PATH=`pwd`:"$$PATH" $(MAKE) prefix=$$bd${PREFIX}/ \ BINDIR=$$bd$(BINDIR) SBINDIR=$$bd$(SBINDIR) \ LIBDIR=$$bd$(LIBDIR) CONFDIR=$$bd$(CONFDIR) \ spool=$$bd$(spool) FAX_SPOOL=$$bd$(FAX_SPOOL) \ -@@ -560,7 +560,7 @@ +@@ -572,7 +572,7 @@ cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz * @@ -149,7 +161,7 @@ $NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ install.bin: mgetty sendfax newslock \ login.config mgetty.config sendfax.config -@@ -568,7 +568,7 @@ +@@ -580,7 +580,7 @@ # binaries # -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) @@ -158,3 +170,29 @@ $NetBSD: patch-ab,v 1.4 1999/08/23 21:04:34 tron Exp $ -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old +@@ -592,18 +592,13 @@ + # + test -d $(LIBDIR) || \ + ( ./mkidirs $(LIBDIR) ; chmod 755 $(LIBDIR) ) +- test -d $(CONFDIR) || \ +- ( ./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 || \ +- $(INSTALL) -o root -m 600 faxrunq.config $(CONFDIR)/ ++ test -d $(CONF_EXAMPLES_DIR) || \ ++ ( ./mkidirs $(CONF_EXAMPLES_DIR); chmod 755 $(CONF_EXAMPLES_DIR)) ++ $(INSTALL) -o root -m 600 login.config $(CONF_EXAMPLES_DIR)/ ++ $(INSTALL) -o root -m 600 mgetty.config $(CONF_EXAMPLES_DIR)/ ++ $(INSTALL) -o root -m 644 sendfax.config $(CONF_EXAMPLES_DIR)/ ++ $(INSTALL) -o root -m 600 dialin.config $(CONF_EXAMPLES_DIR)/ ++ $(INSTALL) -o root -m 600 faxrunq.config $(CONF_EXAMPLES_DIR)/ + # + # test for outdated stuff + # diff --git a/comms/mgetty+sendfax/patches/patch-ai b/comms/mgetty+sendfax/patches/patch-ai new file mode 100644 index 00000000000..8bd56f120a3 --- /dev/null +++ b/comms/mgetty+sendfax/patches/patch-ai @@ -0,0 +1,31 @@ +$NetBSD: patch-ai,v 1.1 2001/06/21 17:02:24 fredb Exp $ + +--- fax/Makefile.orig Sat Jul 24 16:27:24 1999 ++++ fax/Makefile +@@ -9,6 +9,9 @@ + + FAX_SCRIPTS=faxspool faxrunq faxq faxrm + ++CONFDIR=${MGETTY_CONFDIR} ++CONF_EXAMPLES_DIR=${PREFIX}/share/examples/mgetty+sendfax ++ + all: $(FAX_SCRIPTS) faxrunqd faxheader + + faxspool: faxspool.in ../sedscript +@@ -53,8 +56,8 @@ + # + $(INSTALL) -m 644 cour25.pbm $(LIBDIR) + $(INSTALL) -m 644 cour25n.pbm $(LIBDIR) +- -test -f $(CONFDIR)/faxheader || \ +- $(INSTALL) -m 644 faxheader $(CONFDIR) ++ -test -f $(CONF_EXAMPLES_DIR)/faxheader || \ ++ $(INSTALL) -m 644 faxheader $(CONF_EXAMPLES_DIR) + # + # /etc/magic + # +@@ -67,4 +70,4 @@ + # + # faxspool.rules sample file + # +- $(INSTALL) -m 644 faxspool.rules $(CONFDIR)/faxspool.rules.sample ++ $(INSTALL) -m 644 faxspool.rules $(CONF_EXAMPLES_DIR)/faxspool.rules.sample diff --git a/comms/mgetty+sendfax/pkg/INSTALL b/comms/mgetty+sendfax/pkg/INSTALL index 75db147493f..1256c857028 100755 --- a/comms/mgetty+sendfax/pkg/INSTALL +++ b/comms/mgetty+sendfax/pkg/INSTALL @@ -1,5 +1,15 @@ #!/bin/sh # + +if [ x"$2" != xPOST-INSTALL ] +then + exit +fi + +${INSTALL_DATA_DIR} ${MGETTY_CONFDIR} +(cd ${PREFIX}/share/examples/mgetty+sendfax; + ${PAX} -r -w -pe -k * ${MGETTY_CONFDIR}) + test -d /var/spool || \ ( mkdir /var/spool ; chmod 755 /var/spool ) test -d /var/spool/fax || \ diff --git a/comms/mgetty+sendfax/pkg/PLIST b/comms/mgetty+sendfax/pkg/PLIST index a5d2134628a..826df5d4363 100644 --- a/comms/mgetty+sendfax/pkg/PLIST +++ b/comms/mgetty+sendfax/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2000/05/17 03:43:49 fredb Exp $ +@comment $NetBSD: PLIST,v 1.7 2001/06/21 17:02:25 fredb Exp $ bin/autopvf bin/basictopvf bin/faxspool @@ -33,13 +33,6 @@ bin/rmdtopvf bin/vm bin/voctopvf bin/wavtopvf -etc/mgetty+sendfax/dialin.config -etc/mgetty+sendfax/faxheader -etc/mgetty+sendfax/faxrunq.config -etc/mgetty+sendfax/faxspool.rules.sample -etc/mgetty+sendfax/login.config -etc/mgetty+sendfax/mgetty.config -etc/mgetty+sendfax/sendfax.config @unexec install-info --delete %D/info/mgetty.info %D/info/dir info/mgetty.info info/mgetty.info-1 @@ -70,5 +63,12 @@ sbin/faxrunqd sbin/mgetty sbin/sendfax sbin/vgetty -@dirrm etc/mgetty+sendfax +share/examples/mgetty+sendfax/dialin.config +share/examples/mgetty+sendfax/faxheader +share/examples/mgetty+sendfax/faxrunq.config +share/examples/mgetty+sendfax/faxspool.rules.sample +share/examples/mgetty+sendfax/login.config +share/examples/mgetty+sendfax/mgetty.config +share/examples/mgetty+sendfax/sendfax.config +@dirrm share/examples/mgetty+sendfax @dirrm lib/mgetty+sendfax |