From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jun 25 18:10:07 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4FBFE106564A for ; Mon, 25 Jun 2012 18:10:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 22BBA8FC0A for ; Mon, 25 Jun 2012 18:10:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q5PIA7T6073729 for ; Mon, 25 Jun 2012 18:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q5PIA6X4073728; Mon, 25 Jun 2012 18:10:06 GMT (envelope-from gnats) Resent-Date: Mon, 25 Jun 2012 18:10:06 GMT Resent-Message-Id: <201206251810.q5PIA6X4073728@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38CEB1065672 for ; Mon, 25 Jun 2012 18:00:23 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa101lp.auone-net.jp (msa101lp.auone-net.jp [222.3.140.164]) by mx1.freebsd.org (Postfix) with ESMTP id 6D9F28FC0A for ; Mon, 25 Jun 2012 18:00:14 +0000 (UTC) Received: from msa101lp.auone-net.jp (MSA101lp [172.27.12.179]) by msa101lp.auone-net.jp (au one net msa) with ESMTP id 770B52E0263 for ; Tue, 26 Jun 2012 03:00:13 +0900 (JST) Received: from localhost.localdomain (ZT038198.ppp.dion.ne.jp [59.128.38.198]) by msa101lp.auone-net.jp (au one net msa) with ESMTP id 3C9FD34037 for ; Tue, 26 Jun 2012 03:00:03 +0900 (JST) Message-Id: <20120626024504.5e5d1f3d.tkato432@yahoo.com> Date: Tue, 26 Jun 2012 02:45:04 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/169404: cad/qfsm: Update to version 0.53.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2012 18:10:07 -0000 >Number: 169404 >Category: ports >Synopsis: cad/qfsm: Update to version 0.53.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jun 25 18:10:06 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p9 i386 >Organization: >Environment: >Description: - Update to version 0.53.0 New file: files/patch-CMakeLists.txt >How-To-Repeat: >Fix: diff -urN /usr/ports/cad/qfsm/Makefile cad/qfsm/Makefile --- /usr/ports/cad/qfsm/Makefile 2012-06-06 15:43:20.000000000 +0900 +++ cad/qfsm/Makefile 2012-06-23 17:55:13.000000000 +0900 @@ -7,33 +7,39 @@ # PORTNAME= qfsm -PORTVERSION= 0.52.0 -PORTREVISION= 2 +PORTVERSION= 0.53.0 +DISTVERSIONSUFFIX= -Source CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} -DISTNAME= ${PORTNAME}-${PORTVERSION}-Source MAINTAINER= ports@FreeBSD.org COMMENT= A graphical tool for designing finite state machines +LICENSE= GPLv3 # (or later) + +OPTIONS_DEFINE= GRAPHVIZ DOCS EXAMPLES + USE_BZIP2= yes USE_XORG= xi USE_QT4= corelib gui qt3support svg xml \ - moc_build porting_build qmake_build \ - uic_build uic3_build rcc_build + moc_build qmake_build rcc_build uic_build USE_GNOME= desktopfileutils USE_CMAKE= yes INSTALLS_ICONS= yes +MAKE_JOBS_SAFE= yes + +.include -.if !defined(WITH_DEBUG) -CMAKE_ARGS+= -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" +.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 post-patch: - @${REINPLACE_CMD} -e 's|(/usr/include/.*$$|(|g ; \ - /^\/usr\/include/d ; \ - /SET.*CMAKE_BUILD_TYPE/d ; \ - /SET.*CMAKE_INSTALL_PREFIX/d' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e \ + '/\/usr\//d' ${WRKSRC}/FindGraphViz.cmake do-install: (cd ${WRKSRC} && ${INSTALL_PROGRAM} qfsm ${PREFIX}/bin) @@ -53,11 +59,11 @@ ${PREFIX}/share/mimelnk/application) @${MKDIR} ${DATADIR} (cd ${WRKSRC}/po && ${INSTALL_DATA} *.qm ${DATADIR}) -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @(cd ${WRKSRC}/doc/user && ${COPYTREE_SHARE} . ${DOCSDIR}) .endif -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR}) .endif diff -urN /usr/ports/cad/qfsm/distinfo cad/qfsm/distinfo --- /usr/ports/cad/qfsm/distinfo 2011-03-20 21:46:15.000000000 +0900 +++ cad/qfsm/distinfo 2012-06-21 21:37:42.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (qfsm-0.52.0-Source.tar.bz2) = 9d2e03901338517b622771c1e4db4c3d7a50c3d8525cab9315d4b7a953e191b0 -SIZE (qfsm-0.52.0-Source.tar.bz2) = 2830833 +SHA256 (qfsm-0.53.0-Source.tar.bz2) = a47f2f85fc15992a41ae06560fdc0ddbd663488821af6a34d2f0a3a87c4ba9bb +SIZE (qfsm-0.53.0-Source.tar.bz2) = 1498547 diff -urN /usr/ports/cad/qfsm/files/patch-CMakeLists.txt cad/qfsm/files/patch-CMakeLists.txt --- /usr/ports/cad/qfsm/files/patch-CMakeLists.txt 1970-01-01 09:00:00.000000000 +0900 +++ cad/qfsm/files/patch-CMakeLists.txt 2012-06-23 18:00:42.000000000 +0900 @@ -0,0 +1,41 @@ +--- 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 @@ + ENDIF ( WIN32 ) + + ++SET(QFSM_AVOID_GRAPHVIZ "" CACHE BOOL "Avoid linking against GraphViz") ++ ++IF(NOT QFSM_AVOID_GRAPHVIZ) + FIND_PACKAGE(GraphViz) + IF(graphviz_FOUND) + MESSAGE("Graphviz library found") +@@ -45,13 +48,14 @@ + ELSE(graphviz_FOUND) + MESSAGE("WARNING: Graphviz library not found") + ENDIF(graphviz_FOUND) ++ENDIF(NOT QFSM_AVOID_GRAPHVIZ) + + FIND_PACKAGE(Qt4 REQUIRED) + + ADD_DEFINITIONS(-DQT3_SUPPORT -DSVG) + + #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) +- 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) + + IF(UNIX AND NOT WIN32) + ADD_DEFINITIONS(-DQFSM_LANGUAGE_DIR="${CMAKE_INSTALL_PREFIX}/share/qfsm/") diff -urN /usr/ports/cad/qfsm/pkg-plist cad/qfsm/pkg-plist --- /usr/ports/cad/qfsm/pkg-plist 2010-01-22 06:14:48.000000000 +0900 +++ cad/qfsm/pkg-plist 2012-06-21 22:51:13.000000000 +0900 @@ -38,11 +38,14 @@ %%PORTDOCS%%%%DOCSDIR%%/zoom.png %%PORTDOCS%%%%DOCSDIR%%/zoomin.png %%PORTDOCS%%%%DOCSDIR%%/zoomout.png +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii.gv %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii_example.fsm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bin.gv %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bin_example.fsm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/datum.fsm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/float.fsm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/integer.fsm +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/more_complex_nonsense.fsm %%PORTEXAMPLES%%%%EXAMPLESDIR%%/text_example.fsm share/icons/hicolor/32x32/apps/qfsm.png share/icons/hicolor/32x32/mimetypes/x-qfsm.png >Release-Note: >Audit-Trail: >Unformatted: