Honour PKG_SYSCONFDIR. Bump PKGREVISION to 1.

4 files changed, 39 insertions, 4 deletions

diff --git a/news/newscache/Makefile b/news/newscache/Makefile
index f5c69e30415..c637e83a3b6 100644
--- a/news/newscache/Makefile
+++ b/news/newscache/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2002/02/18 15:14:37 seb Exp $
+# $NetBSD: Makefile,v 1.5 2003/05/02 07:36:42 jmmv Exp $
 #
 
 DISTNAME=	NewsCache-0.99.17
+PKGREVISION=	1
 CATEGORIES=	news
 MASTER_SITES=	http://www.infosys.tuwien.ac.at/NewsCache/download/
 
@@ -10,6 +11,16 @@ HOMEPAGE=	http://www.infosys.tuwien.ac.at/NewsCache/
 COMMENT=	Free cache server for USENET News
 
 GNU_CONFIGURE=	YES
+USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
+
+CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
+
+CONF_FILES=	${PREFIX}/share/examples/NewsCache/newscache.conf \
+		${PKG_SYSCONFDIR}/newscache.conf
+
+post-extract:
+	${MV} ${WRKSRC}/etc/newscache.conf-dist ${WRKSRC}/etc/newscache.conf
 
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/newscache/PLIST b/news/newscache/PLIST
index 770494d865e..3a94dabad81 100644
--- a/news/newscache/PLIST
+++ b/news/newscache/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/05/02 07:36:43 jmmv Exp $
 bin/updatenews
-etc/newscache.conf-dist
 @unexec ${INSTALL_INFO} --delete %D/info/NewsCache.info %D/info/dir
 info/NewsCache.info
 @exec ${INSTALL_INFO} %D/info/NewsCache.info %D/info/dir
@@ -14,3 +13,5 @@ sbin/accesslog
 sbin/cachestat
 sbin/hostlog
 sbin/hoststat
+share/examples/NewsCache/newscache.conf
+@dirrm share/examples/NewsCache
diff --git a/news/newscache/distinfo b/news/newscache/distinfo
index dafec19c66f..67962980186 100644
--- a/news/newscache/distinfo
+++ b/news/newscache/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/08/28 03:30:41 mjl Exp $
+$NetBSD: distinfo,v 1.4 2003/05/02 07:36:43 jmmv Exp $
 
 SHA1 (NewsCache-0.99.17.tar.gz) = cb7411a00eeec7dd3a12193733a440b810102cf0
 Size (NewsCache-0.99.17.tar.gz) = 311921 bytes
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = 30da9db48ce320a5e21bb74a38cdbff05b3db28c
 SHA1 (patch-ac) = 48a21e95d80569784f91c3fc288d711d9e4f77d3
 SHA1 (patch-ad) = 93ca8786fea2c745587e6acdc9ec8f422cdbe8ee
 SHA1 (patch-ae) = 94bf16d68d09f86bbd30d34b8932e400b39af462
+SHA1 (patch-af) = b8302a9ec182fffdf2fc67eccdb9c742750b0f94
diff --git a/news/newscache/patches/patch-af b/news/newscache/patches/patch-af
new file mode 100644
index 00000000000..976ef9a12ab
--- /dev/null
+++ b/news/newscache/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2003/05/02 07:36:44 jmmv Exp $
+
+--- etc/Makefile.in.orig	2000-07-09 23:10:15.000000000 +0200
++++ etc/Makefile.in
+@@ -23,7 +23,7 @@ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+-sysconfdir = @sysconfdir@
++sysconfdir = @datadir@/examples/@PACKAGE@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+@@ -67,7 +67,7 @@ RANLIB = @RANLIB@
+ VERSION = @VERSION@
+ ac_cv_prog_find_printf = @ac_cv_prog_find_printf@
+ 
+-sysconf_DATA = newscache.conf-dist
++sysconf_DATA = newscache.conf
+ 
+ EXTRA_DIST = newscache.conf-dist NewsCache.init.in
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs