diff -urN /usr/ports/textproc/ansifilter/Makefile textproc/ansifilter/Makefile --- /usr/ports/textproc/ansifilter/Makefile 2014-02-11 02:38:51.000000000 +0900 +++ textproc/ansifilter/Makefile 2014-02-26 00:00:00.000000000 +0900 @@ -2,7 +2,7 @@ # $FreeBSD: head/textproc/ansifilter/Makefile 343630 2014-02-10 13:27:09Z bapt $ PORTNAME= ansifilter -PORTVERSION= 1.4 +PORTVERSION= 1.7 CATEGORIES= textproc MASTER_SITES= http://www.andre-simon.de/zip/ @@ -11,27 +11,55 @@ LICENSE= GPLv3 -DEPRECATED= No more public distfiles -EXPIRATION_DATE= 2014-03-10 +WRKSRC= ${WRKDIR}/${PORTNAME} USE_BZIP2= yes +USES= gmake MAKEFILE= makefile -MAKE_ARGS= CC="${CXX}" \ - CFLAGS="${CXXFLAGS} ${CPPFLAGS} -c" \ - LDFLAGS="${LDFLAGS}" +PORTDOCS= ChangeLog README PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz -PORTDOCS= ChangeLog README +OPTIONS_DEFINE= DOCS QT4 + +QT4_USES= qmake:norecursive +QT4_USE= QT4=gui,moc_build +QT4_ALL_TARGET= all all-gui +QT4_PLIST_FILES= bin/${PORTNAME}-gui + +.include + +.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: @${REINPLACE_CMD} -e \ - 's|^PREFIX =|PREFIX ?=|' ${WRKSRC}/${MAKEFILE} + '/QMAKE/s|^|#|' ${WRKSRC}/${MAKEFILE} + @${REINPLACE_CMD} -e \ + 's|^CC=|CC?=| ; \ + s|^CFLAGS=|CXXFLAGS+=| ; \ + s|-O2|| ; \ + s|$$(CC)|$$(CXX)| ; \ + s|$$(CFLAGS)|$$(CXXFLAGS)|' ${WRKSRC}/src/${MAKEFILE} + +pre-build: + @${RM} -f ${WRKSRC}/src/qt-gui/moc_*.cpp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1.gz ${STAGEDIR}${MANPREFIX}/man/man1 +.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) @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_MAN} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \ + ${STAGEDIR}${DOCSDIR}) .include diff -urN /usr/ports/textproc/ansifilter/distinfo textproc/ansifilter/distinfo --- /usr/ports/textproc/ansifilter/distinfo 2014-01-23 04:28:25.000000000 +0900 +++ textproc/ansifilter/distinfo 2014-02-26 00:00:00.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (ansifilter-1.4.tar.bz2) = b63d9c471853ff10e229cfced9cb4c3c6ab12fc56e0e491e33e0aaf12490a52e -SIZE (ansifilter-1.4.tar.bz2) = 46383 +SHA256 (ansifilter-1.7.tar.bz2) = a7e8ecec282bf2d823f89c1ae5cd7ca9da4e49f3dad98df052ea48ffd9a4975c +SIZE (ansifilter-1.7.tar.bz2) = 133803