From owner-svn-ports-all@FreeBSD.ORG  Sun Jun 30 21:42:52 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 6D424447;
 Sun, 30 Jun 2013 21:42:52 +0000 (UTC)
 (envelope-from ashish@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 5FB9C1D11;
 Sun, 30 Jun 2013 21:42:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5ULgqZP044359;
 Sun, 30 Jun 2013 21:42:52 GMT (envelope-from ashish@svn.freebsd.org)
Received: (from ashish@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5ULgqKS044358;
 Sun, 30 Jun 2013 21:42:52 GMT (envelope-from ashish@svn.freebsd.org)
Message-Id: <201306302142.r5ULgqKS044358@svn.freebsd.org>
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Sun, 30 Jun 2013 21:42:52 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322107 - head/mail/opensmtpd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Jun 2013 21:42:52 -0000

Author: ashish
Date: Sun Jun 30 21:42:51 2013
New Revision: 322107
URL: http://svnweb.freebsd.org/changeset/ports/322107

Log:
  - Add opensmtpd-devel package to CONFLICTS_INSTALL
  - Update LICENSE information to point to the actual LICENSE file[1]
  
  Submitted by:	Alexander Milanov <a at amilanov.com>[1] (private mail)

Modified:
  head/mail/opensmtpd/Makefile

Modified: head/mail/opensmtpd/Makefile
==============================================================================
--- head/mail/opensmtpd/Makefile	Sun Jun 30 21:30:52 2013	(r322106)
+++ head/mail/opensmtpd/Makefile	Sun Jun 30 21:42:51 2013	(r322107)
@@ -12,9 +12,10 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}p1
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	OpenSMTPD is a free MTA
 
-LIB_DEPENDS=	event-1:${PORTSDIR}/devel/libevent
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LICENSE_NAME=	ISCL
+LIB_DEPENDS=	event-1:${PORTSDIR}/devel/libevent
 
 OPTIONS_DEFINE=	PAM
 
@@ -27,7 +28,7 @@ CONFIGURE_ARGS=	--with-libevent-dir=${LO
 USE_RC_SUBR=	smtpd
 SUB_FILES=	pkg-install pkg-deinstall pkg-message
 
-CONFLICTS_INSTALL=	postfix-[0-9]* sendmail-[0-9]*
+CONFLICTS_INSTALL=	postfix-[0-9]* sendmail-[0-9]* opensmtpd-devel-[0-9]*
 
 MAN8=		makemap.8 newaliases.8 smtpctl.8 smtpd.8
 MAN5=		smtpd.conf.5 aliases.5 forward.5