Ticket #12008: delete_git-core.patch
File delete_git-core.patch, 5.7 KB (added by zacheryph@…, 17 years ago) |
---|
-
dports/devel/git-core/files/patch-curl
1 --- http.h.orig 2007-02-18 13:08:46.000000000 -05002 +++ http.h 2007-02-18 13:08:54.000000000 -05003 @@ -7,7 +7,6 @@4 #include <curl/easy.h>5 6 #if LIBCURL_VERSION_NUM >= 0x0709087 -#define USE_CURL_MULTI8 #define DEFAULT_MAX_REQUESTS 59 #endif10 -
dports/devel/git-core/files/patch-t4200
1 diff --git t/t4200-rerere.sh t/t4200-rerere.sh2 index 6ba63d7..300e90e 1007553 --- t/t4200-rerere.sh4 +++ t/t4200-rerere.sh5 @@ -44,7 +44,7 @@ mkdir .git/rr-cache6 7 test_expect_failure 'conflicting merge' 'git pull . first'8 9 -sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR)10 +sha1=$(sed -e 's/[[:space:]].*//' .git/rr-cache/MERGE_RR)11 rr=.git/rr-cache/$sha112 test_expect_success 'recorded preimage' "grep ======= $rr/preimage"13 -
dports/devel/git-core/files/patch-perl-path
1 diff --git perl/Makefile perl/Makefile2 index 17d004e..2832cb4 1006443 --- perl/Makefile4 +++ perl/Makefile5 @@ -33,7 +33,7 @@ $(makfile): ../GIT-CFLAGS Makefile6 echo ' echo $(instdir_SQ)' >> $@7 else8 $(makfile): Makefile.PL ../GIT-CFLAGS9 - '$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'10 + $(PERL_PATH_SQ) $< PREFIX='$(prefix_SQ)'11 endif12 13 # this is just added comfort for calling make directly in perl dir -
dports/devel/git-core/files/patch-ld-R
1 diff --git Makefile Makefile2 index e0a1308..38bc469 1006443 --- Makefile4 +++ Makefile5 @@ -496,7 +496,7 @@ ifdef NO_R_TO_GCC_LINKER6 # the runtime dynamic library path.7 CC_LD_DYNPATH = -Wl,-rpath=8 else9 - CC_LD_DYNPATH = -R10 + CC_LD_DYNPATH = -L11 endif12 13 ifndef NO_CURL -
dports/devel/git-core/files/patch-Makefiles
1 --- Documentation/Makefile.orig 2007-02-15 13:39:32.000000000 +01002 +++ Documentation/Makefile 2007-02-15 13:39:47.000000000 +01003 @@ -26,7 +26,7 @@4 5 prefix?=$(HOME)6 bindir?=$(prefix)/bin7 -mandir?=$(prefix)/man8 +mandir?=$(prefix)/share/man9 man1dir=$(mandir)/man110 man7dir=$(mandir)/man711 # DESTDIR=12 --- Makefile.orig 2007-02-15 13:36:57.000000000 +010013 +++ Makefile 2007-02-15 13:38:00.000000000 +010014 @@ -114,8 +114,6 @@15 16 # CFLAGS and LDFLAGS are for the users to override from the command line.17 18 -CFLAGS = -g -O2 -Wall19 -LDFLAGS =20 ALL_CFLAGS = $(CFLAGS)21 ALL_LDFLAGS = $(LDFLAGS)22 STRIP ?= strip -
dports/devel/git-core/Portfile
1 # $Id$2 3 PortSystem 1.04 name git-core5 version 1.5.1.36 description The stupid content tracker.7 long_description A stupid (but extremely fast) directory \8 content manager. It doesn't do a whole lot, \9 but what it _does_ do is track directory contents \10 efficiently.11 maintainers bryan@larsen.st12 categories devel13 platforms darwin14 homepage http://git.or.cz/15 use_bzip2 yes16 master_sites http://www.kernel.org/pub/software/scm/git/17 distname git-${version}18 distfiles git-${version}${extract.suffix} \19 git-manpages-${version}${extract.suffix}20 21 checksums git-${version}${extract.suffix} sha1 673bbd457e713251a7fbf54369150dd760c5606d \22 git-manpages-${version}${extract.suffix} sha1 3a5ecaa36fb5b7c3dba9a96240016fcccac6cfc023 depends_run port:curl port:diffutils \24 port:openssh port:rsync port:gsed25 depends_lib port:curl port:zlib port:openssl port:expat port:libiconv26 27 patchfiles patch-Makefiles patch-curl patch-t4200 patch-ld-R patch-perl-path28 29 use_configure no30 31 build.env CFLAGS="-Wall -O2 -I${prefix}/include" LDFLAGS="-L${prefix}/lib"32 build.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} PERL_PATH="/usr/bin/env perl" NO_FINK=1 NO_DARWIN_PORTS=133 34 test.run yes35 test.cmd make36 test.target test37 test.dir ${worksrcpath}38 test.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} PERL_PATH="/usr/bin/env perl" NO_FINK=1 NO_DARWIN_PORTS=139 40 destroot.destdir DESTDIR=${destroot} prefix=${prefix}41 destroot.target install42 destroot.args prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} PERL_PATH="/usr/bin/env perl" NO_FINK=1 NO_DARWIN_PORTS=143 44 post-destroot {45 cd ${workpath}46 foreach f {1 7} {47 xinstall -d ${destroot}${prefix}/share/man/man${f}48 foreach m [glob man${f}/*.${f}] {49 xinstall ${m} ${destroot}${prefix}/share/man/man${f}50 }51 }52 if {[variant_isset no_svn]} {53 system "rm ${destroot}${prefix}/bin/git-svn*"54 }55 }56 57 variant doc {58 depends_build port:asciidoc port:xmlto59 build.target-append doc60 destroot.target-append install-doc61 }62 63 variant svn conflicts no_svn {64 depends_run port:p5-svn-simple port:subversion port:perl port:p5-libwww-perl65 }66 67 variant no_svn conflicts svn {68 }69 70 default_variants +no_svn