Date: Fri, 13 Aug 1999 08:20:28 +0200 (CEST) From: dirk.meyer@dinoex.sub.org To: FreeBSD-gnats-submit@freebsd.org Subject: ports/13123: ports/news/cnews to honor PREFIX better Message-ID: <199908130620.IAA22175@home.dinoex.sub.org>
next in thread | raw e-mail | index | archive | help
>Number: 13123 >Category: ports >Synopsis: ports/news/cnews to honor PREFIX better >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: Fri Aug 13 09:30:02 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Dirk Meyer >Release: FreeBSD 3.2-RELEASE i386 >Organization: privat >Environment: FreeBSD >Description: New rework of configuration New MASTER-SITE >How-To-Repeat: >Fix: apply this patches diff -ru --new-file cnews/Makefile port-cnews/Makefile --- cnews/Makefile Thu Jun 10 10:00:06 1999 +++ port-cnews/Makefile Fri Aug 13 08:14:22 1999 @@ -14,12 +14,14 @@ ftp://ftp.win.or.jp/pub/network/news/cnews/ \ ftp://ftp.redcom.ru/pub/unix/usenet/c-news/ \ ftp://ftp.mc.hik.se/pub/unix/news/c-news/ \ + ftp://ftp.lan-ks.de/pub/c-news/ \ ftp://ftp.dinoex.org/pub/c-news/ EXTRACT_SUFX= .tar.Z DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ pgpverify-1.12 -PATCH_SITES= ftp://ftp.dinoex.org/pub/c-news/ +PATCH_SITES= ftp://ftp.lan-ks.de/pub/c-news/ \ + ftp://ftp.dinoex.org/pub/c-news/ PATCHFILES= c-news-patch-fileart.c c-news-patch-namecheck.awk \ c-news-patch-newsrun c-news-patch-sendbatches \ c-news-patch-ctl-pgp3 c-news-patch-ctl-more \ @@ -42,22 +44,39 @@ mkhistory.8cn newsaux.8cn newsbatch.8cn newsmail.8cn \ newsmaint.8cn newsoverview.8 relaynews.8cn report.8cn \ rnews.8cn - -NEWSSPOOL= ${PREFIX}/newsspool -NEWSBIN= ${PREFIX}/news/cnewsbin -NEWSLIB= ${PREFIX}/news/lib -PGPVERIFY= pgpverify-1.12 +MODIFY= conf/quiz.def \ + conf/substitutions \ + include/config.make + +NEWSBIN?= ${PREFIX}/news/cnewsbin +NEWSCTL?= ${PREFIX}/news/lib +NEWSARTS?= /var/news +NEWSOV?= /var/news/over.view +PGPVERIFY?= pgpverify-1.12 pre-patch: @${CP} ${DISTDIR}/${DIST_SUBDIR}/${PGPVERIFY} ${WRKSRC}/${PGPVERIFY} +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 + do-install: ${RM} -f ${PREFIX}/bin/inews ${INSTALL_DATA} ${WRKSRC}/libdbz/dbz.h ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/libcnews.a ${PREFIX}/lib - ${MKDIR} ${NEWSSPOOL} ${NEWSBIN} ${NEWSLIB} - -ln -s ${NEWSSPOOL} /var/news - chown news.news ${NEWSSPOOL} ${NEWSLIB} + ${MKDIR} ${NEWSARTS} ${NEWSBIN} ${NEWSCTL} + -ln -s ${NEWSARTS} /var/news + chown news.news ${NEWSARTS} ${NEWSCTL} chown bin.bin ${NEWSBIN} ${INSTALL_SCRIPT} ${WRKSRC}/${PGPVERIFY} ${NEWSBIN}/pgpverify cd ${WRKSRC}; ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} install @@ -80,7 +99,7 @@ @${ECHO} "" @${ECHO} "!!!!!!!!" @${ECHO} "you MUST change the configuration of this news setup:" - @${ECHO} " cd to ${NEWSLIB} and change the following files..." + @${ECHO} " cd to ${NEWSCTL} and change the following files..." @${ECHO} "mailname, whoami, organization, mailpaths, sys, readnews.ctl, postdefltgroup" @${ECHO} " to suit your local system and news topology." @${ECHO} "!!!!!!!!" diff -ru --new-file cnews/patches/patch-aa port-cnews/patches/patch-aa --- cnews/patches/patch-aa Mon Feb 22 04:56:55 1999 +++ port-cnews/patches/patch-aa Mon Aug 2 21:11:08 1999 @@ -1,157 +1,153 @@ -*** ../work/conf/makeinc Wed Dec 31 16:00:00 1969 ---- ./conf/makeinc Tue Oct 25 04:00:55 1994 -*************** -*** 0 **** ---- 1,3 ---- -+ # makefile substitutions file -+ # how to include ../include/config.make -+ INCLUDE .include "../include/config.make" -*** ../work/conf/quiz.def Wed Dec 31 16:00:00 1969 ---- ./conf/quiz.def Tue Oct 25 04:00:54 1994 -*************** -*** 0 **** ---- 1,68 ---- -+ # These answers are interdependent; do not edit this file! -+ newsuid="news" -+ # These answers are interdependent; do not edit this file! -+ newsgid="news" -+ # These answers are interdependent; do not edit this file! -+ newsarts="/var/news" -+ # These answers are interdependent; do not edit this file! -+ newsov="/var/news/over.view" -+ # These answers are interdependent; do not edit this file! -+ newsctl="/usr/local/news/lib" -+ # These answers are interdependent; do not edit this file! -+ newsbin="/usr/local/news/cnewsbin" -+ # These answers are interdependent; do not edit this file! -+ newspath="/bin:/usr/bin:/usr/local/bin" -+ # These answers are interdependent; do not edit this file! -+ newsumask="022" -+ # These answers are interdependent; do not edit this file! -+ newsconfig="/usr/local/news/lib/bin/config" -+ # These answers are interdependent; do not edit this file! -+ newscrisis="newscrisis" -+ # These answers are interdependent; do not edit this file! -+ newsmaster="newsmaster" -+ # These answers are interdependent; do not edit this file! -+ addrsize="big" -+ # These answers are interdependent; do not edit this file! -+ fake=" fgetline.o fsync.o" -+ # These answers are interdependent; do not edit this file! -+ storeval="" -+ # These answers are interdependent; do not edit this file! -+ faststdio="no" -+ # These answers are interdependent; do not edit this file! -+ fakehdrs=" sys/timeb.h" -+ # These answers are interdependent; do not edit this file! -+ ranlib="yes" -+ # These answers are interdependent; do not edit this file! -+ make="make" -+ # These answers are interdependent; do not edit this file! -+ include="bsd" -+ # These answers are interdependent; do not edit this file! -+ cc="" -+ # These answers are interdependent; do not edit this file! -+ copts="-O2" -+ # These answers are interdependent; do not edit this file! -+ ldopts="" -+ # These answers are interdependent; do not edit this file! -+ postlibs="" -+ # These answers are interdependent; do not edit this file! -+ uucptype="tay" -+ # These answers are interdependent; do not edit this file! -+ dftype="statfs" -+ # These answers are interdependent; do not edit this file! -+ dfdirs="" -+ # These answers are interdependent; do not edit this file! -+ archive="yes" -+ # These answers are interdependent; do not edit this file! -+ spacelow="no" -+ # These answers are interdependent; do not edit this file! -+ nfsgroup="no" -+ # These answers are interdependent; do not edit this file! -+ server="newsie" -+ # These answers are interdependent; do not edit this file! -+ rbin="/usr/local/news/cnewsbin/input" -+ # These answers are interdependent; do not edit this file! -+ bin="/usr/local/bin" -+ # These answers are interdependent; do not edit this file! -+ faststrchr="no" -+ # These answers are interdependent; do not edit this file! -+ sftype="c" -*** ../work/conf/substitutions Wed Dec 31 16:00:00 1969 ---- ./conf/substitutions Tue Oct 25 04:00:55 1994 -*************** -*** 0 **** ---- 1,8 ---- -+ # general substitutions file -+ NEWSBIN /usr/local/news/cnewsbin -+ NEWSCTL /usr/local/news/lib -+ NEWSARTS /var/news -+ NEWSOV /var/news -+ NEWSPATH /bin:/usr/bin:/usr/local/bin -+ NEWSUMASK 022 -+ NEWSCONFIG /usr/local/news/lib/bin/config -*** ../work/include/config.make Wed Dec 31 16:00:00 1969 ---- ./include/config.make Tue Oct 25 04:00:55 1994 -*************** -*** 0 **** ---- 1,58 ---- -+ # make header file -+ # pathname variables -+ # =()<NEWSARTS=@<NEWSARTS>@>()= -+ NEWSARTS=/var/news -+ # =()<NEWSOV=@<NEWSOV>@>()= -+ NEWSOV=/var/news -+ # =()<NEWSBIN=@<NEWSBIN>@>()= -+ NEWSBIN=/usr/local/news/cnewsbin -+ # =()<NEWSCTL=@<NEWSCTL>@>()= -+ NEWSCTL=/usr/local/news/lib -+ # =()<NEWSCONFIG=@<NEWSCONFIG>@>()= -+ NEWSCONFIG=/usr/local/news/lib/bin/config -+ -+ # workaround for System V make bug -+ SHELL=/bin/sh -+ -+ # directories where things go -+ UIBIN=/usr/local/bin -+ RBIN=/usr/local/news/cnewsbin/input -+ -+ # compilation stuff -+ # LIB is for makefile dependencies, LIBS for cc invocations -+ LIB=../libcnews.a -+ LIBS=../libcnews.a -+ CFLAGS=$(MORECFLAGS) -O2 -I../include -+ LDFLAGS=$(CFLAGS) -+ LINTFLAGS=$(MORELINTFLAGS) -I../include -+ -+ # directories etc. -+ CONF=../conf -+ MAKE=make -+ TO=$(CONF)/cpto -+ IN=$(CONF)/cmpto $(CMPOPT) -+ CF=$(CONF)/checkfile $(CMPOPT) -+ MKDIR=$(CONF)/mkdirs -+ MX=chmod +x -+ UPDATE=$(CONF)/update.ran ../libcnews.a -+ LIBCMP=$(CONF)/libcmp ../libcnews.a -+ -+ # misc configuration bits -+ SPACEFOR=statfs -+ DOSPACEFOR=dospacefor -+ QUEUELEN=tay -+ UID=news -+ GID=news -+ SIZE=big -+ DBZ=libdbz -+ STDIO=sysstdio -+ SERVER= -+ REPORTTO=newsmaster -+ URGENTTO=newscrisis -+ -+ # things for testing -+ HERE=. ../conf/config.r ; -+ -+ # fake files needed -+ HFAKE= sys/timeb.h -+ OFAKE= fgetline.o fsync.o +diff -urN ../pre-conf/conf/makeinc conf/makeinc +--- ../pre-conf/conf/makeinc Thu Jan 1 01:00:00 1970 ++++ conf/makeinc Mon Aug 2 20:32:23 1999 +@@ -0,0 +1,3 @@ ++# makefile substitutions file ++# how to include ../include/config.make ++INCLUDE .include "../include/config.make" +diff -urN ../pre-conf/conf/quiz.def conf/quiz.def +--- ../pre-conf/conf/quiz.def Thu Jan 1 01:00:00 1970 ++++ conf/quiz.def Mon Aug 2 20:36:19 1999 +@@ -0,0 +1,68 @@ ++# These answers are interdependent; do not edit this file! ++newsuid="news" ++# These answers are interdependent; do not edit this file! ++newsgid="news" ++# These answers are interdependent; do not edit this file! ++newsarts="/var/news" ++# These answers are interdependent; do not edit this file! ++newsov="/var/news/over.view" ++# These answers are interdependent; do not edit this file! ++newsctl="/usr/local/news/lib" ++# These answers are interdependent; do not edit this file! ++newsbin="/usr/local/news/cnewsbin" ++# These answers are interdependent; do not edit this file! ++newspath="/bin:/usr/bin:/usr/local/bin" ++# These answers are interdependent; do not edit this file! ++newsumask="022" ++# These answers are interdependent; do not edit this file! ++newsconfig="/usr/local/news/cnewsbin/config" ++# These answers are interdependent; do not edit this file! ++newscrisis="newscrisis" ++# These answers are interdependent; do not edit this file! ++newsmaster="newsmaster" ++# These answers are interdependent; do not edit this file! ++addrsize="big" ++# These answers are interdependent; do not edit this file! ++fake=" fgetline.o fsync.o" ++# These answers are interdependent; do not edit this file! ++storeval="" ++# These answers are interdependent; do not edit this file! ++faststdio="no" ++# These answers are interdependent; do not edit this file! ++fakehdrs=" sys/timeb.h" ++# These answers are interdependent; do not edit this file! ++ranlib="yes" ++# These answers are interdependent; do not edit this file! ++make="make" ++# These answers are interdependent; do not edit this file! ++include="bsd" ++# These answers are interdependent; do not edit this file! ++cc="" ++# These answers are interdependent; do not edit this file! ++copts="-O2" ++# These answers are interdependent; do not edit this file! ++ldopts="" ++# These answers are interdependent; do not edit this file! ++postlibs="" ++# These answers are interdependent; do not edit this file! ++uucptype="tay" ++# These answers are interdependent; do not edit this file! ++dftype="statfs" ++# These answers are interdependent; do not edit this file! ++dfdirs="" ++# These answers are interdependent; do not edit this file! ++archive="yes" ++# These answers are interdependent; do not edit this file! ++spacelow="no" ++# These answers are interdependent; do not edit this file! ++nfsgroup="no" ++# These answers are interdependent; do not edit this file! ++server="newsie" ++# These answers are interdependent; do not edit this file! ++rbin="/usr/local/news/cnewsbin/input" ++# These answers are interdependent; do not edit this file! ++bin="/usr/local/bin" ++# These answers are interdependent; do not edit this file! ++faststrchr="no" ++# These answers are interdependent; do not edit this file! ++sftype="c" +diff -urN ../pre-conf/conf/substitutions conf/substitutions +--- ../pre-conf/conf/substitutions Thu Jan 1 01:00:00 1970 ++++ conf/substitutions Mon Aug 2 20:36:19 1999 +@@ -0,0 +1,8 @@ ++# general substitutions file ++NEWSBIN /usr/local/news/cnewsbin ++NEWSCTL /usr/local/news/lib ++NEWSARTS /var/news ++NEWSOV /var/news/over.view ++NEWSPATH /bin:/usr/bin:/usr/local/bin ++NEWSUMASK 022 ++NEWSCONFIG /usr/local/news/cnewsbin/config +diff -urN ../pre-conf/include/config.make include/config.make +--- ../pre-conf/include/config.make Thu Jan 1 01:00:00 1970 ++++ include/config.make Mon Aug 2 20:36:19 1999 +@@ -0,0 +1,58 @@ ++# make header file ++# pathname variables ++# =()<NEWSARTS=@<NEWSARTS>@>()= ++NEWSARTS=/var/news ++# =()<NEWSOV=@<NEWSOV>@>()= ++NEWSOV=/var/news/over.view ++# =()<NEWSBIN=@<NEWSBIN>@>()= ++NEWSBIN=/usr/local/news/cnewsbin ++# =()<NEWSCTL=@<NEWSCTL>@>()= ++NEWSCTL=/usr/local/news/lib ++# =()<NEWSCONFIG=@<NEWSCONFIG>@>()= ++NEWSCONFIG=/usr/local/news/cnewsbin/config ++ ++# workaround for System V make bug ++SHELL=/bin/sh ++ ++# directories where things go ++UIBIN=/usr/local/bin ++RBIN=/usr/local/news/cnewsbin/input ++ ++# compilation stuff ++# LIB is for makefile dependencies, LIBS for cc invocations ++LIB=../libcnews.a ++LIBS=../libcnews.a ++CFLAGS=$(MORECFLAGS) -O2 -I../include ++LDFLAGS=$(CFLAGS) ++LINTFLAGS=$(MORELINTFLAGS) -I../include ++ ++# directories etc. ++CONF=../conf ++MAKE=make ++TO=$(CONF)/cpto ++IN=$(CONF)/cmpto $(CMPOPT) ++CF=$(CONF)/checkfile $(CMPOPT) ++MKDIR=$(CONF)/mkdirs ++MX=chmod +x ++UPDATE=$(CONF)/update.ran ../libcnews.a ++LIBCMP=$(CONF)/libcmp ../libcnews.a ++ ++# misc configuration bits ++SPACEFOR=statfs ++DOSPACEFOR=dospacefor ++QUEUELEN=tay ++UID=news ++GID=news ++SIZE=big ++DBZ=libdbz ++STDIO=sysstdio ++SERVER= ++REPORTTO=newsmaster ++URGENTTO=newscrisis ++ ++# things for testing ++HERE=. ../conf/rsetup ; ++ ++# fake files needed ++HFAKE= sys/timeb.h ++OFAKE= fgetline.o fsync.o diff -ru --new-file cnews/patches/patch-ac port-cnews/patches/patch-ac --- cnews/patches/patch-ac Thu Jan 1 01:00:00 1970 +++ port-cnews/patches/patch-ac Mon Aug 2 22:25:37 1999 @@ -0,0 +1,25 @@ +diff pre-conf/util/namecheck.t util/namecheck.t +--- pre-conf/util/namecheck.t Tue Oct 18 04:50:01 1994 ++++ util/namecheck.t Mon Aug 2 21:03:29 1999 +@@ -23,9 +23,9 @@ + comp.lang.0++ name component does not contain letter + comp.lang.all `all' or `ctl' used as name component + comp.lang.ctl `all' or `ctl' used as name component +-comp.lang.verylonglanguage name component longer than 14 characters +-comp.lang.verylonglanguag name component longer than 14 characters +-comp.lang.verylonglangua ++comp.lang.verylong1234567890language name component longer than 24 characters ++comp.lang.verylong1234567890languag name component longer than 24 characters ++comp.lang.verylong1234567890langua + comp.lang.C++ uppercase letter(s) in name + comp.lang.c_2 + comp.lang.c-2 +diff pre-conf/ctl/reg/n.1r work/ctl/reg/n.1r +--- pre-conf/ctl/reg/n.1r Fri Apr 28 02:50:47 1995 ++++ ctl/reg/n.1r Mon Aug 2 22:12:43 1999 +@@ -1,4 +1,4 @@ +-newgroup comp.lang.beta ++new newsgroup comp.lang.beta + ::: + tale@uunet.uu.net (David C Lawrence) said to + create `comp.lang.beta'. diff -ru --new-file cnews/patches/patch-ra port-cnews/patches/patch-ra --- cnews/patches/patch-ra Mon Feb 22 04:56:55 1999 +++ port-cnews/patches/patch-ra Thu Jan 1 01:00:00 1970 @@ -1,17 +0,0 @@ -*** ../work/conf/config.r Wed Dec 31 16:00:00 1969 ---- ./conf/config.r Tue Oct 25 04:00:55 1994 -*************** -*** 0 **** ---- 1,12 ---- -+ # fake configuration for regression tests -+ # -+ NEWSCTL=${NEWSCTL-`pwd`} -+ NEWSBIN=${NEWSBIN-`pwd`} -+ NEWSARTS=${NEWSARTS-`pwd`/arts} -+ NEWSOV=$NEWSARTS -+ # =()<NEWSPATH=${NEWSPATH-@<NEWSPATH>@}>()= -+ NEWSPATH=${NEWSPATH-/bin:/usr/bin} -+ NEWSUMASK=${NEWSUMASK-022} -+ NEWSCONFIG=${NEWSCONFIG-`pwd`/../conf/config.r} -+ LOGNAME=regression -+ export NEWSCTL NEWSBIN NEWSARTS NEWSOV NEWSPATH NEWSUMASK NEWSCONFIG LOGNAME diff -ru --new-file cnews/pkg/PLIST port-cnews/pkg/PLIST --- cnews/pkg/PLIST Tue Jun 22 18:24:48 1999 +++ port-cnews/pkg/PLIST Fri Aug 13 08:12:58 1999 @@ -121,10 +121,10 @@ news/cnewsbin/touchlock news/cnewsbin/unlock news/cnewsbin/pgpverify +news/cnewsbin/config news/lib/active news/lib/active.times news/lib/batchparms -news/lib/bin/config news/lib/controlperm news/lib/explist news/lib/history >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?199908130620.IAA22175>