[pkgsrc/trunk]: pkgsrc/net/tnftpd incorporate patch from othersrc/libexec/tnf...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40996516f3c9
branches:  trunk
changeset: 465077:40996516f3c9
user:      grant <grant%pkgsrc.org@localhost>
date:      Sat Dec 20 13:38:37 2003 +0000

description:
incorporate patch from othersrc/libexec/tnftpd to honour --sysconfdir
(will be included in the next release) and make the package honour
PKG_SYSCONFDIR.

use CONF_FILES to install the sample configuration ftpd.conf and
ftpusers.

bump PKGREVISION, as the default configuration file location has
changed to ${PKG_SYSCONFDIR}. set PKG_SYSCONFDIR.tnftpd=/etc to get
the previous behaviour.

diffstat:

 net/tnftpd/Makefile         |   9 ++++++++-
 net/tnftpd/distinfo         |   3 ++-
 net/tnftpd/patches/patch-aa |  19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r 397673f5b0b6 -r 40996516f3c9 net/tnftpd/Makefile
--- a/net/tnftpd/Makefile       Sat Dec 20 11:24:51 2003 +0000
+++ b/net/tnftpd/Makefile       Sat Dec 20 13:38:37 2003 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/12/19 21:30:00 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/12/20 13:38:37 grant Exp $
 #
 
 DISTNAME=              tnftpd-20031217
+PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          ftp://ftp.NetBSD.org/pub/NetBSD/misc/tnftp/
 
@@ -14,6 +15,12 @@
 
 GNU_CONFIGURE=         YES
 MANCOMPRESSED_IF_MANZ= YES
+USE_PKGINSTALL=                YES
+
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+
+CONF_FILES+=           ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf
+CONF_FILES+=           ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers
 
 .include "../../mk/bsd.prefs.mk"
 
diff -r 397673f5b0b6 -r 40996516f3c9 net/tnftpd/distinfo
--- a/net/tnftpd/distinfo       Sat Dec 20 11:24:51 2003 +0000
+++ b/net/tnftpd/distinfo       Sat Dec 20 13:38:37 2003 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/12/18 01:14:59 lukem Exp $
+$NetBSD: distinfo,v 1.4 2003/12/20 13:38:37 grant Exp $
 
 SHA1 (tnftpd-20031217.tar.gz) = d5b1f7b87862eaa67a3660272f3ffc0e240cf62b
 Size (tnftpd-20031217.tar.gz) = 177483 bytes
+SHA1 (patch-aa) = 31924f4595744db9e0c04f4b334f6fc30b39e0e2
diff -r 397673f5b0b6 -r 40996516f3c9 net/tnftpd/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/tnftpd/patches/patch-aa       Sat Dec 20 13:38:37 2003 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2003/12/20 13:38:37 grant Exp $
+
+--- src/Makefile.in.orig       2002-12-09 00:05:36.000000000 +1100
++++ src/Makefile.in
+@@ -10,12 +10,13 @@ exec_prefix = @exec_prefix@
+ bindir        = @bindir@
+ mandir        = @mandir@
+ sbindir       = @sbindir@
++sysconfdir = @sysconfdir@
+ 
+ mandircat5 = ${mandir}/cat5
+ mandircat8 = ${mandir}/cat8
+ 
+ CC    = @CC@
+-CFLAGS        = -I${srcdir} -I${srcdir}/.. -I. -I.. @INCLUDES@ -DHAVE_TNFTPD_H=1 @CFLAGS@
++CFLAGS        = -I${srcdir} -I${srcdir}/.. -I. -I.. @INCLUDES@ -DHAVE_TNFTPD_H=1 @CFLAGS@ -D_DEFAULT_CONFDIR=\"${sysconfdir}\"
+ LIBS  = @LIBS@
+ LDFLAGS       = @LDFLAGS@
+