From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 19 20:50:27 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 1FDA416A4DE for ; Thu, 19 Aug 2004 20:50:27 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAD4343D2D for ; Thu, 19 Aug 2004 20:50:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i7JKoQf3076471 for ; Thu, 19 Aug 2004 20:50:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i7JKoQD7076469; Thu, 19 Aug 2004 20:50:26 GMT (envelope-from gnats) Resent-Date: Thu, 19 Aug 2004 20:50:26 GMT Resent-Message-Id: <200408192050.i7JKoQD7076469@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 8EA2216A4CE for ; Thu, 19 Aug 2004 20:48:47 +0000 (GMT) Received: from mail-kv.alkar.net (mail-kv.alkar.net [195.248.176.165]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1C74743D45 for ; Thu, 19 Aug 2004 20:48:47 +0000 (GMT) (envelope-from anray@inet.ua) Received: from [212.86.235.214] (helo=santinel.home.ua) by mail-kv.alkar.net with esmtp (Exim 4.34 (FreeBSD)) id 1Bxtq0-000JyD-Uc for FreeBSD-gnats-submit@freebsd.org; Thu, 19 Aug 2004 23:48:46 +0300 Received: from anray by santinel.home.ua with local (Exim 4.41; FreeBSD) id 1BxtSn-0001Vp-4u for ; Thu, 19 Aug 2004 23:24:45 +0300 Message-Id: Date: Thu, 19 Aug 2004 23:24:45 +0300 From: Andrey Slusar To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/70676: [MAINTAINER] news/newsstar: update to new version 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: Thu, 19 Aug 2004 20:50:27 -0000 >Number: 70676 >Category: ports >Synopsis: [MAINTAINER] news/newsstar: update to new version >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: Thu Aug 19 20:50:26 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 #2: Mon Aug 16 15:35:15 EEST 2004 anray@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386 >Description: Update to version 1.2 >How-To-Repeat: >Fix: --- newsstar.diff begins here --- diff -ruN /usr/ports/news/newsstar/Makefile newsstar/Makefile --- /usr/ports/news/newsstar/Makefile Sat Aug 14 11:31:26 2004 +++ newsstar/Makefile Thu Aug 19 23:21:19 2004 @@ -6,8 +6,7 @@ # PORTNAME= newsstar -PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTVERSION= 1.2 CATEGORIES= news MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,18 +14,25 @@ MAINTAINER= anray@inet.ua COMMENT= Transfer news between a local NNTP server (INN, sn, s-news) -.if exists(${LOCALBASE}/news/bin/innd) -WITH_INN=yes -.endif - .if defined(WITHOUT_SSL) CONFIGURE_ARGS+=--disable-ssl .else USE_OPENSSL= yes .endif -.if defined(WITH_INN) -CONFIGURE_ARGS+=--with-inn-path=${PREFIX}/news/bin +.if exists(/var/spool/s-news) +CONFIGURE_ARGS+=--with-spool-dir=/var/spool/s-news \ + --with-snews-outgoing-dir=${LOCALBASE}/etc/s-news/suck +.endif + +.if exists(${LOCALBASE}/sbin/snntpd) +CONFIGURE_ARGS+=--with-sn-spool-dir=/var/spool/news \ + --with-sn-articles-dir=/var/spool/news \ + --with-outgoing-dir=/var/spool/news/.outgoing +.endif + +.if exists(${LOCALBASE}/news/bin/innconfval) +CONFIGURE_ARGS+=--with-inn-path=${LOCALBASE}/news/bin .endif CONFIGURE_ARGS+=--prefix=${PREFIX} \ diff -ruN /usr/ports/news/newsstar/distinfo newsstar/distinfo --- /usr/ports/news/newsstar/distinfo Thu Jul 15 07:16:01 2004 +++ newsstar/distinfo Wed Aug 18 21:54:12 2004 @@ -1,2 +1,2 @@ -MD5 (newsstar-1.1.1.tar.gz) = ae56df2413f3d727ef413a7203a43b9b -SIZE (newsstar-1.1.1.tar.gz) = 257732 +MD5 (newsstar-1.2.tar.gz) = 68c6a01b24a196d289605b323ac9f749 +SIZE (newsstar-1.2.tar.gz) = 262902 diff -ruN /usr/ports/news/newsstar/files/patch-newsstar.in newsstar/files/patch-newsstar.in --- /usr/ports/news/newsstar/files/patch-newsstar.in Sat Aug 14 11:31:26 2004 +++ newsstar/files/patch-newsstar.in Thu Aug 19 19:19:30 2004 @@ -1,6 +1,6 @@ ---- newsstar.in.orig Sun Jul 4 00:21:24 2004 -+++ newsstar.in Fri Aug 13 13:21:10 2004 -@@ -29,7 +29,6 @@ +--- newsstar.in.orig Tue Aug 17 22:33:53 2004 ++++ newsstar.in Thu Aug 19 19:18:38 2004 +@@ -30,7 +30,6 @@ $NEWS_PATH = '@NEWS_PATH@'; $prefix = "@prefix@"; $exec_prefix = "@exec_prefix@"; @@ -8,26 +8,7 @@ $NEWSSTAR_BIN = "@NEWSSTAR_BIN@"; $MAINCF = $CONF_DIR . "/main.cf"; $INCOMING_DIR = "@INCOMING_DIR@"; -@@ -199,7 +198,7 @@ - - if ($USE_SN) - { -- $SPOOL_DIR = "/var/spool/sn" if ($SPOOL_DIR eq ""); -+ $SPOOL_DIR = "/var/spool/news" if ($SPOOL_DIR eq ""); - $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 @@ +@@ -261,7 +260,17 @@ } } $OUTGOING_NEWSSTAR_DIR = $OUTGOING_DIR . "/newsstar"; @@ -45,8 +26,8 @@ + } if ($ARTICLES_DIR eq "") { - if (-d "$SPOOL_DIR/articles") -@@ -243,21 +253,9 @@ + if ($USE_SNEWS) +@@ -292,21 +301,9 @@ { if ($SNSTORE eq "") { @@ -70,36 +51,27 @@ } else { -@@ -274,21 +272,9 @@ +@@ -323,21 +320,9 @@ { if ($OVERVIEW eq "") { - if (-x "/usr/sbin/overview") - { -- $overview = "/usr/sbin/overview" +- $OVERVIEW = "/usr/sbin/overview" - } - elsif (-x "/usr/local/sbin/overview") - { -- $overview = "/usr/local/sbin/overview" +- $OVERVIEW = "/usr/local/sbin/overview" - } - elsif (-x "/usr/bin/overview") - { -- $overview = "/usr/bin/overview" +- $OVERVIEW = "/usr/bin/overview" - } - elsif (-x "/usr/local/bin/overview") + if (-x "${prefix}/sbin/overview") { -- $overview = "/usr/local/bin/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: