pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/comms/mgetty+sendfax * Remove unnecessary INSTALL and ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4bf1dd0dd7af
branches: trunk
changeset: 509944:4bf1dd0dd7af
user: jlam <jlam%pkgsrc.org@localhost>
date: Mon Mar 20 04:09:37 2006 +0000
description:
* Remove unnecessary INSTALL and DEINSTALL scripts and replace with an
appropriate OWN_DIRS_PERMS definition.
* Simplify the patches by overriding the value of CONFDIR at build time
and at installation time.
* Honor PKGINFODIR and PKGMANDIR.
Bump PKGREVISION to 4 due to INSTALL script changes.
diffstat:
comms/mgetty+sendfax/DEINSTALL | 15 ----
comms/mgetty+sendfax/INSTALL | 22 ------
comms/mgetty+sendfax/Makefile | 33 +++++---
comms/mgetty+sendfax/PLIST | 3 +-
comms/mgetty+sendfax/distinfo | 9 +-
comms/mgetty+sendfax/patches/patch-ab | 115 ++++-----------------------------
comms/mgetty+sendfax/patches/patch-ac | 19 +----
comms/mgetty+sendfax/patches/patch-ad | 17 +---
comms/mgetty+sendfax/patches/patch-ai | 31 ---------
9 files changed, 49 insertions(+), 215 deletions(-)
diffs (truncated from 465 to 300 lines):
diff -r df94a9b17eb6 -r 4bf1dd0dd7af comms/mgetty+sendfax/DEINSTALL
--- a/comms/mgetty+sendfax/DEINSTALL Mon Mar 20 03:59:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.4 2003/08/30 20:22:50 jlam Exp $
-
-case ${STAGE} in
-DEINSTALL)
- if [ -d /var/spool/fax ]; then
- filecount="`${FIND} /var/spool/fax -type f 2>/dev/null | wc -l`"
- if [ $filecount -eq 0 ]; then
- ${ECHO} "Removing empty fax spool directories..."
- ${RM} -r /var/spool/fax
- fi
- fi
- ;;
-esac
diff -r df94a9b17eb6 -r 4bf1dd0dd7af comms/mgetty+sendfax/INSTALL
--- a/comms/mgetty+sendfax/INSTALL Mon Mar 20 03:59:39 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: INSTALL,v 1.5 2003/12/20 20:09:50 fredb Exp $
-
-case ${STAGE} in
-POST-INSTALL)
- if [ ! -d /var/spool/fax ]; then
- ${ECHO} "Creating fax spool directories..."
- ${MKDIR} /var/spool/fax
- ${CHMOD} 755 /var/spool/fax
- fi
- if [ ! -d /var/spool/fax/incoming ]; then
- ${MKDIR} /var/spool/fax/incoming
- ${CHMOD} 755 /var/spool/fax/incoming
- fi
- if [ ! -d /var/spool/fax/outgoing ]; then
- ${MKDIR} /var/spool/fax/outgoing
- fi
- ${CHMOD} 755 /var/spool/fax/outgoing
- ${CHOWN} fax /var/spool/fax/outgoing
- ;;
-esac
diff -r df94a9b17eb6 -r 4bf1dd0dd7af comms/mgetty+sendfax/Makefile
--- a/comms/mgetty+sendfax/Makefile Mon Mar 20 03:59:39 2006 +0000
+++ b/comms/mgetty+sendfax/Makefile Mon Mar 20 04:09:37 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.52 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2006/03/20 04:09:37 jlam Exp $
DISTNAME= mgetty1.1.31-Jul24
PKGNAME= mgetty-1.1.31
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= comms
MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/ \
ftp://alpha.greenie.net/pub/mgetty/source/1.1/
@@ -18,13 +18,20 @@
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
MAKE_ENV+= MGETTY_CONFDIR=${PKG_SYSCONFDIR:Q}
+MAKE_FLAGS+= prefix=${PREFIX:Q} \
+ INFODIR=${PREFIX:Q}/${PKGINFODIR:Q} \
+ MAN1DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man1 \
+ MAN4DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man4 \
+ MAN5DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man5 \
+ MAN8DIR=${PREFIX:Q}/${PKGMANDIR:Q}/man8
+BUILD_MAKE_FLAGS= ${MAKE_FLAGS} CONFDIR=${PKG_SYSCONFDIR:Q}
+INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CONFDIR=${EXAMPLES_DIR:Q}
USE_TOOLS+= makeinfo
-INFO_FILES= mgetty.info
+INFO_FILES= # PLIST
PKG_SYSCONFSUBDIR= mgetty+sendfax
-.if !defined(CONF_FILES)
-. for cfg in dialin.config \
+.for cfg in dialin.config \
faxheader \
faxrunq.config \
faxspool.rules.sample \
@@ -32,17 +39,18 @@
mgetty.config \
voice.conf
-CONF_FILES+= ${_EXAMPLES_DIR}/${cfg} ${PKG_SYSCONFDIR}/${cfg}
-. endfor
-.endif
+CONF_FILES+= ${EXAMPLES_DIR}/${cfg} ${PKG_SYSCONFDIR}/${cfg}
+.endfor
PKG_GROUPS= dialer
PKG_USERS= fax:dialer
-_EXAMPLES_DIR= ${PREFIX}/share/examples/mgetty+sendfax
-MAKE_DIRS_PERMS+= /var/spool/fax ${ROOT_USER} ${ROOT_GROUP} 755
-MAKE_DIRS_PERMS+= /var/spool/fax/incoming ${ROOT_USER} ${ROOT_GROUP} 755
-MAKE_DIRS_PERMS+= /var/spool/fax/outgoing fax ${ROOT_GROUP} 755
+EXAMPLES_DIR= ${PREFIX}/share/examples/mgetty+sendfax
+OWN_DIRS_PERMS+= /var/spool/fax ${ROOT_USER} ${ROOT_GROUP} 755
+OWN_DIRS_PERMS+= /var/spool/fax/incoming ${ROOT_USER} ${ROOT_GROUP} 755
+OWN_DIRS_PERMS+= /var/spool/fax/outgoing fax ${ROOT_GROUP} 755
+
+.include "../../graphics/netpbm/buildlink3.mk"
do-configure:
${MV} ${WRKSRC}/doc/fax.1in ${WRKSRC}/doc/sendfax.1in
@@ -56,5 +64,4 @@
&& cd ${.CURDIR} \
&& ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-.include "../../graphics/netpbm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r df94a9b17eb6 -r 4bf1dd0dd7af comms/mgetty+sendfax/PLIST
--- a/comms/mgetty+sendfax/PLIST Mon Mar 20 03:59:39 2006 +0000
+++ b/comms/mgetty+sendfax/PLIST Mon Mar 20 04:09:37 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2005/07/01 10:16:28 hira Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/03/20 04:09:37 jlam Exp $
bin/autopvf
bin/basictopvf
bin/faxq
@@ -34,6 +34,7 @@
bin/vm
bin/voctopvf
bin/wavtopvf
+info/mgetty.info
lib/mgetty+sendfax/cour25.pbm
lib/mgetty+sendfax/cour25n.pbm
lib/mgetty+sendfax/faxq-helper
diff -r df94a9b17eb6 -r 4bf1dd0dd7af comms/mgetty+sendfax/distinfo
--- a/comms/mgetty+sendfax/distinfo Mon Mar 20 03:59:39 2006 +0000
+++ b/comms/mgetty+sendfax/distinfo Mon Mar 20 04:09:37 2006 +0000
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.24 2006/01/05 17:32:52 joerg Exp $
+$NetBSD: distinfo,v 1.25 2006/03/20 04:09:37 jlam Exp $
SHA1 (mgetty1.1.31-Jul24.tar.gz) = a6f20da26b49bbfa695791edec7d0a2247b79e2d
RMD160 (mgetty1.1.31-Jul24.tar.gz) = 255eec0838ce5bfad04c53d478a4505e74111a07
Size (mgetty1.1.31-Jul24.tar.gz) = 998462 bytes
SHA1 (patch-aa) = 9b6d9d6af2245f3dfea235bc2e044a2151bc4187
-SHA1 (patch-ab) = 25c7ac6eb05551ac45ddc3b1fa85c47ea2823b66
-SHA1 (patch-ac) = 983ee9598151a2234022bfc65047926841102c65
-SHA1 (patch-ad) = 7c4a96eaf7c83e9d907a74317252f752b4c689e6
+SHA1 (patch-ab) = 1638b3b7162bcff0d5fae7fbe42626b5008fe1e9
+SHA1 (patch-ac) = bdc69ccc3430634bb74742fd105ee8f3fcde4d21
+SHA1 (patch-ad) = a24776252e36cfe84b10b7a1b03a43b15d7049d0
SHA1 (patch-ae) = 04f35280e337fb766152b7d9badcd0c417aa1739
SHA1 (patch-af) = c3d141a0952c54c392e99399fd05efebd55f0267
SHA1 (patch-ag) = f12e39005c78a94f641ccbdbbfa51b5181821148
SHA1 (patch-ah) = 2d9de861d3bce7b454eee957d32ffe67996e27c7
-SHA1 (patch-ai) = a69003a5a28196c5a57bf538b20a31e2371683c7
SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d
SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475
SHA1 (patch-al) = 2a6dcf13d65446d2064228b1024517e599892a60
diff -r df94a9b17eb6 -r 4bf1dd0dd7af comms/mgetty+sendfax/patches/patch-ab
--- a/comms/mgetty+sendfax/patches/patch-ab Mon Mar 20 03:59:39 2006 +0000
+++ b/comms/mgetty+sendfax/patches/patch-ab Mon Mar 20 04:09:37 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.8 2005/02/23 16:58:26 jwise Exp $
+$NetBSD: patch-ab,v 1.9 2006/03/20 04:09:37 jlam Exp $
--- Makefile.orig 2004-07-24 14:53:47.000000000 -0400
-+++ Makefile 2005-02-23 11:07:40.000000000 -0500
++++ Makefile
@@ -4,8 +4,8 @@
#
# this is the C compiler to use (on SunOS, the standard "cc" does not
@@ -13,7 +13,7 @@
#
#### C Compiler Flags ####
#
-@@ -102,7 +102,7 @@
+@@ -102,7 +102,7 @@ CC=gcc
# USTAT - ustat(), no statfs etc.
#
#CFLAGS=-Wall -O2 -pipe -DSECUREWARE -DUSE_POLL
@@ -22,7 +22,7 @@
#CFLAGS=-O -DSVR4
#CFLAGS=-O -DSVR4 -DSVR42
#CFLAGS=-O -DUSE_POLL
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ CFLAGS=-O2 -Wall -pipe
# For Linux, add "-lutil" if the linker complains about "updwtmp".
#
LDFLAGS=
@@ -31,7 +31,7 @@
#LIBS=-lprot -lsocket # SCO Unix
#LIBS=-lsocket
#LIBS=-lbsd # OSF/1
-@@ -164,15 +164,15 @@
+@@ -164,8 +164,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
@@ -42,67 +42,7 @@
#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
- #
- # prefix, where most (all?) of the stuff lives, usually /usr/local or /usr
- #
--prefix=/usr/local
-+prefix=${PREFIX}
- #
- # prefix for all the spool directories (usually /usr/spool or /var/spool)
- #
-@@ -180,20 +180,20 @@
- #
- # where the mgetty + sendfax binaries live (used for "make install")
- #
--SBINDIR=$(prefix)/sbin
-+SBINDIR=${PREFIX}/sbin
- #
- # where the user executable binaries live
- #
--BINDIR=$(prefix)/bin
-+BINDIR=${PREFIX}/bin
- #
- # where the font+coverpage files go
- #
--LIBDIR=$(prefix)/lib/mgetty+sendfax
-+LIBDIR=${PREFIX}/lib/mgetty+sendfax
- #
- # where the configuration files (*.config, aliases, fax.allow/deny) go to
- #
--CONFDIR=$(prefix)/etc/mgetty+sendfax
--#CONFDIR=/etc/default/
-+CONFDIR=${MGETTY_CONFDIR}
-+CONF_EXAMPLES_DIR=${PREFIX}/share/examples/mgetty+sendfax
- #
- #
- # where mgetty PID files (mgetty.pid) go to
-@@ -220,20 +220,20 @@
- #
- #
- # Where section 1 manual pages should be placed
--MAN1DIR=$(prefix)/man/man1
-+MAN1DIR=${PREFIX}/man/man1
- #
- # Where section 4 manual pages (mgettydefs.4) should be placed
--MAN4DIR=$(prefix)/man/man4
-+MAN4DIR=${PREFIX}/man/man4
- #
- # Section 5 man pages (faxqueue.5)
--MAN5DIR=$(prefix)/man/man5
-+MAN5DIR=${PREFIX}/man/man5
- #
- # Section 8 man pages (sendfax.8)
--MAN8DIR=$(prefix)/man/man8
-+MAN8DIR=${PREFIX}/man/man8
- #
- # Where the GNU Info-Files are located
- #
--INFODIR=$(prefix)/info
-+INFODIR=${PREFIX}/info
- #
- #
- # A shell that understands bourne-shell syntax
-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ PERL="/usr/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.
@@ -111,7 +51,7 @@
#
#
# An echo program that understands escapes like "\n" for newline or
-@@ -270,9 +270,9 @@
+@@ -270,9 +270,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
#
@@ -123,7 +63,7 @@
#
# for mgetty, that's it. If you want to use the voice
-@@ -280,7 +280,7 @@
+@@ -280,7 +280,7 @@ ECHO="echo"
# To maintain security, I recommend creating a new group for
# users who are allowed to manipulate the recorded voice messages.
@@ -132,7 +72,7 @@
PHONE_PERMS=770
# Add -DNO_STRSTR to CFLAGS if you don't have strstr().
-@@ -312,7 +312,7 @@
+@@ -312,7 +312,7 @@ SFAXOBJ=sendfax.o logfile.o locks.o mode
all: bin-all doc-all
@@ -141,18 +81,18 @@
# a few C files need extra compiler arguments
-@@ -564,8 +564,8 @@
+@@ -564,8 +564,8 @@ newslock: compat/newslock.c
# internal: use this to create a "clean" mgetty+sendfax tree
Home |
Main Index |
Thread Index |
Old Index