From f4437250afbc12a4ecf7c7b38538c56d7c1bb31a Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 14 Apr 2010 05:12:31 +0000 Subject: [PATCH] Updated git to 1.7.0.5 Applied with the following Haiku: Git is open source Distributed V.C.S Branch and merging clones --- dev-util/git/git-1.7.0.5.bep | 20 ++++++++++++++++++++ dev-util/git/patches/git-1.7.0.5.patch | 25 +++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 dev-util/git/git-1.7.0.5.bep create mode 100644 dev-util/git/patches/git-1.7.0.5.patch diff --git a/dev-util/git/git-1.7.0.5.bep b/dev-util/git/git-1.7.0.5.bep new file mode 100644 index 000000000..9a2242207 --- /dev/null +++ b/dev-util/git/git-1.7.0.5.bep @@ -0,0 +1,20 @@ +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=/boot/common --with-editor=nano --enable-pthreads="-lroot" \ + --with-perl=/boot/common/bin/perl --with-python=/boot/common/bin/python --without-tcltk + make strip +} + +INSTALL { + cd git-1.7.0.5 + make install +} diff --git a/dev-util/git/patches/git-1.7.0.5.patch b/dev-util/git/patches/git-1.7.0.5.patch new file mode 100644 index 000000000..8770e4cde --- /dev/null +++ b/dev-util/git/patches/git-1.7.0.5.patch @@ -0,0 +1,25 @@ +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])