From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 14 03:10:21 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BB6B016A4F3 for ; Sat, 14 Aug 2004 03:10:21 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9793D43D4C for ; Sat, 14 Aug 2004 03:10:21 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i7E3ALdE020606 for ; Sat, 14 Aug 2004 03:10:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7E3ALZ1020605; Sat, 14 Aug 2004 03:10:21 GMT (envelope-from gnats) Resent-Date: Sat, 14 Aug 2004 03:10:21 GMT Resent-Message-Id: <200408140310.i7E3ALZ1020605@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Andrey Slusar Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B99316A4CE for ; Sat, 14 Aug 2004 03:03:18 +0000 (GMT) Received: from mail-kv.alkar.net (mail-kv.alkar.net [195.248.176.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id A01C843D3F for ; Sat, 14 Aug 2004 03:03:17 +0000 (GMT) (envelope-from vasallia@ukr.net) Received: from [212.86.241.97] (helo=santinel.home.ua) by mail-kv.alkar.net with esmtp (Exim 4.34 (FreeBSD)) id 1Bvooy-000EgJ-WE for FreeBSD-gnats-submit@freebsd.org; Sat, 14 Aug 2004 06:03:16 +0300 Received: from anray by santinel.home.ua with local (Exim 4.41; FreeBSD) id 1Bvoo5-0002w6-Ci for ; Sat, 14 Aug 2004 06:02:09 +0300 Message-Id: Date: Sat, 14 Aug 2004 06:02:09 +0300 From: Andrey Slusar To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/70437: [MAINTAINER] news/newsstar: fix autosearch paths to newsservers, fix running 'overview', change option WITH_SN to WITH_INN and other. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Andrey Slusar List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Aug 2004 03:10:21 -0000 >Number: 70437 >Category: ports >Synopsis: [MAINTAINER] news/newsstar: fix autosearch paths to newsservers, fix running 'overview', change option WITH_SN to WITH_INN and other. >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Aug 14 03:10:21 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Andrey Slusar >Release: FreeBSD 5.2-CURRENT i386 >Organization: Santinel >Environment: System: FreeBSD santinel.home.ua 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Fri Aug 13 15:33:33 EEST 2004 root@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386 >Description: - Change option WITH_SN to WITH_INN and remove RUN_DEPENDS. - Add s-news to COMMENT. - Fix autosearch paths to newsservers. - Fix running overview program if using s-news. - Fix path to sendmail. - Bump portrevision. >How-To-Repeat: >Fix: --- newsstar.diff begins here --- diff -ruN /usr/ports/news/newsstar/Makefile newsstar/Makefile --- /usr/ports/news/newsstar/Makefile Sun Aug 8 02:17:01 2004 +++ newsstar/Makefile Sat Aug 14 05:49:47 2004 @@ -7,17 +7,16 @@ PORTNAME= newsstar PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= news MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= anray@inet.ua -COMMENT= Transfer news between a local NNTP server (INN or sn) +COMMENT= Transfer news between a local NNTP server (INN, sn, s-news) -.if !defined(WITH_SN) -RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn -.else -RUN_DEPENDS= ${LOCALBASE}/sbin/snntpd:${PORTSDIR}/news/sn +.if exists(${LOCALBASE}/news/bin/innd) +WITH_INN=yes .endif .if defined(WITHOUT_SSL) @@ -26,7 +25,7 @@ USE_OPENSSL= yes .endif -.if !defined(WITH_SN) +.if defined(WITH_INN) CONFIGURE_ARGS+=--with-inn-path=${PREFIX}/news/bin .endif diff -ruN /usr/ports/news/newsstar/files/patch-newsstar.in newsstar/files/patch-newsstar.in --- /usr/ports/news/newsstar/files/patch-newsstar.in Thu Jul 15 06:13:38 2004 +++ newsstar/files/patch-newsstar.in Fri Aug 13 13:22:27 2004 @@ -1,5 +1,5 @@ --- newsstar.in.orig Sun Jul 4 00:21:24 2004 -+++ newsstar.in Mon Jul 12 21:38:49 2004 ++++ newsstar.in Fri Aug 13 13:21:10 2004 @@ -29,7 +29,6 @@ $NEWS_PATH = '@NEWS_PATH@'; $prefix = "@prefix@"; @@ -17,3 +17,89 @@ $OUTGOING_DIR = $SPOOL_DIR . "/.outgoing" if ($OUTGOING_DIR eq ""); $OUTGOING_NEWSSTAR_DIR = $OUTGOING_DIR . "/.newsstar"; $ARTICLES_DIR = $SPOOL_DIR if ($ARTICLES_DIR eq ""); +@@ -209,7 +208,8 @@ + $SPOOL_DIR = "/var/spool/news" if ($SPOOL_DIR eq ""); + if ($USE_SNEWS) + { +- $OUTGOING_DIR = "/var/lib/news/suck" if ($OUTGOING_DIR eq ""); ++ $ARTICLES_DIR = "/var/spool/s-news" if ($ARTICLES_DIR eq ""); ++ $OUTGOING_DIR = "${prefix}/etc/s-news/suck" if ($OUTGOING_DIR eq ""); + } + elsif ($OUTGOING_DIR eq "") + { +@@ -223,7 +223,17 @@ + } + } + $OUTGOING_NEWSSTAR_DIR = $OUTGOING_DIR . "/newsstar"; +- $ACTIVE_FILE = "/var/lib/news/active" if ($ACTIVE_FILE eq ""); ++ if ($ACTIVE_FILE eq "") ++ { ++ if ($USE_SNEWS) ++ { ++ $ACTIVE_FILE = "${prefix}/etc/s-news/active"; ++ } ++ else ++ { ++ $ACTIVE_FILE = "${prefix}/news/db/active"; ++ } ++ } + if ($ARTICLES_DIR eq "") + { + if (-d "$SPOOL_DIR/articles") +@@ -243,21 +253,9 @@ + { + if ($SNSTORE eq "") + { +- if (-x "/usr/sbin/snstore") +- { +- $SNSTORE = "/usr/sbin/snstore" +- } +- elsif (-x "/usr/local/sbin/snstore") ++ if (-x "${prefix}/sbin/snstore") + { +- $SNSTORE = "/usr/local/sbin/snstore" +- } +- elsif (-x "/usr/bin/snstore") +- { +- $SNSTORE = "/usr/bin/snstore" +- } +- elsif (-x "/usr/local/bin/snstore") +- { +- $SNSTORE = "/usr/local/bin/snstore" ++ $SNSTORE = "${prefix}/sbin/snstore" + } + else + { +@@ -274,21 +272,9 @@ + { + if ($OVERVIEW eq "") + { +- if (-x "/usr/sbin/overview") +- { +- $overview = "/usr/sbin/overview" +- } +- elsif (-x "/usr/local/sbin/overview") +- { +- $overview = "/usr/local/sbin/overview" +- } +- elsif (-x "/usr/bin/overview") +- { +- $overview = "/usr/bin/overview" +- } +- elsif (-x "/usr/local/bin/overview") ++ if (-x "${prefix}/sbin/overview") + { +- $overview = "/usr/local/bin/overview" ++ $OVERVIEW = "${prefix}/sbin/overview" + } + else + { +@@ -908,7 +894,7 @@ + # $NEWS_USER may also contain group + my $news_from = $NEWS_USER; + $news_from =~ s/\..*//; +- if (!open(SENDMAIL, "|/usr/lib/sendmail -oi -t")) ++ if (!open(SENDMAIL, "|/usr/sbin/sendmail -oi -t")) + { + print STDERR "Can't run sendmail to bounce rejected posting\n"; + return; --- newsstar.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: