[25898] trunk/dports/devel/git-core
source_changes at macosforge.org
source_changes at macosforge.org
Mon Jun 4 20:39:35 PDT 2007
Revision: 25898
http://trac.macosforge.org/projects/macports/changeset/25898
Author: boeyms at macports.org
Date: 2007-06-04 20:39:35 -0700 (Mon, 04 Jun 2007)
Log Message:
-----------
devel/git-core:
* Apply patch from maintainer, addressing #7333 (failure of +doc variant) and
#11962 (bump to version 1.5.2, remove patches now incorporated upstream).
Modified Paths:
--------------
trunk/dports/devel/git-core/Portfile
trunk/dports/devel/git-core/files/patch-curl
Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile 2007-06-05 03:20:50 UTC (rev 25897)
+++ trunk/dports/devel/git-core/Portfile 2007-06-05 03:39:35 UTC (rev 25898)
@@ -2,12 +2,12 @@
PortSystem 1.0
name git-core
-version 1.5.1.3
+version 1.5.2
description The stupid content tracker.
long_description A stupid (but extremely fast) directory \
content manager. It doesn't do a whole lot, \
but what it _does_ do is track directory contents \
- efficiently.
+ efficiently.
maintainers bryan at larsen.st
categories devel
platforms darwin
@@ -18,13 +18,12 @@
distfiles git-${version}${extract.suffix} \
git-manpages-${version}${extract.suffix}
-checksums git-${version}${extract.suffix} sha1 673bbd457e713251a7fbf54369150dd760c5606d \
- git-manpages-${version}${extract.suffix} sha1 3a5ecaa36fb5b7c3dba9a96240016fcccac6cfc0
-depends_run port:curl port:diffutils \
- port:openssh port:rsync port:gsed
+checksums git-${version}${extract.suffix} sha1 f60d8dbf0926a3c12a1658bac177b383939d8e54 \
+ git-manpages-${version}${extract.suffix} sha1 025a4a65e6a1c9aa1abfd64007ba3559655bb629
+depends_run port:curl port:openssh port:rsync
depends_lib port:curl port:zlib port:openssl port:expat port:libiconv
-patchfiles patch-Makefiles patch-curl patch-t4200 patch-ld-R patch-perl-path
+patchfiles patch-Makefiles patch-curl patch-ld-R
use_configure no
@@ -43,28 +42,24 @@
post-destroot {
cd ${workpath}
- foreach f {1 7} {
+ foreach f {1 5 7} {
xinstall -d ${destroot}${prefix}/share/man/man${f}
foreach m [glob man${f}/*.${f}] {
xinstall ${m} ${destroot}${prefix}/share/man/man${f}
}
}
- if {[variant_isset no_svn]} {
+ if {![variant_isset svn]} {
system "rm ${destroot}${prefix}/bin/git-svn*"
}
}
variant doc {
- depends_build port:asciidoc port:xmlto
+ depends_build-append port:asciidoc port:xmlto
+ build.args-append XML_CATALOG_FILES=${prefix}/etc/xml/catalog
build.target-append doc
destroot.target-append install-doc
}
-variant svn conflicts no_svn {
+variant svn {
depends_run port:p5-svn-simple port:subversion port:perl port:p5-libwww-perl
}
-
-variant no_svn conflicts svn {
-}
-
-default_variants +no_svn
Modified: trunk/dports/devel/git-core/files/patch-curl
===================================================================
--- trunk/dports/devel/git-core/files/patch-curl 2007-06-05 03:20:50 UTC (rev 25897)
+++ trunk/dports/devel/git-core/files/patch-curl 2007-06-05 03:39:35 UTC (rev 25898)
@@ -1,10 +1,12 @@
---- http.h.orig 2007-02-18 13:08:46.000000000 -0500
-+++ http.h 2007-02-18 13:08:54.000000000 -0500
+diff --git http.h http.h
+index 69b6b66..b33fe7b 100644
+--- http.h
++++ http.h
@@ -7,7 +7,6 @@
#include <curl/easy.h>
-
- #if LIBCURL_VERSION_NUM >= 0x070908
+
+ #if LIBCURL_VERSION_NUM >= 0x071000
-#define USE_CURL_MULTI
#define DEFAULT_MAX_REQUESTS 5
#endif
-
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070604/e9f48082/attachment.html
More information about the macports-changes
mailing list