Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv4656
Modified Files: git.info git.patch Removed Files: git-10.4.info git-10.5.info Log Message: New upstream version. --- git-10.5.info DELETED --- Index: git.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/git.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- git.patch 4 Mar 2010 00:42:59 -0000 1.16 +++ git.patch 26 Jul 2010 23:52:57 -0000 1.17 @@ -1,20 +1,21 @@ -diff -ru git-1.7.0.1.orig/Makefile git-1.7.0.1/Makefile ---- git-1.7.0.1.orig/Makefile 2010-02-28 17:54:17.000000000 -0500 -+++ git-1.7.0.1/Makefile 2010-03-03 18:35:27.000000000 -0500 -@@ -257,10 +257,10 @@ +diff -ru git-1.7.2.orig/Makefile git-1.7.2/Makefile +--- git-1.7.2.orig/Makefile 2010-07-21 17:35:25.000000000 -0400 ++++ git-1.7.2/Makefile 2010-07-26 19:27:42.000000000 -0400 +@@ -278,11 +278,11 @@ bindir = $(prefix)/$(bindir_relative) mandir = share/man infodir = share/info -gitexecdir = libexec/git-core +gitexecdir = lib/git sharedir = $(prefix)/share + gitwebdir = $(sharedir)/gitweb template_dir = share/git-core/templates -htmldir = share/doc/git-doc +htmldir = share/doc/git ifeq ($(prefix),/usr) sysconfdir = /etc ETC_GITCONFIG = $(sysconfdir)/gitconfig -@@ -1029,6 +1029,8 @@ +@@ -1157,6 +1157,8 @@ endif ifeq ($(uname_S),Darwin) @@ -23,10 +24,10 @@ ifndef NO_FINK ifeq ($(shell test -d /sw/lib && echo y),y) BASIC_CFLAGS += -I/sw/include -diff -ru git-1.7.0.1.orig/gitweb/Makefile git-1.7.0.1/gitweb/Makefile ---- git-1.7.0.1.orig/gitweb/Makefile 2010-02-28 17:54:17.000000000 -0500 -+++ git-1.7.0.1/gitweb/Makefile 2010-03-03 18:38:31.000000000 -0500 -@@ -16,7 +16,7 @@ +diff -ru git-1.7.2.orig/gitweb/Makefile git-1.7.2/gitweb/Makefile +--- git-1.7.2.orig/gitweb/Makefile 2010-07-21 17:35:25.000000000 -0400 ++++ git-1.7.2/gitweb/Makefile 2010-07-26 19:25:43.000000000 -0400 +@@ -19,7 +19,7 @@ # default configuration for gitweb GITWEB_CONFIG = gitweb_config.perl @@ -35,9 +36,10 @@ GITWEB_HOME_LINK_STR = projects GITWEB_SITENAME = GITWEB_PROJECTROOT = /pub/git -diff -ru git-1.7.0.1.orig/perl/Makefile git-1.7.0.1/perl/Makefile ---- git-1.7.0.1.orig/perl/Makefile 2010-02-28 17:54:17.000000000 -0500 -+++ git-1.7.0.1/perl/Makefile 2010-03-03 18:35:27.000000000 -0500 +Only in git-1.7.2/gitweb: Makefile.orig +diff -ru git-1.7.2.orig/perl/Makefile git-1.7.2/perl/Makefile +--- git-1.7.2.orig/perl/Makefile 2010-07-21 17:35:25.000000000 -0400 ++++ git-1.7.2/perl/Makefile 2010-07-26 19:25:43.000000000 -0400 @@ -38,7 +38,7 @@ echo ' echo $(instdir_SQ)' >> $@ else Index: git.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/git.info,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- git.info 2 Jul 2010 19:18:10 -0000 1.61 +++ git.info 26 Jul 2010 23:52:57 -0000 1.62 @@ -1,27 +1,60 @@ +Info2:<< Package: git -Version: 1.7.1.1 +Version: 1.7.2 Revision: 1001 Distribution: 10.6 -Depends: libcurl4-shlibs (>= 7.18.2-1), expat1-shlibs, libiconv -BuildDepends: system-openssl-dev, libcurl4 (>= 7.18.2-1), expat1, libiconv-dev, fink (>= 0.24.12) +Type: perl (5.10.0) + +Depends: << + email-valid-pm%type_pkg[perl], + error-pm, + expat1-shlibs, + file-temp-pm%type_pkg[perl], + getopt-long-pm%type_pkg[perl], + libcurl4-shlibs (>= 7.18.2-1), + libiconv, + libnet-pm%type_pkg[perl], + mailtools-pm%type_pkg[perl], + net-smtp-ssl-pm%type_pkg[perl], + term-ansicolor-pm, + term-readline-pm%type_pkg[perl] +<< +BuildDepends: << + expat1, + fink (>= 0.24.12), + libcurl4 (>= 7.18.2-1), + libiconv-dev, + system-openssl-dev +<< Replaces: git-core + Source: mirror:custom:/software/scm/%n/%n-%v.tar.bz2 -Source-MD5: 1b116a3e2ecce46a89e4272abf0de955 +Source-MD5: 652f861ae161e48979ef834707e2dc4c Source2: mirror:custom:/software/scm/%n/%n-htmldocs-%v.tar.bz2 -Source2-MD5: 642edbab5bcf66694c07e0929c0ca223 +Source2-MD5: 31b3d0c142709d5a4faafe52d962d435 Source2ExtractDir: doc Source3: mirror:custom:/software/scm/%n/%n-manpages-%v.tar.bz2 -Source3-MD5: d56a2b79e76efa7b207335f562fbefbe +Source3-MD5: 0ea16b997dea4aec1f2f3d9c6a74abb8 PatchFile: %n.patch -PatchFile-MD5: beebc3865a3cf1d05c7d43106ea2b952 +PatchFile-MD5: aaf8edb2527ca15ca68ae6f1b2f7d162 PatchScript: << %{default_script} perl -pi -e 's|%%p|%p|g' Makefile perl/Makefile perl -pi -e 's,/usr/(share|bin)/git,%p/\1/git,g; s,/usr/libexec/git\\-core,%p/lib/git,g' ../man1/* ../doc/* << -CompileScript: NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1 make TCLTK_PATH=/usr/bin/wish prefix=%p +CompileScript: << + #!/bin/bash -ev + let version=`uname -r | cut -f 1 -d .` + if [ $version -ge 10 ]; then + sed -i.bak -e '1s,.*,#!/usr/bin/arch -%m perl%type_raw[perl] -w,' *.perl + else + sed -i.bak -e '1s,.*,#!/usr/bin/env perl%type_raw[perl] -w,' *.perl + fi + + NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1 make TCLTK_PATH=/usr/bin/wish prefix=%p +<< InfoTest: << TestScript: << @@ -37,8 +70,8 @@ << InstallScript: << - sed -i.bak -e '1s,.*,#!/usr/bin/arch -%m perl5.10.0,' git-svn NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1 make DESTDIR=%d prefix=%p TCLTK_PATH=/usr/bin/wish install + mkdir -p %i/share/man %i/share/doc cp -R ../man* %i/share/man cp -R ../doc %i/share/doc/%n @@ -79,7 +112,7 @@ SplitOff3: << Package: git-svn Description: Tool to let git use subversion repositories - Depends: %N (=%v-%r), svn-swig-pm5100, libwww-pm5100, error-pm, term-readkey-pm5100 + Depends: %N (=%v-%r), svn-swig-pm%type_pkg[perl], libwww-pm%type_pkg[perl], term-readkey-pm%type_pkg[perl] Files: << lib/git/%n share/doc/%N/%n.html @@ -157,3 +190,4 @@ sam-CL: http://www.cl.kernel.org/pub sam-VE: http://www.ve.kernel.org/pub << +<< --- git-10.4.info DELETED --- ------------------------------------------------------------------------------ The Palm PDK Hot Apps Program offers developers who use the Plug-In Development Kit to bring their C/C++ apps to Palm for a share of $1 Million in cash or HP Products. Visit us here for more details: http://ad.doubleclick.net/clk;226879339;13503038;l? http://clk.atdmt.com/CRS/go/247765532/direct/01/ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs