- Clarify LICENSE

- Add LICENSE_FILE
- Switch to options helpers

1 files changed, 14 insertions, 11 deletions

diff --git a/textproc/ansifilter/Makefile b/textproc/ansifilter/Makefile
index c4bbb269ff48..68a494037606 100644
--- a/textproc/ansifilter/Makefile
+++ b/textproc/ansifilter/Makefile
@@ -9,7 +9,8 @@ MASTER_SITES=	http://www.andre-simon.de/zip/
 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>