[24796] trunk/dports/devel/git-core

[source_changes at macosforge.org]

Revision: 24796
          http://trac.macosforge.org/projects/macports/changeset/24796
Author:   pipping at macports.org
Date:     2007-05-04 06:35:14 -0700 (Fri, 04 May 2007)

Log Message:
-----------
maintainer update:
 * bump to version 1.5.1.3
 * remove dependencies: tk, python
 * enable tests
 * fix #11772 (see ticket)
 * add svn variant
 * use posix shebang line for perl scripts

Modified Paths:
--------------
    trunk/dports/devel/git-core/Portfile

Added Paths:
-----------
    trunk/dports/devel/git-core/files/patch-ld-R
    trunk/dports/devel/git-core/files/patch-perl-path
    trunk/dports/devel/git-core/files/patch-t4200

Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile	2007-05-04 10:35:02 UTC (rev 24795)
+++ trunk/dports/devel/git-core/Portfile	2007-05-04 13:35:14 UTC (rev 24796)
@@ -2,7 +2,7 @@
 
 PortSystem 1.0
 name		git-core
-version         1.5.0.5
+version         1.5.1.3
 description	The stupid content tracker.
 long_description	A stupid (but extremely fast) directory \
 			content manager. It doesn't do a whole lot, \
@@ -17,23 +17,29 @@
 distname        git-${version}
 distfiles       git-${version}${extract.suffix} \
                 git-manpages-${version}${extract.suffix}
-
-checksums       git-${version}${extract.suffix} sha1 c765246e8a5bbdef0469bd2b22f604887c40bec0 \
-                git-manpages-${version}${extract.suffix} sha1 bfe8472f3d33058596e28ae4eb7e81ebf6db15b1
-depends_run	port:curl port:diffutils port:tk \
-		port:openssh port:python24 port:rsync \
-		port:gsed
+ 
+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
 depends_lib	port:curl port:zlib port:openssl port:expat port:libiconv
 
-patchfiles	patch-Makefiles patch-curl
+patchfiles	patch-Makefiles patch-curl patch-t4200 patch-ld-R patch-perl-path
 
 use_configure	no
 
 build.env	CFLAGS="-Wall -O2 -I${prefix}/include" LDFLAGS="-L${prefix}/lib"
-build.args	prefix=${prefix} CURLDIR=${prefix} OPENSSLDIR=${prefix} ICONVDIR=${prefix} NO_FINK=1 NO_DARWIN_PORTS=1
+build.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}
@@ -43,8 +49,9 @@
 			xinstall ${m} ${destroot}${prefix}/share/man/man${f}
 		}
 	}
-	file rename -force ${destroot}${prefix}/man/man3 \
-	${destroot}${prefix}/share/man
+	if {[variant_isset no_svn]} {
+		system "rm ${destroot}${prefix}/bin/git-svn*"
+	}
 }
 
 variant doc {
@@ -52,3 +59,12 @@
 	build.target-append	doc
 	destroot.target-append	install-doc
 }
+
+variant svn conflicts no_svn {
+	depends_run		port:p5-svn-simple port:subversion port:perl port:p5-libwww-perl
+}
+
+variant no_svn conflicts svn {
+}
+
+default_variants +no_svn

Added: trunk/dports/devel/git-core/files/patch-ld-R
===================================================================
--- trunk/dports/devel/git-core/files/patch-ld-R	                        (rev 0)
+++ trunk/dports/devel/git-core/files/patch-ld-R	2007-05-04 13:35:14 UTC (rev 24796)
@@ -0,0 +1,13 @@
+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

Added: trunk/dports/devel/git-core/files/patch-perl-path
===================================================================
--- trunk/dports/devel/git-core/files/patch-perl-path	                        (rev 0)
+++ trunk/dports/devel/git-core/files/patch-perl-path	2007-05-04 13:35:14 UTC (rev 24796)
@@ -0,0 +1,13 @@
+diff --git perl/Makefile perl/Makefile
+index 17d004e..2832cb4 100644
+--- perl/Makefile
++++ perl/Makefile
+@@ -33,7 +33,7 @@ $(makfile): ../GIT-CFLAGS Makefile
+ 	echo '	echo $(instdir_SQ)' >> $@
+ else
+ $(makfile): Makefile.PL ../GIT-CFLAGS
+-	'$(PERL_PATH_SQ)' $< PREFIX='$(prefix_SQ)'
++	$(PERL_PATH_SQ) $< PREFIX='$(prefix_SQ)'
+ endif
+ 
+ # this is just added comfort for calling make directly in perl dir

Added: trunk/dports/devel/git-core/files/patch-t4200
===================================================================
--- trunk/dports/devel/git-core/files/patch-t4200	                        (rev 0)
+++ trunk/dports/devel/git-core/files/patch-t4200	2007-05-04 13:35:14 UTC (rev 24796)
@@ -0,0 +1,13 @@
+diff --git t/t4200-rerere.sh t/t4200-rerere.sh
+index 6ba63d7..300e90e 100755
+--- t/t4200-rerere.sh
++++ t/t4200-rerere.sh
+@@ -44,7 +44,7 @@ mkdir .git/rr-cache
+ 
+ test_expect_failure 'conflicting merge' 'git pull . first'
+ 
+-sha1=$(sed -e 's/\t.*//' .git/rr-cache/MERGE_RR)
++sha1=$(sed -e 's/[[:space:]].*//' .git/rr-cache/MERGE_RR)
+ rr=.git/rr-cache/$sha1
+ test_expect_success 'recorded preimage' "grep ======= $rr/preimage"
+ 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070504/255e130f/attachment.html