Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Oct 1999 15:44:48 +0200 (CEST)
From:      dirk.meyer@dinoex.sub.org
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/14421: news/nntp honor PREFIX
Message-ID:  <199910191344.PAA71424@home.dinoex.sub.org>

next in thread | raw e-mail | index | archive | help

>Number:         14421
>Category:       ports
>Synopsis:       news/cnews honor PREFIX
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 19 10:00:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Dirk Meyer
>Release:        FreeBSD 3.3-RELEASE i386
>Organization:
privat
>Environment:

	ports/news/cnews installed

>Description:

	New rework of configuration

>How-To-Repeat:
>Fix:

	apply this patches

diff nntp/Makefile nntp-1.5.11.5/Makefile
--- nntp/Makefile	Sat Oct  2 06:06:56 1999
+++ nntp-1.5.11.5/Makefile	Tue Oct 19 14:56:13 1999
@@ -14,12 +14,36 @@
 
 MAINTAINER=	adam@veda.is
 
-BUILD_DEPENDS=	${PREFIX}/lib/libcnews.a:${PORTSDIR}/news/cnews
+BUILD_DEPENDS=	${LOCALBASE}/lib/libcnews.a:${PORTSDIR}/news/cnews
 
 MAN1=		nntpxmit.1
 MAN8=		nntpd.8c mkgrdates.8c
+PLIST=		${WRKDIR}/.PLIST.sed
+
+MODIFY=		conf.h xfer/Makefile xmit/Makefile
+
+NEWSBIN?=	${PREFIX}/news/cnewsbin
+NEWSCTL?=	${PREFIX}/news/lib
+NEWSARTS?=	/var/news
+NEWSOV?=	/var/news/over.view
 
 post-extract:
 	@${CP} ${WRKSRC}/conf.h.dist ${WRKSRC}/conf.h
+
+pre-configure:
+.for i in ${MODIFY}
+	@${MV} ${WRKSRC}/${i} ${WRKSRC}/${i}.sed
+	${SED} \
+		-e "s=/usr/local/news/lib/bin/config=${NEWSBIN}/config=" \
+		-e "s=/usr/local/news/cnewsbin=${NEWSBIN}=" \
+		-e "s=/usr/local/news/lib=${NEWSCTL}=" \
+		-e "s=/var/news/over.view=${NEWSOV}=" \
+		-e "s=/var/news=${NEWSARTS}=" \
+		-e "s=/usr/local/bin=${PREFIX}/bin=" \
+		${WRKSRC}/${i}.sed >${WRKSRC}/${i}
+.endfor
+	@${SED} \
+		-e "s=news/cnewsbin=${NEWSBIN:S=${PREFIX}/==}=" \
+		${PKGDIR}/PLIST >${PLIST}
 
 .include <bsd.port.mk>
diff nntp/patches/patch-ae nntp-1.5.11.5/patches/patch-ae
--- nntp/patches/patch-ae	Thu Jan  1 01:00:00 1970
+++ nntp-1.5.11.5/patches/patch-ae	Tue Oct 19 14:21:44 1999
@@ -0,0 +1,20 @@
+--- conf.h.orig	Tue Oct 19 14:19:21 1999
++++ conf.h	Tue Oct 19 14:21:08 1999
+@@ -267,7 +267,7 @@
+ /*
+  * This file is where access information is stored
+  */
+-#define ACCESS_FILE	"/usr/local/news/lib/nntp_access"
++#define ACCESS_FILE	"/usr/local/etc/nntp_access"
+ 
+ /*
+  * But if you don't have C News or INN, you can run acttimes (see the support
+@@ -285,7 +285,7 @@
+ #define NEWSGROUPS_FILE	"/usr/local/news/lib/newsgroups"
+ #define HISTORY_FILE	"/usr/local/news/lib/history"
+ #define	SPOOLDIR	"/var/news"
+-#define INEWS		"/usr/local/news/lib/inews"
++#define INEWS		"/usr/local/bin/inews"
+ #define RNEWS		"/usr/local/bin/rnews"		/* Link to inews? */
+ 
+ /*

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199910191344.PAA71424>