Date: Tue, 26 Nov 2013 01:46:40 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334912 - in head/www: arora cutycapt Message-ID: <201311260146.rAQ1keQL036542@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Tue Nov 26 01:46:40 2013 New Revision: 334912 URL: http://svnweb.freebsd.org/changeset/ports/334912 Log: - Convert to USES=qmake - Add stage support - Adjust USE_QT4 components Approved by: portmgr (blanket approval) Modified: head/www/arora/Makefile head/www/arora/pkg-plist (contents, props changed) head/www/cutycapt/Makefile Modified: head/www/arora/Makefile ============================================================================== --- head/www/arora/Makefile Tue Nov 26 01:45:40 2013 (r334911) +++ head/www/arora/Makefile Tue Nov 26 01:46:40 2013 (r334912) @@ -8,32 +8,23 @@ CATEGORIES= www MASTER_SITES= GOOGLE_CODE MAINTAINER= shanjobe@gmail.com -COMMENT= Simple Qt4 based browser +COMMENT= Simple Qt 4 based browser LICENSE= GPLv3 -USE_QT4= network webkit qmake_build moc_build uic_build rcc_build \ - imageformats gui script sql -HAS_CONFIGURE= yes -QMAKE_ARGS+= -unix -recursive PREFIX=${PREFIX} +USES= desktop-file-utils qmake +USE_QT4= network webkit moc_build uic_build rcc_build \ + imageformats_run gui script sql + +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes +NLS_USE= QT4=linguist_build -MAN1= arora.1 arora-cacheinfo.1 arora-placesimport.1 htmlToXBel.1 +BROKEN_ia64= core dump on application startup -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${ARCH} == ia64 -BROKEN= core dump on application startup -.endif - -.if ! ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS="@comment " -.else -USE_QT4+= linguist_build -PLIST_SUB+= NLS="" -.endif - -do-configure: +pre-configure: .if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e "/INSTALLS/s|translations||" \ ${WRKSRC}/src/src.pro @@ -49,12 +40,8 @@ do-configure: ${WRKSRC}/src/locale/locale.pri @${REINPLACE_CMD} "/pkg-config/d" \ ${WRKSRC}/src/src.pro - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS} post-configure: - @${REINPLACE_CMD} -e \ - 's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|; s|^LINK .*|LINK=${CXX}|' \ - ${WRKSRC}/src/Makefile @${REINPLACE_CMD} 's|raster||' ${WRKSRC}/src/main.cpp post-install: @@ -62,6 +49,6 @@ post-install: ${WRKSRC}/tools/cacheinfo/data/arora-cacheinfo.1 \ ${WRKSRC}/tools/htmlToXBel/data/htmlToXBel.1 \ ${WRKSRC}/tools/placesimport/data/arora-placesimport.1 \ - ${PREFIX}/man/man1 + ${STAGEDIR}${PREFIX}/man/man1 .include <bsd.port.mk> Modified: head/www/arora/pkg-plist ============================================================================== --- head/www/arora/pkg-plist Tue Nov 26 01:45:40 2013 (r334911) +++ head/www/arora/pkg-plist Tue Nov 26 01:46:40 2013 (r334912) @@ -2,6 +2,10 @@ bin/arora bin/arora-cacheinfo bin/arora-placesimport bin/htmlToXBel +man/man1/arora.1.gz +man/man1/arora-cacheinfo.1.gz +man/man1/arora-placesimport.1.gz +man/man1/htmlToXBel.1.gz share/applications/arora.desktop %%NLS%%share/arora/locale/ast.qm %%NLS%%share/arora/locale/ca.qm Modified: head/www/cutycapt/Makefile ============================================================================== --- head/www/cutycapt/Makefile Tue Nov 26 01:45:40 2013 (r334911) +++ head/www/cutycapt/Makefile Tue Nov 26 01:46:40 2013 (r334912) @@ -8,21 +8,18 @@ CATEGORIES= www MASTER_SITES= http://bsd.e-shell.net/local/ MAINTAINER= loox@e-shell.net -COMMENT= A command-line utility to capture WebKit's rendering of a web page +COMMENT= Command-line utility to capture WebKit's rendering of a web page LICENSE= GPLv2 WRKSRC= ${WRKDIR}/CutyCapt -USE_QT4= qmake_build moc_build imageformats webkit +USES= qmake +USE_QT4= moc_build imageformats_run webkit PLIST_FILES= bin/CutyCapt -NO_STAGE= yes -do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} - post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/CutyCapt ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/CutyCapt ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311260146.rAQ1keQL036542>