Date: Fri, 22 Nov 2013 12:55:18 +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: r334588 - in head: astro/merkaartor editors/tea editors/texmakerx Message-ID: <201311221255.rAMCtIYv085028@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Fri Nov 22 12:55:18 2013 New Revision: 334588 URL: http://svnweb.freebsd.org/changeset/ports/334588 Log: - Convert to USES=qmake - Use options helpers - Convert LIB_DEPENDS to new style Approved by: portmgr (blanket approval) Modified: head/astro/merkaartor/Makefile head/editors/tea/Makefile head/editors/texmakerx/Makefile Modified: head/astro/merkaartor/Makefile ============================================================================== --- head/astro/merkaartor/Makefile Fri Nov 22 12:55:11 2013 (r334587) +++ head/astro/merkaartor/Makefile Fri Nov 22 12:55:18 2013 (r334588) @@ -9,46 +9,33 @@ MASTER_SITES= http://merkaartor.be/attac https://secure.ohos.nl/downloads/ MAINTAINER= dev2@heesakkers.info -COMMENT= An openstreetmap mapping program +COMMENT= Openstreetmap mapping program LICENSE= GPLv2 -LIB_DEPENDS= gdal:${PORTSDIR}/graphics/gdal \ - proj:${PORTSDIR}/graphics/proj +LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal \ + libproj.so:${PORTSDIR}/graphics/proj -NO_STAGE= yes USE_BZIP2= yes USE_LDCONFIG= yes -USE_QT4= qmake_build uic_build moc_build rcc_build \ +USE_QT4= uic_build moc_build rcc_build \ gui network svg webkit xml imageformats script scripttools -.if exists(${LOCALBASE}/bin/gnome-session) -INSTALLS_ICONS= yes -.endif - -QMAKEFLAGS= PREFIX=${PREFIX} - -OPTIONS_DEFINE= GEOIMAGE ZBAR DEBUG -GEOIMAGE_DESC= Enable geotagged images (needs exiv2) -ZBAR_DESC= Read barcodes from walking papers +OPTIONS_DEFINE= GEOIMAGE ZBAR DEBUG NLS OPTIONS_DEFAULT= GEOIMAGE -.include <bsd.port.options.mk> +GEOIMAGE_DESC= Enable geotagged images (needs exiv2) +GEOIMAGE_QMAKE_ON= GEOIMAGE=1 +GEOIMAGE_LIB_DEPENDS= libexiv2.so:${PORTSDIR}/graphics/exiv2 -.if ${PORT_OPTIONS:MGEOIMAGE} -QMAKEFLAGS+= GEOIMAGE=1 -LIB_DEPENDS+= exiv2:${PORTSDIR}/graphics/exiv2 -.endif +ZBAR_DESC= Read barcodes from walking papers +ZBAR_QMAKE_ON= ZBAR=1 +ZBAR_LIB_DEPENDS= libzbar.so:${PORTSDIR}/graphics/zbar -.if ${PORT_OPTIONS:MZBAR} -QMAKEFLAGS+= ZBAR=1 -LIB_DEPENDS+= zbar:${PORTSDIR}/graphics/zbar -.endif +DEBUG_QMAKE_OFF= NODEBUG=1 RELEASE=1 -.if empty(PORT_OPTIONS:MDEBUG) -QMAKEFLAGS+= NODEBUG=1 RELEASE=1 -.endif +.include <bsd.port.options.mk> .if empty(PORT_OPTIONS:MNLS) PLIST_SUB+= NLS="@comment " @@ -57,11 +44,7 @@ PLIST_SUB+= NLS="" USE_QT4+= linguist_build pre-build: - @cd ${WRKSRC}/translations && lrelease-qt4 ../src/src.pro + @cd ${WRKSRC}/translations && ${LRELEASE} ../src/src.pro .endif -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} - .include <bsd.port.mk> Modified: head/editors/tea/Makefile ============================================================================== --- head/editors/tea/Makefile Fri Nov 22 12:55:11 2013 (r334587) +++ head/editors/tea/Makefile Fri Nov 22 12:55:18 2013 (r334588) @@ -16,8 +16,9 @@ OPTIONS_RADIO= SPELL OPTIONS_RADIO_SPELL= ASPELL HUNSPELL OPTIONS_DEFAULT= ASPELL +USES= qmake USE_BZIP2= yes -USE_QT4= gui moc_build qmake_build rcc_build +USE_QT4= gui moc_build rcc_build PLIST_FILES= bin/tea share/pixmaps/tea_icon_v2.png PORTDOCS= * @@ -25,21 +26,13 @@ PORTDOCS= * DESKTOP_ENTRIES="TEA" "" "${PREFIX}/share/pixmaps/tea_icon_v2.png" \ "${PORTNAME}" "" "" -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell -QMAKEFLAGS+= USE_ASPELL=true -.else -QMAKEFLAGS+= USE_ASPELL=false -.endif - -.if ${PORT_OPTIONS:MHUNSPELL} -LIB_DEPENDS+= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell -QMAKEFLAGS+= USE_HUNSPELL=true -.else -QMAKEFLAGS+= USE_HUNSPELL=false -.endif +ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell +ASPELL_QMAKE_ON= USE_ASPELL=true +ASPELL_QMAKE_OFF= USE_ASPELL=false + +HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell +HUNSPELL_QMAKE_ON= USE_HUNSPELL=true +HUNSPELL_QMAKE_OFF= USE_HUNSPELL=false post-patch: @${REINPLACE_CMD} -e \ @@ -47,14 +40,9 @@ post-patch: @${REINPLACE_CMD} -e \ 's|/usr/include|${LOCALBASE}/include|' ${WRKSRC}/src.pro -do-configure: - @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} - do-install: - (cd ${WRKSRC}/bin \ - && ${INSTALL_PROGRAM} tea ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKSRC}/icons \ - && ${INSTALL_DATA} tea_icon_v2.png ${STAGEDIR}${PREFIX}/share/pixmaps) + ${INSTALL_PROGRAM} ${WRKSRC}/bin/tea ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/icons/tea_icon_v2.png ${STAGEDIR}${PREFIX}/share/pixmaps (cd ${WRKSRC}/manuals \ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) Modified: head/editors/texmakerx/Makefile ============================================================================== --- head/editors/texmakerx/Makefile Fri Nov 22 12:55:11 2013 (r334587) +++ head/editors/texmakerx/Makefile Fri Nov 22 12:55:18 2013 (r334588) @@ -9,37 +9,26 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION:S:.0::} MAINTAINER= lx@FreeBSD.org -COMMENT= A LaTeX IDE derived from Texmaker +COMMENT= LaTeX IDE derived from Texmaker -LIB_DEPENDS= poppler:${PORTSDIR}/graphics/poppler \ - poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 -RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme +LIB_DEPENDS= libpoppler.so:${PORTSDIR}/graphics/poppler \ + libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} -USE_GHOSTSCRIPT=yes -USE_QT4= gui network xml moc_build qmake_build rcc_build \ +USES= dos2unix qmake +USE_GHOSTSCRIPT_RUN= yes +USE_QT4= gui network xml moc_build rcc_build \ uic_build qtestlib script USE_TEX= latex dvipsk -USE_DOS2UNIX= yes -HAS_CONFIGURE= yes INSTALLS_ICONS= yes MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= XDVI GV GV_DESC= View ps files with gv +GV_RUN_DEPENDS= xdvi:${PORTSDIR}/print/xdvik XDVI_DESC= View dvi files with xdvi - -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MXDVI} -RUN_DEPENDS+= xdvi:${PORTSDIR}/print/xdvik -.endif - -.if ${PORT_OPTIONS:MGV} -RUN_DEPENDS+= gv:${PORTSDIR}/print/gv -.endif +XDVI_RUN_DEPENDS= gv:${PORTSDIR}/print/gv post-patch: @${REINPLACE_CMD} -e 's,^\(utilities.path =\).*,\1 ${DATADIR},' \ @@ -47,8 +36,4 @@ post-patch: -e 's,/usr/lib,${LOCALBASE}/lib,g' \ ${WRKSRC}/${PORTNAME}.pro -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} PREFIX=${PREFIX} ${PORTNAME}.pro - .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311221255.rAMCtIYv085028>