From ea7a093fc176b85a077f8f4afc243554d55fbd59 Mon Sep 17 00:00:00 2001
From: amdmi3 <amdmi3@FreeBSD.org>
Date: Mon, 1 Feb 2016 10:13:35 +0000
Subject: - Clarify LICENSE - Add LICENSE_FILE - Switch to USES=localbase -
 Switch to options helpers

---
 ftp/twoftpd/Makefile | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'ftp/twoftpd')

diff --git a/ftp/twoftpd/Makefile b/ftp/twoftpd/Makefile
index be0fe1faf6af..0db32c4b11be 100644
--- a/ftp/twoftpd/Makefile
+++ b/ftp/twoftpd/Makefile
@@ -10,15 +10,13 @@ MASTER_SITES=	http://untroubled.org/${PORTNAME}/archive/
 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/twoftpd-anon-conf \
 		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})
-- 
cgit