Make this package PKG_SYSCONFDIR aware.

Bump PKG_REVISION.

4 files changed, 14 insertions, 11 deletions

diff --git a/net/yale-tftpd/Makefile b/net/yale-tftpd/Makefile
index 2a2ce585d99..96fc4bfd4ee 100644
--- a/net/yale-tftpd/Makefile
+++ b/net/yale-tftpd/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2001/09/09 20:36:40 agc Exp $
+# $NetBSD: Makefile,v 1.3 2002/04/23 15:27:15 seb Exp $
 # FreeBSD Id: ports/ftp/yale-tftpd/Makefile,v 1.14 2000/04/12 05:31:29 mharo Exp
 
 DISTNAME=	yale-tftpd-3.0
+PKGREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.cert.dfn.de/pub/tools/net/yale-tftpd/
 
@@ -12,6 +13,8 @@ WRKSRC=		${WRKDIR}
 
 post-configure:
 	${MV} ${WRKSRC}/tftpd.8 ${WRKSRC}/tftpd.8.in
-	${SED} -e "s|@PREFIX@|${PREFIX}|g" ${WRKSRC}/tftpd.8.in > ${WRKSRC}/tftpd.8
+	${SED} -e "s|@ETCDIR@|${PKG_SYSCONFDIR}|g"	\
+	    -e "s|@PREFIX@|${PREFIX}|g"			\
+	    < ${WRKSRC}/tftpd.8.in > ${WRKSRC}/tftpd.8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/yale-tftpd/distinfo b/net/yale-tftpd/distinfo
index 8bbf3e0e43f..56f6059792b 100644
--- a/net/yale-tftpd/distinfo
+++ b/net/yale-tftpd/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2002/04/01 00:04:43 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2002/04/23 15:27:15 seb Exp $
 
 SHA1 (yale-tftpd-3.0.tar.gz) = 5f87e3d37feb5c5c8b7f2db34a0c87ee537727af
 Size (yale-tftpd-3.0.tar.gz) = 33469 bytes
-SHA1 (patch-aa) = a61c860d4ee1088a4b5b3e8976e6f042d57dae94
+SHA1 (patch-aa) = e6e9b368db8f70bdb4fbb2a1b032bd4ce66206f2
 SHA1 (patch-ab) = e6eb66ed95139b47ee1df07014a636803e89ad47
-SHA1 (patch-ac) = eb748d6a96e50475acb7acd6f38e4552972d73f5
+SHA1 (patch-ac) = 3c550bc492079cdf01be93a12d1692452fd07282
 SHA1 (patch-ad) = 1743282699af3a17e4e95c825ad4989688349cd6
 SHA1 (patch-ae) = 0b431f5a4f769dbc560fc55231ea2cf478616987
 SHA1 (patch-af) = c6815c58d6ce91dbe0478cbb4fcf0c01126b3c4a
diff --git a/net/yale-tftpd/patches/patch-aa b/net/yale-tftpd/patches/patch-aa
index 8da1e9c8faf..867bb5c4af2 100644
--- a/net/yale-tftpd/patches/patch-aa
+++ b/net/yale-tftpd/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/07/30 19:43:49 nra Exp $
+$NetBSD: patch-aa,v 1.2 2002/04/23 15:27:16 seb Exp $
 
 --- Makefile.orig	Fri Oct  7 01:41:10 1994
 +++ Makefile
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/07/30 19:43:49 nra Exp $
  
 -ETCDIR?=${DESTDIR}/etc
 -BINDIR?=${DESTDIR}/usr/libexec
-+ETCDIR=${PREFIX}/etc
++ETCDIR=${PKG_SYSCONFDIR}
 +BINDIR=${PREFIX}/libexec
 +MANDIR=${PREFIX}/man
  
diff --git a/net/yale-tftpd/patches/patch-ac b/net/yale-tftpd/patches/patch-ac
index a267d48e4d0..baf9007e58a 100644
--- a/net/yale-tftpd/patches/patch-ac
+++ b/net/yale-tftpd/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/07/30 19:43:49 nra Exp $
+$NetBSD: patch-ac,v 1.2 2002/04/23 15:27:16 seb Exp $
 
 --- tftpd.8.orig	Wed Oct  5 06:18:21 1994
 +++ tftpd.8
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/07/30 19:43:49 nra Exp $
  line,
  .B tftpd
 -will use that, otherwise the default file is ``/usr/local/etc/tftpd.conf''.
-+will use that, otherwise the default file is ``@PREFIX@/etc/tftpd.conf''.
++will use that, otherwise the default file is ``@ETCDIR@/tftpd.conf''.
  .sp
  Configuration commands are:
  .IP defaultDirectory
@@ -26,7 +26,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/07/30 19:43:49 nra Exp $
  .SH "FILES"
 -.ta \w'/usr/local/etc/tftpd.conf~~'u
 -/usr/local/etc/tftpd.conf	default tftpd configuration file
-+.ta \w'@PREFIX@/etc/tftpd.conf~~'u
-+@PREFIX@/etc/tftpd.conf	default tftpd configuration file
++.ta \w'@ETCDIRX@/tftpd.conf~~'u
++@ETCDIR@/tftpd.conf	default tftpd configuration file
  .br
  /etc/inetd.conf	inetd configuration file