Update git to 1.7.10 and prune old versions.

This commit is contained in:
Chris Roberts
2012-05-03 03:48:17 +00:00
parent 53e0280107
commit ceb67a97c2
18 changed files with 105 additions and 492 deletions

View File

@@ -1,39 +0,0 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://kernel.org/pub/software/scm/git/git-1.6.5.3.tar.bz2"
CHECKSUM_MD5="a1dbc3da46cbf33c4367db689853c142"
REVISION="1"
STATUS_HAIKU="broken"
DEPEND=""
BUILD {
cd git-1.6.5.3
libtoolize --force --copy --install
aclocal
autoconf
./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-pthreads=""
make prefix=/boot/common NO_R_TO_GCC_LINKER=YesPlease \
NO_C99_FORMAT=YesPlease \
NO_ST_BLOCKS_IN_STRUCT_STAT=YesPlease \
NO_MEMMEM=YesPlease NO_MKSTEMPS=YesPlease \
NO_MKDTEMP=YesPlease NO_IPV6=YesPlease \
NO_TCLTK=YesPlease CURLDIR=/boot/common \
PERL_PATH=`finddir B_COMMON_BIN_DIRECTORY`/perl \
CFLAGS="-g -O2 -I/boot/common/include" \
LIBS="" \
LDFLAGS="-L/boot/common/lib -lnetwork -lbsd -liconv" \
strip
}
INSTALL {
cd git-1.6.5.3
make install prefix=/boot/common NO_R_TO_GCC_LINKER=YesPlease \
NO_C99_FORMAT=YesPlease NO_ST_BLOCKS_IN_STRUCT_STAT=YesPlease \
NO_MEMMEM=YesPlease NO_MKSTEMPS=YesPlease \
NO_MKDTEMP=YesPlease NO_IPV6=YesPlease NO_TCLTK=YesPlease \
CURLDIR=/boot/common PERL_PATH=`finddir B_COMMON_BIN_DIRECTORY`/perl \
CFLAGS="-g -O2 -I/boot/common/include" \
LIBS="" \
LDFLAGS="-L/boot/common/lib -lnetwork -lbsd -liconv" \
strip
}
LICENSE="GNU GPL v2"

View File

@@ -1,49 +0,0 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.0.1.tar.gz"
CHECKSUM_MD5="05485caf5c503ce378a87759bc3a0509"
REVISION="1"
STATUS_HAIKU="broken"
DEPEND=""
BUILD {
cd git-1.7.0.1
# libtoolize --force --copy --install
# aclocal
# autoconf
./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-pthreads=""
make prefix=/boot/common \
NO_R_TO_GCC_LINKER=YesPlease \
NO_C99_FORMAT=YesPlease \
NO_ST_BLOCKS_IN_STRUCT_STAT=YesPlease \
NO_MEMMEM=YesPlease \
NO_MKSTEMPS=YesPlease \
NO_MKDTEMP=YesPlease \
NO_IPV6=YesPlease \
NO_TCLTK=YesPlease \
CURLDIR=/boot/common \
PERL_PATH=`finddir B_COMMON_BIN_DIRECTORY`/perl \
CFLAGS="-g -O2 -I/boot/common/include" \
LIBS="" \
LDFLAGS="-L/boot/common/lib -lnetwork -lbsd -liconv" \
strip
}
INSTALL {
cd git-1.7.0.1
make install prefix=/boot/common \
NO_R_TO_GCC_LINKER=YesPlease \
NO_C99_FORMAT=YesPlease \
NO_ST_BLOCKS_IN_STRUCT_STAT=YesPlease \
NO_MEMMEM=YesPlease \
NO_MKSTEMPS=YesPlease \
NO_MKDTEMP=YesPlease \
NO_IPV6=YesPlease \
NO_TCLTK=YesPlease \
CURLDIR=/boot/common \
PERL_PATH=`finddir B_COMMON_BIN_DIRECTORY`/perl \
CFLAGS="-g -O2 -I/boot/common/include" \
LIBS="" \
LDFLAGS="-L/boot/common/lib -lnetwork -lbsd -liconv" \
strip
}
LICENSE="GNU GPL v2"

View File

@@ -1,21 +0,0 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.0.4.tar.bz2"
CHECKSUM_MD5="1cc8b2aea57e5e999ccac18ae355f760"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd git-1.7.0.4
autoconf
CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \
./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-editor=nano --enable-pthreads="-lroot" \
--with-perl=`finddir B_COMMON_BIN_DIRECTORY`/perl --with-python=`finddir B_COMMON_BIN_DIRECTORY`/python --without-tcltk
make strip
}
INSTALL {
cd git-1.7.0.4
make install
}
LICENSE="GNU GPL v2"

View File

@@ -1,21 +0,0 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.0.5.tar.bz2"
CHECKSUM_MD5="77d50f41ef282752dc69d9a47765f5c7"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD {
cd git-1.7.0.5
autoconf
CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \
./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-editor=nano --enable-pthreads="-lroot" \
--with-perl=`finddir B_COMMON_BIN_DIRECTORY`/perl --with-python=`finddir B_COMMON_BIN_DIRECTORY`/python --without-tcltk
make strip
}
INSTALL {
cd git-1.7.0.5
make install
}
LICENSE="GNU GPL v2"

View File

@@ -1,22 +0,0 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.1.tar.bz2"
CHECKSUM_MD5="3da231dbe82ad103373cb530ae7475d5"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="net-misc/curl >= 7.20.0
dev-lang/perl >= 5.10.1"
BUILD {
cd git-1.7.1
autoconf
CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \
./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-editor=nano --enable-pthreads="-lroot" \
--with-perl=`finddir B_COMMON_BIN_DIRECTORY`/perl --with-python=`finddir B_COMMON_BIN_DIRECTORY`/python --without-tcltk
make strip
}
INSTALL {
cd git-1.7.1
make install
}
LICENSE="GNU GPL v2"

View File

@@ -0,0 +1,26 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://git-core.googlecode.com/files/git-1.7.10.tar.gz"
CHECKSUM_MD5="ab2716db51580037c7ebda4c8e9d56eb"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="net-misc/curl >= 7.20.0
dev-lang/perl >= 5.10.1
dev-vcs/gitdoc == 1.7.10"
BUILD {
cd git-1.7.10
make strip
}
INSTALL {
cd git-1.7.10
make install
}
TEST {
cd git-1.7.10
make check
}
LICENSE="GNU GPL v2"
COPYRIGHT="2005-2012 Git Authors (see git web site for list)"

View File

@@ -1,22 +0,0 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.3.1.tar.bz2"
CHECKSUM_MD5="77e1611498919965fb65fd1f229ee155"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="net-misc/curl >= 7.20.0
dev-lang/perl >= 5.10.1"
BUILD {
cd git-1.7.3.1
autoconf
CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \
./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-editor=nano --enable-pthreads="-lroot" \
--with-perl=`finddir B_COMMON_BIN_DIRECTORY`/perl --with-python=`finddir B_COMMON_BIN_DIRECTORY`/python --without-tcltk
make strip
}
INSTALL {
cd git-1.7.3.1
make install
}
LICENSE="GNU GPL v2"

View File

@@ -1,34 +0,0 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.3.5.tar.bz2"
CHECKSUM_MD5="8a8cd93b8a4dff0a03c0fdc77253af3e"
REVISION="1"
STATUS_HAIKU="broken"
DEPEND="net-misc/curl >= 7.20.0
dev-lang/perl >= 5.10.1"
BUILD {
cd git-1.7.3.5
autoconf
sed -i 's/lgen/ /' configure
sed -i 's/-lgen/ /' Makefile
CFLAGS="-I/boot/common/include" LDFLAGS="-L/boot/common/lib -L/boot/system/lib -lbsd -lnetwork" \
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
--libexecdir=`finddir B_COMMON_BIN_DIRECTORY` \
sharedir=`finddir B_COMMON_DATA_DIRECTORY` \
--with-editor=nano \
--enable-pthreads \
--with-perl=`finddir B_COMMON_BIN_DIRECTORY`/perl \
--with-python=`finddir B_COMMON_BIN_DIRECTORY`/python \
--without-tcltk
make strip
}
INSTALL {
cd git-1.7.3.5
make install
}
LICENSE="GNU GPL v2"
COPYRIGHT="2005-2011 Git Authors (see git web site for list)"

View File

@@ -1,20 +0,0 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.5.tar.bz2"
CHECKSUM_MD5="7f0bc26a6e87d251c9b09fa05a186ed3"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="net-misc/curl >= 7.20.0
dev-lang/perl >= 5.10.1"
BUILD {
cd git-1.7.5
make strip
}
INSTALL {
cd git-1.7.5
make install
}
LICENSE="GNU GPL v2"
COPYRIGHT="2005-2011 Git Authors (see git web site for list)"

View File

@@ -1,25 +0,0 @@
DESCRIPTION="git a fast version control system"
HOMEPAGE="http://git-scm.com/"
SRC_URI="http://kernel.org/pub/software/scm/git/git-1.7.6.tar.bz2"
CHECKSUM_MD5="9e0a438eb71e89eedb61f89470ed32a0"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND="net-misc/curl >= 7.20.0
dev-lang/perl >= 5.10.1"
BUILD {
cd git-1.7.6
make strip
}
INSTALL {
cd git-1.7.6
make install
}
TEST {
cd git-1.7.6
make check
}
LICENSE="GNU GPL v2"
COPYRIGHT="2005-2011 Git Authors (see git web site for list)"

View File

@@ -1,54 +0,0 @@
--- git-1.5.5/Makefile 2008-04-08 07:10:01.000000000 +0000
+++ git-1.5.5.patched/Makefile 2008-04-19 00:20:29.000000000 +0000
@@ -989,7 +989,7 @@
'-DGIT_INFO_PATH="$(infodir_SQ)"' $<
$(BUILT_INS): git$X
- $(QUIET_BUILT_IN)$(RM) $@ && ln git$X $@
+ $(QUIET_BUILT_IN)$(RM) $@ && ln -s git$X $@
common-cmds.h: ./generate-cmdlist.sh command-list.txt
@@ -1230,7 +1230,7 @@
cp '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
'$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X'; \
fi
- $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
+ $(foreach p,$(BUILT_INS), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln -s '$(DESTDIR_SQ)$(gitexecdir_SQ)/git$X' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
ifneq (,$X)
$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p';)
endif
--- git-1.5.5/git-compat-util.h 2008-04-08 07:10:01.000000000 +0000
+++ git-1.5.5.patched/git-compat-util.h 2008-04-18 22:15:48.000000000 +0000
@@ -453,4 +453,8 @@
# define FORCE_DIR_SET_GID 0
#endif
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN 16
+#endif
+
#endif
--- git-1.5.5/builtin-count-objects.c 2008-04-08 07:10:01.000000000 +0000
+++ git-1.5.5.patched/builtin-count-objects.c 2008-04-19 00:32:05.000000000 +0000
@@ -43,7 +43,8 @@
if (lstat(path, &st) || !S_ISREG(st.st_mode))
bad = 1;
else
- (*loose_size) += xsize_t(st.st_blocks);
+// (*loose_size) += xsize_t(st.st_blocks);
+ (*loose_size) += ceil(st.st_size / 512.0);
}
if (bad) {
if (verbose) {
--- git-1.5.5/templates/Makefile 2008-04-08 07:10:01.000000000 +0000
+++ git-1.5.5.patched/templates/Makefile 2008-04-19 00:44:46.000000000 +0000
@@ -23,7 +23,7 @@
bpsrc = $(filter-out %~,$(wildcard *--*))
boilerplates.made : $(bpsrc)
- $(QUIET)ls *--* 2>/dev/null | \
+ $(QUIET)ls -1 *--* 2>/dev/null | \
while read boilerplate; \
do \
case "$$boilerplate" in *~) continue ;; esac && \

View File

@@ -1,25 +0,0 @@
diff -up git-1.7.0.4/configure.ac.orig git-1.7.0.4/configure.ac
--- git-1.7.0.4/configure.ac.orig 2010-04-03 18:57:28.303824896 -0600
+++ git-1.7.0.4/configure.ac 2010-04-03 18:59:05.954990592 -0600
@@ -527,17 +527,13 @@ test -n "$NEEDS_SOCKET" && LIBS="$LIBS -
# Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough.
# Notably on Solaris hstrerror resides in libresolv and on Solaris 7
# inet_ntop and inet_pton additionally reside there.
-AC_CHECK_LIB([c], [hstrerror],
-[NEEDS_RESOLV=],
-[NEEDS_RESOLV=YesPlease])
+AC_SEARCH_LIBS([hstrerror], [resolv],
+[AC_DEFINE([NEEDS_RESOLV], [YesPlease])])
AC_SUBST(NEEDS_RESOLV)
-test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv"
-AC_CHECK_LIB([c], [basename],
-[NEEDS_LIBGEN=],
-[NEEDS_LIBGEN=YesPlease])
+AC_SEARCH_LIBS([basename], [gen],
+[AC_DEFINE([NEEDS_LIBGEN], [YesPlease])])
AC_SUBST(NEEDS_LIBGEN)
-test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen"
## Checks for header files.
AC_MSG_NOTICE([CHECKS for header files])

View File

@@ -1,25 +0,0 @@
diff -up git-1.7.0.5/configure.ac.orig git-1.7.0.4/configure.ac
--- git-1.7.0.5/configure.ac.orig 2010-04-03 18:57:28.303824896 -0600
+++ git-1.7.0.5/configure.ac 2010-04-03 18:59:05.954990592 -0600
@@ -527,17 +527,13 @@ test -n "$NEEDS_SOCKET" && LIBS="$LIBS -
# Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough.
# Notably on Solaris hstrerror resides in libresolv and on Solaris 7
# inet_ntop and inet_pton additionally reside there.
-AC_CHECK_LIB([c], [hstrerror],
-[NEEDS_RESOLV=],
-[NEEDS_RESOLV=YesPlease])
+AC_SEARCH_LIBS([hstrerror], [resolv],
+[AC_DEFINE([NEEDS_RESOLV], [YesPlease])])
AC_SUBST(NEEDS_RESOLV)
-test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv"
-AC_CHECK_LIB([c], [basename],
-[NEEDS_LIBGEN=],
-[NEEDS_LIBGEN=YesPlease])
+AC_SEARCH_LIBS([basename], [gen],
+[AC_DEFINE([NEEDS_LIBGEN], [YesPlease])])
AC_SUBST(NEEDS_LIBGEN)
-test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen"
## Checks for header files.
AC_MSG_NOTICE([CHECKS for header files])

View File

@@ -1,25 +0,0 @@
diff -up git-1.7.1/configure.ac.orig git-1.7.1/configure.ac
--- git-1.7.1/configure.ac.orig 2010-04-23 20:38:35.035127296 -0600
+++ git-1.7.1/configure.ac 2010-05-13 18:03:30.180355072 -0600
@@ -547,17 +547,13 @@ test -n "$NEEDS_SOCKET" && LIBS="$LIBS -
# Define NEEDS_RESOLV if linking with -lnsl and/or -lsocket is not enough.
# Notably on Solaris hstrerror resides in libresolv and on Solaris 7
# inet_ntop and inet_pton additionally reside there.
-AC_CHECK_LIB([c], [hstrerror],
-[NEEDS_RESOLV=],
-[NEEDS_RESOLV=YesPlease])
+AC_SEARCH_LIBS([hstrerror], [resolv],
+[AC_DEFINE([NEEDS_RESOLV], [YesPlease])])
AC_SUBST(NEEDS_RESOLV)
-test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv"
-AC_CHECK_LIB([c], [basename],
-[NEEDS_LIBGEN=],
-[NEEDS_LIBGEN=YesPlease])
+AC_SEARCH_LIBS([basename], [gen],
+[AC_DEFINE([NEEDS_LIBGEN], [YesPlease])])
AC_SUBST(NEEDS_LIBGEN)
-test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen"
## Checks for header files.
AC_MSG_NOTICE([CHECKS for header files])

View File

@@ -0,0 +1,47 @@
diff -up git-1.7.10/Makefile.orig git-1.7.10/Makefile
--- git-1.7.10/Makefile.orig 2012-04-06 12:42:50.033030144 -0600
+++ git-1.7.10/Makefile 2012-04-22 15:44:52.718798848 -0600
@@ -1242,6 +1242,31 @@ ifeq ($(uname_S),Minix)
NO_CURL =
NO_EXPAT =
endif
+ifeq ($(uname_S),Haiku)
+ NO_LIBGEN_H = YesPlease
+ NO_MEMMEM = YesPlease
+ NO_MKSTEMPS = YesPlease
+ NEEDS_LIBICONV = YesPlease
+ PERL_PATH = perl
+ PYTHON_PATH = python
+# TCL_PATH = tclsh
+ mandir = /boot/common/documentation/man
+ infodir = /boot/common/documentation/info
+ htmldir = /boot/common/documentation/doc/git-1.7.10
+ gitexecdir = /boot/common/bin/git-core
+ gitwebdir = /boot/common/data/gitweb
+ template_dir = /boot/common/data/git-core/templates
+ NO_TCLTK = YesPlease
+ DEFAULT_EDITOR = nano
+ CURL_DIR = /boot/common
+ EXPAT_DIR = /boot/common
+ BASIC_CFLAGS += -I/boot/common/include
+ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib
+ PTHREAD_LIBS =
+ prefix = /boot/common
+ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease
+ NO_GETTEXT = YesPlease
+endif
ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ;
NO_PREAD = YesPlease
diff -up git-1.7.10/git-web--browse.sh.orig git-1.7.10/git-web--browse.sh
--- git-1.7.10/git-web--browse.sh.orig 2012-04-06 12:42:50.020185088 -0600
+++ git-1.7.10/git-web--browse.sh 2012-04-22 15:44:52.720371712 -0600
@@ -116,7 +116,7 @@ if test -z "$browser" ; then
browser_candidates="konqueror $browser_candidates"
fi
else
- browser_candidates="w3m elinks links lynx"
+ browser_candidates="w3m elinks links lynx open"
fi
# SECURITYSESSIONID indicates an OS X GUI login session
if test -n "$SECURITYSESSIONID" \

View File

@@ -1,55 +0,0 @@
diff -up git-1.7.5/Makefile.orig git-1.7.5/Makefile
--- git-1.7.5/Makefile.orig 2011-04-24 11:48:31.029622272 -0600
+++ git-1.7.5/Makefile 2011-05-04 14:19:53.645136384 -0600
@@ -1135,6 +1135,30 @@ ifeq ($(uname_S),Interix)
NO_INET_PTON = YesPlease
endif
endif
+ifeq ($(uname_S),Haiku)
+ NO_LIBGEN_H = YesPlease
+ NO_MEMMEM = YesPlease
+ NO_MKSTEMPS = YesPlease
+ NEEDS_LIBICONV = YesPlease
+ NO_IPV6 = YesPlease
+ PERL_PATH = perl
+ PYTHON_PATH = python
+# TCL_PATH = tclsh
+ mandir = /boot/common/documentation/man
+ infodir = /boot/common/documentation/info
+ gitexecdir = /boot/common/bin/git-core
+ gitwebdir = /boot/common/data/gitweb
+ template_dir = /boot/common/data/git-core/templates
+ NO_TCLTK = YesPlease
+ DEFAULT_EDITOR = nano
+ CURL_DIR = /boot/common
+ EXPAT_DIR = /boot/common
+ BASIC_CFLAGS += -I/boot/common/include
+ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib
+ PTHREAD_LIBS =
+ prefix = /boot/common
+ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease
+endif
ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ;
NO_PREAD = YesPlease
diff -up git-1.7.5/git-gui/Makefile.orig git-1.7.5/git-gui/Makefile
--- git-1.7.5/git-gui/Makefile.orig 2011-04-24 11:48:31.002883584 -0600
+++ git-1.7.5/git-gui/Makefile 2011-05-04 14:19:10.532152320 -0600
@@ -57,7 +57,7 @@ INSTALL_X1 =
INSTALL_A0 = find # space is required here
INSTALL_A1 = | cpio -pud
INSTALL_L0 = rm -f # space is required here
-INSTALL_L1 = && ln # space is required here
+INSTALL_L1 = && ln -s # space is required here
INSTALL_L2 =
INSTALL_L3 =
@@ -87,7 +87,7 @@ ifndef V
INSTALL_L0 = dst=
INSTALL_L1 = && src=
INSTALL_L2 = && dst=
- INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
+ INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln -s "$$src" "$$dst"
CLEAN_DST = echo ' ' UNINSTALL
REMOVE_D0 = dir=

View File

@@ -1,55 +0,0 @@
diff -up git-1.7.6/Makefile.orig git-1.7.6/Makefile
--- git-1.7.6/Makefile.orig 2011-06-26 16:26:13.012582912 -0600
+++ git-1.7.6/Makefile 2011-07-02 12:04:18.592183296 -0600
@@ -1142,6 +1142,30 @@ ifeq ($(uname_S),Interix)
NO_INET_PTON = YesPlease
endif
endif
+ifeq ($(uname_S),Haiku)
+ NO_LIBGEN_H = YesPlease
+ NO_MEMMEM = YesPlease
+ NO_MKSTEMPS = YesPlease
+ NEEDS_LIBICONV = YesPlease
+ NO_IPV6 = YesPlease
+ PERL_PATH = perl
+ PYTHON_PATH = python
+# TCL_PATH = tclsh
+ mandir = /boot/common/documentation/man
+ infodir = /boot/common/documentation/info
+ gitexecdir = /boot/common/bin/git-core
+ gitwebdir = /boot/common/data/gitweb
+ template_dir = /boot/common/data/git-core/templates
+ NO_TCLTK = YesPlease
+ DEFAULT_EDITOR = nano
+ CURL_DIR = /boot/common
+ EXPAT_DIR = /boot/common
+ BASIC_CFLAGS += -I/boot/common/include
+ BASIC_LDFLAGS += -lnetwork -lbsd -L/boot/common/lib
+ PTHREAD_LIBS =
+ prefix = /boot/common
+ NO_CROSS_DIRECTORY_HARDLINKS = YesPlease
+endif
ifneq (,$(findstring MINGW,$(uname_S)))
pathsep = ;
NO_PREAD = YesPlease
diff -up git-1.7.6/git-gui/Makefile.orig git-1.7.6/git-gui/Makefile
--- git-1.7.6/git-gui/Makefile.orig 2011-06-26 16:26:13.052690944 -0600
+++ git-1.7.6/git-gui/Makefile 2011-07-02 12:04:18.594804736 -0600
@@ -57,7 +57,7 @@ INSTALL_X1 =
INSTALL_A0 = find # space is required here
INSTALL_A1 = | cpio -pud
INSTALL_L0 = rm -f # space is required here
-INSTALL_L1 = && ln # space is required here
+INSTALL_L1 = && ln -s # space is required here
INSTALL_L2 =
INSTALL_L3 =
@@ -87,7 +87,7 @@ ifndef V
INSTALL_L0 = dst=
INSTALL_L1 = && src=
INSTALL_L2 = && dst=
- INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln "$$src" "$$dst"
+ INSTALL_L3 = && echo ' ' 'LINK ' `basename "$$dst"` '->' `basename "$$src"` && rm -f "$$dst" && ln -s "$$src" "$$dst"
CLEAN_DST = echo ' ' UNINSTALL
REMOVE_D0 = dir=