Fix the VARBASE propagation to all utilities. Without this, we tried

to log to /spool/fax/Faxlog.

4 files changed, 28 insertions, 16 deletions

diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 8bab193b2c0..a2fd7f50df2 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.84 2013/01/26 21:37:13 adam Exp $
+# $NetBSD: Makefile,v 1.85 2013/01/29 16:56:39 is Exp $
 
 DISTNAME=	mgetty1.1.37-Jun05
 PKGNAME=	mgetty-1.1.37
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	comms
 MASTER_SITES=	ftp://alpha.greenie.net/pub/mgetty/source/1.1/
 
@@ -23,6 +23,7 @@ MAKE_ENV+=		MGETTY_CONFDIR=${PKG_SYSCONFDIR:Q} PERL5=${PERL5:Q}
 MAKE_ENV+=		ROOT_USER=${REAL_ROOT_USER:Q}
 MAKE_ENV+=		ROOT_GROUP=${REAL_ROOT_GROUP:Q}
 MAKE_ENV+=		SHELL=${SH:Q}
+MAKE_ENV+=		VARBASE=${VARBASE:Q}
 MAKE_FLAGS+=		prefix=${DESTDIR:Q}${PREFIX:Q}                  \
 			spool=${VARBASE}/spool				\
 			INFODIR=${DESTDIR:Q}${PREFIX:Q}/${PKGINFODIR:Q} \
diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index caabd9979ef..cddf081504f 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.36 2012/04/08 01:28:35 dholland Exp $
+$NetBSD: distinfo,v 1.37 2013/01/29 16:56:39 is Exp $
 
 SHA1 (mgetty1.1.37-Jun05.tar.gz) = fec9672e8be29a41f1392c6bf90c0d5732cdb2c2
 RMD160 (mgetty1.1.37-Jun05.tar.gz) = 56aa9e213e4bd79c13ace2b7222253d91e756865
 Size (mgetty1.1.37-Jun05.tar.gz) = 1057939 bytes
 SHA1 (patch-aa) = f80c4e7f7eb23eac7ee23c2144612b82c122d45f
-SHA1 (patch-ab) = 21f2eee6e6534335e96d93f6a418068db1824c89
+SHA1 (patch-ab) = f2d30ca105f536bce9684f6a56b20437d9aa6c86
 SHA1 (patch-ac) = bdc69ccc3430634bb74742fd105ee8f3fcde4d21
 SHA1 (patch-ad) = f02a92a3a9a46fe71d7541897da24470e38f68c7
 SHA1 (patch-af) = 088be22c69f39ca099cbe497b7e845bf103bf1c7
 SHA1 (patch-ag) = f12e39005c78a94f641ccbdbbfa51b5181821148
 SHA1 (patch-ah) = 0a3e5b1375eb36610e6a97113a8e535bf2fd1c6b
-SHA1 (patch-ai) = 31c028c99e7f3e3aea37e271b6cec55b81df4421
+SHA1 (patch-ai) = 0c3a6e5d067ff360789264f8be89710907f54403
 SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d
 SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475
 SHA1 (patch-al) = 2a6dcf13d65446d2064228b1024517e599892a60
diff --git a/comms/mgetty+sendfax/patches/patch-ab b/comms/mgetty+sendfax/patches/patch-ab
index 00d7c93bacb..07d9cd54898 100644
--- a/comms/mgetty+sendfax/patches/patch-ab
+++ b/comms/mgetty+sendfax/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.15 2012/04/08 01:28:35 dholland Exp $
+$NetBSD: patch-ab,v 1.16 2013/01/29 16:56:39 is Exp $
 
 - configure for pkgsrc
 - honor VARBASE
@@ -23,7 +23,7 @@ $NetBSD: patch-ab,v 1.15 2012/04/08 01:28:35 dholland Exp $
  #
  #CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
 -CFLAGS=-O2 -Wall -pipe
-+CFLAGS+=-O2 -Wall -pipe -DPREFIX=\"${PREFIX}\" -DVARBASE=\"${VARBASE}\"
++CFLAGS+=-O2 -Wall -pipe -DPREFIX=\"${PREFIX}\" -DVARBASE=${VARBASE}
  #CFLAGS=-O -DSVR4
  #CFLAGS=-O -DSVR4 -DSVR42
  #CFLAGS=-O -DUSE_POLL
@@ -104,6 +104,15 @@ $NetBSD: patch-ab,v 1.15 2012/04/08 01:28:35 dholland Exp $
  
  # a few C files need extra compiler arguments
  
+@@ -375,7 +374,7 @@ subdirs:
+ 
+ call-back:
+ 	@$(MAKE) mgetty
+-	cd callback && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "CONFDIR=$(CONFDIR)" "VARRUNDIR=$(VARRUNDIR)" "LIBS=$(LIBS)" all
++	cd callback && $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "CONFDIR=$(CONFDIR)" "VARRUNDIR=$(VARRUNDIR)" "LIBS=$(LIBS)" all
+ 
+ contrib-all: 
+ 	cd contrib ; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS) -I.." "LDFLAGS=$(LDFLAGS)" "LIBS=$(LIBS)" all
 @@ -572,8 +571,8 @@ newslock: compat/newslock.c
  # internal: use this to create a "clean" mgetty+sendfax tree
  bindist: all doc-all sedscript
diff --git a/comms/mgetty+sendfax/patches/patch-ai b/comms/mgetty+sendfax/patches/patch-ai
index ae120b7958b..9096633d4b0 100644
--- a/comms/mgetty+sendfax/patches/patch-ai
+++ b/comms/mgetty+sendfax/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.9 2012/04/08 00:47:27 dholland Exp $
+$NetBSD: patch-ai,v 1.10 2013/01/29 16:56:39 is Exp $
 
 - improve default configuration behavior for the modern world
 - configure for pkgsrc
@@ -41,16 +41,18 @@ $NetBSD: patch-ai,v 1.9 2012/04/08 00:47:27 dholland Exp $
  
  /* access mode for the line while getty has it - it should be accessible
   * by uucp / uucp, but not by others (imagine someone dialing into your
-@@ -147,7 +154,7 @@
+@@ -147,7 +154,9 @@
   *
   * if the directory does not exist, the log file goes to CONSOLE (!)
   */
 -#define LOG_PATH "/var/log/mgetty.%s"
-+#define LOG_PATH VARBASE "/log/mgetty.%s"
++#define STR1(x) #x
++#define STR(x) STR1(x)
++#define LOG_PATH STR(VARBASE) "/log/mgetty.%s"
  
  /* Default log error level threshold. Possible error levels are
   * L_FATAL, L_ERROR, L_AUDIT, L_WARN, L_MESG, L_NOISE, L_JUNK (see mgetty.h)
-@@ -233,6 +240,7 @@
+@@ -233,6 +242,7 @@
   */
  
  /* for a few systems, you can just take those defaults and be happy */
@@ -58,17 +60,17 @@ $NetBSD: patch-ai,v 1.9 2012/04/08 00:47:27 dholland Exp $
  #if defined (SVR4) || defined(sunos4)
  # define LOCK_PATH "/var/spool/locks"
  # define LOCK      "/var/spool/locks/LCK..%s"
-@@ -459,7 +467,8 @@
+@@ -459,7 +469,8 @@
   * watch out: if you run 'sendfax' as non-privileged user (user 'fax' etc.)
   * you might need to create this file manually and chown it to 'fax'
   */
 -#define FAX_LOG		"/var/log/sendfax.log"
 +/*#define FAX_LOG		"/var/log/sendfax.log" */ /* original */
-+#define FAX_LOG         VARBASE "/spool/fax/Faxlog"
++#define FAX_LOG         STR(VARBASE) "/spool/fax/Faxlog"
  
  /* local station ID (your fax number)
   * 20 character string, most faxmodem allow all ascii characters 32..127,
-@@ -552,20 +561,15 @@
+@@ -552,20 +563,15 @@
   */
  #ifdef SVR4
  # define MAILER		"/usr/bin/mailx -s 'Incoming facsimile message'"
@@ -96,7 +98,7 @@ $NetBSD: patch-ai,v 1.9 2012/04/08 00:47:27 dholland Exp $
  #endif
  
  /* where to send notify mail about incoming faxes to
-@@ -586,13 +590,18 @@
+@@ -586,13 +592,18 @@
   * If you don't want this type of service, do not define it at all
   * Absolute path name has to be used here!
   */
@@ -116,7 +118,7 @@ $NetBSD: patch-ai,v 1.9 2012/04/08 00:47:27 dholland Exp $
  /* fax machines exchange so-called "non-standard-frames" that can be 
   * used to identify what vendor and model is on the other end.
   * mgetty parses and prints this by default, because it can help 
-@@ -601,3 +610,4 @@
+@@ -601,3 +612,4 @@
   */
  #define FAX_NSF_PARSER