svn commit: r377962 - in head/cad/qfsm: . files
Thierry Thomas
thierry at FreeBSD.org
Mon Jan 26 23:05:43 UTC 2015
Author: thierry
Date: Mon Jan 26 23:05:41 2015
New Revision: 377962
URL: https://svnweb.freebsd.org/changeset/ports/377962
QAT: https://qat.redports.org/buildarchive/r377962/
Log:
Upgrade to 0.54 ans respect options for docs and examples.
Changelog at <http://qfsm.sourceforge.net/changes.html>.
Modified:
head/cad/qfsm/Makefile
head/cad/qfsm/distinfo
head/cad/qfsm/files/patch-CMakeLists.txt
head/cad/qfsm/pkg-plist
Modified: head/cad/qfsm/Makefile
==============================================================================
--- head/cad/qfsm/Makefile Mon Jan 26 22:04:39 2015 (r377961)
+++ head/cad/qfsm/Makefile Mon Jan 26 23:05:41 2015 (r377962)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= qfsm
-PORTVERSION= 0.53.0
+PORTVERSION= 0.54.0
DISTVERSIONSUFFIX= -Source
CATEGORIES= cad
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
@@ -24,30 +24,23 @@ GRAPHVIZ_BUILD_DEPENDS= graphviz>=2.22:$
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
+.include <bsd.port.options.mk>
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/qfsm ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/desktop/qfsm.desktop \
- ${STAGEDIR}${PREFIX}/share/applications
-.for i in 32x32 48x48 64x64
- @${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} ${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})
+pre-configure:
+ ${REINPLACE_CMD} -e \
+ '/\/usr\//d' ${WRKSRC}/FindGraphViz.cmake
+ ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
+ -e '/examples/s|share/qfsm|share/examples/${PORTNAME}|' \
+ ${WRKSRC}/CMakeLists.txt
+.if ${PORT_OPTIONS:MDOCS}
+ ${REINPLACE_CMD} -e 's|%%PD%%||' ${WRKSRC}/CMakeLists.txt
+.else
+ ${REINPLACE_CMD} -e 's|%%PD%%|#|' ${WRKSRC}/CMakeLists.txt
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+ ${REINPLACE_CMD} -e 's|%%PE%%||' ${WRKSRC}/CMakeLists.txt
+.else
+ ${REINPLACE_CMD} -e 's|%%PE%%|#|' ${WRKSRC}/CMakeLists.txt
+.endif
.include <bsd.port.mk>
Modified: head/cad/qfsm/distinfo
==============================================================================
--- head/cad/qfsm/distinfo Mon Jan 26 22:04:39 2015 (r377961)
+++ head/cad/qfsm/distinfo Mon Jan 26 23:05:41 2015 (r377962)
@@ -1,2 +1,2 @@
-SHA256 (qfsm-0.53.0-Source.tar.bz2) = a47f2f85fc15992a41ae06560fdc0ddbd663488821af6a34d2f0a3a87c4ba9bb
-SIZE (qfsm-0.53.0-Source.tar.bz2) = 1498547
+SHA256 (qfsm-0.54.0-Source.tar.bz2) = 2b53b7e54e42d4c188f62220aaae3d3fb5e8239b8ac8e88f793689cc0a5b8766
+SIZE (qfsm-0.54.0-Source.tar.bz2) = 2130183
Modified: head/cad/qfsm/files/patch-CMakeLists.txt
==============================================================================
--- head/cad/qfsm/files/patch-CMakeLists.txt Mon Jan 26 22:04:39 2015 (r377961)
+++ head/cad/qfsm/files/patch-CMakeLists.txt Mon Jan 26 23:05:41 2015 (r377962)
@@ -1,6 +1,15 @@
---- CMakeLists.txt.orig 2012-05-30 18:36:12.000000000 +0900
-+++ CMakeLists.txt 2012-06-23 18:00:22.000000000 +0900
-@@ -35,6 +35,9 @@
+--- CMakeLists.txt.orig 2015-01-25 19:29:53.000000000 +0100
++++ CMakeLists.txt 2015-01-26 23:51:27.000000000 +0100
+@@ -3,7 +3,7 @@
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+
+ #SET( CMAKE_BUILD_TYPE Debug )
+-SET( CMAKE_BUILD_TYPE Release )
++#SET( CMAKE_BUILD_TYPE Release )
+
+ #INCLUDE(FindGraphviz.cmake)
+
+@@ -39,6 +39,9 @@
ENDIF ( WIN32 )
@@ -10,7 +19,7 @@
FIND_PACKAGE(GraphViz)
IF(graphviz_FOUND)
MESSAGE("Graphviz library found")
-@@ -45,13 +48,14 @@
+@@ -50,6 +53,7 @@
ELSE(graphviz_FOUND)
MESSAGE("WARNING: Graphviz library not found")
ENDIF(graphviz_FOUND)
@@ -18,24 +27,38 @@
FIND_PACKAGE(Qt4 REQUIRED)
- ADD_DEFINITIONS(-DQT3_SUPPORT -DSVG)
+@@ -416,7 +420,7 @@
- #SET( CMAKE_BUILD_TYPE Debug )
--SET( CMAKE_BUILD_TYPE Release )
-+#SET( CMAKE_BUILD_TYPE Release )
-
- SET( QT_USE_QT3SUPPORT TRUE )
- SET( QT_USE_QTXML TRUE )
-@@ -405,9 +409,9 @@
-
-
--IF(UNIX AND NOT WIN32)
+ IF(UNIX AND NOT WIN32)
- SET(CMAKE_INSTALL_PREFIX "/usr")
--ENDIF(UNIX AND NOT WIN32)
-+#IF(UNIX AND NOT WIN32)
-+# SET(CMAKE_INSTALL_PREFIX "/usr")
-+#ENDIF(UNIX AND NOT WIN32)
++ SET(CMAKE_INSTALL_PREFIX "%%PREFIX%%")
+ ENDIF(UNIX AND NOT WIN32)
IF(UNIX AND NOT WIN32)
- ADD_DEFINITIONS(-DQFSM_LANGUAGE_DIR="${CMAKE_INSTALL_PREFIX}/share/qfsm/")
+@@ -433,9 +437,9 @@
+ PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
+ GROUP_EXECUTE GROUP_READ
+ WORLD_EXECUTE WORLD_READ)
+- INSTALL(DIRECTORY doc/user/ DESTINATION share/doc/qfsm
+- PATTERN "CVS" EXCLUDE
+- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
++%%PD%% INSTALL(DIRECTORY doc/user/ DESTINATION share/doc/qfsm
++%%PD%% PATTERN "CVS" EXCLUDE
++%%PD%% PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+ INSTALL(FILES desktop/qfsm.desktop DESTINATION share/applications
+ PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+ INSTALL(FILES desktop/x-qfsm.desktop DESTINATION share/mimelnk/application
+@@ -451,9 +455,9 @@
+ PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+ INSTALL(FILES po/English.qm po/French.qm po/German.qm po/Russian.qm DESTINATION share/qfsm
+ PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+- INSTALL(DIRECTORY examples DESTINATION share/qfsm
+- PATTERN "CVS" EXCLUDE
+- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
++%%PE%% INSTALL(DIRECTORY examples/ DESTINATION share/qfsm
++%%PE%% PATTERN "CVS" EXCLUDE
++%%PE%% PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+ ELSE(UNIX AND NOT WIN32)
+ INSTALL(TARGETS qfsm RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}
+ # INSTALL(TARGETS qfsm RUNTIME DESTINATION ${DESTDIR}
Modified: head/cad/qfsm/pkg-plist
==============================================================================
--- head/cad/qfsm/pkg-plist Mon Jan 26 22:04:39 2015 (r377961)
+++ head/cad/qfsm/pkg-plist Mon Jan 26 23:05:41 2015 (r377962)
@@ -25,6 +25,7 @@ share/applications/qfsm.desktop
%%PORTDOCS%%%%DOCSDIR%%/select.png
%%PORTDOCS%%%%DOCSDIR%%/simulate.png
%%PORTDOCS%%%%DOCSDIR%%/simulation.png
+%%PORTDOCS%%%%DOCSDIR%%/smc_example.svg
%%PORTDOCS%%%%DOCSDIR%%/state_properties.png
%%PORTDOCS%%%%DOCSDIR%%/straighten.png
%%PORTDOCS%%%%DOCSDIR%%/toolbar.png
@@ -38,6 +39,8 @@ share/applications/qfsm.desktop
%%PORTDOCS%%%%DOCSDIR%%/zoom.png
%%PORTDOCS%%%%DOCSDIR%%/zoomin.png
%%PORTDOCS%%%%DOCSDIR%%/zoomout.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FSM1.fsm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/FSM1.java
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii.gv
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii_example.fsm
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bin.gv
More information about the svn-ports-head
mailing list