From owner-svn-ports-all@FreeBSD.ORG Mon Jan 20 20:48:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A26BABAF; Mon, 20 Jan 2014 20:48:12 +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 8E6C81933; Mon, 20 Jan 2014 20:48:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0KKmC4t065501; Mon, 20 Jan 2014 20:48:12 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0KKmCU3065499; Mon, 20 Jan 2014 20:48:12 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201401202048.s0KKmCU3065499@svn.freebsd.org> From: Antoine Brodin Date: Mon, 20 Jan 2014 20:48:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340471 - head/cad/qfsm 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: Mon, 20 Jan 2014 20:48:12 -0000 Author: antoine Date: Mon Jan 20 20:48:11 2014 New Revision: 340471 URL: http://svnweb.freebsd.org/changeset/ports/340471 QAT: https://qat.redports.org/buildarchive/r340471/ Log: - Stage support - Use OPTIONS helpers Modified: head/cad/qfsm/Makefile head/cad/qfsm/pkg-plist Modified: head/cad/qfsm/Makefile ============================================================================== --- head/cad/qfsm/Makefile Mon Jan 20 20:47:32 2014 (r340470) +++ head/cad/qfsm/Makefile Mon Jan 20 20:48:11 2014 (r340471) @@ -8,7 +8,7 @@ CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} MAINTAINER= ports@FreeBSD.org -COMMENT= A graphical tool for designing finite state machines +COMMENT= Graphical tool for designing finite state machines LICENSE= GPLv3 # (or later) @@ -18,49 +18,37 @@ USE_BZIP2= yes USE_XORG= xi USE_QT4= corelib gui qt3support svg xml \ moc_build qmake_build rcc_build uic_build -USE_GNOME= desktopfileutils -USES= cmake +USES= cmake desktop-file-utils INSTALLS_ICONS= yes -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MGRAPHVIZ} -BULID_DEPENDS+= graphviz>=2.22:${PORTSDIR}/graphics/graphviz -RUN_DEPENDS+= graphviz>=2.22:${PORTSDIR}/graphics/graphviz -.else -CMAKE_ARGS+= -DQFSM_AVOID_GRAPHVIZ:BOOL=ON -.endif +GRAPHVIZ_BUILD_DEPENDS= graphviz>=2.22:${PORTSDIR}/graphics/graphviz +GRAPHVIZ_RUN_DEPENDS= graphviz>=2.22:${PORTSDIR}/graphics/graphviz +GRAPHVIZ_CMAKE_OFF= -DQFSM_AVOID_GRAPHVIZ:BOOL=ON post-patch: @${REINPLACE_CMD} -e \ '/\/usr\//d' ${WRKSRC}/FindGraphViz.cmake do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} qfsm ${PREFIX}/bin) - (cd ${WRKSRC}/desktop && ${INSTALL_DATA} qfsm.desktop \ - ${PREFIX}/share/applications) + ${INSTALL_PROGRAM} ${WRKSRC}/qfsm ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/desktop/qfsm.desktop \ + ${STAGEDIR}${PREFIX}/share/applications .for i in 32x32 48x48 64x64 - @${MKDIR} ${PREFIX}/share/icons/hicolor/${i}/apps - (cd ${WRKSRC}/desktop/${i}/apps && ${INSTALL_DATA} qfsm.png \ - ${PREFIX}/share/icons/hicolor/${i}/apps) - @${MKDIR} ${PREFIX}/share/icons/hicolor/${i}/mimetypes - (cd ${WRKSRC}/desktop/${i}/mimetypes && ${INSTALL_DATA} x-qfsm.png \ - ${PREFIX}/share/icons/hicolor/${i}/mimetypes) + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps + ${INSTALL_DATA} ${WRKSRC}/desktop/${i}/apps/qfsm.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/apps + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/mimetypes + ${INSTALL_DATA} ${WRKSRC}/desktop/${i}/mimetypes/x-qfsm.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}/mimetypes .endfor - @${MKDIR} ${PREFIX}/share/mimelnk/application - (cd ${WRKSRC}/desktop && ${INSTALL_DATA} x-qfsm.desktop \ - ${PREFIX}/share/mimelnk/application) - @${MKDIR} ${DATADIR} - (cd ${WRKSRC}/po && ${INSTALL_DATA} *.qm ${DATADIR}) -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}/doc/user && ${COPYTREE_SHARE} . ${DOCSDIR}) -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}) -.endif - @-update-desktop-database + @${MKDIR} ${STAGEDIR}${PREFIX}/share/mimelnk/application + ${INSTALL_DATA} ${WRKSRC}/desktop/x-qfsm.desktop \ + ${STAGEDIR}${PREFIX}/share/mimelnk/application + @${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/po/*.qm ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc/user && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/cad/qfsm/pkg-plist ============================================================================== --- head/cad/qfsm/pkg-plist Mon Jan 20 20:47:32 2014 (r340470) +++ head/cad/qfsm/pkg-plist Mon Jan 20 20:48:11 2014 (r340471) @@ -74,5 +74,3 @@ share/mimelnk/application/x-qfsm.desktop @dirrmtry share/icons %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true