From 2b138f401f4c8442e81db68525b3e647d8b8bd90 Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Fri, 13 Jun 2003 04:11:06 +0000
Subject: - Sync with cnews paths better.

---
 news/nntp/Makefile  | 14 ++++++++------
 news/nntp/pkg-plist |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'news')

diff --git a/news/nntp/Makefile b/news/nntp/Makefile
index ee827115500c..b46013eceef4 100644
--- a/news/nntp/Makefile
+++ b/news/nntp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nntp
 PORTVERSION=	1.5.12.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.academ.com/pub/nntp/server/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -24,17 +24,19 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libcnews.a:${PORTSDIR}/news/cnews
 NO_WRKSUBDIR=	yes
 MAN1=		nntpxmit.1
 MAN8=		nntpd.8c acttimes.8c
-PLIST_SUB+=	NEWSBIN=${NEWSBIN:S=${PREFIX}/==}
-PLIST_SUB+=	NEWSCTL=${NEWSCTL:S=${PREFIX}/==}
+PLIST_SUB+=	VARBASE=${VARBASE}
+PLIST_SUB+=	NEWSBIN=${NEWSBIN:S=^${PREFIX}/==}
+PLIST_SUB+=	NEWSCTL=${NEWSCTL:S=^${VARBASE}/==}
 
 MODIFY=		conf.h Makefile
 DOCSFILES1=	AUTHORIZE CHANGES README README-conf.h SYSLOG doc/rfc977
 DOCSFILES2=	server support xfer xmit
 
+VARBASE?=	/var
 NEWSBIN?=	${PREFIX}/libexec/cnews
-NEWSCTL?=	${PREFIX}/news/lib
-NEWSARTS?=	/var/news
-NEWSOV?=	/var/news/over.view
+NEWSCTL?=	${VARBASE}/lib/news
+NEWSARTS?=	${VARBASE}/news
+NEWSOV?=	${VARBASE}/news
 
 MAKE_ENV+=	DBLIBS="${LOCALBASE}/lib/libcnews.a -lcrypt -lutil"
 MAKE_ENV+=	ETCDIR="${LOCALBASE}/sbin" BINDIR="${NEWSBIN}"
diff --git a/news/nntp/pkg-plist b/news/nntp/pkg-plist
index efd0da3ec213..c45bbf3b0b62 100644
--- a/news/nntp/pkg-plist
+++ b/news/nntp/pkg-plist
@@ -4,7 +4,6 @@ sbin/nntpd
 %%NEWSBIN%%/nntpxfer
 @comment     just in case anyone wants it
 %%NEWSBIN%%/shlock
-%%NEWSCTL%%/overview.fmt
 %%PORTDOCS%%share/doc/nntp/AUTHORIZE
 %%PORTDOCS%%share/doc/nntp/CHANGES
 %%PORTDOCS%%share/doc/nntp/README
@@ -16,3 +15,5 @@ sbin/nntpd
 %%PORTDOCS%%share/doc/nntp/xfer-README
 %%PORTDOCS%%share/doc/nntp/xmit-README
 %%PORTDOCS%%@dirrm share/doc/nntp
+@cwd %%VARBASE%%
+%%NEWSCTL%%/overview.fmt
-- 
cgit v1.2.3