From owner-svn-ports-all@freebsd.org  Tue Jul 10 12:51:48 2018
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C7161049037;
 Tue, 10 Jul 2018 12:51:48 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0A7B274D39;
 Tue, 10 Jul 2018 12:51:48 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF91D24354;
 Tue, 10 Jul 2018 12:51:47 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6ACplLo051315;
 Tue, 10 Jul 2018 12:51:47 GMT (envelope-from cy@FreeBSD.org)
Received: (from cy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6ACplmv051314;
 Tue, 10 Jul 2018 12:51:47 GMT (envelope-from cy@FreeBSD.org)
Message-Id: <201807101251.w6ACplmv051314@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org
 using -f
From: Cy Schubert <cy@FreeBSD.org>
Date: Tue, 10 Jul 2018 12:51:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r474359 - branches/2018Q3/devel/e2fsprogs-libss
X-SVN-Group: ports-branches
X-SVN-Commit-Author: cy
X-SVN-Commit-Paths: branches/2018Q3/devel/e2fsprogs-libss
X-SVN-Commit-Revision: 474359
X-SVN-Commit-Repository: ports
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.27
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jul 2018 12:51:48 -0000

Author: cy
Date: Tue Jul 10 12:51:47 2018
New Revision: 474359
URL: https://svnweb.freebsd.org/changeset/ports/474359

Log:
  MFH: r474328
  
  devel/e2fsprogs-libss has not conflicted with security/heimdal
  since 1.4. Remove the conflict registration.
  
  PR:		229464
  Submitted by:	cy
  Reported by:	cy
  Approved by:	bjk (maintainer)
  Approved by:	portmgr (miwi)

Modified:
  branches/2018Q3/devel/e2fsprogs-libss/Makefile
Directory Properties:
  branches/2018Q3/   (props changed)

Modified: branches/2018Q3/devel/e2fsprogs-libss/Makefile
==============================================================================
--- branches/2018Q3/devel/e2fsprogs-libss/Makefile	Tue Jul 10 12:46:35 2018	(r474358)
+++ branches/2018Q3/devel/e2fsprogs-libss/Makefile	Tue Jul 10 12:51:47 2018	(r474359)
@@ -1,7 +1,7 @@
 # Created by: Ben Kaduk <kaduk@mit.edu>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-libss
 
@@ -10,9 +10,6 @@ COMMENT=	Command-line interface parsing library from e
 
 LICENSE=	MIT
 LICENSE_FILE=	${INSTALL_WRKSRC}/ss.h
-
-CONFLICTS=	heimdal-[0-9]*
-CONFLICTS+=	krb4-[0-9]*
 
 OPTIONS_EXCLUDE=	DOCS EXAMPLES IPV6 NLS
 CONFIGURE_ARGS=	--enable-elf-shlibs