From owner-svn-ports-head@FreeBSD.ORG  Sun Mar 17 20:39:10 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id E6033736;
 Sun, 17 Mar 2013 20:39:10 +0000 (UTC)
 (envelope-from johans@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D78A71AF;
 Sun, 17 Mar 2013 20:39:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2HKdAaG043281;
 Sun, 17 Mar 2013 20:39:10 GMT (envelope-from johans@svn.freebsd.org)
Received: (from johans@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2HKdA88043280;
 Sun, 17 Mar 2013 20:39:10 GMT (envelope-from johans@svn.freebsd.org)
Message-Id: <201303172039.r2HKdA88043280@svn.freebsd.org>
From: Johan van Selst <johans@FreeBSD.org>
Date: Sun, 17 Mar 2013 20:39:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314490 - head/news/trn4
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 Mar 2013 20:39:11 -0000

Author: johans
Date: Sun Mar 17 20:39:10 2013
New Revision: 314490
URL: http://svnweb.freebsd.org/changeset/ports/314490

Log:
  Remove bogus conflict with INN
  
  Submitted by:	naddy

Modified:
  head/news/trn4/Makefile

Modified: head/news/trn4/Makefile
==============================================================================
--- head/news/trn4/Makefile	Sun Mar 17 20:28:22 2013	(r314489)
+++ head/news/trn4/Makefile	Sun Mar 17 20:39:10 2013	(r314490)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	trn
-# Date created:		21 October 1994
-# Whom:			smace
-#
+# Created by: smace
 # $FreeBSD$
-#
 
 PORTNAME=	trn
 PORTVERSION=	4.0.b77
@@ -14,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Version 4.0 of the threaded readnews newsreader
 
-CONFLICTS_INSTALL=trn-3.[0-9]* inn-[0-9]* cnews-* s-news-[0-9]*
+CONFLICTS_INSTALL=trn-3.[0-9]* cnews-* s-news-[0-9]*
 
 NO_LATEST_LINK=	yes
 MAN1=		trn.1 Pnews.1 Rnmail.1