svn commit: r338614 - in head/ftp: ncftp1 ncftp3

[Baptiste Daroussin]

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 at 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