[40920] trunk/dports/devel/qgit

[raimue at macports.org]

Revision: 40920
          http://trac.macports.org/changeset/40920
Author:   raimue at macports.org
Date:     2008-10-18 07:26:27 -0700 (Sat, 18 Oct 2008)
Log Message:
-----------
devel/qgit:
Maintainer update to version 2.2, closes #16827 and #16800

Modified Paths:
--------------
    trunk/dports/devel/qgit/Portfile

Added Paths:
-----------
    trunk/dports/devel/qgit/files/
    trunk/dports/devel/qgit/files/patch_src_namespace_def.cpp.diff
    trunk/dports/devel/qgit/files/patch_src_qgit.cpp.diff

Modified: trunk/dports/devel/qgit/Portfile
===================================================================
--- trunk/dports/devel/qgit/Portfile	2008-10-18 12:59:38 UTC (rev 40919)
+++ trunk/dports/devel/qgit/Portfile	2008-10-18 14:26:27 UTC (rev 40920)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                qgit
-version             2.1
+version             2.2
 categories          devel
 maintainers         ocroquette at free.fr
 description         A graphical interface to git repositories
@@ -17,10 +17,12 @@
 worksrcdir          qgit
 
 master_sites        sourceforge
-checksums           md5 f22787c814fbe832d6da7c6a2436c3c0
+checksums           md5 f863efa000aa1549f803c6ad743decd6
 
 depends_lib         port:qt4-mac port:git-core
 
+patchfiles          patch_src_namespace_def.cpp.diff  patch_src_qgit.cpp.diff
+
 configure {
     # ui_msg ${worksrcpath}
     system "cd ${worksrcpath} && qmake"

Added: trunk/dports/devel/qgit/files/patch_src_namespace_def.cpp.diff
===================================================================
--- trunk/dports/devel/qgit/files/patch_src_namespace_def.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/qgit/files/patch_src_namespace_def.cpp.diff	2008-10-18 14:26:27 UTC (rev 40920)
@@ -0,0 +1,37 @@
+diff -ru src/namespace_def.cpp.org src/namespace_def.cpp
+--- src/namespace_def.cpp.org	2008-03-21 03:19:30.000000000 +0100
++++ src/namespace_def.cpp	2008-10-11 17:11:09.000000000 +0200
+@@ -51,6 +51,33 @@
+ 	}
+ }
+ 
++#elif defined(Q_OS_MACX) // MacOS X specific code
++
++#include <sys/types.h> // used by chmod()
++#include <sys/stat.h>  // used by chmod()
++
++const QString QGit::SCRIPT_EXT = ".sh";
++
++static void adjustPath(QStringList& args, bool*) {
++/*
++    Under MacOS X, git typically doesn't live in the PATH
++    So use GIT_DIR from the settings if available
++    
++    Note: I (OC) think that this should be the default behaviour,
++          but I don't want to break other platforms, so I introduced
++          the MacOS X special case. Feel free to make this the default if
++          you do feel the same.
++*/
++	if (args.first() == "git" || args.first().startsWith("git-")) {
++
++		if (!QGit::GIT_DIR.isEmpty()) // application built from sources
++			args.first().prepend(QGit::GIT_DIR + '/');
++
++	}
++}
++
++
++
+ #else
+ 
+ #include <sys/types.h> // used by chmod()

Added: trunk/dports/devel/qgit/files/patch_src_qgit.cpp.diff
===================================================================
--- trunk/dports/devel/qgit/files/patch_src_qgit.cpp.diff	                        (rev 0)
+++ trunk/dports/devel/qgit/files/patch_src_qgit.cpp.diff	2008-10-18 14:26:27 UTC (rev 40920)
@@ -0,0 +1,19 @@
+diff -ru src/qgit.cpp.org src/qgit.cpp
+--- src/qgit.cpp.org	2007-12-31 07:12:57.000000000 +0100
++++ src/qgit.cpp	2008-10-11 17:14:05.000000000 +0200
+@@ -16,11 +16,11 @@
+ 	QCoreApplication::setOrganizationName(ORG_KEY);
+ 	QCoreApplication::setApplicationName(APP_KEY);
+ 
+-	/* On Windows msysgit exec directory is set up
+-	 * during installation so to always find git.exe
+-	 * also if not in PATH
+-	 */
+ 	QSettings set;
++	if ( set.value(GIT_DIR_KEY).toString().isEmpty() ) {
++	      // path to git is not set. Set it to our default.
++	      set.setValue(GIT_DIR_KEY, "/opt/local/bin");
++	}
+ 	GIT_DIR = set.value(GIT_DIR_KEY).toString();
+ 
+ 	initMimePix();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20081018/caf07a17/attachment.html