From owner-svn-ports-all@FreeBSD.ORG Sun Feb 17 16:06:28 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id CEAED13E; Sun, 17 Feb 2013 16:06:28 +0000 (UTC) (envelope-from pawel@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 B1B5CD63; Sun, 17 Feb 2013 16:06:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1HG6SPs083432; Sun, 17 Feb 2013 16:06:28 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1HG6R26083425; Sun, 17 Feb 2013 16:06:27 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201302171606.r1HG6R26083425@svn.freebsd.org> From: Pawel Pekala Date: Sun, 17 Feb 2013 16:06:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r312419 - in head/devel/universalindentgui: . 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-all@freebsd.org X-Mailman-Version: 2.1.14 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: Sun, 17 Feb 2013 16:06:28 -0000 Author: pawel Date: Sun Feb 17 16:06:27 2013 New Revision: 312419 URL: http://svnweb.freebsd.org/changeset/ports/312419 Log: - Update to version 1.2.0 [1] - Respect CFLAGS - Add desktop entry - Fix WWW: line, convert tab to space - Trim Makefile header PR: ports/174547 [1] Submitted by: Maxim Samsonov [1] Approved by: maintainer timeout Added: head/devel/universalindentgui/files/patch-src_UiGuiSettings.cpp (contents, props changed) head/devel/universalindentgui/files/patch-src_UiGuiSystemInfo.cpp (contents, props changed) Modified: head/devel/universalindentgui/Makefile head/devel/universalindentgui/distinfo head/devel/universalindentgui/pkg-descr head/devel/universalindentgui/pkg-plist Modified: head/devel/universalindentgui/Makefile ============================================================================== --- head/devel/universalindentgui/Makefile Sun Feb 17 14:44:08 2013 (r312418) +++ head/devel/universalindentgui/Makefile Sun Feb 17 16:06:27 2013 (r312419) @@ -1,13 +1,8 @@ -# New ports collection makefile for: universalindentgui -# Date created: 2009-09-30 -# Whom: Andriy Gapon -# +# Created by: Andriy Gapon # $FreeBSD$ -# PORTNAME= universalindentgui -PORTVERSION= 1.1.0 -PORTREVISION= 4 +PORTVERSION= 1.2.0 CATEGORIES= devel MASTER_SITES= SF/universalindent/uigui/UniversalIndentGUI_${PORTVERSION} @@ -16,6 +11,7 @@ COMMENT= Graphical UI for multiple sourc LIB_DEPENDS= qscintilla2:${PORTSDIR}/devel/qscintilla2 +USE_DOS2UNIX= yes USE_QT4= qmake_build moc_build uic_build rcc_build \ linguist network script gui HAS_CONFIGURE= yes @@ -25,14 +21,20 @@ MANCOMPRESSED= yes QMAKE_ARGS= -unix PREFIX=${PREFIX} +DESKTOP_ENTRIES="UniversalIndentGUI" "${COMMENT}" "" "${PORTNAME}" "" true + post-patch: @${REINPLACE_CMD} -e 's#/usr/#${PREFIX}/#g' -e 's#/share/man/#/man/#g' \ - ${WRKSRC}/UniversalIndentGUI.pro + ${WRKSRC}/UniversalIndentGUI.pro ${WRKSRC}/src/SettingsPaths.cpp do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ ${QMAKE} ${QMAKE_ARGS} +post-configure: + @${REINPLACE_CMD} 's|-pipe -O2|${CFLAGS}|' ${WRKSRC}/Makefile.Release + @${REINPLACE_CMD} 's|-pipe -g|${CFLAGS}|' ${WRKSRC}/Makefile.Debug + post-install: @${ECHO_MSG} @${CAT} ${PKGMESSAGE} Modified: head/devel/universalindentgui/distinfo ============================================================================== --- head/devel/universalindentgui/distinfo Sun Feb 17 14:44:08 2013 (r312418) +++ head/devel/universalindentgui/distinfo Sun Feb 17 16:06:27 2013 (r312419) @@ -1,2 +1,2 @@ -SHA256 (universalindentgui-1.1.0.tar.gz) = 6b1d06e2a9d441ea330d45e0d8e9099acb3066a3ca259a5f0d604cd18a1025d6 -SIZE (universalindentgui-1.1.0.tar.gz) = 934141 +SHA256 (universalindentgui-1.2.0.tar.gz) = 78a8d5538b951080c521118a0cefcae5bf1b32a3f0a022087087af3d70e98338 +SIZE (universalindentgui-1.2.0.tar.gz) = 863793 Added: head/devel/universalindentgui/files/patch-src_UiGuiSettings.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/universalindentgui/files/patch-src_UiGuiSettings.cpp Sun Feb 17 16:06:27 2013 (r312419) @@ -0,0 +1,11 @@ +--- ./src/UiGuiSettings.cpp.orig 2013-02-17 16:32:05.000000000 +0100 ++++ ./src/UiGuiSettings.cpp 2013-02-17 16:34:46.000000000 +0100 +@@ -181,7 +181,7 @@ + _qsettings->setValue( "UniversalIndentGUI/language", _availableTranslations.indexOf( _qsettings->value("UniversalIndentGUI/language", "").toString() ) ); + + // Read the update check settings from the settings file. +- _qsettings->setValue( "UniversalIndentGUI/CheckForUpdate", _qsettings->value("UniversalIndentGUI/CheckForUpdate", true) ); ++ _qsettings->setValue( "UniversalIndentGUI/CheckForUpdate", _qsettings->value("UniversalIndentGUI/CheckForUpdate", false) ); + _qsettings->setValue( "UniversalIndentGUI/LastUpdateCheck", _qsettings->value("UniversalIndentGUI/LastUpdateCheck", QDate(1900,1,1)) ); + + // Read the main window state. Added: head/devel/universalindentgui/files/patch-src_UiGuiSystemInfo.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/universalindentgui/files/patch-src_UiGuiSystemInfo.cpp Sun Feb 17 16:06:27 2013 (r312419) @@ -0,0 +1,20 @@ +--- src/UiGuiSystemInfo.cpp.orig 2012-01-01 17:51:34.000000000 +0100 ++++ src/UiGuiSystemInfo.cpp 2013-02-17 15:22:00.000000000 +0100 +@@ -154,6 +154,17 @@ + + operatingSystemString = os + "oslevel " + oslevel; + } ++ else if ( os == "FreeBSD" ) { ++ process.start("uname -n"); ++ result = process.waitForFinished(1000); ++ QString name = process.readAllStandardOutput().trimmed(); ++ ++ process.start("uname -v"); ++ result = process.waitForFinished(1000); ++ QString oslevel = process.readAllStandardOutput().trimmed(); ++ ++ operatingSystemString = os + " " + name + " " + rev + " " + oslevel + " " + mach; ++ } + else if ( os == "Linux" ) { + QString dist; + QString pseudoname; Modified: head/devel/universalindentgui/pkg-descr ============================================================================== --- head/devel/universalindentgui/pkg-descr Sun Feb 17 14:44:08 2013 (r312418) +++ head/devel/universalindentgui/pkg-descr Sun Feb 17 16:06:27 2013 (r312419) @@ -1,4 +1,4 @@ UniversalIndentGUI is a graphical UI for multiple source code indent, format and beautify tools like GNU Indent, Astyle, GreatCode etc. -WWW: http://universalindent.sourceforge.net/ +WWW: http://universalindent.sourceforge.net/ Modified: head/devel/universalindentgui/pkg-plist ============================================================================== --- head/devel/universalindentgui/pkg-plist Sun Feb 17 14:44:08 2013 (r312418) +++ head/devel/universalindentgui/pkg-plist Sun Feb 17 16:06:27 2013 (r312419) @@ -12,6 +12,8 @@ share/universalindentgui/indenters/examp share/universalindentgui/indenters/example.py share/universalindentgui/indenters/example.rb share/universalindentgui/indenters/example.sh +share/universalindentgui/indenters/example.sql +share/universalindentgui/indenters/example.vb share/universalindentgui/indenters/example.xml share/universalindentgui/indenters/phpStylist.php share/universalindentgui/indenters/phpStylist.txt @@ -36,15 +38,17 @@ share/universalindentgui/indenters/uigui share/universalindentgui/indenters/uigui_phpStylist.ini share/universalindentgui/indenters/uigui_php_Beautifier.ini share/universalindentgui/indenters/uigui_pindent.ini +share/universalindentgui/indenters/uigui_psti.ini share/universalindentgui/indenters/uigui_rbeautify.ini share/universalindentgui/indenters/uigui_rubyformatter.ini share/universalindentgui/indenters/uigui_shellindent.ini share/universalindentgui/indenters/uigui_tidy.ini share/universalindentgui/indenters/uigui_uncrustify.ini +share/universalindentgui/indenters/uigui_vbsbeaut.ini share/universalindentgui/indenters/uigui_xmlindent.ini share/universalindentgui/translations/universalindent_de.qm share/universalindentgui/translations/universalindent_fr.qm -share/universalindentgui/translations/universalindent_ja_jp.qm +share/universalindentgui/translations/universalindent_ja.qm share/universalindentgui/translations/universalindent_ru.qm share/universalindentgui/translations/universalindent_uk.qm share/universalindentgui/translations/universalindent_zh_TW.qm