[26771] trunk/dports/devel/git-core
source_changes at macosforge.org
source_changes at macosforge.org
Fri Jul 6 14:41:49 PDT 2007
Revision: 26771
http://trac.macosforge.org/projects/macports/changeset/26771
Author: mgrimes at macports.org
Date: 2007-07-06 14:41:49 -0700 (Fri, 06 Jul 2007)
Log Message:
-----------
Update to git-core 1.5.2.3
- Add p5-error (Fix #12240)
- Refresh and rename patch files to literal naming conventions instead
of functional.
- Add darwin_9 variant to workaround ticket #12245.
- whitespace fixes
Modified Paths:
--------------
trunk/dports/devel/git-core/Portfile
Added Paths:
-----------
trunk/dports/devel/git-core/files/patch-Documentation_Makefile
trunk/dports/devel/git-core/files/patch-Makefile
trunk/dports/devel/git-core/files/patch-http.h
Removed Paths:
-------------
trunk/dports/devel/git-core/files/patch-Makefiles
trunk/dports/devel/git-core/files/patch-curl
trunk/dports/devel/git-core/files/patch-ld-R
Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile 2007-07-06 19:40:23 UTC (rev 26770)
+++ trunk/dports/devel/git-core/Portfile 2007-07-06 21:41:49 UTC (rev 26771)
@@ -1,65 +1,74 @@
# $Id$
-PortSystem 1.0
-name git-core
-version 1.5.2.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.
-maintainers bryan at larsen.st
-categories devel
-platforms darwin
-homepage http://git.or.cz/
-use_bzip2 yes
-master_sites http://www.kernel.org/pub/software/scm/git/
-distname git-${version}
-distfiles git-${version}${extract.suffix} \
- git-manpages-${version}${extract.suffix}
+PortSystem 1.0
+name git-core
+version 1.5.2.3
+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.
+maintainers bryan at larsen.st
+categories devel
+platforms darwin
+homepage http://git.or.cz/
+use_bzip2 yes
+master_sites http://www.kernel.org/pub/software/scm/git/
+distname git-${version}
+distfiles git-${version}${extract.suffix} \
+ git-manpages-${version}${extract.suffix}
-checksums git-${version}${extract.suffix} sha1 7dbb601265e601293f8918290258088f9ae2918f \
- git-manpages-${version}${extract.suffix} sha1 4bd6c99b8b30fa1af05408b86621eb3f0d47d69e
-depends_run port:curl port:openssh port:rsync
-depends_lib port:curl port:zlib port:openssl port:expat port:libiconv
+checksums git-${version}${extract.suffix} sha1 b9d421c1dee3ea52929ea016d49f3b38727042e5 \
+ git-manpages-${version}${extract.suffix} sha1 23155f8c771e5d801690cb4dde15a5a409bef8e4
-patchfiles patch-Makefiles patch-curl patch-ld-R
+depends_run port:curl port:openssh port:rsync
+depends_lib port:curl port:zlib port:openssl port:expat port:libiconv
-use_configure no
+patchfiles patch-Documentation_Makefile patch-Makefile patch-http.h
-build.env CFLAGS="-Wall -O2 -I${prefix}/include" LDFLAGS="-L${prefix}/lib"
-build.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} PERL_PATH="/usr/bin/env perl" NO_FINK=1 NO_DARWIN_PORTS=1
+use_configure no
-test.run yes
-test.cmd make
-test.target test
-test.dir ${worksrcpath}
-test.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} PERL_PATH="/usr/bin/env perl" NO_FINK=1 NO_DARWIN_PORTS=1
+build.env CFLAGS="-Wall -O2 -I${prefix}/include" LDFLAGS="-L${prefix}/lib"
+build.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
+ PERL_PATH="/usr/bin/env perl" NO_FINK=1 NO_DARWIN_PORTS=1
-destroot.destdir DESTDIR=${destroot} prefix=${prefix}
-destroot.target install
-destroot.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} PERL_PATH="/usr/bin/env perl" NO_FINK=1 NO_DARWIN_PORTS=1
+test.run yes
+test.cmd make
+test.target test
+test.dir ${worksrcpath}
+test.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
+ PERL_PATH="/usr/bin/env perl" NO_FINK=1 NO_DARWIN_PORTS=1
+destroot.destdir DESTDIR=${destroot} prefix=${prefix}
+destroot.target install
+destroot.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} \
+ PERL_PATH="/usr/bin/env perl" NO_FINK=1 NO_DARWIN_PORTS=1
+
post-destroot {
- cd ${workpath}
- 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 svn]} {
- system "rm ${destroot}${prefix}/bin/git-svn*"
- }
+ cd ${workpath}
+ 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 svn]} {
+ system "rm ${destroot}${prefix}/bin/git-svn*"
+ }
}
variant doc {
- 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
+ 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 {
- depends_run port:p5-svn-simple port:subversion port:perl port:p5-libwww-perl port:p5-term-readkey
+ depends_run port:subversion port:perl \
+ port:p5-error port:p5-libwww-perl port:p5-svn-simple port:p5-term-readkey
}
+
+platform darwin 9 {
+ # Provision until Ticket #12245 is resolved. Built-in openssh will suffice.
+ depends_run-delete port:openssh
+}
Added: trunk/dports/devel/git-core/files/patch-Documentation_Makefile
===================================================================
--- trunk/dports/devel/git-core/files/patch-Documentation_Makefile (rev 0)
+++ trunk/dports/devel/git-core/files/patch-Documentation_Makefile 2007-07-06 21:41:49 UTC (rev 26771)
@@ -0,0 +1,11 @@
+--- Documentation/Makefile.orig 2007-07-03 02:07:27.000000000 -0700
++++ Documentation/Makefile 2007-07-03 02:07:38.000000000 -0700
+@@ -29,7 +29,7 @@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT
+
+ prefix?=$(HOME)
+ bindir?=$(prefix)/bin
+-mandir?=$(prefix)/man
++mandir?=$(prefix)/share/man
+ man1dir=$(mandir)/man1
+ man5dir=$(mandir)/man5
+ man7dir=$(mandir)/man7
Added: trunk/dports/devel/git-core/files/patch-Makefile
===================================================================
--- trunk/dports/devel/git-core/files/patch-Makefile (rev 0)
+++ trunk/dports/devel/git-core/files/patch-Makefile 2007-07-06 21:41:49 UTC (rev 26771)
@@ -0,0 +1,20 @@
+--- Makefile.orig 2007-07-03 02:06:07.000000000 -0700
++++ Makefile 2007-07-03 02:06:32.000000000 -0700
+@@ -137,8 +137,6 @@ uname_P := $(shell sh -c 'uname -p 2>/de
+
+ # CFLAGS and LDFLAGS are for the users to override from the command line.
+
+-CFLAGS = -g -O2 -Wall
+-LDFLAGS =
+ ALL_CFLAGS = $(CFLAGS)
+ ALL_LDFLAGS = $(LDFLAGS)
+ STRIP ?= strip
+@@ -507,7 +505,7 @@ ifdef NO_R_TO_GCC_LINKER
+ # the runtime dynamic library path.
+ CC_LD_DYNPATH = -Wl,-rpath=
+ else
+- CC_LD_DYNPATH = -R
++ CC_LD_DYNPATH = -L
+ endif
+
+ ifndef NO_CURL
Deleted: trunk/dports/devel/git-core/files/patch-Makefiles
===================================================================
--- trunk/dports/devel/git-core/files/patch-Makefiles 2007-07-06 19:40:23 UTC (rev 26770)
+++ trunk/dports/devel/git-core/files/patch-Makefiles 2007-07-06 21:41:49 UTC (rev 26771)
@@ -1,22 +0,0 @@
---- Documentation/Makefile.orig 2007-02-15 13:39:32.000000000 +0100
-+++ Documentation/Makefile 2007-02-15 13:39:47.000000000 +0100
-@@ -26,7 +26,7 @@
-
- prefix?=$(HOME)
- bindir?=$(prefix)/bin
--mandir?=$(prefix)/man
-+mandir?=$(prefix)/share/man
- man1dir=$(mandir)/man1
- man7dir=$(mandir)/man7
- # DESTDIR=
---- Makefile.orig 2007-02-15 13:36:57.000000000 +0100
-+++ Makefile 2007-02-15 13:38:00.000000000 +0100
-@@ -114,8 +114,6 @@
-
- # CFLAGS and LDFLAGS are for the users to override from the command line.
-
--CFLAGS = -g -O2 -Wall
--LDFLAGS =
- ALL_CFLAGS = $(CFLAGS)
- ALL_LDFLAGS = $(LDFLAGS)
- STRIP ?= strip
Deleted: trunk/dports/devel/git-core/files/patch-curl
===================================================================
--- trunk/dports/devel/git-core/files/patch-curl 2007-07-06 19:40:23 UTC (rev 26770)
+++ trunk/dports/devel/git-core/files/patch-curl 2007-07-06 21:41:49 UTC (rev 26771)
@@ -1,12 +0,0 @@
-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 >= 0x071000
--#define USE_CURL_MULTI
- #define DEFAULT_MAX_REQUESTS 5
- #endif
-
Copied: trunk/dports/devel/git-core/files/patch-http.h (from rev 26770, trunk/dports/devel/git-core/files/patch-curl)
===================================================================
--- trunk/dports/devel/git-core/files/patch-http.h (rev 0)
+++ trunk/dports/devel/git-core/files/patch-http.h 2007-07-06 21:41:49 UTC (rev 26771)
@@ -0,0 +1,10 @@
+--- http.h.orig 2007-07-03 02:08:49.000000000 -0700
++++ http.h 2007-07-03 02:09:00.000000000 -0700
+@@ -7,7 +7,6 @@
+ #include <curl/easy.h>
+
+ #if LIBCURL_VERSION_NUM >= 0x071000
+-#define USE_CURL_MULTI
+ #define DEFAULT_MAX_REQUESTS 5
+ #endif
+
Deleted: trunk/dports/devel/git-core/files/patch-ld-R
===================================================================
--- trunk/dports/devel/git-core/files/patch-ld-R 2007-07-06 19:40:23 UTC (rev 26770)
+++ trunk/dports/devel/git-core/files/patch-ld-R 2007-07-06 21:41:49 UTC (rev 26771)
@@ -1,13 +0,0 @@
-diff --git Makefile Makefile
-index e0a1308..38bc469 100644
---- Makefile
-+++ Makefile
-@@ -496,7 +496,7 @@ ifdef NO_R_TO_GCC_LINKER
- # the runtime dynamic library path.
- CC_LD_DYNPATH = -Wl,-rpath=
- else
-- CC_LD_DYNPATH = -R
-+ CC_LD_DYNPATH = -L
- endif
-
- ifndef NO_CURL
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070706/66c292c9/attachment.html
More information about the macports-changes
mailing list