From owner-svn-ports-all@FreeBSD.ORG Fri May 23 09:55:26 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D9608F86; Fri, 23 May 2014 09:55:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C540A28AE; Fri, 23 May 2014 09:55:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4N9tQeM046643; Fri, 23 May 2014 09:55:26 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4N9tP6l046637; Fri, 23 May 2014 09:55:25 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201405230955.s4N9tP6l046637@svn.freebsd.org> From: Jimmy Olgeni Date: Fri, 23 May 2014 09:55:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354921 - in head/comms/mgetty+sendfax: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 May 2014 09:55:26 -0000 Author: olgeni Date: Fri May 23 09:55:25 2014 New Revision: 354921 URL: http://svnweb.freebsd.org/changeset/ports/354921 QAT: https://qat.redports.org/buildarchive/r354921/ Log: - Add staging support. - Add LICENSE. - Use @sample in plist. Added: head/comms/mgetty+sendfax/files/patch-fax_Makefile (contents, props changed) Modified: head/comms/mgetty+sendfax/Makefile head/comms/mgetty+sendfax/files/patch-ab (contents, props changed) head/comms/mgetty+sendfax/files/patch-ac (contents, props changed) head/comms/mgetty+sendfax/files/patch-g3_Makefile head/comms/mgetty+sendfax/pkg-plist (contents, props changed) Modified: head/comms/mgetty+sendfax/Makefile ============================================================================== --- head/comms/mgetty+sendfax/Makefile Fri May 23 09:06:04 2014 (r354920) +++ head/comms/mgetty+sendfax/Makefile Fri May 23 09:55:25 2014 (r354921) @@ -3,7 +3,7 @@ PORTNAME= mgetty PORTVERSION= 1.1.35 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= comms MASTER_SITES= ftp://mgetty.greenie.net/pub/mgetty/source/1.1/ DISTNAME= ${PORTNAME}${PORTVERSION}-Feb22 @@ -11,91 +11,49 @@ DISTNAME= ${PORTNAME}${PORTVERSION}-Feb2 MAINTAINER= olgeni@FreeBSD.org COMMENT= Handle external logins, send and receive faxes +LICENSE= GPL + USE_CSTD= gnu89 USES= perl5 SUB_FILES= pkg-message mgettycfg WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MAKE_FLAGS= CFLAGS="${CFLAGS}" prefix=${PREFIX} -f +MAKE_FLAGS= CFLAGS="${CFLAGS}" prefix=${PREFIX} LOCALBASE=${LOCALBASE} STAGEDIR=${STAGEDIR} -f ALL_TARGET= noident all INFO= mgetty -MAN1= autopvf.1 \ - basictopvf.1 \ - coverpg.1 \ - fax.1 \ - faxq.1 \ - faxrm.1 \ - faxrunq.1 \ - faxspool.1 \ - g3cat.1 \ - g32pbm.1 \ - lintopvf.1 \ - pbm2g3.1 \ - pvf.1 \ - sff2g3.1 \ - zplay.1 -MAN4= mgettydefs.4 -MAN5= faxqueue.5 -MAN8= callback.8 \ - faxq-helper.8 \ - faxrunqd.8 \ - mgetty.8 \ - sendfax.8 \ - vgetty.8 -MLINKS= pvf.1 pvfamp.1 \ - pvf.1 pvfcut.1 \ - pvf.1 pvfecho.1 \ - pvf.1 pvffft.1 \ - pvf.1 pvffile.1 \ - pvf.1 pvffilter.1 \ - pvf.1 pvfmix.1 \ - pvf.1 pvfnoise.1 \ - pvf.1 pvfreverse.1 \ - pvf.1 pvfsine.1 \ - pvf.1 pvfspeed.1 \ - pvf.1 pvftoau.1 \ - pvf.1 pvftobasic.1 \ - pvf.1 pvftolin.1 \ - pvf.1 pvftormd.1 \ - pvf.1 pvftovoc.1 \ - pvf.1 pvftowav.1 \ - pvf.1 rmdfile.1 \ - pvf.1 rmdtopvf.1 \ - pvf.1 voctopvf.1 \ - pvf.1 wavtopvf.1 + MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes -.include +OPTIONS_DEFINE= FIDO + +FIDO_DESC= Enable FIDO EMSI support + +.include CFLAGS+= -DAUTO_PPP -.if defined(WITH_FIDO) && ${WITH_FIDO:tl} != no + +.if ${PORT_OPTIONS:MFIDO} CFLAGS+= -DFIDO .endif -pre-everything:: -.if !defined(WITH_FIDO) - @${ECHO_MSG} - @${ECHO_MSG} "If you need FIDO EMSI support, use \"make WITH_FIDO=yes\"" - @${ECHO_MSG} -.endif +.include pre-install: @(cd ${WRKSRC}/doc; ${MAKE} manpages) 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 + @${MV} ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/dialin.config \ + ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/dialin.config.sample + @${MV} ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/faxheader \ + ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/faxheader.sample + @${MV} ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/faxrunq.config \ + ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/faxrunq.config.sample + @${MV} ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/login.config \ + ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/login.config.sample ${INSTALL_DATA} -m 600 ${WRKSRC}/voice/voice.conf-dist \ - ${PREFIX}/etc/mgetty+sendfax/voice.conf.dist - @${TAR} -cf - -C ${WRKSRC} samples | ${TAR} -xf - -C ${PREFIX}/lib/mgetty+sendfax/ - @${INSTALL_SCRIPT} ${WRKDIR}/mgettycfg ${PREFIX}/bin - @${CAT} ${PKGMESSAGE} + ${STAGEDIR}${PREFIX}/etc/mgetty+sendfax/voice.conf.sample + ${TAR} -cf - -C ${WRKSRC} samples | ${TAR} -xf - -C ${STAGEDIR}${PREFIX}/lib/mgetty+sendfax/ + ${INSTALL_SCRIPT} ${WRKDIR}/mgettycfg ${STAGEDIR}${PREFIX}/bin + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mgetty+sendfax/faxq-helper .include Modified: head/comms/mgetty+sendfax/files/patch-ab ============================================================================== --- head/comms/mgetty+sendfax/files/patch-ab Fri May 23 09:06:04 2014 (r354920) +++ head/comms/mgetty+sendfax/files/patch-ab Fri May 23 09:55:25 2014 (r354921) @@ -1,5 +1,8 @@ ---- Makefile.orig Sun Mar 13 18:59:34 2005 -+++ Makefile Sat Jul 9 14:37:08 2005 + +$FreeBSD$ + +--- Makefile.orig ++++ Makefile @@ -4,8 +4,8 @@ # # this is the C compiler to use (on SunOS, the standard "cc" does not @@ -34,8 +37,8 @@ # 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 -+INSTALL_PROGRAM=install -s -c -o root -g wheel ++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 @@ -48,7 +51,13 @@ # # # Where section 1 manual pages should be placed -@@ -263,7 +264,7 @@ +@@ -258,12 +259,12 @@ + # 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. @@ -78,7 +87,7 @@ # a few C files need extra compiler arguments -@@ -583,21 +584,22 @@ +@@ -578,42 +579,39 @@ cd bindist; gtar cvvfz mgetty$(MR).$(SR)-bin.tgz * @@ -91,38 +100,76 @@ # # binaries # - -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) +- -test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) ) - $(INSTALL) -m 755 newslock $(BINDIR) -+ $(INSTALL_PROGRAM) -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) ) - -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old - -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old +- -test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) ) +- -mv -f $(SBINDIR)/mgetty $(SBINDIR)/mgetty.old +- -mv -f $(SBINDIR)/sendfax $(SBINDIR)/sendfax.old - $(INSTALL) -s -m 700 mgetty $(SBINDIR) - $(INSTALL) -s -m 755 sendfax $(SBINDIR) -+ $(INSTALL_PROGRAM) -s -m 700 mgetty $(SBINDIR) -+ $(INSTALL_PROGRAM) -s -m 755 sendfax $(SBINDIR) -+ $(INSTALL_PROGRAM) -s -m 755 callback/callback $(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 # -@@ -607,10 +609,10 @@ - ( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR)) - test -f $(CONFDIR)/login.config || \ - $(INSTALL) -o root -m 600 login.config $(CONFDIR)/ +- 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)/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 || \ -@@ -643,7 +645,7 @@ - # +- 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 " ;\ +@@ -621,24 +619,9 @@ + 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)" \ @@ -130,3 +177,29 @@ BINDIR=$(BINDIR) \ LIBDIR=$(LIBDIR) CONFDIR=$(CONFDIR) # +@@ -654,7 +637,7 @@ + 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 + + # +@@ -662,11 +645,11 @@ + # + 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 Modified: head/comms/mgetty+sendfax/files/patch-ac ============================================================================== --- head/comms/mgetty+sendfax/files/patch-ac Fri May 23 09:06:04 2014 (r354920) +++ head/comms/mgetty+sendfax/files/patch-ac Fri May 23 09:55:25 2014 (r354921) @@ -1,26 +1,38 @@ ---- voice/Makefile.orig Sun Dec 23 16:08:13 2001 -+++ voice/Makefile Sat Jan 19 02:32:10 2002 + +$FreeBSD$ + +--- voice/Makefile.orig ++++ voice/Makefile @@ -13,6 +13,8 @@ LN=ln MV=mv RM=rm -+INSTALL=install -c -o root -g wheel -+INSTALL_PROGRAM=install -s -c -o root -g wheel ++INSTALL=install -c ++INSTALL_PROGRAM=install -s -c MGETTYLIB=../../getdisk.o ../../goodies.o ../../io.o \ ../../locks.o ../../tio.o ../../modem.o \ -@@ -83,11 +85,11 @@ +@@ -83,16 +85,16 @@ @echo " Installing the voice extensions" @echo " -------------------------------" @echo "" - $(INSTALL) -m 700 vgetty/vgetty $(SBINDIR) - $(INSTALL) -m 755 vm/vm $(BINDIR) -+ $(INSTALL_PROGRAM) -m 700 vgetty/vgetty $(SBINDIR) -+ $(INSTALL_PROGRAM) -m 755 vm/vm $(BINDIR) ++ $(INSTALL_PROGRAM) -m 700 vgetty/vgetty $(STAGEDIR)$(SBINDIR) ++ $(INSTALL_PROGRAM) -m 755 vm/vm $(STAGEDIR)$(BINDIR) for i in $(PVFTOOLS); \ do \ - $(INSTALL) -m 755 pvftools/$$i $(BINDIR); \ -+ $(INSTALL_PROGRAM) -m 755 pvftools/$$i $(BINDIR); \ ++ $(INSTALL_PROGRAM) -m 755 pvftools/$$i $(STAGEDIR)$(BINDIR); \ done - $(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR) - $(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR) +- $(INSTALL) -m 644 man/man1/zplay.1 $(MAN1DIR) +- $(INSTALL) -m 644 man/man1/pvf.1 $(MAN1DIR) +- $(INSTALL) -m 644 man/man8/vgetty.8 $(MAN8DIR) +- cd $(MAN1DIR); \ ++ $(INSTALL) -m 644 man/man1/zplay.1 $(STAGEDIR)$(MAN1DIR) ++ $(INSTALL) -m 644 man/man1/pvf.1 $(STAGEDIR)$(MAN1DIR) ++ $(INSTALL) -m 644 man/man8/vgetty.8 $(STAGEDIR)$(MAN8DIR) ++ cd $(STAGEDIR)$(MAN1DIR); \ + for i in $(PVFTOOLS); \ + do \ + $(RM) -f $$i.1; $(LN) -s pvf.1 $$i.1; \ Added: head/comms/mgetty+sendfax/files/patch-fax_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/mgetty+sendfax/files/patch-fax_Makefile Fri May 23 09:55:25 2014 (r354921) @@ -0,0 +1,38 @@ + +$FreeBSD$ + +--- fax/Makefile.orig ++++ fax/Makefile +@@ -56,20 +56,16 @@ + # programs / scripts + # + -for i in $(FAX_SCRIPTS); do \ +- mv -f $(BINDIR)/$$i $(BINDIR)/$$i.old 2>/dev/null ; \ +- $(INSTALL) -m 755 $$i $(BINDIR) ; \ ++ $(INSTALL) -m 755 $$i $(STAGEDIR)$(BINDIR) ; \ + done +- $(INSTALL) -m 755 faxrunqd $(SBINDIR) +- $(INSTALL) faxq-helper $(LIBDIR) +- chown $(FAX_OUT_USER) $(LIBDIR)/faxq-helper +- chmod 4711 $(LIBDIR)/faxq-helper ++ $(INSTALL) -m 755 faxrunqd $(STAGEDIR)$(SBINDIR) ++ $(INSTALL) faxq-helper $(STAGEDIR)$(LIBDIR) + # + # data files + # +- $(INSTALL) -m 644 cour25.pbm $(LIBDIR) +- $(INSTALL) -m 644 cour25n.pbm $(LIBDIR) +- -test -f $(CONFDIR)/faxheader || \ +- $(INSTALL) -m 644 faxheader $(CONFDIR) ++ $(INSTALL) -m 644 cour25.pbm $(STAGEDIR)$(LIBDIR) ++ $(INSTALL) -m 644 cour25n.pbm $(STAGEDIR)$(LIBDIR) ++ $(INSTALL) -m 644 faxheader $(STAGEDIR)$(CONFDIR) + # + # /etc/magic + # +@@ -82,4 +78,4 @@ + # + # faxspool.rules sample file + # +- $(INSTALL) -m 644 faxspool.rules $(CONFDIR)/faxspool.rules.sample ++ $(INSTALL) -m 644 faxspool.rules $(STAGEDIR)$(CONFDIR)/faxspool.rules.sample Modified: head/comms/mgetty+sendfax/files/patch-g3_Makefile ============================================================================== --- head/comms/mgetty+sendfax/files/patch-g3_Makefile Fri May 23 09:06:04 2014 (r354920) +++ head/comms/mgetty+sendfax/files/patch-g3_Makefile Fri May 23 09:55:25 2014 (r354921) @@ -3,7 +3,13 @@ $FreeBSD$ --- g3/Makefile.orig +++ g3/Makefile -@@ -45,8 +45,8 @@ +@@ -40,13 +40,13 @@ + # install programs + # + for f in $(G3_PROGRAMS) ; do \ +- $(INSTALL) -s -m 755 $$f $(BINDIR) ; \ ++ $(INSTALL) -s -m 755 $$f $(STAGEDIR)$(BINDIR) ; \ + done # # make symlink for "g3topbm" (so third-party fax viewers won't fail) # Modified: head/comms/mgetty+sendfax/pkg-plist ============================================================================== --- head/comms/mgetty+sendfax/pkg-plist Fri May 23 09:06:04 2014 (r354920) +++ head/comms/mgetty+sendfax/pkg-plist Fri May 23 09:55:25 2014 (r354921) @@ -1,3 +1,11 @@ +@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 @@ -34,27 +42,11 @@ bin/sff2g3 bin/vm bin/voctopvf bin/wavtopvf -@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 -@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 if cmp -s %D/etc/mgetty+sendfax/voice.conf %D/etc/mgetty+sendfax/voice.conf.dist; then rm -f %D/etc/mgetty+sendfax/voice.conf; fi -etc/mgetty+sendfax/voice.conf.dist -@exec if [ ! -f %D/etc/mgetty+sendfax/voice.conf ]; then cp %B/%f %D/etc/mgetty+sendfax/voice.conf; fi lib/mgetty+sendfax/cour25.pbm lib/mgetty+sendfax/cour25n.pbm +@mode 4711 lib/mgetty+sendfax/faxq-helper +@mode lib/mgetty+sendfax/samples/answer_fax.sh lib/mgetty+sendfax/samples/coverpg-pl.ps lib/mgetty+sendfax/samples/coverpg.pbm