Date: Fri, 22 Nov 2013 12:55:00 +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: r334586 - in head: archivers/quazip audio/cuberok audio/cueplayer audio/lastfm-desktop audio/mehdiaplayer audio/midipp audio/minitunes audio/mumble audio/murmur audio/qmpdclient cad/lay... Message-ID: <201311221255.rAMCt0UE084675@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Fri Nov 22 12:55:00 2013 New Revision: 334586 URL: http://svnweb.freebsd.org/changeset/ports/334586 Log: - Convert to USES=qmake (and other USES while I'm here) - Add state support - Convert LIB_DEPENDS to new style, adjust USE_QT4 components, etc. Approved by: portmgr (blanket approval) Modified: head/archivers/quazip/Makefile head/audio/cuberok/Makefile head/audio/cueplayer/Makefile head/audio/lastfm-desktop/Makefile (contents, props changed) head/audio/mehdiaplayer/Makefile (contents, props changed) head/audio/midipp/Makefile head/audio/minitunes/Makefile (contents, props changed) head/audio/mumble/Makefile head/audio/murmur/Makefile head/audio/qmpdclient/Makefile head/cad/layouteditor/Makefile (contents, props changed) head/cad/leocad/Makefile head/cad/meshlab/Makefile head/cad/openscad/Makefile (contents, props changed) head/cad/qelectrotech/Makefile head/comms/gqrx/Makefile (contents, props changed) head/comms/qsstv/Makefile head/ftp/scythia/Makefile head/graphics/autoq3d/Makefile head/graphics/burplex/Makefile head/graphics/easypaint/Makefile head/graphics/evolvotron/Makefile head/graphics/opencsg/Makefile (contents, props changed) head/graphics/pencil/Makefile head/graphics/qiviewer/Makefile head/graphics/qxv/Makefile head/graphics/seam-carving-gui/Makefile (contents, props changed) head/misc/qbrew/Makefile (contents, props changed) head/misc/qmetro/Makefile head/misc/saaghar/Makefile head/multimedia/clipgrab/Makefile head/multimedia/mediadownloader/Makefile head/net-im/qxmpp-leechcraft/Makefile (contents, props changed) head/net-im/qxmpp/Makefile (contents, props changed) head/net-p2p/retroshare/Makefile head/net/ostinato/Makefile head/net/qoauth/Makefile (contents, props changed) head/net/wpa_gui/Makefile head/polish/qfaktury/Makefile (contents, props changed) head/polish/qnapi/Makefile head/science/qtresistors/Makefile (contents, props changed) head/x11-fm/qtfm/Makefile Modified: head/archivers/quazip/Makefile ============================================================================== --- head/archivers/quazip/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/archivers/quazip/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -12,14 +12,8 @@ COMMENT= Qt/C++ wrapper for ZIP/UNZIP pa LICENSE= LGPL21 -NO_STAGE= yes -QMAKE_ARGS= PREFIX=${PREFIX} ${QMAKE_PRO} -QMAKE_PRO= ${WRKSRC}/${PORTNAME}.pro - +USES= qmake USE_LDCONFIG= yes -USE_QT4= corelib moc_build qtestlib qmake_build - -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} +USE_QT4= corelib moc_build qtestlib .include <bsd.port.mk> Modified: head/audio/cuberok/Makefile ============================================================================== --- head/audio/cuberok/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/audio/cuberok/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -8,7 +8,7 @@ CATEGORIES= audio MASTER_SITES= GOOGLE_CODE MAINTAINER= vg@FreeBSD.org -COMMENT= A music player and a collection manager based on Qt4 +COMMENT= Music player and collection manager based on Qt4 BUILD_DEPENDS= audiere-config:${PORTSDIR}/audio/audiere \ ${LOCALBASE}/lib/libdumb.a:${PORTSDIR}/audio/dumb @@ -18,14 +18,15 @@ LIB_DEPENDS= libavcodec0.so:${PORTSDIR}/ libtag.so:${PORTSDIR}/audio/taglib USE_LDCONFIG= yes -USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \ +USE_QT4= gui xml uic_build moc_build rcc_build \ network phonon-gst sql -USES= gettext iconv pkgconfig -NO_STAGE= yes +USES= gettext iconv pkgconfig qmake USE_SDL= sdl -QMAKEFLAGS+= "CONFIG+=player_phonon" -MAKE_ENV+= INSTALL_ROOT=${PREFIX} -QMAKEPRO= Cuberok.pro +QMAKE_ARGS+= "CONFIG+=player_phonon" + +BROKEN_ia64= does not compile +BROKEN_powerpc= ${BROKEN_ia64} +BROKEN_sparc64= ${BROKEN_ia64} post-patch: @${REINPLACE_CMD} \ @@ -34,18 +35,11 @@ post-patch: -e 's,libavformat,libavformat0,g' \ ${WRKSRC}/Cuberok.pro \ ${WRKSRC}/plugins/player_ffmpeg/player_ffmpeg.pro + ${REINPLACE_CMD} -e 's/lib64/lib/g' \ + ${WRKSRC}/plugins/plugins_path-x86* +# Fix installation paths + ${REINPLACE_CMD} '/.path =/s,= \(.*\),= $$$$PREFIX/\1,' \ + ${WRKSRC}/plugins/*.pri \ + ${WRKSRC}/src/src.pro -do-configure: - cd ${WRKSRC} && ${REINPLACE_CMD} -e 's/lib64/lib/g' \ - plugins/plugins_path-x86* - - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on ia64, powerpc, or sparc64 -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/audio/cueplayer/Makefile ============================================================================== --- head/audio/cueplayer/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/audio/cueplayer/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -10,18 +10,17 @@ MASTER_SITES= GOOGLE_CODE MAINTAINER= vg@FreeBSD.org COMMENT= CUE player -LIB_DEPENDS= notify.4:${PORTSDIR}/devel/libnotify +LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify -USES= pkgconfig -NO_STAGE= yes -USE_QT4= gui xml qmake_build uic_build moc_build rcc_build network +USES= pkgconfig qmake +USE_QT4= gui xml uic_build moc_build rcc_build network USE_GSTREAMER= flac good dvd lame ugly ffmpeg taglib ogg vorbis soup libmms wavpack LICENSE= GPLv3 DESKTOP_ENTRIES="Cueplayer" "Lightweight media player based on Qt and Gstreamer" \ "${DATADIR}/${PORTNAME}.png" "${PORTNAME}" \ - "AudioVideo;Audio;Video;" ${FALSE} + "AudioVideo;Audio;Video;" true post-patch: cd ${WRKSRC} && ${REINPLACE_CMD} -e 's,/usr/share/cueplayer/,${DATADIR}/,g' \ @@ -29,10 +28,7 @@ post-patch: ${REINPLACE_CMD} -e 's,/usr/share,${PREFIX},g' \ ${WRKSRC}/${PORTNAME}.pro -do-configure: - cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} - post-install: - ${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${DATADIR} .include <bsd.port.mk> Modified: head/audio/lastfm-desktop/Makefile ============================================================================== --- head/audio/lastfm-desktop/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/audio/lastfm-desktop/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -18,26 +18,21 @@ LIB_DEPENDS= liblastfm.so:${PORTSDIR}/au libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libgpod.so:${PORTSDIR}/audio/libgpod -USES= pkgconfig -NO_STAGE= yes +USES= pkgconfig qmake USE_BZIP2= yes -USE_QT4= gui linguist_build moc_build network phonon qmake_build \ +USE_QT4= gui linguist_build moc_build network phonon \ rcc_build uic_build webkit xml -USE_LDCONFIG= yes LASTFM= ${PORTNAME}${PKGNAMESUFFIX} SUB_FILES= ${LASTFM}.sh WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} -do-configure: - cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} - do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/${LASTFM}.sh ${PREFIX}/bin/${LASTFM} - ${INSTALL_PROGRAM} ${WRKSRC}/_bin/Last.fm\ Scrobbler ${DATADIR}/ - ${INSTALL_LIB} ${WRKSRC}/_bin/lib*.so* ${DATADIR}/ + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/${LASTFM}.sh ${STAGEDIR}${PREFIX}/bin/${LASTFM} + ${INSTALL_PROGRAM} ${WRKSRC}/_bin/Last.fm\ Scrobbler ${STAGEDIR}${DATADIR} + ${INSTALL_LIB} ${WRKSRC}/_bin/lib*.so* ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/app/client/Last.fm\ Scrobbler.css \ - ${DATADIR}/ + ${STAGEDIR}${DATADIR} .include <bsd.port.mk> Modified: head/audio/mehdiaplayer/Makefile ============================================================================== --- head/audio/mehdiaplayer/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/audio/mehdiaplayer/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -8,23 +8,18 @@ CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MAINTAINER= vg@FreeBSD.org -COMMENT= A simple media player using Qt/Phonon +COMMENT= Simple media player using Qt/Phonon +USES= qmake USE_BZIP2= yes -NO_STAGE= yes -USE_QT4= gui xml qmake_build uic_build moc_build \ +USE_QT4= gui xml uic_build moc_build \ rcc_build phonon -QMAKE_PRO= ${PORTNAME}.pro - WRKSRC= ${WRKDIR}/dev PLIST_FILES= bin/${PORTNAME} -do-configure: - cd ${WRKSRC} && ${QMAKE} - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/audio/midipp/Makefile ============================================================================== --- head/audio/midipp/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/audio/midipp/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -15,15 +15,8 @@ LICENSE= BSD BUILD_DEPENDS= libumidi>=2.0.9:${PORTSDIR}/audio/libumidi LIB_DEPENDS= libumidi20.so:${PORTSDIR}/audio/libumidi +USES= qmake USE_BZIP2= yes -NO_STAGE= yes - -USE_QT4= gui qmake_build moc_build rcc_build network - -QMAKE_MIDIPP= ${QMAKE} -unix PREFIX=${PREFIX} -o - -do-configure: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ - ${QMAKE_MIDIPP} Makefile ${PORTNAME}.pro +USE_QT4= gui moc_build rcc_build network .include <bsd.port.mk> Modified: head/audio/minitunes/Makefile ============================================================================== --- head/audio/minitunes/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/audio/minitunes/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -8,24 +8,18 @@ CATEGORIES= audio MASTER_SITES= http://flavio.tordini.org/files/${PORTNAME}/ MAINTAINER= vg@FreeBSD.org -COMMENT= Minitunes is just another music player +COMMENT= Just another music player -LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib +LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib -NO_STAGE= yes -USE_QT4= dbus gui moc_build network phonon qmake_build rcc_build \ +USES= qmake +USE_QT4= dbus gui moc_build network phonon rcc_build \ sql uic_build xml INSTALLS_ICONS= yes LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -QMAKEFLAGS+= PREFIX="${PREFIX}" - WRKSRC= ${WRKDIR}/${PORTNAME} -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} ${PORTNAME}.pro - .include <bsd.port.mk> Modified: head/audio/mumble/Makefile ============================================================================== --- head/audio/mumble/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/audio/mumble/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -8,7 +8,7 @@ CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/Mumble/${PORTVERSION} MAINTAINER= feld@FreeBSD.org -COMMENT= A voice chat software primarily intended for use while gaming +COMMENT= Voice chat software primarily intended for use while gaming LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex \ libsndfile.so:${PORTSDIR}/audio/libsndfile \ @@ -17,18 +17,18 @@ LIB_DEPENDS+= libspeex.so:${PORTSDIR}/au libprotoc.so:${PORTSDIR}/devel/protobuf \ libopus.so:${PORTSDIR}/audio/opus -USES= gmake pkgconfig +USES= gmake pkgconfig qmake USE_QT4= gui svg iconengines_run xml sql network l10n \ - linguist_build qmake_build moc_build rcc_build uic_build \ + linguist_build moc_build rcc_build uic_build \ opengl sql-sqlite3_run USE_XORG= ice -HAS_CONFIGURE= yes INSTALLS_ICONS= yes MAKE_JOBS_UNSAFE=yes CONFIG= no-server no-alsa no-speechd no-bundled-speex no-bundled-opus no-update \ bundled-celt no-g15 no-portaudio no-pulseaudio no-xevie no-embed-qt-translations +QMAKE_ARGS= "CONFIG+=${CONFIG}" OPTIONS_DEFINE= DBUS BONJOUR OPTIONS_DEFAULT= DBUS @@ -51,9 +51,6 @@ LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/n post-patch: @${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/overlay_gl/overlay_gl.pro -do-configure: - cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} ${QMAKE} PREFIX=${PREFIX} main.pro "CONFIG+=${CONFIG}" - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${STAGEDIR}${PREFIX}/bin ${INSTALL_LIB} ${WRKSRC}/release/libcelt0.so.0.11.0 ${STAGEDIR}${PREFIX}/lib/libcelt-mumble.so.0.11.0 Modified: head/audio/murmur/Makefile ============================================================================== --- head/audio/murmur/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/audio/murmur/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -15,9 +15,11 @@ LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/ USERS= murmur GROUPS= murmur -USE_QT4= qmake_build moc_build corelib network xml sql sql-sqlite3_run +USES= qmake +USE_QT4= moc_build corelib network xml sql sql-sqlite3_run CONFIG= no-client +QMAKE_ARGS= "CONFIG+=${CONFIG}" USE_RC_SUBR= murmur SUB_LIST+= USERS="${USERS}" GROUPS="${GROUPS}" @@ -50,10 +52,6 @@ CONFIG+= no-bonjour post-patch: @${ECHO_CMD} 'QMAKE_LFLAGS += -fstack-protector' >> ${WRKSRC}/src/murmur/murmur.pro -do-configure: - @cd ${WRKSRC} && ${SETENV} QMAKESPEC=${QMAKESPEC} \ - ${QMAKE} -unix PREFIX=${PREFIX} ${QMAKEFLAGS} main.pro "CONFIG+=${CONFIG}" - pre-install: @${SED} -i '' -e 's|database=.*|database=/var/db/murmur/murmur.sqlite|' ${WRKSRC}/scripts/murmur.ini @${SED} -i '' -e 's|#pidfile=.*|pidfile=/var/run/murmur/murmur.pid|' ${WRKSRC}/scripts/murmur.ini Modified: head/audio/qmpdclient/Makefile ============================================================================== --- head/audio/qmpdclient/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/audio/qmpdclient/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -13,15 +13,11 @@ COMMENT= Easy to use musicpd client writ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS+= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme - +USES= qmake USE_BZIP2= yes -NO_STAGE= yes -USE_QT4= qmake_build moc_build rcc_build uic_build \ +USE_QT4= moc_build rcc_build uic_build \ corelib gui network xml xmlpatterns INSTALLS_ICONS= yes -QMAKE_ARGS= ${QMAKE_PRO} -QMAKE_PRO= ${PORTNAME}.pro OPTIONS_DEFINE= DBUS NLS DEBUG @@ -39,27 +35,23 @@ PLIST_SUB+= NLS="" .if ${PORT_OPTIONS:MDBUS} USE_QT4+= dbus -QMAKEFLAGS+= "CONFIG+=qdbus" +QMAKE_ARGS+= "CONFIG+=qdbus" .endif .if ${PORT_OPTIONS:MDEBUG} -QMAKEFLAGS+= "CONFIG+=debug" +QMAKE_ARGS+= "CONFIG+=debug" .endif post-patch: .if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -e '/INSTALLS += translations/d' \ - ${WRKSRC}/${QMAKE_PRO} + ${WRKSRC}/${PORTNAME}.pro .endif @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ -e 's|lupdate|lupdate-qt4|' \ -e 's|lrelease|lrelease-qt4|' \ - ${WRKSRC}/${QMAKE_PRO} + ${WRKSRC}/${PORTNAME}.pro @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \ ${WRKSRC}/src/notifications_dbus.cpp -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} \ - ${QMAKEFLAGS} ${QMAKE_ARGS} - .include <bsd.port.mk> Modified: head/cad/layouteditor/Makefile ============================================================================== --- head/cad/layouteditor/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/cad/layouteditor/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -12,19 +12,16 @@ DISTNAME= LayoutEditor-${PORTVERSION:S,^ MAINTAINER= hrs@FreeBSD.org COMMENT= IC/MEMS layout editor -LIB_DEPENDS= ttf:${PORTSDIR}/print/freetype +LIB_DEPENDS= libttf.so:${PORTSDIR}/print/freetype +USES= qmake USE_QT4= corelib gui network moc_build sql uic_build \ - rcc_build qmake qt3support xml + rcc_build qt3support xml USE_ZIP= yes WRKSRC= ${WRKDIR}/layout PLIST_FILES= bin/layout -NO_STAGE= yes -do-configure: - cd ${WRKSRC} && ${QMAKE} -makefile -spec ${QMAKESPEC} - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/layout ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/bin/layout ${STAGEDIR}${PREFIX}/bin/ .include <bsd.port.mk> Modified: head/cad/leocad/Makefile ============================================================================== --- head/cad/leocad/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/cad/leocad/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -23,8 +23,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/ldraw/mo WRKSRC= ${WRKDIR}/${PORTNAME} LEOCAD_PIECES= pieces-7439.zip -USES= desktop-file-utils gmake pkgconfig shared-mime-info -USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \ +USES= desktop-file-utils gmake pkgconfig qmake shared-mime-info +USE_QT4= moc_build rcc_build uic_build iconengines_run imageformats_run \ corelib gui network opengl USE_GL= glut @@ -39,7 +39,6 @@ ICON_SIZES= 16x16 24x24 32x32 48x48 128x OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-extract: @@ -59,28 +58,24 @@ post-patch: @cd ${WRKSRC}/tools/icon && ${CP} -a ${PORTNAME}_128x128.png icon128.png @cd ${WRKSRC}/tools/icon && ${MV} icon.svg ${PORTNAME}.svg -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} - post-install: - @${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKDIR}/pieces/* ${STAGEDIR}${DATADIR} .for s in ${ICON_SIZES} @${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps ${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}_${s}.png \ - ${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor - @${MKDIR} ${PREFIX}/share/icons/hicolor/scalable/apps + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps ${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}.svg \ - ${PREFIX}/share/icons/hicolor/scalable/apps/ - @${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/ - ${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${MAN1PREFIX}/man/man1/ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ + @${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${STAGEDIR}${MAN1PREFIX}/man/man1/ .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/cad/meshlab/Makefile ============================================================================== --- head/cad/meshlab/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/cad/meshlab/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -14,10 +14,11 @@ COMMENT= 3D triangular meshes processing EXTRACT_DEPENDS=7z:${PORTSDIR}/archivers/p7zip LIB_DEPENDS= libQtSolutions_SOAP-head.so:${PORTSDIR}/devel/qt4-qtsolutions-soap +USES= dos2unix qmake USE_GL= glew glu -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui xml \ +USE_QT4= moc_build rcc_build uic_build corelib gui xml \ xmlpatterns opengl network script -USE_DOS2UNIX= external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h \ +DOS2UNIX_FILES= external/structuresynth/ssynth/SyntopiaCore/GLEngine/Object3D.h \ meshlabplugins/edit_arc3D/fillImage.cpp WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME}/src @@ -35,13 +36,11 @@ post-patch: ${REINPLACE_CMD} -e '/^CONFIG +=/s|$$| debug|' .endif -do-configure: - cd ${WRKSRC}/external && ${QMAKE} -spec ${QMAKESPEC} -recursive external.pro - cd ${WRKSRC} && ${QMAKE} -spec ${QMAKESPEC} -recursive meshlab_full.pro +pre-configure: + cd ${WRKSRC}/external && ${QMAKE} ${QMAKE_ARGS} -recursive external.pro -do-build: +pre-build: cd ${WRKSRC}/external && ${MAKE} - cd ${WRKSRC} && ${MAKE} do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/meshlab/plugins Modified: head/cad/openscad/Makefile ============================================================================== --- head/cad/openscad/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/cad/openscad/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -12,26 +12,22 @@ COMMENT= The programmer's solid 3D CAD m LICENSE= GPLv2 -BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ - ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ +BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ ${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2 \ ${LOCALBASE}/include/boost/tuple/tuple.hpp:${PORTSDIR}/devel/boost-libs -LIB_DEPENDS= GLU:${PORTSDIR}/graphics/libGLU \ - gmp:${PORTSDIR}/math/gmp \ - mpfr:${PORTSDIR}/math/mpfr \ - CGAL:${PORTSDIR}/math/cgal \ - opencsg:${PORTSDIR}/graphics/opencsg - -USE_GL= glew -USE_QT4= qmake corelib gui opengl moc uic rcc -PLIST_SUB= PORTVERSION=${PORTVERSION} -#MAKE_JOBS_UNSAFE=yes -QMAKE_ENV = EIGEN2DIR=${LOCALBASE}/include/eigen2 -QMAKE_FLAGS = VERSION=${PORTVERSION} -MAKE_ENV = INSTALL_ROOT=${DESTDIR} +LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp \ + libmpfr.so:${PORTSDIR}/math/mpfr \ + libCGAL.so:${PORTSDIR}/math/cgal \ + libopencsg.so:${PORTSDIR}/graphics/opencsg + +USES= bison qmake +USE_GL= glu glew +USE_QT4= corelib gui opengl moc_build uic_build rcc_build +PLIST_SUB= PORTVERSION=${PORTVERSION} +QMAKE_ENV= EIGEN2DIR=${LOCALBASE}/include/eigen2 +QMAKE_ARGS+= VERSION=${PORTVERSION} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's,XXXFLEXXX,"${LOCALBASE}/bin/flex",' \ ${WRKSRC}/openscad.pro @@ -42,8 +38,4 @@ post-patch: ${REINPLACE_CMD} -e 's#/usr/local/bin/flex#${LOCALBASE}/bin/flex#g' \ ${WRKSRC}/flex.pri -do-configure: - cd ${WRKSRC} && \ - ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_FLAGS} openscad.pro - .include <bsd.port.mk> Modified: head/cad/qelectrotech/Makefile ============================================================================== --- head/cad/qelectrotech/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/cad/qelectrotech/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -14,26 +14,26 @@ COMMENT= QElectroTech is application to LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -USE_QT4= gui moc_build network qmake_build rcc_build \ - sql-sqlite3 svg uic_build xml designer +USES= qmake +USE_QT4= gui moc_build network rcc_build \ + sql-sqlite3_run svg uic_build xml designer USE_GCC= 4.7+ INSTALLS_ICONS= yes CXXFLAGS+= "-fno-ipa-sra" -QMAKEFLAGS+= QMAKE_RPATHDIR="${_GCC_RUNTIME}" +QMAKE_ARGS+= QMAKE_RPATHDIR="${_GCC_RUNTIME}" MAN1= qelectrotech.1 MANLANG= "" cs el es fr.ISO8859-1 fr.UTF-8 fr it pl pt_PT MANCOMPRESSED= yes -do-configure: +pre-configure: ${MV} ${WRKSRC}/man/files/pt ${WRKSRC}/man/files/pt_PT - ${REINPLACE_CMD} -e 's,/usr/local/,${STAGEDIR}${PREFIX}/,g' \ + ${REINPLACE_CMD} -e 's,/usr/local/,${PREFIX}/,g' \ ${WRKSRC}/${PORTNAME}.pro ${REINPLACE_CMD} -e 's,doc/,share/doc/,g' \ ${WRKSRC}/${PORTNAME}.pro ${REINPLACE_CMD} -e 's,../share,share,g' \ ${WRKSRC}/${PORTNAME}.pro - cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} ${PORTNAME}.pro .include <bsd.port.mk> Modified: head/comms/gqrx/Makefile ============================================================================== --- head/comms/gqrx/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/comms/gqrx/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -14,25 +14,20 @@ COMMENT= Qt-based software defined radio LICENSE= GPLv3 -LIB_DEPENDS= gnuradio-core:${PORTSDIR}/comms/gnuradio \ - gnuradio-audio:${PORTSDIR}/comms/gnuradio \ - gnuradio-osmosdr:${PORTSDIR}/comms/gr-osmosdr \ - pulse:${PORTSDIR}/audio/pulseaudio \ - pulse-simple:${PORTSDIR}/audio/pulseaudio \ - boost_system:${PORTSDIR}/devel/boost-libs \ - boost_program_options:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= libgnuradio-core.so:${PORTSDIR}/comms/gnuradio \ + libgnuradio-audio.so:${PORTSDIR}/comms/gnuradio \ + libgnuradio-osmosdr.so:${PORTSDIR}/comms/gr-osmosdr \ + libpulse.so:${PORTSDIR}/audio/pulseaudio \ + libpulse-simple.so:${PORTSDIR}/audio/pulseaudio \ + libboost_system.so:${PORTSDIR}/devel/boost-libs \ + libboost_program_options.so:${PORTSDIR}/devel/boost-libs -USES= pkgconfig -USE_QT4= qmake_build moc_build rcc_build uic_build corelib gui svg +USES= pkgconfig qmake +USE_QT4= moc_build rcc_build uic_build corelib gui svg PLIST_FILES= bin/gqrx -NO_STAGE= yes -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/gqrx ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/gqrx ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/comms/qsstv/Makefile ============================================================================== --- head/comms/qsstv/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/comms/qsstv/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -12,16 +12,16 @@ EXTRACT_SUFX= .tgz MAINTAINER= shurd@sasktel.net COMMENT= Amateur Radio SSTV/FAX reception program for unix -LIB_DEPENDS= fftw3:${PORTSDIR}/math/fftw3 \ - hamlib:${PORTSDIR}/comms/hamlib \ - asound:${PORTSDIR}/audio/alsa-lib +LIB_DEPENDS= libfftw3.so:${PORTSDIR}/math/fftw3 \ + libhamlib.so:${PORTSDIR}/comms/hamlib \ + libasound.so:${PORTSDIR}/audio/alsa-lib BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat -USE_QT4= gui network moc_build qmake_build rcc_build uic_build +USES= qmake +USE_QT4= gui network moc_build rcc_build uic_build OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> .if ! ${PORT_OPTIONS:MDOCS} @@ -36,8 +36,4 @@ post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/src/src.pro -do-configure: - @cd ${WRKSRC}; \ - ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${DISTNAME}.pro - .include <bsd.port.mk> Modified: head/ftp/scythia/Makefile ============================================================================== --- head/ftp/scythia/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/ftp/scythia/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -12,7 +12,8 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}-2-s MAINTAINER= dhn@FreeBSD.org COMMENT= Small ftp client unpretentious based on Qt4 -USE_QT4= gui network corelib qmake_build uic_build moc_build rcc_build +USES= qmake +USE_QT4= gui network corelib uic_build moc_build rcc_build INSTALLS_ICONS= yes WRKSRC= ${WRKDIR}/${PORTNAME} @@ -25,9 +26,8 @@ DESKTOP_ENTRIES= "Scythia" \ "scythia" \ "scythia" \ "Network;FileTransfer;Qt;" \ - "false" + "true" -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \ -e '/unix:desktop/d' \ @@ -35,8 +35,4 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \ ${WRKSRC}/src/main.cpp -pre-build: - @cd ${BUILD_WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} scythia.pro - .include <bsd.port.mk> Modified: head/graphics/autoq3d/Makefile ============================================================================== --- head/graphics/autoq3d/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/graphics/autoq3d/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -9,16 +9,15 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} DISTNAME= AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source MAINTAINER= nemysis@gmx.ch -COMMENT= Qt4 quick 3D model editor +COMMENT= Qt 4 quick 3D model editor LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -USE_DOS2UNIX= yes +USES= dos2unix qmake USE_GL= glu USE_ZIP= yes -USE_QT4= corelib gui opengl \ - moc_build qmake_build +USE_QT4= corelib gui opengl moc_build PORTDOCS= 3DQformat.txt ChangeLog.txt @@ -27,9 +26,8 @@ DESKTOP_ENTRIES="AutoQ3D" \ "AutoQ3D" \ "AutoQ3D" \ "Graphics;3DGraphics;Qt;" \ - false + true -NO_STAGE= yes .include <bsd.port.options.mk> post-patch: .for file in src/main.cpp src/fgui/cadform.cpp src/dialogs/prgsettings.cpp @@ -37,16 +35,13 @@ post-patch: 's|/usr/share/AutoQ3D-Community|${DATADIR}|g' ${WRKSRC}/${file} .endfor -do-configure: - @(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS}) - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${PREFIX}/bin - @(cd ${WRKSRC} && ${COPYTREE_SHARE} "images *.htm *.qm" ${DATADIR}) - ${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png ${PREFIX}/share/pixmaps + ${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${STAGEDIR}${PREFIX}/bin + @(cd ${WRKSRC} && ${COPYTREE_SHARE} "images *.htm *.qm" ${STAGEDIR}${DATADIR}) + ${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png ${STAGEDIR}${PREFIX}/share/pixmaps .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> Modified: head/graphics/burplex/Makefile ============================================================================== --- head/graphics/burplex/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/graphics/burplex/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -14,31 +14,23 @@ LICENSE= BSD RUN_DEPENDS= ${LOCALBASE}/bin/dcraw:${PORTSDIR}/graphics/dcraw -USE_QT4= gui qmake_build uic_build moc_build rcc_build \ +USES= qmake +USE_QT4= gui uic_build moc_build rcc_build \ imageformats_run -HAS_CONFIGURE= yes -QMAKE_ARGS= -recursive PREFIX=${PREFIX} WRKSRC= ${WRKDIR}/${PORTNAME} -MAN7= burplex.7 -PLIST_FILES= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} \ + man/man7/burplex.7.gz DESKTOP_ENTRIES= "burplex" "${COMMENT}" "" \ - "burplex" "" "false" + "burplex" "" "true" -NO_STAGE= yes post-patch: ${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' \ ${WRKSRC}/mainwindow.cpp -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKE_ARGS} ${QMAKEFLAGS} - do-install: - ${MKDIR} ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${MKDIR} ${MANPREFIX}/man/man7 - ${INSTALL_MAN} ${WRKSRC}/burplex.7 ${MANPREFIX}/man/man7 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/burplex.7 ${STAGEDIR}${MANPREFIX}/man/man7 .include <bsd.port.mk> Modified: head/graphics/easypaint/Makefile ============================================================================== --- head/graphics/easypaint/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/graphics/easypaint/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -13,7 +13,8 @@ COMMENT= Easy graphic editing program LICENSE= GPLv3 -USE_QT4= gui xml qmake_build uic_build moc_build rcc_build +USES= qmake +USE_QT4= gui xml uic_build moc_build rcc_build QPROFILE= easyPaint WRKSRC= ${WRKDIR}/${QPROFILE} @@ -22,11 +23,7 @@ DESKTOP_ENTRIES="easyPaint" "${COMMENT}" PLIST_FILES= bin/${PORTNAME} -NO_STAGE= yes -do-configure: - cd ${WRKSRC} && ${QMAKE} - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${QPROFILE} ${PREFIX}/bin/${PORTNAME} + ${INSTALL_PROGRAM} ${WRKSRC}/${QPROFILE} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include <bsd.port.mk> Modified: head/graphics/evolvotron/Makefile ============================================================================== --- head/graphics/evolvotron/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/graphics/evolvotron/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -19,10 +19,11 @@ LIB_DEPENDS= libboost_thread.so:${PORTSD WRKSRC= ${WRKDIR}/${PORTNAME} -USE_QT4= corelib gui xml moc_build qmake_build +USES= qmake +USE_QT4= corelib gui xml moc_build USE_PYTHON= yes -HAS_CONFIGURE= yes -CONFIGURE_ENV= QTDIR="${QT_PREFIX}" +QMAKE_ARGS+= VERSION_NUMBER="${PORTVERSION}" +QMAKE_SOURCE_PATH= ${WRKSRC}/main.pro MAKE_JOBS_UNSAFE= yes PORTDOCS= NEWS README TODO USAGE evolvotron.html @@ -44,21 +45,14 @@ CXXFLAGS+= -include ${WRKSRC}/${i}/${i}_ -I${WRKSRC}/${i} .endfor .else -QMAKEFLAGS+= CONFIG+=precompile_header +QMAKE_ARGS+= CONFIG+=precompile_header .endif post-patch: - @${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \ - ${WRKSRC}/configure ${WRKSRC}/VERSION @${REINPLACE_CMD} -e \ '/^CONFIG/s|precompile_header|| ; \ /DEFINES/s|_LINUX|_BSD|' ${WRKSRC}/common.pro -post-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} \ - VERSION_NUMBER="${PORTVERSION}" main.pro - do-install: .for i in evolvotron evolvotron_mutate evolvotron_render ${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${STAGEDIR}${PREFIX}/bin/ Modified: head/graphics/opencsg/Makefile ============================================================================== --- head/graphics/opencsg/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/graphics/opencsg/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -11,22 +11,17 @@ DISTNAME= OpenCSG-${PORTVERSION} MAINTAINER= mr@FreeBSD.org COMMENT= Constructive Solid Geometry rendering library +USES= qmake USE_GL= glew +USE_QT4= corelib gui WRKSRC= ${WRKDIR}/${DISTNAME}/src - -USE_QT4= qmake_build corelib gui PLIST_SUB= PORTVERSION=${PORTVERSION} -#MAKE_JOBS_UNSAFE=yes - -NO_STAGE= yes -do-configure: - cd ${WRKSRC} && ${QMAKE} src.pro do-install: ${INSTALL_LIB} ${WRKDIR}/${DISTNAME}/lib/libopencsg.so.${PORTVERSION} \ - ${PREFIX}/lib - ${LN} -sf libopencsg.so.${PORTVERSION} ${PREFIX}/lib/libopencsg.so.1 - ${LN} -sf libopencsg.so.${PORTVERSION} ${PREFIX}/lib/libopencsg.so - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/include/opencsg.h ${PREFIX}/include + ${STAGEDIR}${PREFIX}/lib + ${LN} -sf libopencsg.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopencsg.so.1 + ${LN} -sf libopencsg.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopencsg.so + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/include/opencsg.h ${STAGEDIR}${PREFIX}/include .include <bsd.port.mk> Modified: head/graphics/pencil/Makefile ============================================================================== --- head/graphics/pencil/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/graphics/pencil/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -22,38 +22,26 @@ LIB_DEPENDS+= ming:${PORTSDIR}/graphics/ drm:${PORTSDIR}/graphics/libdrm USE_ZIP= yes -USES= gettext iconv +USES= gettext iconv qmake USE_GNOME= glib20 -USE_QT4= gui moc_build qmake_build rcc_build xml_build opengl_build +USE_QT4= gui moc_build rcc_build xml_build opengl_build USE_XORG= xi xrender xrandr xfixes xcursor xinerama xext x11 xau xdmcp \ xxf86vm xdamage USE_GL= gl glu +QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include/ming WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source PLIST_FILES= bin/pencil PORTDOCS= README TODO -NO_STAGE= yes -.include <bsd.port.options.mk> - -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} -unix PREFIX=${PREFIX} \ - INCLUDEPATH+=${LOCALBASE}/include/ming \ - ${PORTNAME}.pro - post-patch: @${MKDIR} ${WRKSRC}/src/external/freebsd @${CP} ${FILESDIR}/src-external-freebsd-freebsd.cpp \ ${WRKSRC}/src/external/freebsd/freebsd.cpp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/Pencil ${PREFIX}/bin/pencil -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} -.for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} -.endfor -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/Pencil ${STAGEDIR}${PREFIX}/bin/pencil + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}} ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/graphics/qiviewer/Makefile ============================================================================== --- head/graphics/qiviewer/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/graphics/qiviewer/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -12,10 +12,10 @@ COMMENT= Fast and lightweight image view LICENSE= GPLv2 +USES= qmake USE_BZIP2= yes -USE_QT4= gui xml dbus imageformats linguist_build qmake_build \ +USE_QT4= gui xml dbus imageformats_run linguist_build \ moc_build rcc_build uic_build -QMAKEFLAGS+= PREFIX="${PREFIX}" PLIST_FILES= bin/qiviewer \ share/applications/qiviewer.desktop \ @@ -29,19 +29,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}/src OPTIONS_DEFINE= WEBP WEBP_DESC= Support for WebP image format (experimental) - -NO_STAGE= yes -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MWEBP} -QMAKEFLAGS+= CONFIG+=enable-webp -PLIST_SUB+= WEBP="" -.else -PLIST_SUB+= WEBP="@comment " -.endif - -do-configure: - @cd ${WRKSRC} && ${QMAKE} ${QMAKEFLAGS} +WEBP_QMAKE_ON= CONFIG+=enable-webp post-configure: ${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|g' \ Modified: head/graphics/qxv/Makefile ============================================================================== --- head/graphics/qxv/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/graphics/qxv/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -8,7 +8,7 @@ CATEGORIES+= graphics MASTER_SITES= http://labs.freehackers.org/attachments/download/422/ MAINTAINER= cy@FreeBSD.org -COMMENT= A QT4 program that displays images of various formats +COMMENT= Qt 4 program that displays images of various formats LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING @@ -24,22 +24,15 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/ expat.6:${PORTSDIR}/textproc/expat2 \ xcb.2:${PORTSDIR}/x11/xcb -USES= iconv +USES= iconv qmake USE_BZIP2= yes USE_XORG= sm xrender xext x11 xau xdmcp ice -USE_QT4= corelib gui qmake_build moc_build uic_build rcc_build +USE_QT4= corelib gui moc_build uic_build rcc_build MAKE_JOBS_UNSAFE= yes -HAS_CONFIGURE= yes PLIST_FILES= bin/${PORTNAME} -NO_STAGE= yes -do-configure: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} PREFIX=${PREFIX} ${PORTNAME}.pro - do-install: - @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${INSTALL_PROGRAM} ${PORTNAME} ${LOCALBASE}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/ .include <bsd.port.mk> Modified: head/graphics/seam-carving-gui/Makefile ============================================================================== --- head/graphics/seam-carving-gui/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/graphics/seam-carving-gui/Makefile Fri Nov 22 12:55:00 2013 (r334586) @@ -11,21 +11,14 @@ DISTNAME= SeamCarvingGui-Src-${PORTVERSI MAINTAINER= buganini@gmail.com COMMENT= The Seam Carving GUI is a GUI front end to CAIR -HAS_CONFIGURE= yes - -USE_GMAKE= yes -USE_QT4= gui imageformats_run moc_build qmake_build uic_build +USES= gmake qmake +USE_QT4= gui imageformats_run moc_build uic_build WRKSRC= ${WRKDIR}/Src\ Seam\ Carving\ GUI\ ${PORTVERSION} PLIST_FILES= bin/SeamCarvingGui -NO_STAGE= yes -do-configure: - cd ${WRKSRC} && \ - ${SETENV} QMAKESPEC="${QMAKESPEC}" ${QMAKE} seam-carving-gui.pro - do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/SeamCarvingGui ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/SeamCarvingGui ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/misc/qbrew/Makefile ============================================================================== --- head/misc/qbrew/Makefile Fri Nov 22 12:54:56 2013 (r334585) +++ head/misc/qbrew/Makefile Fri Nov 22 12:55:00 2013 (r334586) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311221255.rAMCt0UE084675>