From owner-svn-ports-all@FreeBSD.ORG Thu Feb 27 09:22:15 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48462FFA; Thu, 27 Feb 2014 09:22:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 28BF3109B; Thu, 27 Feb 2014 09:22:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1R9MFCF054345; Thu, 27 Feb 2014 09:22:15 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1R9ME9U054341; Thu, 27 Feb 2014 09:22:14 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201402270922.s1R9ME9U054341@svn.freebsd.org> From: Martin Wilke Date: Thu, 27 Feb 2014 09:22:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346297 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Feb 2014 09:22:15 -0000 Author: miwi Date: Thu Feb 27 09:22:14 2014 New Revision: 346297 URL: http://svnweb.freebsd.org/changeset/ports/346297 QAT: https://qat.redports.org/buildarchive/r346297/ Log: - Update to 1.7 PR: 187058 Modified: head/textproc/ansifilter/Makefile head/textproc/ansifilter/distinfo Modified: head/textproc/ansifilter/Makefile ============================================================================== --- head/textproc/ansifilter/Makefile Thu Feb 27 09:21:38 2014 (r346296) +++ head/textproc/ansifilter/Makefile Thu Feb 27 09:22:14 2014 (r346297) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ansifilter -PORTVERSION= 1.4 +PORTVERSION= 1.7 CATEGORIES= textproc MASTER_SITES= http://www.andre-simon.de/zip/ @@ -11,27 +11,55 @@ COMMENT= Customizable ANSI Code Converte 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 Modified: head/textproc/ansifilter/distinfo ============================================================================== --- head/textproc/ansifilter/distinfo Thu Feb 27 09:21:38 2014 (r346296) +++ head/textproc/ansifilter/distinfo Thu Feb 27 09:22:14 2014 (r346297) @@ -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