Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2548
Modified Files:
git.info git.patch
Log Message:
git 1.6.3.3; fix git help -w
Index: git.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/git.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- git.patch 13 Mar 2009 04:02:16 -0000 1.14
+++ git.patch 27 Jun 2009 02:32:02 -0000 1.15
@@ -1,11 +1,12 @@
Use system-openssl in Makefile.
Use /usr/bin/wish in gitk.
Fix perl install locations.
+Point git -w to %p/share/doc/git.
-diff -ru git-1.6.2/Makefile git-1.6.2-patched/Makefile
---- git-1.6.2/Makefile 2009-03-04 03:18:50.000000000 -0500
-+++ git-1.6.2-patched/Makefile 2009-03-08 22:06:32.000000000 -0400
-@@ -196,7 +196,7 @@
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -215,10 +215,10 @@
bindir = $(prefix)/$(bindir_relative)
mandir = share/man
infodir = share/info
@@ -13,8 +14,12 @@
+gitexecdir = lib/git
sharedir = $(prefix)/share
template_dir = share/git-core/templates
- htmldir = share/doc/git-doc
-@@ -212,7 +212,7 @@
+-htmldir = share/doc/git-doc
++htmldir = share/doc/git
+ ifeq ($(prefix),/usr)
+ sysconfdir = /etc
+ ETC_GITCONFIG = $(sysconfdir)/gitconfig
+@@ -231,7 +231,7 @@
# default configuration for gitweb
GITWEB_CONFIG = gitweb_config.perl
@@ -23,7 +28,7 @@
GITWEB_HOME_LINK_STR = projects
GITWEB_SITENAME =
GITWEB_PROJECTROOT = /pub/git
-@@ -814,6 +814,8 @@
+@@ -857,6 +857,8 @@
-include config.mak
ifeq ($(uname_S),Darwin)
@@ -32,9 +37,9 @@
ifndef NO_FINK
ifeq ($(shell test -d /sw/lib && echo y),y)
BASIC_CFLAGS += -I/sw/include
-diff -ru git-1.6.2/perl/Makefile git-1.6.2-patched/perl/Makefile
---- git-1.6.2/perl/Makefile 2009-03-04 03:18:50.000000000 -0500
-+++ git-1.6.2-patched/perl/Makefile 2009-03-08 22:06:45.000000000 -0400
+diff --git a/perl/Makefile b/perl/Makefile
+--- a/perl/Makefile
++++ b/perl/Makefile
@@ -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.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- git.info 10 Jun 2009 16:12:38 -0000 1.40
+++ git.info 27 Jun 2009 02:32:02 -0000 1.41
@@ -1,5 +1,5 @@
Package: git
-Version: 1.6.3.2
+Version: 1.6.3.3
Revision: 1
# git-svn requires error-pm and term-readkey-pm
Depends: <<
@@ -9,18 +9,18 @@
BuildDepends: system-openssl-dev, libcurl4 (>= 7.16.1), libssh2.1, expat1,
libiconv-dev, fink (>= 0.24.12)
Replaces: git-core
Source: mirror:custom:/software/scm/%n/%n-%v.tar.bz2
-Source-MD5: 149948ff33fb7d8cf9eef925e6c08157
+Source-MD5: 91ae46ac01dadab1962beb064abd5b60
Source2: mirror:custom:/software/scm/%n/%n-htmldocs-%v.tar.bz2
-Source2-MD5: e83e19735ebc187b870b00a05b93f514
+Source2-MD5: c43c1d0c7497e7a6eac843d5dc1ac876
Source2ExtractDir: doc
Source3: mirror:custom:/software/scm/%n/%n-manpages-%v.tar.bz2
-Source3-MD5: 2fb5ba5cabe0057470d577d2d4ff4816
+Source3-MD5: 36be16310d1e24f23c966c8e17a499d7
PatchFile: %n.patch
-PatchFile-MD5: 880da377a7a4a1cfb2ec53294077012c
+PatchFile-MD5: b727c628ff90e9119e896871cdccb704
PatchScript: <<
- %{default_script}
- sed -i.bak -e 's|%%p|%p|g' Makefile perl/Makefile
+ %{default_script}
+ sed -i.bak -e 's|%%p|%p|g' Makefile perl/Makefile
<<
CompileScript: NO_FINK=1 NO_DARWIN_PORTS=1 make TCLTK_PATH=/usr/bin/wish
prefix=%p
InstallScript: <<
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
