From owner-svn-ports-head@FreeBSD.ORG  Sat Jan  4 00:56:15 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 125E580F;
 Sat,  4 Jan 2014 00:56:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F33E811A4;
 Sat,  4 Jan 2014 00:56:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s040uE23035610;
 Sat, 4 Jan 2014 00:56:14 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s040uEjo035608;
 Sat, 4 Jan 2014 00:56:14 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401040056.s040uEjo035608@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 4 Jan 2014 00:56:14 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338614 - in head/ftp: ncftp1 ncftp3
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.17
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: Sat, 04 Jan 2014 00:56:15 -0000

Author: bapt
Date: Sat Jan  4 00:56:14 2014
New Revision: 338614
URL: http://svnweb.freebsd.org/changeset/ports/338614

Log:
  Fix pkg name collision

Modified:
  head/ftp/ncftp1/Makefile
  head/ftp/ncftp3/Makefile

Modified: head/ftp/ncftp1/Makefile
==============================================================================
--- head/ftp/ncftp1/Makefile	Sat Jan  4 00:54:13 2014	(r338613)
+++ head/ftp/ncftp1/Makefile	Sat Jan  4 00:56:14 2014	(r338614)
@@ -6,15 +6,11 @@ PORTVERSION=	1.9.5
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/
 DISTNAME=	ncftp-${PORTVERSION}
+PKGNAMESUFFIX=	1
 
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	FTP replacement with advanced user interface
 
-.if defined(INSTALL_AS_NCFTP)
-LATEST_LINK=	ncftp
-.else
-LATEST_LINK=	ncftp1
-.endif
 PLIST_FILES=	bin/${LATEST_LINK}
 MAN1=		ncftp.1
 

Modified: head/ftp/ncftp3/Makefile
==============================================================================
--- head/ftp/ncftp3/Makefile	Sat Jan  4 00:54:13 2014	(r338613)
+++ head/ftp/ncftp3/Makefile	Sat Jan  4 00:56:14 2014	(r338614)
@@ -23,11 +23,6 @@ USE_BZIP2=	yes
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if defined(INSTALL_AS_NCFTP3)
-LATEST_LINK=	ncftp3
-.else
-LATEST_LINK=	ncftp
-.endif
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes