From owner-svn-ports-head@FreeBSD.ORG Fri Dec 21 16:11:55 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 67D954BB; Fri, 21 Dec 2012 16:11:55 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 4B9058FC14; Fri, 21 Dec 2012 16:11:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBLGBtVf093556; Fri, 21 Dec 2012 16:11:55 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBLGBsX9093546; Fri, 21 Dec 2012 16:11:54 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201212211611.qBLGBsX9093546@svn.freebsd.org> From: Max Brazhnikov Date: Fri, 21 Dec 2012 16:11:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309366 - in head/math/qtoctave: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Dec 2012 16:11:55 -0000 Author: makc Date: Fri Dec 21 16:11:53 2012 New Revision: 309366 URL: http://svnweb.freebsd.org/changeset/ports/309366 Log: - Update to 0.10.1 - Strip Makefile header - Mark MAKE_JOBS_SAFE Added: head/math/qtoctave/files/patch-qtjs__CMakeLists.txt (contents, props changed) head/math/qtoctave/files/patch-simple_rcs__CMakeLists.txt (contents, props changed) Deleted: head/math/qtoctave/files/patch-CMakeLists.txt head/math/qtoctave/files/patch-qtinfo__CMakeLists.txt Modified: head/math/qtoctave/Makefile (contents, props changed) head/math/qtoctave/distinfo (contents, props changed) head/math/qtoctave/files/patch-qtoctave__src__scripts_octave__qtinfo.m (contents, props changed) head/math/qtoctave/pkg-plist (contents, props changed) Modified: head/math/qtoctave/Makefile ============================================================================== --- head/math/qtoctave/Makefile Fri Dec 21 16:11:05 2012 (r309365) +++ head/math/qtoctave/Makefile Fri Dec 21 16:11:53 2012 (r309366) @@ -1,25 +1,25 @@ -# New ports collection makefile for: qtoctave -# Date created: 2009-02-18 -# Whom: Max Brazhnikov -# # $FreeBSD$ -# PORTNAME= qtoctave -PORTVERSION= 0.9.1 -PORTREVISION= 1 +PORTVERSION= 0.10.1 CATEGORIES= math -MASTER_SITES= http://forja.rediris.es/frs/download.php/1760/ +MASTER_SITES= http://forja.rediris.es/frs/download.php/2054/ MAINTAINER= makc@FreeBSD.org COMMENT= Qt4 frontend for Octave RUN_DEPENDS= octave:${PORTSDIR}/math/octave -USE_BZIP2= yes USE_QT4= designer gui network script svg xml \ - qmake_build moc_build rcc_build uic_build + qmake_build moc_build rcc_build uic_build \ + linguist_build USE_CMAKE= yes CMAKE_ARGS+= -DWITH_UseRPMTools:Bool=Off +MAKE_JOBS_SAFE= yes + +post-patch: + ${REINPLACE_CMD} -e '/COMMAND "lrelease"/s,lrelease,$${QT_LRELEASE_EXECUTABLE},' \ + ${WRKSRC}/qtoctave/src/CMakeLists.txt + ${RM} ${WRKSRC}/qtoctave/src/scripts_octave/qtinfo.m.orig .include Modified: head/math/qtoctave/distinfo ============================================================================== --- head/math/qtoctave/distinfo Fri Dec 21 16:11:05 2012 (r309365) +++ head/math/qtoctave/distinfo Fri Dec 21 16:11:53 2012 (r309366) @@ -1,2 +1,2 @@ -SHA256 (qtoctave-0.9.1.tar.bz2) = dd54c1dda166811e1ab32043211e37b803135b01d5f7d9101e85300ea9cfc986 -SIZE (qtoctave-0.9.1.tar.bz2) = 3335725 +SHA256 (qtoctave-0.10.1.tar.gz) = 4abd367924964887ea691f93c2c8ec90dcc64eb22827893dfb506ae43331b732 +SIZE (qtoctave-0.10.1.tar.gz) = 4215812 Added: head/math/qtoctave/files/patch-qtjs__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/qtoctave/files/patch-qtjs__CMakeLists.txt Fri Dec 21 16:11:53 2012 (r309366) @@ -0,0 +1,15 @@ +--- ./qtjs/CMakeLists.txt.orig 2011-01-06 21:48:05.000000000 +0000 ++++ ./qtjs/CMakeLists.txt 2012-12-14 22:22:22.999032717 +0000 +@@ -2,10 +2,5 @@ + + install( + DIRECTORY doc +- DESTINATION share/doc/qtoctave-utils/qtjs ++ DESTINATION share/doc/qtoctave/utils/qtjs + ) +- +-install( +- FILES "instalar.txt" "install.txt" +- DESTINATION share/doc/qtoctave-utils/qtjs +-) +\ No newline at end of file Modified: head/math/qtoctave/files/patch-qtoctave__src__scripts_octave__qtinfo.m ============================================================================== --- head/math/qtoctave/files/patch-qtoctave__src__scripts_octave__qtinfo.m Fri Dec 21 16:11:05 2012 (r309365) +++ head/math/qtoctave/files/patch-qtoctave__src__scripts_octave__qtinfo.m Fri Dec 21 16:11:53 2012 (r309366) @@ -1,11 +1,9 @@ ---- ./qtoctave/src/scripts_octave/qtinfo.m.orig 2010-01-25 16:19:50.000000000 +0300 -+++ ./qtoctave/src/scripts_octave/qtinfo.m 2010-11-28 19:09:57.670497066 +0300 +--- ./qtoctave/src/scripts_octave/qtinfo.m.orig 2011-01-06 21:48:08.000000000 +0000 ++++ ./qtoctave/src/scripts_octave/qtinfo.m 2012-12-15 22:23:03.542899718 +0000 @@ -1,5 +1,5 @@ function qtinfo() -- command=sprintf("qtinfo %s > /dev/null", info_file); -+ command=sprintf("qtoctave_info %s > /dev/null", info_file); + command=sprintf("qtoctave-info-reader %s > /dev/null", info_file); printf("Starting info: %s\n", command); - system(command, 1, "async"); --endfunction -\ No newline at end of file -+endfunction +- system(command, 1, "async"); ++ system(command, "async"); + endfunction Added: head/math/qtoctave/files/patch-simple_rcs__CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/qtoctave/files/patch-simple_rcs__CMakeLists.txt Fri Dec 21 16:11:53 2012 (r309366) @@ -0,0 +1,13 @@ +--- ./simple_rcs/CMakeLists.txt.orig 2011-01-06 21:48:06.000000000 +0000 ++++ ./simple_rcs/CMakeLists.txt 2012-12-14 22:49:32.658033064 +0000 +@@ -14,9 +14,3 @@ + #ADD_DEFINITIONS(-DUSER_CONFIG) + + add_subdirectory (src) +- +-install( +- DIRECTORY design +- DESTINATION share/doc/qtoctave-utils/simple_rcs +- PATTERN ".svn" EXCLUDE +-) +\ No newline at end of file Modified: head/math/qtoctave/pkg-plist ============================================================================== --- head/math/qtoctave/pkg-plist Fri Dec 21 16:11:05 2012 (r309365) +++ head/math/qtoctave/pkg-plist Fri Dec 21 16:11:53 2012 (r309366) @@ -1,7 +1,7 @@ bin/easy_plot bin/qtjs bin/qtoctave -bin/qtoctave_info +bin/qtoctave-info-reader bin/qtoctave_pkg bin/simplercs bin/xmlwidget @@ -10,6 +10,39 @@ share/applications/qtoctave.desktop %%DOCSDIR%%/qtoctave_doc/index.html %%DOCSDIR%%/qtoctave_doc/menu_integrate_easy.png %%DOCSDIR%%/qtoctave_doc/menus.html +%%DOCSDIR%%/utils/qtjs/doc/english/building guis with Qt Designer and qtjs.odt +%%DOCSDIR%%/utils/qtjs/doc/english/examples/readme.txt +%%DOCSDIR%%/utils/qtjs/doc/english/examples/run_example.sh +%%DOCSDIR%%/utils/qtjs/doc/english/examples/sombrero.js +%%DOCSDIR%%/utils/qtjs/doc/english/examples/sombrero.ui +%%DOCSDIR%%/utils/qtjs/doc/english/examples/sombrero2.js +%%DOCSDIR%%/utils/qtjs/doc/english/examples/sombrero2.ui +%%DOCSDIR%%/utils/qtjs/doc/english/examples/sombrero3.js +%%DOCSDIR%%/utils/qtjs/doc/english/examples/sombrero3.ui +%%DOCSDIR%%/utils/qtjs/doc/english/examples/sombrero4.js +%%DOCSDIR%%/utils/qtjs/doc/english/examples/sombrero4.ui +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/ejecutar_ejemplo.sh +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/leeme.txt +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/sombrero/ejecutar_ventana.m +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/sombrero/sombrero.js +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/sombrero/sombrero.ui +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/sombrero2.js +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/sombrero2.ui +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/sombrero3.js +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/sombrero3.ui +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/sombrero4.js +%%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/sombrero4.ui +%%DOCSDIR%%/utils/qtjs/doc/espanol/guis con Qt Designer y qtjs.odt +%%DOCSDIR%%/utils/qtjs/doc/espanol/images/combobox.png +%%DOCSDIR%%/utils/qtjs/doc/espanol/images/designer_label.png +%%DOCSDIR%%/utils/qtjs/doc/espanol/images/designer_new_widget.png +%%DOCSDIR%%/utils/qtjs/doc/espanol/images/designer_proyecto_vacio.png +%%DOCSDIR%%/utils/qtjs/doc/espanol/images/designer_ventana_completa.png +%%DOCSDIR%%/utils/qtjs/doc/espanol/images/lineEdit.png +%%DOCSDIR%%/utils/qtjs/doc/espanol/images/octave_sombrero.png +%%DOCSDIR%%/utils/qtjs/doc/espanol/images/qtdesigner.png +%%DOCSDIR%%/utils/qtjs/doc/espanol/images/qtjs_sombrero.png +%%DOCSDIR%%/utils/qtjs/doc/espanol/images/slider.png share/icons/hicolor/64x64/apps/qtoctave.png %%DATADIR%%/config.rc %%DATADIR%%/images/back.png @@ -52,11 +85,11 @@ share/icons/hicolor/64x64/apps/qtoctave. %%DATADIR%%/images/undo.png %%DATADIR%%/images/up.png %%DATADIR%%/images/xedit.png -%%DATADIR%%/lang/qtoctave.qph -%%DATADIR%%/lang/qtoctave_cs.ts -%%DATADIR%%/lang/qtoctave_es.ts +%%DATADIR%%/lang/qtoctave.qm +%%DATADIR%%/lang/qtoctave_cs.qm +%%DATADIR%%/lang/qtoctave_es.qm %%DATADIR%%/lang/qtoctave_gl_ES.qm -%%DATADIR%%/lang/qtoctave_gl_ES.ts +%%DATADIR%%/lang/qtoctave_pl.qm %%DATADIR%%/menus/Analysis/Integrate function/Easy integrate.menu %%DATADIR%%/menus/Analysis/Integrate function/Integrate function.menu %%DATADIR%%/menus/Analysis/Integrate function/integrate_simpson.menu @@ -68,13 +101,11 @@ share/icons/hicolor/64x64/apps/qtoctave. %%DATADIR%%/menus/Equations/equation_by_bisection.menu %%DATADIR%%/menus/Equations/linear_equation.menu %%DATADIR%%/menus/Equations/nonlinear_equation.menu -%%DATADIR%%/menus/Help/octave_help.menu %%DATADIR%%/menus/Plot/Export/eps.menu %%DATADIR%%/menus/Plot/Export/inkscape.menu %%DATADIR%%/menus/Plot/Export/pdf.menu %%DATADIR%%/menus/Plot/Export/png.menu %%DATADIR%%/menus/menus.ts -%%DATADIR%%/octave.xml %%DATADIR%%/scripts/clc.m %%DATADIR%%/scripts/diary.m %%DATADIR%%/scripts_octave/_ide_completion_matches.m @@ -82,10 +113,14 @@ share/icons/hicolor/64x64/apps/qtoctave. %%DATADIR%%/scripts_octave/_ide_reload_variables_list.m %%DATADIR%%/scripts_octave/maxima.m %%DATADIR%%/scripts_octave/qtinfo.m -%%DATADIR%%/scripts_octave/qtinfo.m.orig %%DATADIR%%/scripts_octave/svgcanvas_delete_on_load.m %%DATADIR%%/scripts_octave/svgcanvasload.m %%DATADIR%%/scripts_octave/svgcanvassave.m +%%DATADIR%%/syntax_files/cpp.xml +%%DATADIR%%/syntax_files/h.xml +%%DATADIR%%/syntax_files/m.xml +%%DATADIR%%/syntax_files/sh.xml +@dirrm %%DATADIR%%/syntax_files @dirrm %%DATADIR%%/scripts_octave @dirrm %%DATADIR%%/scripts @dirrm %%DATADIR%%/menus/Statistics @@ -106,8 +141,21 @@ share/icons/hicolor/64x64/apps/qtoctave. @dirrmtry share/icons/hicolor/64x64 @dirrmtry share/icons/hicolor @dirrmtry share/icons +@dirrm %%DOCSDIR%%/utils/qtjs/doc/images +@dirrm %%DOCSDIR%%/utils/qtjs/doc/espanol/images +@dirrm %%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos/sombrero +@dirrm %%DOCSDIR%%/utils/qtjs/doc/espanol/ejemplos +@dirrm %%DOCSDIR%%/utils/qtjs/doc/espanol +@dirrm %%DOCSDIR%%/utils/qtjs/doc/english/examples +@dirrm %%DOCSDIR%%/utils/qtjs/doc/english +@dirrm %%DOCSDIR%%/utils/qtjs/doc/ejemplos/sombrero +@dirrm %%DOCSDIR%%/utils/qtjs/doc/ejemplos +@dirrm %%DOCSDIR%%/utils/qtjs/doc +@dirrm %%DOCSDIR%%/utils/qtjs +@dirrm %%DOCSDIR%%/utils @dirrm %%DOCSDIR%%/qtoctave_doc @dirrm %%DOCSDIR%% @dirrmtry share/applications +@exec mkdir -p %D/%%DATADIR%%/menus/Help @exec mkdir -p %D/%%DATADIR%%/menus/Matrix @exec mkdir -p %D/%%DATADIR%%/menus/Statistics