From owner-svn-ports-all@freebsd.org  Mon Feb  1 10:13:36 2016
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9A58DA97B36;
 Mon,  1 Feb 2016 10:13:36 +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 6D1F41448;
 Mon,  1 Feb 2016 10:13:36 +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 u11ADZZJ031691;
 Mon, 1 Feb 2016 10:13:35 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u11ADZ8D031690;
 Mon, 1 Feb 2016 10:13:35 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201602011013.u11ADZ8D031690@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: Mon, 1 Feb 2016 10:13:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r407698 - head/ftp/twoftpd
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.20
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: Mon, 01 Feb 2016 10:13:36 -0000

Author: amdmi3
Date: Mon Feb  1 10:13:35 2016
New Revision: 407698
URL: https://svnweb.freebsd.org/changeset/ports/407698

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Switch to USES=localbase
  - Switch to options helpers

Modified:
  head/ftp/twoftpd/Makefile

Modified: head/ftp/twoftpd/Makefile
==============================================================================
--- head/ftp/twoftpd/Makefile	Mon Feb  1 10:13:29 2016	(r407697)
+++ head/ftp/twoftpd/Makefile	Mon Feb  1 10:13:35 2016	(r407698)
@@ -10,15 +10,13 @@ MASTER_SITES=	http://untroubled.org/${PO
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple, secure, efficient FTP server
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/bg-installer:${PORTSDIR}/devel/bglibs
 LIB_DEPENDS=	libcvm-v2client.so:${PORTSDIR}/security/cvm
 
-OPTIONS_DEFINE=	DOCS
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USES=		localbase
 
 BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
 BGLIBS_INCLUDE=	${LOCALBASE}/include/bglibs
@@ -31,6 +29,8 @@ PLIST_FILES=	bin/twoftpd-anon bin/twoftp
 		man/man1/twoftpd-auth.1.gz man/man1/twoftpd-switch.1.gz \
 		man/man1/twoftpd-xfer.1.gz
 
+OPTIONS_DEFINE=	DOCS
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,timezone,tm.tm_gmtoff,' ${WRKSRC}/statmod.c
 
@@ -50,6 +50,8 @@ do-install:
 .for f in twoftpd-auth.1 twoftpd-switch.1 twoftpd-xfer.1
 	${INSTALL_MAN} ${WRKSRC}/${f} ${STAGEDIR}${MAN1PREFIX}/man/man1/
 .endfor
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in NEWS README TODO
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})