diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 83ca8add9efc..744e9b7cc700 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	mgetty
 PORTVERSION=	1.1.37
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	comms
 MASTER_SITES=	ftp://mgetty.greenie.net/pub/mgetty/source/1.1/
 DISTNAME=	${PORTNAME}${PORTVERSION}-Jun05
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Handle external logins, send and receive faxes
 WWW=		http://mgetty.greenie.net/
 
 LICENSE=	GPLv2
 
 BROKEN_aarch64=		fails to compile: error: initializer element is not a compile-time constant
 BROKEN_mips64=		fails to compile: error: initializer element is not a compile-time constant
 BROKEN_riscv64=		fails to compile: error: initializer element is not a compile-time constant
 
 USES=		cpe makeinfo perl5 shebangfix
 USE_CSTD=	gnu89
 SHEBANG_FILES=	samples/fax samples/new_fax.all/new_fax samples/new_fax.mime1 \
 		samples/new_fax.th samples/coverpg-pl.ps samples/faxview.th
 
 CPE_VENDOR=	mgetty_project
 SUB_FILES=	pkg-message mgettycfg
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_ARGS=	INFODIR=${PREFIX}/${INFO_PATH}
 MAKE_FLAGS=	CFLAGS="${CFLAGS}" prefix=${PREFIX} LOCALBASE=${LOCALBASE}\
 		STAGEDIR=${STAGEDIR} -f
 ALL_TARGET=	noident all
 INFO=		mgetty
 CFLAGS+=	-DAUTO_PPP
 
 CONFLICTS_INSTALL=	hylafax
 
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	FIDO
 FIDO_DESC=	Enable FIDO EMSI support
 FIDO_CFLAGS=	-DFIDO
 
 pre-install:
 	@(cd ${WRKSRC}/doc; ${MAKE} manpages)
 
 post-install:
 .for a in dialin.config faxheader faxrunq.config login.config
 	cd ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/ && ${MV} ${a} ${a}.sample
 .endfor
 	${INSTALL_DATA} -m 600 ${WRKSRC}/voice/voice.conf-dist \
 		${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/voice.conf.sample
 	cd ${WRKSRC} && ${COPYTREE_BIN} samples\
 		${STAGEDIR}${PREFIX}/lib/mgetty+sendfax
 	${INSTALL_SCRIPT} ${WRKDIR}/mgettycfg ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/comms/mgetty+sendfax/files/patch-Makefile b/comms/mgetty+sendfax/files/patch-Makefile
index 7e88c227ee96..5fb7bab5da1a 100644
--- a/comms/mgetty+sendfax/files/patch-Makefile
+++ b/comms/mgetty+sendfax/files/patch-Makefile
@@ -1,202 +1,219 @@
 --- Makefile.orig	2010-06-05 09:48:22 UTC
 +++ Makefile
 @@ -6,7 +6,7 @@
  # grok my code, so please use gcc there. On ISC 4.0, use "icc".).
  #
  # if you are cross-compiling, this is the C compiler for the target platform
 -CC=gcc
 +#CC=gcc
  #CC=cc
  #
  # if you are cross-compiling, *this* needs to be the C compiler that 
 @@ -109,7 +109,7 @@ HOSTCC=$(CC)
  #	    USTAT	  - ustat(), no statfs etc.
  #
  #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 @@ CFLAGS=-O2 -Wall -pipe
+@@ -151,7 +151,7 @@ LDFLAGS=
  # 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
 @@ -171,7 +171,8 @@ LIBS=
  #
  # 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
 +INSTALL_PROGRAM=install -s -c
  #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
-@@ -223,7 +224,7 @@ FAX_SPOOL_OUT=$(FAX_SPOOL)/outgoing
+@@ -223,20 +224,20 @@ FAX_SPOOL_OUT=$(FAX_SPOOL)/outgoing
  # (it's possible to run faxrunq(d) as root, but the FAX_OUT_USER 
  #  MUST NOT BE root or any other privileged account).
  #
 -FAX_OUT_USER=fax
 +FAX_OUT_USER=root
  #
  #
  # Where section 1 manual pages should be placed
+-MAN1DIR=$(prefix)/man/man1
++MAN1DIR=$(prefix)/share/man/man1
+ #
+ # Where section 4 manual pages (mgettydefs.4) should be placed
+-MAN4DIR=$(prefix)/man/man4
++MAN4DIR=$(prefix)/share/man/man4
+ #
+ # Section 5 man pages (faxqueue.5)
+-MAN5DIR=$(prefix)/man/man5
++MAN5DIR=$(prefix)/share/man/man5
+ #
+ # Section 8 man pages (sendfax.8)
+-MAN8DIR=$(prefix)/man/man8
++MAN8DIR=$(prefix)/share/man/man8
+ #
+ # Where the GNU Info-Files are located
+ #
 @@ -265,12 +266,12 @@ AWK=awk
  # and the "tkperl" frontends without PERL, so don't worry if you don't
  # have it.
  # If you specify command line arguments (-w), don't forget the quotes!
 -PERL="/usr/bin/perl -w"
 +PERL="$(LOCALBASE)/bin/perl -w"
  #
  # 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.
 -TKPERL=/usr/bin/tkperl
 +#TKPERL=/usr/bin/tkperl
  #
  #
  # An echo program that understands escapes like "\n" for newline or
 @@ -282,9 +283,9 @@ TKPERL=/usr/bin/tkperl
  # 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
-@@ -324,7 +325,7 @@ SFAXOBJ=sendfax.o logfile.o locks.o mode
+@@ -324,7 +325,7 @@ all:	bin-all doc-man-only
  
  all:	bin-all doc-man-only
  
 -bin-all: mgetty sendfax newslock sedscript subdirs call-back 
 +bin-all: mgetty sendfax newslock sedscript subdirs call-back vgetty
  
  # a few C files need extra compiler arguments
  
 @@ -585,44 +586,39 @@ bindist: all doc-all sedscript
  	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)
 +	-test -d $(STAGEDIR)$(BINDIR)  || ( ./mkidirs $(STAGEDIR)$(BINDIR)  ; chmod 755 $(STAGEDIR)$(BINDIR)  )
 +	$(INSTALL_PROGRAM) -m 755 newslock $(STAGEDIR)$(BINDIR)
  
 -	-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
 -	if [ -f $(SBINDIR)/mgetty ] ; then \
 -		mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old ; fi
 -	if [ -f $(SBINDIR)/sendfax ] ; then \
 -		mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old ; fi
 -	$(INSTALL) -s -m 700 mgetty $(SBINDIR)
 -	$(INSTALL) -s -m 755 sendfax $(SBINDIR)
 +	-test -d $(STAGEDIR)$(SBINDIR) || ( ./mkidirs $(STAGEDIR)$(SBINDIR) ; chmod 755 $(STAGEDIR)$(SBINDIR) )
 +	-mv -f $(STAGEDIR)$(SBINDIR)/mgetty $(STAGEDIR)$(SBINDIR)/mgetty.old
 +	-mv -f $(STAGEDIR)$(SBINDIR)/sendfax $(STAGEDIR)$(SBINDIR)/sendfax.old
 +	$(INSTALL_PROGRAM) -s -m 700 mgetty $(STAGEDIR)$(SBINDIR)
 +	$(INSTALL_PROGRAM) -s -m 755 sendfax $(STAGEDIR)$(SBINDIR)
 +	$(INSTALL_PROGRAM) -s -m 755 callback/callback $(STAGEDIR)$(SBINDIR)
  #
  # data files + directories
  #
 -	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 644 faxrunq.config $(CONFDIR)/
 +	test -d $(STAGEDIR)$(LIBDIR)  || \
 +		( ./mkidirs $(STAGEDIR)$(LIBDIR) &&  chmod 755 $(STAGEDIR)$(LIBDIR) )
 +	test -d $(STAGEDIR)$(CONFDIR) || \
 +		( ./mkidirs $(STAGEDIR)$(CONFDIR) && chmod 755 $(STAGEDIR)$(CONFDIR))
 +	test -f $(STAGEDIR)$(CONFDIR)/login.config || \
 +		$(INSTALL) -m 600 login.config $(STAGEDIR)$(CONFDIR)/
 +	test -f $(STAGEDIR)$(CONFDIR)/dialin.config || \
 +		$(INSTALL) -m 600 dialin.config $(STAGEDIR)$(CONFDIR)/
 +	test -f $(STAGEDIR)$(CONFDIR)/faxrunq.config || \
 +		$(INSTALL) -m 644 faxrunq.config $(STAGEDIR)$(CONFDIR)/
  #
  # test for outdated stuff
  #
 -	-@if test -f $(LIBDIR)/mgetty.login ; \
 +	-@if test -f $(STAGEDIR)$(LIBDIR)/mgetty.login ; \
  	then \
  	    echo "WARNING: the format of $(LIBDIR)/mgetty.login has " ;\
  	    echo "been changed. Because of this, to avoid confusions, it's called " ;\
 @@ -630,24 +626,9 @@ install.bin: mgetty sendfax newslock \
  	    echo "" ;\
  	fi
  #
 -# fax spool directories
 -#
 -	test -d $(spool) || \
 -		( mkdir $(spool) && chmod 755 $(spool) )
 -	test -d $(FAX_SPOOL) || \
 -		( mkdir $(FAX_SPOOL) && \
 -		  chown $(FAX_OUT_USER) $(FAX_SPOOL) && \
 -		  chmod 755 $(FAX_SPOOL) )
 -	test -d $(FAX_SPOOL_IN) || \
 -		( mkdir $(FAX_SPOOL_IN) && chmod 755 $(FAX_SPOOL_IN) )
 -	test -d $(FAX_SPOOL_OUT) || \
 -		  mkdir $(FAX_SPOOL_OUT)
 -	chown $(FAX_OUT_USER) $(FAX_SPOOL_OUT)
 -	chmod 755 $(FAX_SPOOL_OUT)
 -#
  # g3 tool programs
  #
 -	cd g3 && $(MAKE) install INSTALL="$(INSTALL)" \
 +	cd g3 && $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \
  				BINDIR=$(BINDIR) \
  				LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR)
  #
 @@ -663,7 +644,7 @@ install.bin: mgetty sendfax newslock \
  	if [ ! -z "$(INSTALL_MECHO)" ] ; then \
  	    cd compat ; \
  	    $(CC) $(CFLAGS) -o mg.echo mg.echo.c && \
 -	    $(INSTALL) -s -m 755 mg.echo $(BINDIR) ; \
 +	    $(INSTALL) -s -m 755 mg.echo $(STAGEDIR)$(BINDIR) ; \
  	fi
  
  #
-@@ -671,11 +652,11 @@ install.bin: mgetty sendfax newslock \
+@@ -671,11 +652,11 @@ install.doc:
  #
  install.doc:
  	cd doc ; $(MAKE) install INSTALL="$(INSTALL)" \
 -				MAN1DIR=$(MAN1DIR) \
 -				MAN4DIR=$(MAN4DIR) \
 -				MAN5DIR=$(MAN5DIR) \
 -				MAN8DIR=$(MAN8DIR) \
 -				INFODIR=$(INFODIR)
 +				MAN1DIR=$(STAGEDIR)$(MAN1DIR) \
 +				MAN4DIR=$(STAGEDIR)$(MAN4DIR) \
 +				MAN5DIR=$(STAGEDIR)$(MAN5DIR) \
 +				MAN8DIR=$(STAGEDIR)$(MAN8DIR) \
 +				INFODIR=$(STAGEDIR)$(INFODIR)
  
  #
  # WWW frontend stuff
diff --git a/comms/mgetty+sendfax/pkg-plist b/comms/mgetty+sendfax/pkg-plist
index 67cb28b73f9c..afdbceb9ff8f 100644
--- a/comms/mgetty+sendfax/pkg-plist
+++ b/comms/mgetty+sendfax/pkg-plist
@@ -1,132 +1,132 @@
 @mode 600
 @sample etc/mgetty+sendfax/dialin.config.sample
 @sample etc/mgetty+sendfax/login.config.sample
 @sample etc/mgetty+sendfax/voice.conf.sample
 @mode
 @sample etc/mgetty+sendfax/faxheader.sample
 @sample etc/mgetty+sendfax/faxrunq.config.sample
 @sample etc/mgetty+sendfax/faxspool.rules.sample
 bin/autopvf
 bin/basictopvf
 bin/faxq
 bin/faxrm
 bin/faxrunq
 bin/faxspool
 bin/g32pbm
 bin/g3cat
 bin/lintopvf
 bin/mg.echo
 bin/mgettycfg
 bin/newslock
 bin/pbm2g3
 bin/pvfamp
 bin/pvfcut
 bin/pvfecho
 bin/pvffft
 bin/pvffile
 bin/pvffilter
 bin/pvfmix
 bin/pvfnoise
 bin/pvfreverse
 bin/pvfsine
 bin/pvfspeed
 bin/pvftoau
 bin/pvftobasic
 bin/pvftolin
 bin/pvftormd
 bin/pvftovoc
 bin/pvftowav
 bin/rmdfile
 bin/rmdtopvf
 bin/sff2g3
 bin/vm
 bin/voctopvf
 bin/wavtopvf
 lib/mgetty+sendfax/cour25.pbm
 lib/mgetty+sendfax/cour25n.pbm
 @mode 4711
 lib/mgetty+sendfax/faxq-helper
 @mode 0755
 lib/mgetty+sendfax/samples/coverpg.pbm
 lib/mgetty+sendfax/samples/coverpg.ps
 lib/mgetty+sendfax/samples/fax
 lib/mgetty+sendfax/samples/faxmemo
 lib/mgetty+sendfax/samples/new_fax.all/new_fax
 lib/mgetty+sendfax/samples/new_fax.hpa
 lib/mgetty+sendfax/samples/new_fax.lj
 lib/mgetty+sendfax/samples/new_fax.mail
 lib/mgetty+sendfax/samples/new_fax.mime1
 lib/mgetty+sendfax/samples/new_fax.pbm
 lib/mgetty+sendfax/samples/printfax
 @mode
 lib/mgetty+sendfax/samples/answer_fax.sh
 lib/mgetty+sendfax/samples/coverpg-pl.ps
 lib/mgetty+sendfax/samples/faxview.th
 lib/mgetty+sendfax/samples/new_fax.NeXT
 lib/mgetty+sendfax/samples/new_fax.all/INSTALL
 lib/mgetty+sendfax/samples/new_fax.all/README
 lib/mgetty+sendfax/samples/new_fax.all/archive.module
 lib/mgetty+sendfax/samples/new_fax.all/delete.module
 lib/mgetty+sendfax/samples/new_fax.all/fax.module
 lib/mgetty+sendfax/samples/new_fax.all/faxlist
 lib/mgetty+sendfax/samples/new_fax.all/faxlist.dist
 lib/mgetty+sendfax/samples/new_fax.all/list.module
 lib/mgetty+sendfax/samples/new_fax.all/mail.module
 lib/mgetty+sendfax/samples/new_fax.all/notify.module
 lib/mgetty+sendfax/samples/new_fax.all/print.module
 lib/mgetty+sendfax/samples/new_fax.all/write.module
 lib/mgetty+sendfax/samples/new_fax.mime3
 lib/mgetty+sendfax/samples/new_fax.mime4
 lib/mgetty+sendfax/samples/new_fax.th
 lib/mgetty+sendfax/samples/new_fax.tiff
 lib/mgetty+sendfax/samples/new_fax.vacation
 lib/mgetty+sendfax/samples/printfax.ps
-man/man1/autopvf.1.gz
-man/man1/basictopvf.1.gz
-man/man1/coverpg.1.gz
-man/man1/fax.1.gz
-man/man1/faxq.1.gz
-man/man1/faxrm.1.gz
-man/man1/faxrunq.1.gz
-man/man1/faxspool.1.gz
-man/man1/g32pbm.1.gz
-man/man1/g3cat.1.gz
-man/man1/lintopvf.1.gz
-man/man1/pbm2g3.1.gz
-man/man1/pvf.1.gz
-man/man1/pvfamp.1.gz
-man/man1/pvfcut.1.gz
-man/man1/pvfecho.1.gz
-man/man1/pvffft.1.gz
-man/man1/pvffile.1.gz
-man/man1/pvffilter.1.gz
-man/man1/pvfmix.1.gz
-man/man1/pvfnoise.1.gz
-man/man1/pvfreverse.1.gz
-man/man1/pvfsine.1.gz
-man/man1/pvfspeed.1.gz
-man/man1/pvftoau.1.gz
-man/man1/pvftobasic.1.gz
-man/man1/pvftolin.1.gz
-man/man1/pvftormd.1.gz
-man/man1/pvftovoc.1.gz
-man/man1/pvftowav.1.gz
-man/man1/rmdfile.1.gz
-man/man1/rmdtopvf.1.gz
-man/man1/sff2g3.1.gz
-man/man1/voctopvf.1.gz
-man/man1/wavtopvf.1.gz
-man/man1/zplay.1.gz
-man/man4/mgettydefs.4.gz
-man/man5/faxqueue.5.gz
-man/man8/callback.8.gz
-man/man8/faxq-helper.8.gz
-man/man8/faxrunqd.8.gz
-man/man8/mgetty.8.gz
-man/man8/sendfax.8.gz
-man/man8/vgetty.8.gz
+share/man/man1/autopvf.1.gz
+share/man/man1/basictopvf.1.gz
+share/man/man1/coverpg.1.gz
+share/man/man1/fax.1.gz
+share/man/man1/faxq.1.gz
+share/man/man1/faxrm.1.gz
+share/man/man1/faxrunq.1.gz
+share/man/man1/faxspool.1.gz
+share/man/man1/g32pbm.1.gz
+share/man/man1/g3cat.1.gz
+share/man/man1/lintopvf.1.gz
+share/man/man1/pbm2g3.1.gz
+share/man/man1/pvf.1.gz
+share/man/man1/pvfamp.1.gz
+share/man/man1/pvfcut.1.gz
+share/man/man1/pvfecho.1.gz
+share/man/man1/pvffft.1.gz
+share/man/man1/pvffile.1.gz
+share/man/man1/pvffilter.1.gz
+share/man/man1/pvfmix.1.gz
+share/man/man1/pvfnoise.1.gz
+share/man/man1/pvfreverse.1.gz
+share/man/man1/pvfsine.1.gz
+share/man/man1/pvfspeed.1.gz
+share/man/man1/pvftoau.1.gz
+share/man/man1/pvftobasic.1.gz
+share/man/man1/pvftolin.1.gz
+share/man/man1/pvftormd.1.gz
+share/man/man1/pvftovoc.1.gz
+share/man/man1/pvftowav.1.gz
+share/man/man1/rmdfile.1.gz
+share/man/man1/rmdtopvf.1.gz
+share/man/man1/sff2g3.1.gz
+share/man/man1/voctopvf.1.gz
+share/man/man1/wavtopvf.1.gz
+share/man/man1/zplay.1.gz
+share/man/man4/mgettydefs.4.gz
+share/man/man5/faxqueue.5.gz
+share/man/man8/callback.8.gz
+share/man/man8/faxq-helper.8.gz
+share/man/man8/faxrunqd.8.gz
+share/man/man8/mgetty.8.gz
+share/man/man8/sendfax.8.gz
+share/man/man8/vgetty.8.gz
 sbin/callback
 sbin/faxrunqd
 sbin/mgetty
 sbin/sendfax
 sbin/vgetty