From owner-svn-ports-head@freebsd.org  Sun Jan 31 18:03:04 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id ECEFDA6F687;
 Sun, 31 Jan 2016 18:03:04 +0000 (UTC)
 (envelope-from amdmi3@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 mx1.freebsd.org (Postfix) with ESMTPS id A500815BF;
 Sun, 31 Jan 2016 18:03:04 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0VI33nO045760;
 Sun, 31 Jan 2016 18:03:03 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0VI33i3045759;
 Sun, 31 Jan 2016 18:03:03 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201601311803.u0VI33i3045759@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Sun, 31 Jan 2016 18:03:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r407658 - head/ftp/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.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 31 Jan 2016 18:03:05 -0000

Author: amdmi3
Date: Sun Jan 31 18:03:03 2016
New Revision: 407658
URL: https://svnweb.freebsd.org/changeset/ports/407658

Log:
  - Add LICENSE
  - Switch to options helpers

Modified:
  head/ftp/ncftp3/Makefile

Modified: head/ftp/ncftp3/Makefile
==============================================================================
--- head/ftp/ncftp3/Makefile	Sun Jan 31 18:02:59 2016	(r407657)
+++ head/ftp/ncftp3/Makefile	Sun Jan 31 18:03:03 2016	(r407658)
@@ -12,49 +12,47 @@ DISTNAME=	ncftp-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FTP client with advanced user interface
 
+LICENSE=	ARTPERL10
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE.txt
 
-USES=	tar:bzip2
+USES=		tar:bzip2
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
-OPTIONS_DEFINE=	LIBS DOCS
-OPTIONS_DEFAULT=LIBS
-LIBS_DESC=		Install optional libraries
-OPTIONS_SUB=	yes
-
 PORTDOCS=	*
 
 LIBNCFTP=	libncftp.so.3
 LIBSIO=		libsio.so.5
 LIBSTRN=	libStrn.so.1
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	LIBS DOCS
+OPTIONS_DEFAULT=LIBS
+LIBS_DESC=	Install optional libraries
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MLIBS}
-pre-build:
+pre-build-LIBS-on:
 .for dir in Strn libncftp sio
 	${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -C ${WRKSRC}/${dir} so
 .endfor
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${STAGEDIR}${PREFIX}/bin
 	${LN} -sf ncftpbatch ${STAGEDIR}${PREFIX}/bin/ncftpspooler
 	${INSTALL_MAN} ${WRKSRC}/doc/man/* ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/Strn/Strn.3 ${STAGEDIR}${MANPREFIX}/man/man3
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	-${RM} -r ${STAGEDIR}${DOCSDIR}/man
 
-.if ${PORT_OPTIONS:MLIBS}
+do-install-LIBS-on:
 	${INSTALL_LIB} ${WRKSRC}/Strn/${LIBSTRN} ${STAGEDIR}${PREFIX}/lib
 .for lib in libncftp/${LIBNCFTP} sio/${LIBSIO} Strn/${LIBSTRN}
 	${INSTALL_LIB} ${WRKSRC}/${lib} ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf ${lib:T} ${STAGEDIR}${PREFIX}/lib/${lib:T:R}
 .endfor
-.endif
 
 .include <bsd.port.mk>