Honour PKG_SYSCONFDIR. Bump PKGREVISION to 1.

This commit is contained in:
jmmv 2003-05-01 15:44:43 +00:00
parent 2dee2ed078
commit c10f159c4e
5 changed files with 61 additions and 23 deletions

View file

@ -1,8 +1,9 @@
# $NetBSD: Makefile,v 1.9 2002/10/17 19:18:01 wiz Exp $
# $NetBSD: Makefile,v 1.10 2003/05/01 15:44:43 jmmv Exp $
#
DISTNAME= sendfile-20010216
PKGNAME= sendfile-2.1.0.2
PKGREVISION= 1
WRKSRC= ${WRKDIR}/sendfile-2.1a
CATEGORIES= net
MASTER_SITES= ftp://ftp.belwue.de/pub/unix/sendfile/current/
@ -11,9 +12,18 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.belwue.de/aktivitaeten/projekte/saft/
COMMENT= Implementation of the Simple asynchronous file transfer protocol
post-patch:
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
EGDIR= ${PREFIX}/share/examples/sendfile
CONF_FILES= ${EGDIR}/sendfile.cf ${PKG_SYSCONFDIR}/sendfile.cf
CONF_FILES+= ${EGDIR}/sendfile.deny ${PKG_SYSCONFDIR}/sendfile.deny
pre-configure:
cd ${WRKSRC} && \
${SED} -e 's,@PREFIX@,${PREFIX},' < makeconfig > makeconfig.new; \
${SED} -e 's,@PREFIX@,${PREFIX},g' \
-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g' \
< makeconfig > makeconfig.new; \
${MV} makeconfig.new makeconfig; \
${CHMOD} +x makeconfig

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:58:50 zuntum Exp $
@comment $NetBSD: PLIST,v 1.2 2003/05/01 15:44:43 jmmv Exp $
bin/sf_cleanup
bin/sfdconf
bin/sfconf
@ -14,8 +14,6 @@ bin/utf7decode
bin/sf
bin/sm
bin/rf
etc/sendfile.deny
etc/sendfile.cf
man/man1/sendfile.1
man/man1/sendmsg.1
man/man1/receive.1
@ -26,3 +24,6 @@ man/man1/utf7decode.1
man/man7/fetchfile.7
man/man8/sendfiled.8
sbin/sendfiled
share/examples/sendfile/sendfile.cf
share/examples/sendfile/sendfile.deny
@dirrm share/examples/sendfile

View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.5 2002/10/17 19:18:01 wiz Exp $
$NetBSD: distinfo,v 1.6 2003/05/01 15:44:43 jmmv Exp $
SHA1 (sendfile-20010216.tar.gz) = cdf6ff67bdc11709209c5f93ac94d380fa1abac3
Size (sendfile-20010216.tar.gz) = 292130 bytes
SHA1 (patch-aa) = 6c242d962625986cf6c0ed20696a979f8852c85f
SHA1 (patch-aa) = d116a9a0a4a2fb17051b5a67e48a503368b57b71
SHA1 (patch-ab) = c74cf201573068d8e1afa8e285831181d1be789e
SHA1 (patch-ac) = bd81d52fc1eada9170b48404f6c0d7779acdea84
SHA1 (patch-ac) = 14f393e122870cd4246ddbb6534e7568dbed5968
SHA1 (patch-ad) = ec9cf6dd79b6856c196058cb3117f2b140fffa31

View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.3 2001/10/25 19:02:48 agc Exp $
$NetBSD: patch-aa,v 1.4 2003/05/01 15:44:44 jmmv Exp $
--- makeconfig.orig Thu Aug 26 19:53:32 1999
+++ makeconfig Thu Oct 25 19:53:04 2001
@@ -16,10 +16,10 @@
--- makeconfig.orig 1999-08-26 20:53:32.000000000 +0200
+++ makeconfig
@@ -16,10 +16,11 @@ LDFLAGS=-s
# default installation settings
SPOOL=/var/spool/sendfile
@ -13,18 +13,27 @@ $NetBSD: patch-aa,v 1.3 2001/10/25 19:02:48 agc Exp $
+BINDIR=@PREFIX@/bin
+MANDIR=@PREFIX@/man
+CONFIG=@PREFIX@/etc
+EGDIR=@PREFIX@/share/examples/sendfile
+SERVERDIR=@PREFIX@/sbin
INETDCONF=/etc/inetd.conf
SERVICES=/etc/services
@@ -108,6 +108,10 @@
# esac;;
# *) SYSTEM=UNKNOWN;;
@@ -110,6 +111,10 @@ case "$SYSTEM" in
# esac;;
+esac
+
+case "$SYSTEM" in
+BSD) CFLAGS="$CFLAGS -DHAVE_STRERROR=1" ;;
esac
+case "$SYSTEM" in
+BSD) CFLAGS="$CFLAGS -DHAVE_STRERROR=1" ;;
+esac
+
cd ../src
echo now in `pwd`
@@ -133,6 +138,7 @@ cat <<EOD>globals.h
#define MANDIR "$MANDIR"
#define SERVERDIR "$SERVERDIR"
+#define EGDIR "$EGDIR"
#define CONFIG "$CONFIG/sendfile.cf"
#define ALIASES "$CONFIG/sendfile.aliases"
#define ALLOW "$CONFIG/sendfile.allow"

View file

@ -1,8 +1,26 @@
$NetBSD: patch-ac,v 1.2 2001/02/26 11:34:55 wiz Exp $
$NetBSD: patch-ac,v 1.3 2003/05/01 15:44:44 jmmv Exp $
--- develop/install.orig Tue Dec 7 10:40:11 1999
--- develop/install.orig 1999-12-07 10:40:11.000000000 +0100
+++ develop/install
@@ -165,14 +165,6 @@
@@ -105,6 +105,7 @@ eval `awk -F\" '/define BINDIR/ {prin
/define MANDIR/ {print "MANDIR="$2}
/define SERVERDIR/ {print "SERVERDIR="$2}
/define SPOOL/ {print "SPOOL="$2}
+ /define EGDIR/ {print "EGDIR="$2}
/define CONFIG/ {print "CONFIG="$2}
/define DENY/ {print "DENY="$2}
/define ALLOW/ {print "ALLOW="$2}
@@ -126,6 +127,9 @@ if [ "$OUTLOG" = "" ]; then OUTLOG=$SPOO
if [ "$INETDCONF" = "" ]; then INETDCONF=/etc/inetd.conf; fi
if [ "$SERVICES" = "" ]; then SERVICES=/etc/services; fi
+CONFIG=$EGDIR/sendfile.cf
+DENY=$EGDIR/sendfile.deny
+
case "$SYSTEM" in
*BSD*) manmisc=7; manadmin=8;;
*) manmisc=5; manadmin=1m;;
@@ -165,14 +169,6 @@ In /etc/profile and /etc/csh.login a cal
To deinstall the sendfile-daemon, simply type: rm -f $SERVERDIR/sendfiled
EOD