Some port related improvements, no functional changes in mgetty itself.

* Preserve configuration files in etc/mgetty+sendfax. Remove the
  pkg-deinstall file that used to warn about potential loss of
  configuration files at deinstall time.

* Patch file mtools.info so that it can be installed with install-info in
  the info index (the stock file lacks a proper directory entry).

* Make pkg-install exit without asking anything, if BATCH is defined. And
  fix a banner length :o)

Reviewed by:	jmz

6 files changed, 43 insertions, 32 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 6c89147a6f0..162d5b4e674 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -36,8 +36,17 @@ MAN8=		callback.8 \
 pre-install:
 	@(cd ${WRKSRC}/doc; ${MAKE} manpages)
 
-.if !defined(BATCH)
 post-install:
+	@${CP} ${PREFIX}/etc/mgetty+sendfax/dialin.config \
+		${PREFIX}/etc/mgetty+sendfax/dialin.config.dist
+	@${CP} ${PREFIX}/etc/mgetty+sendfax/faxheader \
+		${PREFIX}/etc/mgetty+sendfax/faxheader.dist
+	@${CP} ${PREFIX}/etc/mgetty+sendfax/faxrunq.config \
+		${PREFIX}/etc/mgetty+sendfax/faxrunq.config.dist
+	@${CP} ${PREFIX}/etc/mgetty+sendfax/login.config \
+		${PREFIX}/etc/mgetty+sendfax/login.config.dist
+	@install-info ${PREFIX}/info/mgetty.info ${PREFIX}/info/dir
+.if !defined(BATCH)
 	@(cd ${PKGDIR}; export PKG_PREFIX=${PREFIX}; ${PERL5} ${PKGINSTALL} _ POST-INSTALL)
 .endif
 
diff --git a/comms/mgetty+sendfax/files/mgettycfg.in b/comms/mgetty+sendfax/files/mgettycfg.in
index e2b93de3d85..68d8f57c50d 100644
--- a/comms/mgetty+sendfax/files/mgettycfg.in
+++ b/comms/mgetty+sendfax/files/mgettycfg.in
@@ -1,8 +1,9 @@
 #!/usr/bin/perl
 
 exit 0 if $ARGV[1] ne "POST-INSTALL";
+exit 0 if $ENV{'BATCH'};
 
-print STDERR "\n\n\n =========== mgetty+sendfax configuration ================\n\n";
+print STDERR "\n\n\n =========== mgetty+sendfax configuration ===========\n\n";
 $prefix = $ENV{'PKG_PREFIX'};
 $sep = "~";
 
diff --git a/comms/mgetty+sendfax/files/patch-d1 b/comms/mgetty+sendfax/files/patch-d1
new file mode 100644
index 00000000000..4ef06024162
--- /dev/null
+++ b/comms/mgetty+sendfax/files/patch-d1
@@ -0,0 +1,14 @@
+--- doc/mgetty.texi-in.orig	Sat Apr 28 12:57:00 2001
++++ doc/mgetty.texi-in	Sat Apr 28 13:03:46 2001
+@@ -11,6 +11,11 @@
+ package.
+ 
+ Copyright @copyright{} 1993-2000 Gert Doering
++@format
++START-INFO-DIR-ENTRY
++* Mgetty: (mgetty).		Mgetty: an advanced getty that can manage faxes.
++END-INFO-DIR-ENTRY
++@end format
+ @end ifinfo
+ 
+ @titlepage
diff --git a/comms/mgetty+sendfax/pkg-deinstall b/comms/mgetty+sendfax/pkg-deinstall
deleted file mode 100644
index 82ed1dbf663..00000000000
--- a/comms/mgetty+sendfax/pkg-deinstall
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-prefix=/usr/local
-
-cat << END
-
-Deinstalling mgetty+sendfax will remove your configuration files (usually
-mgetty.config and sendfax.config in $prefix/etc/mgetty+sendfax/). If you
-want to reinstall the port later, you must make a backup of those files 
-now.
-
-END
-
-if [ -z "${PACKAGE_BUILDING}" ]; then
-  echo -n "do you want to deinstall the package ? [y] "
-  read answ; if [ "$answ" = "" ]; then answ=y; fi
-else
-  answ=y
-fi
-case $answ in
-  y*|Y*) exit 0;;
-  *) exit 1;;
-esac
diff --git a/comms/mgetty+sendfax/pkg-install b/comms/mgetty+sendfax/pkg-install
index e2b93de3d85..68d8f57c50d 100644
--- a/comms/mgetty+sendfax/pkg-install
+++ b/comms/mgetty+sendfax/pkg-install
@@ -1,8 +1,9 @@
 #!/usr/bin/perl
 
 exit 0 if $ARGV[1] ne "POST-INSTALL";
+exit 0 if $ENV{'BATCH'};
 
-print STDERR "\n\n\n =========== mgetty+sendfax configuration ================\n\n";
+print STDERR "\n\n\n =========== mgetty+sendfax configuration ===========\n\n";
 $prefix = $ENV{'PKG_PREFIX'};
 $sep = "~";
 
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index 1eac5d25729..ffad41e5787 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -33,12 +33,21 @@ bin/rmdtopvf
 bin/vm
 bin/voctopvf
 bin/wavtopvf
-etc/mgetty+sendfax/dialin.config
-etc/mgetty+sendfax/faxheader
-etc/mgetty+sendfax/faxrunq.config
+@unexec if cmp -s %D/etc/mgetty+sendfax/dialin.config %D/etc/mgetty+sendfax/dialin.config.dist; then rm -f %D/etc/mgetty+sendfax/dialin.config; fi
+etc/mgetty+sendfax/dialin.config.dist
+@exec if [ ! -f %D/etc/mgetty+sendfax/dialin.config ]; then cp %B/%f %D/etc/mgetty+sendfax/dialin.config; fi
+@unexec if cmp -s %D/etc/mgetty+sendfax/faxheader %D/etc/mgetty+sendfax/faxheader.dist; then rm -f %D/etc/mgetty+sendfax/faxheader; fi
+etc/mgetty+sendfax/faxheader.dist
+@exec if [ ! -f %D/etc/mgetty+sendfax/faxheader ]; then cp %B/%f %D/etc/mgetty+sendfax/faxheader; fi
+@unexec if cmp -s %D/etc/mgetty+sendfax/faxrunq.config %D/etc/mgetty+sendfax/faxrunq.config.dist; then rm -f %D/etc/mgetty+sendfax/faxrunq.config; fi
+etc/mgetty+sendfax/faxrunq.config.dist
+@exec if [ ! -f %D/etc/mgetty+sendfax/faxrunq.config ]; then cp %B/%f %D/etc/mgetty+sendfax/faxrunq.config; fi
+@unexec if cmp -s %D/etc/mgetty+sendfax/faxspool.rules %D/etc/mgetty+sendfax/faxspool.rules.sample; then rm -f %D/etc/mgetty+sendfax/faxspool.rules; fi
 etc/mgetty+sendfax/faxspool.rules.sample
-etc/mgetty+sendfax/login.config
-@unexec rm -f %D/etc/mgetty+sendfax/faxheader %D/etc/mgetty+sendfax/mgetty.config* %D/etc/mgetty+sendfax/sendfax.config*
+@exec if [ ! -f %D/etc/mgetty+sendfax/faxspool.rules ]; then cp %B/%f %D/etc/mgetty+sendfax/faxspool.rules; fi
+@unexec if cmp -s %D/etc/mgetty+sendfax/login.config %D/etc/mgetty+sendfax/login.config.dist; then rm -f %D/etc/mgetty+sendfax/login.config; fi
+etc/mgetty+sendfax/login.config.dist
+@exec if [ ! -f %D/etc/mgetty+sendfax/login.config ]; then cp %B/%f %D/etc/mgetty+sendfax/login.config; fi
 @unexec install-info --delete %D/info/mgetty.info %D/info/dir
 info/mgetty.info
 @exec install-info %D/info/mgetty.info %D/info/dir
@@ -48,5 +57,5 @@ sbin/faxrunqd
 sbin/mgetty
 sbin/sendfax
 sbin/vgetty
-@dirrm etc/mgetty+sendfax
+@unexec rmdir %D/etc/mgetty+sendfax 2>/dev/null || true
 @dirrm lib/mgetty+sendfax