[135324] users/devans/GNOME-3/stable/dports/devel/libgit2

[devans at macports.org]

Revision: 135324
          https://trac.macports.org/changeset/135324
Author:   devans at macports.org
Date:     2015-04-22 17:06:27 -0700 (Wed, 22 Apr 2015)
Log Message:
-----------
GNOME-3/stable: libgit2, sync with trunk and update to version 0.22.2.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/devel/libgit2/Portfile

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/devel/libgit2/


Property changes on: users/devans/GNOME-3/stable/dports/devel/libgit2
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/devel/libgit2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/libgit2:120932-134165
/users/cal/ports/devel/libgit2:96570-97031
   + /branches/mld-qt-481/dports/devel/libgit2:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/devel/libgit2:120932-134789
/users/cal/ports/devel/libgit2:96570-97031

Modified: users/devans/GNOME-3/stable/dports/devel/libgit2/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/devel/libgit2/Portfile	2015-04-22 23:54:35 UTC (rev 135323)
+++ users/devans/GNOME-3/stable/dports/devel/libgit2/Portfile	2015-04-23 00:06:27 UTC (rev 135324)
@@ -7,7 +7,7 @@
 
 cmake.out_of_source yes
 
-github.setup        libgit2 libgit2 0.22.1 v
+github.setup        libgit2 libgit2 0.22.2 v
 categories          devel
 platforms           darwin
 maintainers         juanrgar devans openmaintainer
@@ -23,8 +23,8 @@
 
 homepage            http://libgit2.github.com/
 
-checksums           rmd160  6e1aef41fab0d93a64120a2d4cc2f6014880b0ce \
-                    sha256  ea392623aaaea4c851779e0f74b606c5e4ec5e7219e0ca4b1fba684d06a4ea04
+checksums           rmd160  a798bfecb7a2337ced97fdf1fd419804884aa739 \
+                    sha256  3ee91f8d94ed97b1075924d0a1ce64f5c4c5ee36594f4f2c21ed664bdd30c4af
 
 depends_lib         port:libiconv \
                     port:libssh2 \
@@ -34,3 +34,17 @@
 patchfiles          patch-strnlen-posix.h.diff
 
 livecheck.regex     "archive/v(\\d+(?:\\.\\d+)*)${extract.suffix}"
+
+conflicts           libgit2-0.20
+
+# sigh, apparently libgit2 regressed and haven't accepted the pull request to
+# fix it yet: https://github.com/libgit2/libgit2/pull/2898
+subport libgit2-0.20 {
+    github.setup    libgit2 libgit2 0.20.0 v
+    conflicts       libgit2
+
+    checksums       rmd160  15d2635326274d1f6acefcb674a51506f8e319d8 \
+                    sha256  7251daf92958b7f3e59e90a989542d6ef05b1c1d9acade0632fc2becd067d6c7
+
+    livecheck.type  none
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150422/acf95b47/attachment-0001.html>