From owner-svn-ports-head@freebsd.org  Tue May 10 21:30:43 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 456C6B3542D;
 Tue, 10 May 2016 21:30:43 +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 F3BE416E8;
 Tue, 10 May 2016 21:30:42 +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 u4ALUgbS078820;
 Tue, 10 May 2016 21:30:42 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4ALUgrj078819;
 Tue, 10 May 2016 21:30:42 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201605102130.u4ALUgrj078819@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: Tue, 10 May 2016 21:30:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r414965 - head/textproc/ansifilter
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.22
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: Tue, 10 May 2016 21:30:43 -0000

Author: amdmi3
Date: Tue May 10 21:30:42 2016
New Revision: 414965
URL: https://svnweb.freebsd.org/changeset/ports/414965

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Switch to options helpers

Modified:
  head/textproc/ansifilter/Makefile

Modified: head/textproc/ansifilter/Makefile
==============================================================================
--- head/textproc/ansifilter/Makefile	Tue May 10 21:29:04 2016	(r414964)
+++ head/textproc/ansifilter/Makefile	Tue May 10 21:30:42 2016	(r414965)
@@ -9,7 +9,8 @@ MASTER_SITES=	http://www.andre-simon.de/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Customizable ANSI Code Converter
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -25,14 +26,14 @@ QT4_USES=		qmake:norecursive
 QT4_USE=		QT4=gui,moc_build
 QT4_ALL_TARGET=		all all-gui
 QT4_PLIST_FILES=	bin/${PORTNAME}-gui
+QT4_DESKTOP_ENTRIES=	"ANSIFilter" "" "" "${PORTNAME}-gui" \
+			"TextTools;Utility;Qt;" ""
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MQT4}
 CONFIGURE_WRKSRC=	${WRKSRC}/src/qt-gui
 QMAKE_SOURCE_PATH=	${CONFIGURE_WRKSRC}/${PORTNAME}-gui.pro
-DESKTOP_ENTRIES=	"ANSIFilter" "" "" "${PORTNAME}-gui" \
-			"TextTools;Utility;Qt;" ""
 .endif
 
 post-patch:
@@ -49,16 +50,18 @@ pre-build:
 	@${RM} -f ${WRKSRC}/src/qt-gui/moc_*.cpp
 
 do-install:
-.if ${PORT_OPTIONS:MQT4}
-	(cd ${WRKSRC}/src/qt-gui && ${INSTALL_PROGRAM} ${PORTNAME}-gui \
-		${STAGEDIR}${PREFIX}/bin)
-.endif
-	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} ${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin)
-	(cd ${WRKSRC}/man && ${INSTALL_MAN} ${PORTNAME}.1.gz \
-		${STAGEDIR}${MANPREFIX}/man/man1)
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1.gz \
+		${STAGEDIR}${MANPREFIX}/man/man1
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \
 		${STAGEDIR}${DOCSDIR})
 
+do-install-QT4-on:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/qt-gui/${PORTNAME}-gui \
+		${STAGEDIR}${PREFIX}/bin
+
 .include <bsd.port.mk>