Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3337
Modified Files:
git-10.4.info git-10.5.info git.info git.patch
Added Files:
git-archimport.info git-cvsimport.info git-svn-10.4.info
git-svn-10.5.info git-svn.info
Log Message:
Move to stable.
--- NEW FILE: git-archimport.info ---
Package: git-archimport
Version: 1.7.3.1
Revision: 1
Description: Tool to import an arch repository into git
Depends: git (>= %v-1), arch-tla
Source: mirror:custom:/software/scm/git/git-%v.tar.bz2
Source-MD5: 77e1611498919965fb65fd1f229ee155
Source2: mirror:custom:/software/scm/git/git-htmldocs-%v.tar.bz2
Source2-MD5: f9c9669fb00df38f1486763ace135666
Source2ExtractDir: doc
Source3: mirror:custom:/software/scm/git/git-manpages-%v.tar.bz2
Source3-MD5: 41a164c1ad025e0970b2365e27209a11
CompileScript: echo "Nothing to compile."
InstallScript: <<
#!/bin/bash -ev
mkdir -p %i/lib/git-core
mkdir -p %i/share/doc/git
mkdir -p %i/share/man/man1
cp %n.perl %i/lib/git-core/%n
cp ../doc/%n.* %i/share/doc/git
cp ../man1/%n.1 %i/share/man/man1
let version=`uname -r | cut -f 1 -d .`
if [ $version -ge 10 ]; then
perl -pi -e 's,/usr/bin/perl,/usr/bin/arch -%m /usr/bin/perl,'
%i/lib/git-core/%n
fi
<<
DocFiles: COPYING
License: GPL
Homepage: http://git-scm.com/
Maintainer: Daniel Johnson <[email protected]>
CustomMirror: <<
Primary: http://www.kernel.org/pub
asi-CN: http://www.cn.kernel.org/pub
asi-IN: http://www.in.kernel.org/pub
asi-JP: http://www.jp.kernel.org/pub
asi-KR: http://www.kr.kernel.org/pub
asi-MY: http://www.my.kernel.org/pub
asi-SG: http://www.sg.kernel.org/pub
asi-TW: http://www.tw.kernel.org/pub
aus-AU: http://www.au.kernel.org/pub
aus-NZ: http://www.nz.kernel.org/pub
eur-BA: http://www.ba.kernel.org/pub
eur-BE: http://www.be.kernel.org/pub
eur-BG: http://www.bg.kernel.org/pub
eur-CH: http://www.ch.kernel.org/pub
eur-CZ: http://www.cz.kernel.org/pub
eur-DE: http://www.de.kernel.org/pub
eur-DK: http://www.dk.kernel.org/pub
eur-EE: http://www.ee.kernel.org/pub
eur-ES: http://www.es.kernel.org/pub
eur-FI: http://www.fi.kernel.org/pub
eur-FR: http://www.fr.kernel.org/pub
eur-GR: http://www.gr.kernel.org/pub
eur-HR: http://www.hr.kernel.org/pub
eur-HU: http://www.hu.kernel.org/pub
eur-IE: http://www.ie.kernel.org/pub
eur-IL: http://www.il.kernel.org/pub
eur-IS: http://www.is.kernel.org/pub
eur-IT: http://www.it.kernel.org/pub
eur-LI: http://www.li.kernel.org/pub
eur-LT: http://www.lt.kernel.org/pub
eur-LU: http://www.lu.kernel.org/pub
eur-LV: http://www.lv.kernel.org/pub
eur-MD: http://www.md.kernel.org/pub
eur-MK: http://www.mk.kernel.org/pub
eur-NL: http://www.nl.kernel.org/pub
eur-NO: http://www.no.kernel.org/pub
eur-PL: http://www.pl.kernel.org/pub
eur-PT: http://www.pt.kernel.org/pub
eur-RO: http://www.ro.kernel.org/pub
eur-RU: http://www.ru.kernel.org/pub
eur-SE: http://www.se.kernel.org/pub
eur-SI: http://www.si.kernel.org/pub
eur-SK: http://www.sk.kernel.org/pub
eur-TR: ftp://ftp.tr.kernel.org/pub
eur-UA: http://www.ua.kernel.org/pub
eur-UK: http://www.uk.kernel.org/pub
nam-CA: http://www.ca.kernel.org/pub
nam-MX: http://www.mx.kernel.org/pub
nam-US: http://www.us.kernel.org/pub
sam-AR: http://www.ar.kernel.org/pub
sam-BR: http://www.br.kernel.org/pub
sam-CL: http://www.cl.kernel.org/pub
sam-VE: http://www.ve.kernel.org/pub
<<
Index: git-10.4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/git-10.4.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- git-10.4.info 2 Jul 2010 17:06:19 -0000 1.2
+++ git-10.4.info 22 Oct 2010 20:35:12 -0000 1.3
@@ -1,93 +1,121 @@
+Info2:<<
Package: git
-Version: 1.7.1
-Revision: 2
+Version: 1.7.3.1
+Revision: 1+10.4
Distribution: 10.4
-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)
-Replaces: git-core
-Source: mirror:custom:/software/scm/%n/%n-%v.tar.bz2
-Source-MD5: 3da231dbe82ad103373cb530ae7475d5
-Source2: mirror:custom:/software/scm/%n/%n-htmldocs-%v.tar.bz2
-Source2-MD5: bc4bdafdc1b257c40564d47bc5c97365
+Type: pm 5.8.6
+
+Depends: <<
+ email-valid-pm%type_pkg[pm],
+ error-pm,
+ expat1-shlibs,
+ file-temp-pm%type_pkg[pm],
+ getopt-long-pm%type_pkg[pm],
+ libcurl4-shlibs (>= 7.18.2-1),
+ libiconv,
+ libnet-pm%type_pkg[pm],
+ mailtools-pm%type_pkg[pm],
+ net-smtp-ssl-pm%type_pkg[pm],
+ term-ansicolor-pm,
+ term-readline-pm%type_pkg[pm]
+<<
+BuildDepends: <<
+ expat1,
+ fink (>= 0.24.12),
+ libcurl4 (>= 7.18.2-1),
+ libiconv-dev,
+ system-openssl-dev
+<<
+Replaces: git-core, git-cvsimport (<< 1.7.2.3-1002), git-archimport (<<
1.7.2.3-1002), git-svn (<< 1.7.2.3-1002)
+Conflicts: git-cvsimport (<< 1.7.2.3-1002), git-archimport (<< 1.7.2.3-1002),
git-svn (<< 1.7.2.3-1002)
+
+Source: mirror:custom:/software/scm/git/git-%v.tar.bz2
+Source-MD5: 77e1611498919965fb65fd1f229ee155
+Source2: mirror:custom:/software/scm/git/git-htmldocs-%v.tar.bz2
+Source2-MD5: f9c9669fb00df38f1486763ace135666
Source2ExtractDir: doc
-Source3: mirror:custom:/software/scm/%n/%n-manpages-%v.tar.bz2
-Source3-MD5: 50c3e1119a2197de208cbb69c7da0a50
+Source3: mirror:custom:/software/scm/git/git-manpages-%v.tar.bz2
+Source3-MD5: 41a164c1ad025e0970b2365e27209a11
PatchFile: %n.patch
-PatchFile-MD5: beebc3865a3cf1d05c7d43106ea2b952
+PatchFile-MD5: b912402c564bf9c8ae39a9e2f80480a9
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/*
+ #!/bin/bash -ev
+ %{default_script}
+ # Fix up paths in documentation to point to %p.
+ perl -pi -e 's,/usr/(share|bin)/git,%p/\1/git,g;
s,/usr/libexec,%p/lib,g' ../man1/* ../doc/*
+ # Setting these variables in 'config.mak' lets Makefile import them
+ # automatically instead of always manually passing them to make.
+ cat >> config.mak << EOF
+NO_FINK=1
+NO_DARWIN_PORTS=1
+NO_MSGFMT=1
+NO_SVN_TESTS=1
+GITWEB_CONFIG_SYSTEM=%p/gitweb.conf
+CC_LD_DYNPATH=-L
+AR=ar
+EOF
<<
-CompileScript: NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1 make
TCLTK_PATH=/usr/bin/wish prefix=%p
+UseMaxBuildJobs: true
+
+# Let configure do the work of setting up the environment instead of
+# patching and passing things manually to make.
+SetCPPFLAGS: -I%p/lib/system-openssl/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib
+# Darwin needs no special flags for pthreads, so set flags to ' ' because
+# "-pthreads" causes problems for gcc-4.0.
+ConfigureParams: <<
+ --libexecdir='${exec_prefix}/lib' \
+ --enable-pthreads=' ' \
+ --without-python \
+ --with-perl='/usr/bin/perl%type_raw[pm]' \
+ --with-tcltk='/usr/bin/wish' \
+ --with-openssl='%p/lib/system-openssl'
+<<
+# See? No more CompileScript!
+# Tests are much cleaner looking too.
InfoTest: <<
- TestScript: <<
- #!/bin/bash -ev
- if [ $UID = 0 ]; then
- #Some tests fail when run as root.
- NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1
GIT_SKIP_TESTS='t0001.25 t0004.2 t0004.3 t0004.4 t0004.5 t1004.13 t3700.21
t3700.22 t3700.23 t3700.24 t3700.25 t7006 t7300.26' make -k test
TCLTK_PATH=/usr/bin/wish prefix=%p || exit 2
- else
- #It's been reported that t7006 fails on 10.4 but I can't test myself.
- NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1
GIT_SKIP_TESTS='t7006' make -k test TCLTK_PATH=/usr/bin/wish prefix=%p || exit 2
- fi
- <<
- TestSuiteSize: large
+ TestScript: <<
+ #!/bin/bash -ev
+
+ if [ $UID = 0 ]; then
+ # Some tests fail when run as root.
+ GIT_SKIP_TESTS='t0001.25 t0004.2 t0004.3 t0004.4
t0004.5 t1004.13 t3700.21 t3700.22 t3700.23 t3700.24 t3700.25 t4201.2 t7006
t7300.26' make -k test || exit 2
+ else
+ GIT_SKIP_TESTS="t4201.2 t7006" make -k test || exit 2
+ fi
+ <<
+ TestSuiteSize: large
<<
InstallScript: <<
- sed -i.bak -e '1s,.*,#!/usr/bin/env perl5.8.6,' 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
- mkdir -p %i/share/emacs/site-lisp
- cp contrib/emacs/*.el %i/share/emacs/site-lisp
- mkdir -p %i/etc/bash_completion.d
- cp contrib/completion/git-completion.bash %i/etc/bash_completion.d/
+ make install DESTDIR=%d
+
+ mkdir -p %i/share/man %i/share/doc
+ cp -R ../man* %i/share/man
+ cp -R ../doc %i/share/doc/%n
+ mkdir -p %i/share/emacs/site-lisp
+ cp contrib/emacs/*.el %i/share/emacs/site-lisp
+ mkdir -p %i/etc/bash_completion.d
+ cp contrib/completion/git-completion.bash %i/etc/bash_completion.d/
+
+ # These go in separate packages.
+ rm %i/lib/git-core/git-cvsimport
+ rm %i/share/doc/%n/git-cvsimport.*
+ rm %i/share/man/man1/git-cvsimport.1
+ rm %i/lib/git-core/git-archimport
+ rm %i/share/doc/%n/git-archimport.*
+ rm %i/share/man/man1/git-archimport.1
+ rm %i/lib/git-core/git-svn
+ rm %i/share/doc/%n/git-svn.*
+ rm %i/share/man/man1/git-svn.1
<<
+
UpdatePOD: true
DocFiles: COPYING README
-SplitOff: <<
- Package: git-cvsimport
- Description: Tool to import a CVS repository into git
- Depends: %N (=%v-%r), cvsps
- Files: <<
- lib/git/%n
- share/doc/%N/%n.html
- share/man/man1/%n.1
- <<
- DocFiles: COPYING
-<<
-
-SplitOff2: <<
- Package: git-archimport
- Description: Tool to import an arch repository into git
- # Should probably depend on arch when that gets packaged
- Depends: %N (=%v-%r), string-shellquote-pm
- Files: <<
- lib/git/%n
- share/doc/%N/%n.html
- share/man/man1/%n.1
- <<
- DocFiles: COPYING
-<<
-
-SplitOff3: <<
- Package: git-svn
- Description: Tool to let git use subversion repositories
- Depends: %N (=%v-%r), svn-swig-pm586, libwww-pm586, error-pm,
term-readkey-pm586
- Files: <<
- lib/git/%n
- share/doc/%N/%n.html
- share/man/man1/%n.1
- <<
- DocFiles: COPYING
-<<
-
Description: Distributed version control system
DescDetail: <<
Git is an open source, distributed version control system designed to
@@ -157,3 +185,4 @@
sam-CL: http://www.cl.kernel.org/pub
sam-VE: http://www.ve.kernel.org/pub
<<
+<<
--- NEW FILE: git-svn.info ---
Info2:<<
Package: git-svn
Version: 1.7.3.1
Revision: 1+10.6
Type: pm 5.10.0
Distribution: 10.6
Description: Tool to let git use subversion repositories
Depends: git (>= %v-%r), svn-swig-pm%type_pkg[pm], libwww-pm%type_pkg[pm],
term-readkey-pm%type_pkg[pm]
Source: mirror:custom:/software/scm/git/git-%v.tar.bz2
Source-MD5: 77e1611498919965fb65fd1f229ee155
Source2: mirror:custom:/software/scm/git/git-htmldocs-%v.tar.bz2
Source2-MD5: f9c9669fb00df38f1486763ace135666
Source2ExtractDir: doc
Source3: mirror:custom:/software/scm/git/git-manpages-%v.tar.bz2
Source3-MD5: 41a164c1ad025e0970b2365e27209a11
CompileScript: echo "Nothing to compile."
InstallScript: <<
#!/bin/bash -ev
mkdir -p %i/lib/git-core
mkdir -p %i/share/doc/git
mkdir -p %i/share/man/man1
cp %n.perl %i/lib/git-core/%n
cp ../doc/%n.* %i/share/doc/git
cp ../man1/%n.1 %i/share/man/man1
let version=`uname -r | cut -f 1 -d .`
if [ $version -ge 10 ]; then
perl -pi -e 's,/usr/bin/perl,/usr/bin/arch -%m
perl%type_raw[pm],' %i/lib/git-core/%n
fi
<<
DocFiles: COPYING
License: GPL
Homepage: http://git-scm.com/
Maintainer: Daniel Johnson <[email protected]>
CustomMirror: <<
Primary: http://www.kernel.org/pub
asi-CN: http://www.cn.kernel.org/pub
asi-IN: http://www.in.kernel.org/pub
asi-JP: http://www.jp.kernel.org/pub
asi-KR: http://www.kr.kernel.org/pub
asi-MY: http://www.my.kernel.org/pub
asi-SG: http://www.sg.kernel.org/pub
asi-TW: http://www.tw.kernel.org/pub
aus-AU: http://www.au.kernel.org/pub
aus-NZ: http://www.nz.kernel.org/pub
eur-BA: http://www.ba.kernel.org/pub
eur-BE: http://www.be.kernel.org/pub
eur-BG: http://www.bg.kernel.org/pub
eur-CH: http://www.ch.kernel.org/pub
eur-CZ: http://www.cz.kernel.org/pub
eur-DE: http://www.de.kernel.org/pub
eur-DK: http://www.dk.kernel.org/pub
eur-EE: http://www.ee.kernel.org/pub
eur-ES: http://www.es.kernel.org/pub
eur-FI: http://www.fi.kernel.org/pub
eur-FR: http://www.fr.kernel.org/pub
eur-GR: http://www.gr.kernel.org/pub
eur-HR: http://www.hr.kernel.org/pub
eur-HU: http://www.hu.kernel.org/pub
eur-IE: http://www.ie.kernel.org/pub
eur-IL: http://www.il.kernel.org/pub
eur-IS: http://www.is.kernel.org/pub
eur-IT: http://www.it.kernel.org/pub
eur-LI: http://www.li.kernel.org/pub
eur-LT: http://www.lt.kernel.org/pub
eur-LU: http://www.lu.kernel.org/pub
eur-LV: http://www.lv.kernel.org/pub
eur-MD: http://www.md.kernel.org/pub
eur-MK: http://www.mk.kernel.org/pub
eur-NL: http://www.nl.kernel.org/pub
eur-NO: http://www.no.kernel.org/pub
eur-PL: http://www.pl.kernel.org/pub
eur-PT: http://www.pt.kernel.org/pub
eur-RO: http://www.ro.kernel.org/pub
eur-RU: http://www.ru.kernel.org/pub
eur-SE: http://www.se.kernel.org/pub
eur-SI: http://www.si.kernel.org/pub
eur-SK: http://www.sk.kernel.org/pub
eur-TR: ftp://ftp.tr.kernel.org/pub
eur-UA: http://www.ua.kernel.org/pub
eur-UK: http://www.uk.kernel.org/pub
nam-CA: http://www.ca.kernel.org/pub
nam-MX: http://www.mx.kernel.org/pub
nam-US: http://www.us.kernel.org/pub
sam-AR: http://www.ar.kernel.org/pub
sam-BR: http://www.br.kernel.org/pub
sam-CL: http://www.cl.kernel.org/pub
sam-VE: http://www.ve.kernel.org/pub
<<
<<
--- NEW FILE: git-svn-10.4.info ---
Info2:<<
Package: git-svn
Version: 1.7.3.1
Revision: 1+10.4
Type: pm 5.8.6
Distribution: 10.4
Description: Tool to let git use subversion repositories
Depends: git (>= %v-%r), svn-swig-pm%type_pkg[pm], libwww-pm%type_pkg[pm],
term-readkey-pm%type_pkg[pm]
Source: mirror:custom:/software/scm/git/git-%v.tar.bz2
Source-MD5: 77e1611498919965fb65fd1f229ee155
Source2: mirror:custom:/software/scm/git/git-htmldocs-%v.tar.bz2
Source2-MD5: f9c9669fb00df38f1486763ace135666
Source2ExtractDir: doc
Source3: mirror:custom:/software/scm/git/git-manpages-%v.tar.bz2
Source3-MD5: 41a164c1ad025e0970b2365e27209a11
CompileScript: echo "Nothing to compile."
InstallScript: <<
#!/bin/bash -ev
mkdir -p %i/lib/git-core
mkdir -p %i/share/doc/git
mkdir -p %i/share/man/man1
cp %n.perl %i/lib/git-core/%n
cp ../doc/%n.* %i/share/doc/git
cp ../man1/%n.1 %i/share/man/man1
let version=`uname -r | cut -f 1 -d .`
if [ $version -ge 10 ]; then
perl -pi -e 's,/usr/bin/perl,/usr/bin/arch -%m
perl%type_raw[pm],' %i/lib/git-core/%n
fi
<<
DocFiles: COPYING
License: GPL
Homepage: http://git-scm.com/
Maintainer: Daniel Johnson <[email protected]>
CustomMirror: <<
Primary: http://www.kernel.org/pub
asi-CN: http://www.cn.kernel.org/pub
asi-IN: http://www.in.kernel.org/pub
asi-JP: http://www.jp.kernel.org/pub
asi-KR: http://www.kr.kernel.org/pub
asi-MY: http://www.my.kernel.org/pub
asi-SG: http://www.sg.kernel.org/pub
asi-TW: http://www.tw.kernel.org/pub
aus-AU: http://www.au.kernel.org/pub
aus-NZ: http://www.nz.kernel.org/pub
eur-BA: http://www.ba.kernel.org/pub
eur-BE: http://www.be.kernel.org/pub
eur-BG: http://www.bg.kernel.org/pub
eur-CH: http://www.ch.kernel.org/pub
eur-CZ: http://www.cz.kernel.org/pub
eur-DE: http://www.de.kernel.org/pub
eur-DK: http://www.dk.kernel.org/pub
eur-EE: http://www.ee.kernel.org/pub
eur-ES: http://www.es.kernel.org/pub
eur-FI: http://www.fi.kernel.org/pub
eur-FR: http://www.fr.kernel.org/pub
eur-GR: http://www.gr.kernel.org/pub
eur-HR: http://www.hr.kernel.org/pub
eur-HU: http://www.hu.kernel.org/pub
eur-IE: http://www.ie.kernel.org/pub
eur-IL: http://www.il.kernel.org/pub
eur-IS: http://www.is.kernel.org/pub
eur-IT: http://www.it.kernel.org/pub
eur-LI: http://www.li.kernel.org/pub
eur-LT: http://www.lt.kernel.org/pub
eur-LU: http://www.lu.kernel.org/pub
eur-LV: http://www.lv.kernel.org/pub
eur-MD: http://www.md.kernel.org/pub
eur-MK: http://www.mk.kernel.org/pub
eur-NL: http://www.nl.kernel.org/pub
eur-NO: http://www.no.kernel.org/pub
eur-PL: http://www.pl.kernel.org/pub
eur-PT: http://www.pt.kernel.org/pub
eur-RO: http://www.ro.kernel.org/pub
eur-RU: http://www.ru.kernel.org/pub
eur-SE: http://www.se.kernel.org/pub
eur-SI: http://www.si.kernel.org/pub
eur-SK: http://www.sk.kernel.org/pub
eur-TR: ftp://ftp.tr.kernel.org/pub
eur-UA: http://www.ua.kernel.org/pub
eur-UK: http://www.uk.kernel.org/pub
nam-CA: http://www.ca.kernel.org/pub
nam-MX: http://www.mx.kernel.org/pub
nam-US: http://www.us.kernel.org/pub
sam-AR: http://www.ar.kernel.org/pub
sam-BR: http://www.br.kernel.org/pub
sam-CL: http://www.cl.kernel.org/pub
sam-VE: http://www.ve.kernel.org/pub
<<
<<
--- NEW FILE: git-svn-10.5.info ---
Info2:<<
Package: git-svn
Version: 1.7.3.1
Revision: 1+10.5
Type: pm 5.8.8
Distribution: 10.5
Description: Tool to let git use subversion repositories
Depends: git (>= %v-%r), svn-swig-pm%type_pkg[pm], libwww-pm%type_pkg[pm],
term-readkey-pm%type_pkg[pm]
Source: mirror:custom:/software/scm/git/git-%v.tar.bz2
Source-MD5: 77e1611498919965fb65fd1f229ee155
Source2: mirror:custom:/software/scm/git/git-htmldocs-%v.tar.bz2
Source2-MD5: f9c9669fb00df38f1486763ace135666
Source2ExtractDir: doc
Source3: mirror:custom:/software/scm/git/git-manpages-%v.tar.bz2
Source3-MD5: 41a164c1ad025e0970b2365e27209a11
CompileScript: echo "Nothing to compile."
InstallScript: <<
#!/bin/bash -ev
mkdir -p %i/lib/git-core
mkdir -p %i/share/doc/git
mkdir -p %i/share/man/man1
cp %n.perl %i/lib/git-core/%n
cp ../doc/%n.* %i/share/doc/git
cp ../man1/%n.1 %i/share/man/man1
let version=`uname -r | cut -f 1 -d .`
if [ $version -ge 10 ]; then
perl -pi -e 's,/usr/bin/perl,/usr/bin/arch -%m
perl%type_raw[pm],' %i/lib/git-core/%n
fi
<<
DocFiles: COPYING
License: GPL
Homepage: http://git-scm.com/
Maintainer: Daniel Johnson <[email protected]>
CustomMirror: <<
Primary: http://www.kernel.org/pub
asi-CN: http://www.cn.kernel.org/pub
asi-IN: http://www.in.kernel.org/pub
asi-JP: http://www.jp.kernel.org/pub
asi-KR: http://www.kr.kernel.org/pub
asi-MY: http://www.my.kernel.org/pub
asi-SG: http://www.sg.kernel.org/pub
asi-TW: http://www.tw.kernel.org/pub
aus-AU: http://www.au.kernel.org/pub
aus-NZ: http://www.nz.kernel.org/pub
eur-BA: http://www.ba.kernel.org/pub
eur-BE: http://www.be.kernel.org/pub
eur-BG: http://www.bg.kernel.org/pub
eur-CH: http://www.ch.kernel.org/pub
eur-CZ: http://www.cz.kernel.org/pub
eur-DE: http://www.de.kernel.org/pub
eur-DK: http://www.dk.kernel.org/pub
eur-EE: http://www.ee.kernel.org/pub
eur-ES: http://www.es.kernel.org/pub
eur-FI: http://www.fi.kernel.org/pub
eur-FR: http://www.fr.kernel.org/pub
eur-GR: http://www.gr.kernel.org/pub
eur-HR: http://www.hr.kernel.org/pub
eur-HU: http://www.hu.kernel.org/pub
eur-IE: http://www.ie.kernel.org/pub
eur-IL: http://www.il.kernel.org/pub
eur-IS: http://www.is.kernel.org/pub
eur-IT: http://www.it.kernel.org/pub
eur-LI: http://www.li.kernel.org/pub
eur-LT: http://www.lt.kernel.org/pub
eur-LU: http://www.lu.kernel.org/pub
eur-LV: http://www.lv.kernel.org/pub
eur-MD: http://www.md.kernel.org/pub
eur-MK: http://www.mk.kernel.org/pub
eur-NL: http://www.nl.kernel.org/pub
eur-NO: http://www.no.kernel.org/pub
eur-PL: http://www.pl.kernel.org/pub
eur-PT: http://www.pt.kernel.org/pub
eur-RO: http://www.ro.kernel.org/pub
eur-RU: http://www.ru.kernel.org/pub
eur-SE: http://www.se.kernel.org/pub
eur-SI: http://www.si.kernel.org/pub
eur-SK: http://www.sk.kernel.org/pub
eur-TR: ftp://ftp.tr.kernel.org/pub
eur-UA: http://www.ua.kernel.org/pub
eur-UK: http://www.uk.kernel.org/pub
nam-CA: http://www.ca.kernel.org/pub
nam-MX: http://www.mx.kernel.org/pub
nam-US: http://www.us.kernel.org/pub
sam-AR: http://www.ar.kernel.org/pub
sam-BR: http://www.br.kernel.org/pub
sam-CL: http://www.cl.kernel.org/pub
sam-VE: http://www.ve.kernel.org/pub
<<
<<
Index: git.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/git.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- git.info 2 Jul 2010 17:06:20 -0000 1.2
+++ git.info 22 Oct 2010 20:35:12 -0000 1.3
@@ -1,93 +1,129 @@
+Info2:<<
Package: git
-Version: 1.7.1
-Revision: 1002
+Version: 1.7.3.1
+Revision: 2+10.6
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)
-Replaces: git-core
-Source: mirror:custom:/software/scm/%n/%n-%v.tar.bz2
-Source-MD5: 3da231dbe82ad103373cb530ae7475d5
-Source2: mirror:custom:/software/scm/%n/%n-htmldocs-%v.tar.bz2
-Source2-MD5: bc4bdafdc1b257c40564d47bc5c97365
+Type: pm 5.10.0
+
+Depends: <<
+ email-valid-pm%type_pkg[pm],
+ error-pm,
+ expat1-shlibs,
+ file-temp-pm%type_pkg[pm],
+ getopt-long-pm%type_pkg[pm],
+ libcurl4-shlibs (>= 7.18.2-1),
+ libiconv,
+ libnet-pm%type_pkg[pm],
+ mailtools-pm%type_pkg[pm],
+ net-smtp-ssl-pm%type_pkg[pm],
+ term-ansicolor-pm,
+ term-readline-pm%type_pkg[pm]
+<<
+BuildDepends: <<
+ expat1,
+ fink (>= 0.24.12),
+ libcurl4 (>= 7.18.2-1),
+ libiconv-dev,
+ system-openssl-dev
+<<
+Replaces: git-core, git-cvsimport (<< 1.7.2.3-1002), git-archimport (<<
1.7.2.3-1002), git-svn (<< 1.7.2.3-1002)
+Conflicts: git-cvsimport (<< 1.7.2.3-1002), git-archimport (<< 1.7.2.3-1002),
git-svn (<< 1.7.2.3-1002)
+
+Source: mirror:custom:/software/scm/git/git-%v.tar.bz2
+Source-MD5: 77e1611498919965fb65fd1f229ee155
+Source2: mirror:custom:/software/scm/git/git-htmldocs-%v.tar.bz2
+Source2-MD5: f9c9669fb00df38f1486763ace135666
Source2ExtractDir: doc
-Source3: mirror:custom:/software/scm/%n/%n-manpages-%v.tar.bz2
-Source3-MD5: 50c3e1119a2197de208cbb69c7da0a50
+Source3: mirror:custom:/software/scm/git/git-manpages-%v.tar.bz2
+Source3-MD5: 41a164c1ad025e0970b2365e27209a11
PatchFile: %n.patch
-PatchFile-MD5: beebc3865a3cf1d05c7d43106ea2b952
+PatchFile-MD5: b912402c564bf9c8ae39a9e2f80480a9
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/*
+ #!/bin/bash -ev
+ %{default_script}
+ # Fix up paths in documentation to point to %p.
+ perl -pi -e 's,/usr/(share|bin)/git,%p/\1/git,g;
s,/usr/libexec,%p/lib,g' ../man1/* ../doc/*
+ # Setting these variables in 'config.mak' lets Makefile import them
+ # automatically instead of always manually passing them to make.
+ cat >> config.mak << EOF
+NO_FINK=1
+NO_DARWIN_PORTS=1
+NO_MSGFMT=1
+NO_SVN_TESTS=1
+GITWEB_CONFIG_SYSTEM=%p/gitweb.conf
+CC_LD_DYNPATH=-L
+AR=ar
+EOF
+ perl -pi -e 's/\"\$PERL\"/\$PERL/' git-instaweb.sh
<<
-CompileScript: NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1 make
TCLTK_PATH=/usr/bin/wish prefix=%p
+UseMaxBuildJobs: true
+# Let configure do the work of setting up the environment instead of
+# patching and passing things manually to make.
+SetCPPFLAGS: -I%p/lib/system-openssl/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib
+# Darwin needs no special flags for pthreads, so set flags to ' ' because
+# "-pthreads" causes problems for gcc-4.0.
+ConfigureParams: <<
+ --libexecdir='${exec_prefix}/lib' \
+ --enable-pthreads=' ' \
+ --without-python \
+ --with-perl='/usr/bin/arch -%m perl%type_raw[pm]' \
+ --with-tcltk='/usr/bin/wish' \
+ --with-openssl='%p/lib/system-openssl'
+<<
+# See? No more CompileScript!
+
+# Tests are much cleaner looking too.
InfoTest: <<
- TestScript: <<
- #!/bin/bash -ev
- if [ $UID = 0 ]; then
- #Some tests fail when run as root.
- NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1
GIT_SKIP_TESTS='t0001.25 t0004.2 t0004.3 t0004.4 t0004.5 t1004.13 t3700.21
t3700.22 t3700.23 t3700.24 t3700.25 t7300.26' make -k test
TCLTK_PATH=/usr/bin/wish prefix=%p || exit 2
- else
- NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1 make -k test
TCLTK_PATH=/usr/bin/wish prefix=%p || exit 2
- fi
- <<
- TestSuiteSize: large
+ TestScript: <<
+ #!/bin/bash -ev
+
+ # This hackery is needed to get svn tests working with
multi-arch perl.
+ cat > myperl << EOF
+#!/bin/sh
+exec /usr/bin/arch -%m perl%type_raw[pm] "\$@"
+EOF
+ chmod +x myperl; PERL_PATH=`pwd`/myperl
+
+ if [ $UID = 0 ]; then
+ # Some tests fail when run as root.
+ GIT_SKIP_TESTS='t0001.25 t0004.2 t0004.3 t0004.4
t0004.5 t1004.13 t3700.21 t3700.22 t3700.23 t3700.24 t3700.25 t4201.2 t7300.26'
make -k test PERL_PATH="$PERL_PATH" || exit 2
+ else
+ GIT_SKIP_TESTS="t4201.2" make -k test
PERL_PATH="$PERL_PATH" || exit 2
+ fi
+ <<
+ TestSuiteSize: large
<<
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
- mkdir -p %i/share/emacs/site-lisp
- cp contrib/emacs/*.el %i/share/emacs/site-lisp
- mkdir -p %i/etc/bash_completion.d
- cp contrib/completion/git-completion.bash %i/etc/bash_completion.d/
+ make install DESTDIR=%d
+
+ mkdir -p %i/share/man %i/share/doc
+ cp -R ../man* %i/share/man
+ cp -R ../doc %i/share/doc/%n
+ mkdir -p %i/share/emacs/site-lisp
+ cp contrib/emacs/*.el %i/share/emacs/site-lisp
+ mkdir -p %i/etc/bash_completion.d
+ cp contrib/completion/git-completion.bash %i/etc/bash_completion.d/
+
+ # These go in separate packages.
+ rm %i/lib/git-core/git-cvsimport
+ rm %i/share/doc/%n/git-cvsimport.*
+ rm %i/share/man/man1/git-cvsimport.1
+ rm %i/lib/git-core/git-archimport
+ rm %i/share/doc/%n/git-archimport.*
+ rm %i/share/man/man1/git-archimport.1
+ rm %i/lib/git-core/git-svn
+ rm %i/share/doc/%n/git-svn.*
+ rm %i/share/man/man1/git-svn.1
<<
UpdatePOD: true
DocFiles: COPYING README
-SplitOff: <<
- Package: git-cvsimport
- Description: Tool to import a CVS repository into git
- Depends: %N (=%v-%r), cvsps
- Files: <<
- lib/git/%n
- share/doc/%N/%n.html
- share/man/man1/%n.1
- <<
- DocFiles: COPYING
-<<
-
-SplitOff2: <<
- Package: git-archimport
- Description: Tool to import an arch repository into git
- # Should probably depend on arch when that gets packaged
- Depends: %N (=%v-%r), string-shellquote-pm
- Files: <<
- lib/git/%n
- share/doc/%N/%n.html
- share/man/man1/%n.1
- <<
- DocFiles: COPYING
-<<
-
-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
- Files: <<
- lib/git/%n
- share/doc/%N/%n.html
- share/man/man1/%n.1
- <<
- DocFiles: COPYING
-<<
-
Description: Distributed version control system
DescDetail: <<
Git is an open source, distributed version control system designed to
@@ -157,3 +193,4 @@
sam-CL: http://www.cl.kernel.org/pub
sam-VE: http://www.ve.kernel.org/pub
<<
+<<
Index: git-10.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/git-10.5.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- git-10.5.info 2 Jul 2010 17:06:20 -0000 1.2
+++ git-10.5.info 22 Oct 2010 20:35:12 -0000 1.3
@@ -1,93 +1,121 @@
+Info2:<<
Package: git
-Version: 1.7.1
-Revision: 102
+Version: 1.7.3.1
+Revision: 1+10.5
Distribution: 10.5
-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)
-Replaces: git-core
-Source: mirror:custom:/software/scm/%n/%n-%v.tar.bz2
-Source-MD5: 3da231dbe82ad103373cb530ae7475d5
-Source2: mirror:custom:/software/scm/%n/%n-htmldocs-%v.tar.bz2
-Source2-MD5: bc4bdafdc1b257c40564d47bc5c97365
+Type: pm 5.8.8
+
+Depends: <<
+ email-valid-pm%type_pkg[pm],
+ error-pm,
+ expat1-shlibs,
+ file-temp-pm%type_pkg[pm],
+ getopt-long-pm%type_pkg[pm],
+ libcurl4-shlibs (>= 7.18.2-1),
+ libiconv,
+ libnet-pm%type_pkg[pm],
+ mailtools-pm%type_pkg[pm],
+ net-smtp-ssl-pm%type_pkg[pm],
+ term-ansicolor-pm,
+ term-readline-pm%type_pkg[pm]
+<<
+BuildDepends: <<
+ expat1,
+ fink (>= 0.24.12),
+ libcurl4 (>= 7.18.2-1),
+ libiconv-dev,
+ system-openssl-dev
+<<
+Replaces: git-core, git-cvsimport (<< 1.7.2.3-1002), git-archimport (<<
1.7.2.3-1002), git-svn (<< 1.7.2.3-1002)
+Conflicts: git-cvsimport (<< 1.7.2.3-1002), git-archimport (<< 1.7.2.3-1002),
git-svn (<< 1.7.2.3-1002)
+
+Source: mirror:custom:/software/scm/git/git-%v.tar.bz2
+Source-MD5: 77e1611498919965fb65fd1f229ee155
+Source2: mirror:custom:/software/scm/git/git-htmldocs-%v.tar.bz2
+Source2-MD5: f9c9669fb00df38f1486763ace135666
Source2ExtractDir: doc
-Source3: mirror:custom:/software/scm/%n/%n-manpages-%v.tar.bz2
-Source3-MD5: 50c3e1119a2197de208cbb69c7da0a50
+Source3: mirror:custom:/software/scm/git/git-manpages-%v.tar.bz2
+Source3-MD5: 41a164c1ad025e0970b2365e27209a11
PatchFile: %n.patch
-PatchFile-MD5: beebc3865a3cf1d05c7d43106ea2b952
+PatchFile-MD5: b912402c564bf9c8ae39a9e2f80480a9
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/*
+ #!/bin/bash -ev
+ %{default_script}
+ # Fix up paths in documentation to point to %p.
+ perl -pi -e 's,/usr/(share|bin)/git,%p/\1/git,g;
s,/usr/libexec,%p/lib,g' ../man1/* ../doc/*
+ # Setting these variables in 'config.mak' lets Makefile import them
+ # automatically instead of always manually passing them to make.
+ cat >> config.mak << EOF
+NO_FINK=1
+NO_DARWIN_PORTS=1
+NO_MSGFMT=1
+NO_SVN_TESTS=1
+GITWEB_CONFIG_SYSTEM=%p/gitweb.conf
+CC_LD_DYNPATH=-L
+AR=ar
+EOF
<<
-CompileScript: NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1 make
TCLTK_PATH=/usr/bin/wish prefix=%p
+UseMaxBuildJobs: true
+# Let configure do the work of setting up the environment instead of
+# patching and passing things manually to make.
+SetCPPFLAGS: -I%p/lib/system-openssl/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib
+# Darwin needs no special flags for pthreads, so set flags to ' ' because
+# "-pthreads" causes problems for gcc-4.0.
+ConfigureParams: <<
+ --libexecdir='${exec_prefix}/lib' \
+ --enable-pthreads=' ' \
+ --without-python \
+ --with-perl='/usr/bin/perl%type_raw[pm]' \
+ --with-tcltk='/usr/bin/wish' \
+ --with-openssl='%p/lib/system-openssl'
+<<
+# See? No more CompileScript!
+
+# Tests are much cleaner looking too.
InfoTest: <<
- TestScript: <<
- #!/bin/bash -ev
- if [ $UID = 0 ]; then
- #Some tests fail when run as root.
- NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1
GIT_SKIP_TESTS='t0001.25 t0004.2 t0004.3 t0004.4 t0004.5 t1004.13 t3700.21
t3700.22 t3700.23 t3700.24 t3700.25 t7300.26' make -k test
TCLTK_PATH=/usr/bin/wish prefix=%p || exit 2
- else
- NO_FINK=1 NO_DARWIN_PORTS=1 NO_MSGFMT=1 NO_PYTHON=1 make -k test
TCLTK_PATH=/usr/bin/wish prefix=%p || exit 2
- fi
- <<
- TestSuiteSize: large
+ TestScript: <<
+ #!/bin/bash -ev
+
+ if [ $UID = 0 ]; then
+ # Some tests fail when run as root.
+ GIT_SKIP_TESTS='t0001.25 t0004.2 t0004.3 t0004.4
t0004.5 t1004.13 t3700.21 t3700.22 t3700.23 t3700.24 t3700.25 t4201.2 t7300.26'
make -k test || exit 2
+ else
+ GIT_SKIP_TESTS="t4201.2" make -k test || exit 2
+ fi
+ <<
+ TestSuiteSize: large
<<
InstallScript: <<
- sed -i.bak -e '1s,.*,#!/usr/bin/env perl5.8.8,' 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
- mkdir -p %i/share/emacs/site-lisp
- cp contrib/emacs/*.el %i/share/emacs/site-lisp
- mkdir -p %i/etc/bash_completion.d
- cp contrib/completion/git-completion.bash %i/etc/bash_completion.d/
+ make install DESTDIR=%d
+
+ mkdir -p %i/share/man %i/share/doc
+ cp -R ../man* %i/share/man
+ cp -R ../doc %i/share/doc/%n
+ mkdir -p %i/share/emacs/site-lisp
+ cp contrib/emacs/*.el %i/share/emacs/site-lisp
+ mkdir -p %i/etc/bash_completion.d
+ cp contrib/completion/git-completion.bash %i/etc/bash_completion.d/
+
+ # These go in separate packages.
+ rm %i/lib/git-core/git-cvsimport
+ rm %i/share/doc/%n/git-cvsimport.*
+ rm %i/share/man/man1/git-cvsimport.1
+ rm %i/lib/git-core/git-archimport
+ rm %i/share/doc/%n/git-archimport.*
+ rm %i/share/man/man1/git-archimport.1
+ rm %i/lib/git-core/git-svn
+ rm %i/share/doc/%n/git-svn.*
+ rm %i/share/man/man1/git-svn.1
<<
UpdatePOD: true
DocFiles: COPYING README
-SplitOff: <<
- Package: git-cvsimport
- Description: Tool to import a CVS repository into git
- Depends: %N (=%v-%r), cvsps
- Files: <<
- lib/git/%n
- share/doc/%N/%n.html
- share/man/man1/%n.1
- <<
- DocFiles: COPYING
-<<
-
-SplitOff2: <<
- Package: git-archimport
- Description: Tool to import an arch repository into git
- # Should probably depend on arch when that gets packaged
- Depends: %N (=%v-%r), string-shellquote-pm
- Files: <<
- lib/git/%n
- share/doc/%N/%n.html
- share/man/man1/%n.1
- <<
- DocFiles: COPYING
-<<
-
-SplitOff3: <<
- Package: git-svn
- Description: Tool to let git use subversion repositories
- Depends: %N (=%v-%r), svn-swig-pm588, libwww-pm588, error-pm,
term-readkey-pm588
- Files: <<
- lib/git/%n
- share/doc/%N/%n.html
- share/man/man1/%n.1
- <<
- DocFiles: COPYING
-<<
-
Description: Distributed version control system
DescDetail: <<
Git is an open source, distributed version control system designed to
@@ -157,3 +185,4 @@
sam-CL: http://www.cl.kernel.org/pub
sam-VE: http://www.ve.kernel.org/pub
<<
+<<
Index: git.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- git.patch 16 May 2010 15:54:29 -0000 1.1
+++ git.patch 22 Oct 2010 20:35:12 -0000 1.2
@@ -1,49 +1,25 @@
-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 @@
- bindir = $(prefix)/$(bindir_relative)
- mandir = share/man
- infodir = share/info
--gitexecdir = libexec/git-core
-+gitexecdir = lib/git
- sharedir = $(prefix)/share
- 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 @@
- endif
-
- ifeq ($(uname_S),Darwin)
-+ BASIC_CFLAGS += -I%p/lib/system-openssl/include -I%p/include
-+ BASIC_LDFLAGS += -L%p/lib/system-openssl/lib -L%p/lib
- 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.1.orig/contrib/completion/git-completion.bash
git-1.7.2.1/contrib/completion/git-completion.bash
+--- git-1.7.2.1.orig/contrib/completion/git-completion.bash 2010-07-28
13:03:43.000000000 -0400
++++ git-1.7.2.1/contrib/completion/git-completion.bash 2010-08-10
11:44:42.000000000 -0400
+@@ -72,6 +72,9 @@
+ # [email protected]
+ #
- # default configuration for gitweb
- GITWEB_CONFIG = gitweb_config.perl
--GITWEB_CONFIG_SYSTEM = /etc/gitweb.conf
-+GITWEB_CONFIG_SYSTEM = $(sysconfdir)/gitweb.conf
- 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
++# Make sure we're not in posix mode, otherwise process substitution is
invalid.
++set +o posix
++
+ case "$COMP_WORDBREAKS" in
+ *:*) : great ;;
+ *) COMP_WORDBREAKS="$COMP_WORDBREAKS:"
+diff -ru git-1.7.2.1.orig/perl/Makefile git-1.7.2.1/perl/Makefile
+--- git-1.7.2.1.orig/perl/Makefile 2010-07-28 13:03:43.000000000 -0400
++++ git-1.7.2.1/perl/Makefile 2010-08-10 11:42:47.000000000 -0400
@@ -38,7 +38,7 @@
echo ' echo $(instdir_SQ)' >> $@
else
$(makfile): Makefile.PL ../GIT-CFLAGS
-- $(PERL_PATH) $< PREFIX='$(prefix_SQ)'
-+ $(PERL_PATH) $< PREFIX='$(prefix_SQ)' LIB='%p/lib/perl5'
INSTALLSITEMAN3DIR='%p/share/man/man3'
+- $(PERL_PATH) $< PREFIX='$(prefix_SQ)' INSTALL_BASE=''
++ $(PERL_PATH) $< PREFIX='$(prefix_SQ)' INSTALL_BASE=''
LIB='$(prefix_SQ)/lib/perl5' INSTALLSITEMAN3DIR='$(prefix_SQ)/share/man/man3'
endif
# this is just added comfort for calling make directly in perl dir
--- NEW FILE: git-cvsimport.info ---
Package: git-cvsimport
Version: 1.7.3.1
Revision: 1
Description: Tool to import a CVS repository into git
Depends: git (>= %v-1), cvsps
Source: mirror:custom:/software/scm/git/git-%v.tar.bz2
Source-MD5: 77e1611498919965fb65fd1f229ee155
Source2: mirror:custom:/software/scm/git/git-htmldocs-%v.tar.bz2
Source2-MD5: f9c9669fb00df38f1486763ace135666
Source2ExtractDir: doc
Source3: mirror:custom:/software/scm/git/git-manpages-%v.tar.bz2
Source3-MD5: 41a164c1ad025e0970b2365e27209a11
CompileScript: echo "Nothing to compile."
InstallScript: <<
#!/bin/bash -ev
mkdir -p %i/lib/git-core
mkdir -p %i/share/doc/git
mkdir -p %i/share/man/man1
cp %n.perl %i/lib/git-core/%n
cp ../doc/%n.* %i/share/doc/git
cp ../man1/%n.1 %i/share/man/man1
let version=`uname -r | cut -f 1 -d .`
if [ $version -ge 10 ]; then
perl -pi -e 's,/usr/bin/perl,/usr/bin/arch -%m /usr/bin/perl,'
%i/lib/git-core/%n
fi
<<
DocFiles: COPYING
License: GPL
Homepage: http://git-scm.com/
Maintainer: Daniel Johnson <[email protected]>
CustomMirror: <<
Primary: http://www.kernel.org/pub
asi-CN: http://www.cn.kernel.org/pub
asi-IN: http://www.in.kernel.org/pub
asi-JP: http://www.jp.kernel.org/pub
asi-KR: http://www.kr.kernel.org/pub
asi-MY: http://www.my.kernel.org/pub
asi-SG: http://www.sg.kernel.org/pub
asi-TW: http://www.tw.kernel.org/pub
aus-AU: http://www.au.kernel.org/pub
aus-NZ: http://www.nz.kernel.org/pub
eur-BA: http://www.ba.kernel.org/pub
eur-BE: http://www.be.kernel.org/pub
eur-BG: http://www.bg.kernel.org/pub
eur-CH: http://www.ch.kernel.org/pub
eur-CZ: http://www.cz.kernel.org/pub
eur-DE: http://www.de.kernel.org/pub
eur-DK: http://www.dk.kernel.org/pub
eur-EE: http://www.ee.kernel.org/pub
eur-ES: http://www.es.kernel.org/pub
eur-FI: http://www.fi.kernel.org/pub
eur-FR: http://www.fr.kernel.org/pub
eur-GR: http://www.gr.kernel.org/pub
eur-HR: http://www.hr.kernel.org/pub
eur-HU: http://www.hu.kernel.org/pub
eur-IE: http://www.ie.kernel.org/pub
eur-IL: http://www.il.kernel.org/pub
eur-IS: http://www.is.kernel.org/pub
eur-IT: http://www.it.kernel.org/pub
eur-LI: http://www.li.kernel.org/pub
eur-LT: http://www.lt.kernel.org/pub
eur-LU: http://www.lu.kernel.org/pub
eur-LV: http://www.lv.kernel.org/pub
eur-MD: http://www.md.kernel.org/pub
eur-MK: http://www.mk.kernel.org/pub
eur-NL: http://www.nl.kernel.org/pub
eur-NO: http://www.no.kernel.org/pub
eur-PL: http://www.pl.kernel.org/pub
eur-PT: http://www.pt.kernel.org/pub
eur-RO: http://www.ro.kernel.org/pub
eur-RU: http://www.ru.kernel.org/pub
eur-SE: http://www.se.kernel.org/pub
eur-SI: http://www.si.kernel.org/pub
eur-SK: http://www.sk.kernel.org/pub
eur-TR: ftp://ftp.tr.kernel.org/pub
eur-UA: http://www.ua.kernel.org/pub
eur-UK: http://www.uk.kernel.org/pub
nam-CA: http://www.ca.kernel.org/pub
nam-MX: http://www.mx.kernel.org/pub
nam-US: http://www.us.kernel.org/pub
sam-AR: http://www.ar.kernel.org/pub
sam-BR: http://www.br.kernel.org/pub
sam-CL: http://www.cl.kernel.org/pub
sam-VE: http://www.ve.kernel.org/pub
<<
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
