From owner-svn-ports-all@FreeBSD.ORG  Fri Dec 14 02:32:58 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id A659614C;
 Fri, 14 Dec 2012 02:32:58 +0000 (UTC)
 (envelope-from araujo@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 70D718FC0A;
 Fri, 14 Dec 2012 02:32:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBE2WwvG065128;
 Fri, 14 Dec 2012 02:32:58 GMT (envelope-from araujo@svn.freebsd.org)
Received: (from araujo@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBE2Ww4I065127;
 Fri, 14 Dec 2012 02:32:58 GMT (envelope-from araujo@svn.freebsd.org)
Message-Id: <201212140232.qBE2Ww4I065127@svn.freebsd.org>
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Fri, 14 Dec 2012 02:32:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308876 - head/ftp/ncftp2
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: Fri, 14 Dec 2012 02:32:58 -0000

Author: araujo
Date: Fri Dec 14 02:32:57 2012
New Revision: 308876
URL: http://svnweb.freebsd.org/changeset/ports/308876

Log:
  - Support USE_READLINE.
  - Trim header.
  - Convert to new option framework.
  
  PR:		ports/171999
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Modified:
  head/ftp/ncftp2/Makefile   (contents, props changed)

Modified: head/ftp/ncftp2/Makefile
==============================================================================
--- head/ftp/ncftp2/Makefile	Fri Dec 14 02:31:55 2012	(r308875)
+++ head/ftp/ncftp2/Makefile	Fri Dec 14 02:32:57 2012	(r308876)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    ncftp2
-# Date created:         4 Nov 1994
-# Whom:                 ache
-#
+# Created by: ache
 # $FreeBSD$
-#
 
 PORTNAME=	ncftp
 PORTVERSION=	2.4.3
@@ -14,23 +10,45 @@ MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FTP replacement with advanced user interface
 
+LICENSE=	GPLv2
+
+OPTIONS_DEFINE=	READLINE
+OPTIONS_DEFAULT=READLINE
+READLINE_DESC=	Enable readline support
+
+USE_NCURSES=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	ac_cv_func_getmaxyx=yes
+MAKE_JOBS_SAFE=	yes
+
+MAN1=		ncftp2.1
+PLIST_FILES=	bin/${LATEST_LINK}
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MREADLINE}
+USE_READLINE=	yes
+.else
+CONFIGURE_ARGS+=--disable-readline
+.endif
+
 .if defined(INSTALL_AS_NCFTP)
 LATEST_LINK=	ncftp
 .else
 LATEST_LINK=	ncftp2
 .endif
-PLIST_FILES=	bin/${LATEST_LINK}
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	ac_cv_func_getmaxyx=yes ac_cv_lib_readline=yes
-MAN1=		ncftp2.1
 
-pre-fetch:
-	@${ECHO} ""
-	@${ECHO} "Use INSTALL_AS_NCFTP=yes to install ncftp1 as ${PREFIX}/bin/ncftp"
-	@${ECHO} ""
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Use INSTALL_AS_NCFTP=yes to install ncftp2 as ${PREFIX}/bin/ncftp"
+	@${ECHO_MSG} ""
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^exdirs=.*|exdirs=""|' ${WRKSRC}/configure
 
 do-install:
-	$(INSTALL_PROGRAM) $(WRKSRC)/ncftp $(PREFIX)/bin/${LATEST_LINK}
-	$(INSTALL_MAN) $(WRKSRC)/ncftp.1 $(PREFIX)/man/man1/ncftp2.1
+	${INSTALL_PROGRAM} ${WRKSRC}/ncftp ${PREFIX}/bin/${LATEST_LINK}
+	${INSTALL_MAN} ${WRKSRC}/ncftp.1 ${MANPREFIX}/man/man1/ncftp2.1
 
 .include <bsd.port.mk>