summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/universalindentgui/Makefile18
-rw-r--r--devel/universalindentgui/distinfo4
-rw-r--r--devel/universalindentgui/files/patch-src_UiGuiSettings.cpp11
-rw-r--r--devel/universalindentgui/files/patch-src_UiGuiSystemInfo.cpp20
-rw-r--r--devel/universalindentgui/pkg-descr2
-rw-r--r--devel/universalindentgui/pkg-plist6
6 files changed, 49 insertions, 12 deletions
diff --git a/devel/universalindentgui/Makefile b/devel/universalindentgui/Makefile
index 029014d9d42d..78d868a3ad5a 100644
--- a/devel/universalindentgui/Makefile
+++ b/devel/universalindentgui/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for: universalindentgui
-# Date created: 2009-09-30
-# Whom: Andriy Gapon <avg@icyb.net.ua>
-#
+# Created by: Andriy Gapon <avg@icyb.net.ua>
# $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 source code indent/format/beautify tools
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}
diff --git a/devel/universalindentgui/distinfo b/devel/universalindentgui/distinfo
index 05cbee93a8d3..3be41186ca64 100644
--- a/devel/universalindentgui/distinfo
+++ b/devel/universalindentgui/distinfo
@@ -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
diff --git a/devel/universalindentgui/files/patch-src_UiGuiSettings.cpp b/devel/universalindentgui/files/patch-src_UiGuiSettings.cpp
new file mode 100644
index 000000000000..de4b11888856
--- /dev/null
+++ b/devel/universalindentgui/files/patch-src_UiGuiSettings.cpp
@@ -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.
diff --git a/devel/universalindentgui/files/patch-src_UiGuiSystemInfo.cpp b/devel/universalindentgui/files/patch-src_UiGuiSystemInfo.cpp
new file mode 100644
index 000000000000..08c189eddb86
--- /dev/null
+++ b/devel/universalindentgui/files/patch-src_UiGuiSystemInfo.cpp
@@ -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;
diff --git a/devel/universalindentgui/pkg-descr b/devel/universalindentgui/pkg-descr
index 2c669ebee362..8eec1c336728 100644
--- a/devel/universalindentgui/pkg-descr
+++ b/devel/universalindentgui/pkg-descr
@@ -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/
diff --git a/devel/universalindentgui/pkg-plist b/devel/universalindentgui/pkg-plist
index ab2f336f9d11..9e7d435d41c9 100644
--- a/devel/universalindentgui/pkg-plist
+++ b/devel/universalindentgui/pkg-plist
@@ -12,6 +12,8 @@ share/universalindentgui/indenters/example.pl
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_phpCB.ini
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