kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/comms/mgetty+sendfax/patches/patch-ab
is bdf2a443a7 Fix the VARBASE propagation to all utilities. Without this, we tried 
to log to /spool/fax/Faxlog.
2013-01-29 16:56:39 +00:00

196 lines
6.7 KiB
Text
Raw Blame History

$NetBSD: patch-ab,v 1.16 2013/01/29 16:56:39 is Exp $
- configure for pkgsrc
- honor VARBASE
- add vgetty to build
- user-destdir support
--- Makefile.orig 2010-06-05 09:48:22.000000000 +0000
+++ Makefile
@@ -6,8 +6,8 @@
# 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=cc
+#CC=gcc
+CC=cc
#
# if you are cross-compiling, *this* needs to be the C compiler that
# is able to produce binaries that run on the local system (if not
@@ -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 -DPREFIX=\"${PREFIX}\" -DVARBASE=${VARBASE}
#CFLAGS=-O -DSVR4
#CFLAGS=-O -DSVR4 -DSVR42
#CFLAGS=-O -DUSE_POLL
@@ -150,8 +150,6 @@ CFLAGS=-O2 -Wall -pipe
# "utmp.o: unresolved symbol _login"
# For Linux, add "-lutil" if the linker complains about "updwtmp".
#
-LDFLAGS=
-LIBS=
#LIBS=-lprot -lsocket # SCO Unix
#LIBS=-lsocket
#LIBS=-lbsd # OSF/1
@@ -171,11 +169,12 @@ 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 -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
+INSTALL=install -c
#
# prefix, where most (all?) of the stuff lives, usually /usr/local or /usr
#
@@ -247,7 +246,7 @@ INFODIR=$(prefix)/info
# Usually this will be /bin/sh or /usr/bin/sh, but bash or ksh are fine.
# (on some ultrix systems, you may need /bin/sh5 here)
#
-SHELL=/bin/sh
+#SHELL=/bin/sh
#
# If your shell requires pre-posix syntax to disable traps ('trap 0'
# instead of 'trap - 0'), set this to "0" (very rarely needed)
@@ -265,12 +264,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="${PERL5} -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 +281,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
@@ -292,7 +291,7 @@ ECHO="echo"
# To maintain security, I recommend creating a new group for
# users who are allowed to manipulate the recorded voice messages.
-PHONE_GROUP=phone
+PHONE_GROUP=uucp
PHONE_PERMS=770
# Add -DNO_STRSTR to CFLAGS if you don't have strstr().
@@ -324,7 +323,7 @@ SFAXOBJ=sendfax.o logfile.o locks.o mode
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
@@ -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
-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)/ \
BINDIR=$$bd$(BINDIR) SBINDIR=$$bd$(SBINDIR) \
LIBDIR=$$bd$(LIBDIR) CONFDIR=$$bd$(CONFDIR) \
spool=$$bd$(spool) FAX_SPOOL=$$bd$(FAX_SPOOL) \
@@ -585,7 +584,7 @@ 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
@@ -593,7 +592,7 @@ install.bin: mgetty sendfax newslock \
# binaries
#
-test -d $(BINDIR) || ( ./mkidirs $(BINDIR) ; chmod 755 $(BINDIR) )
- $(INSTALL) -m 755 newslock $(BINDIR)
+ $(INSTALL) -s -m 755 newslock $(BINDIR)
-test -d $(SBINDIR) || ( ./mkidirs $(SBINDIR) ; chmod 755 $(SBINDIR) )
if [ -f $(SBINDIR)/mgetty ] ; then \
@@ -610,15 +609,15 @@ install.bin: mgetty sendfax newslock \
test -d $(CONFDIR) || \
( ./mkidirs $(CONFDIR) && chmod 755 $(CONFDIR))
test -f $(CONFDIR)/login.config || \
- $(INSTALL) -o root -m 600 login.config $(CONFDIR)/
+ $(INSTALL) -m 600 login.config $(CONFDIR)/
test -f $(CONFDIR)/mgetty.config || \
- $(INSTALL) -o root -m 600 mgetty.config $(CONFDIR)/
+ $(INSTALL) -m 600 mgetty.config $(CONFDIR)/
test -f $(CONFDIR)/sendfax.config || \
- $(INSTALL) -o root -m 644 sendfax.config $(CONFDIR)/
+ $(INSTALL) -m 644 sendfax.config $(CONFDIR)/
test -f $(CONFDIR)/dialin.config || \
- $(INSTALL) -o root -m 600 dialin.config $(CONFDIR)/
+ $(INSTALL) -m 600 dialin.config $(CONFDIR)/
test -f $(CONFDIR)/faxrunq.config || \
- $(INSTALL) -o root -m 644 faxrunq.config $(CONFDIR)/
+ $(INSTALL) -m 644 faxrunq.config $(CONFDIR)/
#
# test for outdated stuff
#
@@ -632,18 +631,18 @@ install.bin: mgetty sendfax newslock \
#
# 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)
+ #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
#
Reference in a new issue View git blame Copy permalink