Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Jan 2014 20:48:12 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340471 - head/cad/qfsm
Message-ID:  <201401202048.s0KKmCU3065499@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-.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 <bsd.port.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401202048.s0KKmCU3065499>