mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
Relocate the vcs tools to match changes in portage
This commit is contained in:
Chris Roberts
54
dev-vcs/git/git-1.5.5.diff
Normal file
54
dev-vcs/git/git-1.5.5.diff
Normal file
@@ -0,0 +1,54 @@
|
||||
--- 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 && \
|
||||
39
dev-vcs/git/git-1.6.5.3.bep
Normal file
39
dev-vcs/git/git-1.6.5.3.bep
Normal file
@@ -0,0 +1,39 @@
|
||||
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=/boot/common --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=/boot/common/bin/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=/boot/common/bin/perl \
|
||||
CFLAGS="-g -O2 -I/boot/common/include" \
|
||||
LIBS="" \
|
||||
LDFLAGS="-L/boot/common/lib -lnetwork -lbsd -liconv" \
|
||||
strip
|
||||
}
|
||||
LICENSE="GNU GPL v2"
|
||||
49
dev-vcs/git/git-1.7.0.1.bep
Normal file
49
dev-vcs/git/git-1.7.0.1.bep
Normal file
@@ -0,0 +1,49 @@
|
||||
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=/boot/common --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=/boot/common/bin/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=/boot/common/bin/perl \
|
||||
CFLAGS="-g -O2 -I/boot/common/include" \
|
||||
LIBS="" \
|
||||
LDFLAGS="-L/boot/common/lib -lnetwork -lbsd -liconv" \
|
||||
strip
|
||||
}
|
||||
LICENSE="GNU GPL v2"
|
||||
21
dev-vcs/git/git-1.7.0.4.bep
Normal file
21
dev-vcs/git/git-1.7.0.4.bep
Normal file
@@ -0,0 +1,21 @@
|
||||
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=/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.4
|
||||
make install
|
||||
}
|
||||
LICENSE="GNU GPL v2"
|
||||
21
dev-vcs/git/git-1.7.0.5.bep
Normal file
21
dev-vcs/git/git-1.7.0.5.bep
Normal file
@@ -0,0 +1,21 @@
|
||||
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
|
||||
}
|
||||
LICENSE="GNU GPL v2"
|
||||
22
dev-vcs/git/git-1.7.1.bep
Normal file
22
dev-vcs/git/git-1.7.1.bep
Normal file
@@ -0,0 +1,22 @@
|
||||
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=/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.1
|
||||
make install
|
||||
}
|
||||
LICENSE="GNU GPL v2"
|
||||
25
dev-vcs/git/patches/git-1.7.0.4.patch
Normal file
25
dev-vcs/git/patches/git-1.7.0.4.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
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])
|
||||
25
dev-vcs/git/patches/git-1.7.0.5.patch
Normal file
25
dev-vcs/git/patches/git-1.7.0.5.patch
Normal file
@@ -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])
|
||||
25
dev-vcs/git/patches/git-1.7.1.patch
Normal file
25
dev-vcs/git/patches/git-1.7.1.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
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])
|
||||
Reference in New Issue
Block a user