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
433
dev-vcs/cvs/cvs-CVS.diff
Normal file
433
dev-vcs/cvs/cvs-CVS.diff
Normal file
@@ -0,0 +1,433 @@
|
||||
? build-aux/ltmain.sh
|
||||
Index: configure
|
||||
===================================================================
|
||||
RCS file: /sources/cvs/ccvs/configure,v
|
||||
retrieving revision 1.488
|
||||
diff -u -p -r1.488 configure
|
||||
--- configure 28 Jan 2008 05:32:56 -0000 1.488
|
||||
+++ configure 4 May 2008 09:32:20 -0000
|
||||
@@ -40558,7 +40558,7 @@ return connect ();
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
-for ac_lib in '' xnet socket inet; do
|
||||
+for ac_lib in '' xnet socket inet network; do
|
||||
if test -z "$ac_lib"; then
|
||||
ac_res="none required"
|
||||
else
|
||||
Index: configure.in
|
||||
===================================================================
|
||||
RCS file: /sources/cvs/ccvs/configure.in,v
|
||||
retrieving revision 1.385
|
||||
diff -u -p -r1.385 configure.in
|
||||
--- configure.in 28 Jan 2008 05:32:56 -0000 1.385
|
||||
+++ configure.in 4 May 2008 09:32:26 -0000
|
||||
@@ -527,7 +527,7 @@ CVS_FUNC_PRINTF_PTR
|
||||
|
||||
# Try to find connect and gethostbyname.
|
||||
AC_CHECK_LIB(nsl, main)
|
||||
-AC_SEARCH_LIBS(connect, xnet socket inet,
|
||||
+AC_SEARCH_LIBS(connect, xnet socket inet network,
|
||||
AC_DEFINE(HAVE_CONNECT, 1,
|
||||
[Define if you have the connect function.]))
|
||||
dnl no need to search nsl for gethostbyname here since we should have
|
||||
Index: build-aux/config.guess
|
||||
===================================================================
|
||||
RCS file: /sources/cvs/ccvs/build-aux/config.guess,v
|
||||
retrieving revision 1.2
|
||||
diff -u -p -r1.2 config.guess
|
||||
--- build-aux/config.guess 21 Aug 2007 18:42:53 -0000 1.2
|
||||
+++ build-aux/config.guess 4 May 2008 09:32:31 -0000
|
||||
@@ -1,10 +1,10 @@
|
||||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||
-# Inc.
|
||||
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
+# Free Software Foundation, Inc.
|
||||
|
||||
-timestamp='2006-07-02'
|
||||
+timestamp='2008-01-08'
|
||||
|
||||
# This file is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
@@ -56,8 +56,8 @@ version="\
|
||||
GNU config.guess ($timestamp)
|
||||
|
||||
Originally written by Per Bothner.
|
||||
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
-Free Software Foundation, Inc.
|
||||
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
||||
arm*) machine=arm-unknown ;;
|
||||
sh3el) machine=shl-unknown ;;
|
||||
sh3eb) machine=sh-unknown ;;
|
||||
+ sh5el) machine=sh5le-unknown ;;
|
||||
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
||||
esac
|
||||
# The Operating System including object format, if it has switched
|
||||
@@ -329,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
|
||||
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
||||
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit ;;
|
||||
- i86pc:SunOS:5.*:*)
|
||||
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
|
||||
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit ;;
|
||||
sun4*:SunOS:6*:*)
|
||||
@@ -531,7 +532,7 @@ EOF
|
||||
echo rs6000-ibm-aix3.2
|
||||
fi
|
||||
exit ;;
|
||||
- *:AIX:*:[45])
|
||||
+ *:AIX:*:[456])
|
||||
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
|
||||
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
||||
IBM_ARCH=rs6000
|
||||
@@ -780,7 +781,7 @@ EOF
|
||||
i*:CYGWIN*:*)
|
||||
echo ${UNAME_MACHINE}-pc-cygwin
|
||||
exit ;;
|
||||
- i*:MINGW*:*)
|
||||
+ *:MINGW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-mingw32
|
||||
exit ;;
|
||||
i*:windows32*:*)
|
||||
@@ -790,12 +791,18 @@ EOF
|
||||
i*:PW*:*)
|
||||
echo ${UNAME_MACHINE}-pc-pw32
|
||||
exit ;;
|
||||
- x86:Interix*:[3456]*)
|
||||
- echo i586-pc-interix${UNAME_RELEASE}
|
||||
- exit ;;
|
||||
- EM64T:Interix*:[3456]*)
|
||||
- echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||
- exit ;;
|
||||
+ *:Interix*:[3456]*)
|
||||
+ case ${UNAME_MACHINE} in
|
||||
+ x86)
|
||||
+ echo i586-pc-interix${UNAME_RELEASE}
|
||||
+ exit ;;
|
||||
+ EM64T | authenticamd)
|
||||
+ echo x86_64-unknown-interix${UNAME_RELEASE}
|
||||
+ exit ;;
|
||||
+ IA64)
|
||||
+ echo ia64-unknown-interix${UNAME_RELEASE}
|
||||
+ exit ;;
|
||||
+ esac ;;
|
||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||
echo i${UNAME_MACHINE}-pc-mks
|
||||
exit ;;
|
||||
@@ -829,7 +836,14 @@ EOF
|
||||
echo ${UNAME_MACHINE}-pc-minix
|
||||
exit ;;
|
||||
arm*:Linux:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ eval $set_cc_for_build
|
||||
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
||||
+ | grep -q __ARM_EABI__
|
||||
+ then
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ else
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
||||
+ fi
|
||||
exit ;;
|
||||
avr32*:Linux:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
@@ -950,6 +964,9 @@ EOF
|
||||
x86_64:Linux:*:*)
|
||||
echo x86_64-unknown-linux-gnu
|
||||
exit ;;
|
||||
+ xtensa*:Linux:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||
+ exit ;;
|
||||
i*86:Linux:*:*)
|
||||
# The BFD linker knows what the default object file format is, so
|
||||
# first see if it will tell us. cd to the root directory to prevent
|
||||
@@ -1199,6 +1216,12 @@ EOF
|
||||
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
|
||||
echo i586-pc-beos
|
||||
exit ;;
|
||||
+ BeMac:Haiku:*:*)
|
||||
+ echo powerpc-apple-haiku
|
||||
+ exit ;;
|
||||
+ BePC:Haiku:*:*)
|
||||
+ echo i586-pc-haiku
|
||||
+ exit ;;
|
||||
SX-4:SUPER-UX:*:*)
|
||||
echo sx4-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
@@ -1208,6 +1231,15 @@ EOF
|
||||
SX-6:SUPER-UX:*:*)
|
||||
echo sx6-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
+ SX-7:SUPER-UX:*:*)
|
||||
+ echo sx7-nec-superux${UNAME_RELEASE}
|
||||
+ exit ;;
|
||||
+ SX-8:SUPER-UX:*:*)
|
||||
+ echo sx8-nec-superux${UNAME_RELEASE}
|
||||
+ exit ;;
|
||||
+ SX-8R:SUPER-UX:*:*)
|
||||
+ echo sx8r-nec-superux${UNAME_RELEASE}
|
||||
+ exit ;;
|
||||
Power*:Rhapsody:*:*)
|
||||
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
||||
exit ;;
|
||||
Index: build-aux/config.sub
|
||||
===================================================================
|
||||
RCS file: /sources/cvs/ccvs/build-aux/config.sub,v
|
||||
retrieving revision 1.2
|
||||
diff -u -p -r1.2 config.sub
|
||||
--- build-aux/config.sub 21 Aug 2007 18:42:53 -0000 1.2
|
||||
+++ build-aux/config.sub 4 May 2008 09:32:35 -0000
|
||||
@@ -1,10 +1,10 @@
|
||||
#! /bin/sh
|
||||
# Configuration validation subroutine script.
|
||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
||||
-# Inc.
|
||||
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
|
||||
+# Free Software Foundation, Inc.
|
||||
|
||||
-timestamp='2006-09-20'
|
||||
+timestamp='2008-01-16'
|
||||
|
||||
# This file is (in principle) common to ALL GNU software.
|
||||
# The presence of a machine in this file suggests that SOME GNU software
|
||||
@@ -72,8 +72,8 @@ Report bugs and patches to <config-patch
|
||||
version="\
|
||||
GNU config.sub ($timestamp)
|
||||
|
||||
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
||||
-Free Software Foundation, Inc.
|
||||
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
|
||||
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This is free software; see the source for copying conditions. There is NO
|
||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||
@@ -245,12 +245,12 @@ case $basic_machine in
|
||||
| bfin \
|
||||
| c4x | clipper \
|
||||
| d10v | d30v | dlx | dsp16xx \
|
||||
- | fr30 | frv \
|
||||
+ | fido | fr30 | frv \
|
||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||
| i370 | i860 | i960 | ia64 \
|
||||
| ip2k | iq2000 \
|
||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
||||
- | maxq | mb | microblaze | mcore \
|
||||
+ | maxq | mb | microblaze | mcore | mep \
|
||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||
| mips16 \
|
||||
| mips64 | mips64el \
|
||||
@@ -324,7 +324,7 @@ case $basic_machine in
|
||||
| clipper-* | craynv-* | cydra-* \
|
||||
| d10v-* | d30v-* | dlx-* \
|
||||
| elxsi-* \
|
||||
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
|
||||
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
||||
| h8300-* | h8500-* \
|
||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||
| i*86-* | i860-* | i960-* | ia64-* \
|
||||
@@ -369,10 +369,14 @@ case $basic_machine in
|
||||
| v850-* | v850e-* | vax-* \
|
||||
| we32k-* \
|
||||
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||
- | xstormy16-* | xtensa-* \
|
||||
+ | xstormy16-* | xtensa*-* \
|
||||
| ymp-* \
|
||||
| z8k-*)
|
||||
;;
|
||||
+ # Recognize the basic CPU types without company name, with glob match.
|
||||
+ xtensa*)
|
||||
+ basic_machine=$basic_machine-unknown
|
||||
+ ;;
|
||||
# Recognize the various machine names and aliases which stand
|
||||
# for a CPU type and a company and sometimes even an OS.
|
||||
386bsd)
|
||||
@@ -443,6 +447,14 @@ case $basic_machine in
|
||||
basic_machine=ns32k-sequent
|
||||
os=-dynix
|
||||
;;
|
||||
+ blackfin)
|
||||
+ basic_machine=bfin-unknown
|
||||
+ os=-linux
|
||||
+ ;;
|
||||
+ blackfin-*)
|
||||
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
+ os=-linux
|
||||
+ ;;
|
||||
c90)
|
||||
basic_machine=c90-cray
|
||||
os=-unicos
|
||||
@@ -475,8 +487,8 @@ case $basic_machine in
|
||||
basic_machine=craynv-cray
|
||||
os=-unicosmp
|
||||
;;
|
||||
- cr16c)
|
||||
- basic_machine=cr16c-unknown
|
||||
+ cr16)
|
||||
+ basic_machine=cr16-unknown
|
||||
os=-elf
|
||||
;;
|
||||
crds | unos)
|
||||
@@ -668,6 +680,14 @@ case $basic_machine in
|
||||
basic_machine=m68k-isi
|
||||
os=-sysv
|
||||
;;
|
||||
+ m68knommu)
|
||||
+ basic_machine=m68k-unknown
|
||||
+ os=-linux
|
||||
+ ;;
|
||||
+ m68knommu-*)
|
||||
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
+ os=-linux
|
||||
+ ;;
|
||||
m88k-omron*)
|
||||
basic_machine=m88k-omron
|
||||
;;
|
||||
@@ -683,6 +703,10 @@ case $basic_machine in
|
||||
basic_machine=i386-pc
|
||||
os=-mingw32
|
||||
;;
|
||||
+ mingw32ce)
|
||||
+ basic_machine=arm-unknown
|
||||
+ os=-mingw32ce
|
||||
+ ;;
|
||||
miniframe)
|
||||
basic_machine=m68000-convergent
|
||||
;;
|
||||
@@ -809,6 +833,14 @@ case $basic_machine in
|
||||
basic_machine=i860-intel
|
||||
os=-osf
|
||||
;;
|
||||
+ parisc)
|
||||
+ basic_machine=hppa-unknown
|
||||
+ os=-linux
|
||||
+ ;;
|
||||
+ parisc-*)
|
||||
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
|
||||
+ os=-linux
|
||||
+ ;;
|
||||
pbd)
|
||||
basic_machine=sparc-tti
|
||||
;;
|
||||
@@ -925,6 +957,9 @@ case $basic_machine in
|
||||
basic_machine=sh-hitachi
|
||||
os=-hms
|
||||
;;
|
||||
+ sh5el)
|
||||
+ basic_machine=sh5le-unknown
|
||||
+ ;;
|
||||
sh64)
|
||||
basic_machine=sh64-unknown
|
||||
;;
|
||||
@@ -1014,6 +1049,10 @@ case $basic_machine in
|
||||
basic_machine=tic6x-unknown
|
||||
os=-coff
|
||||
;;
|
||||
+ tile*)
|
||||
+ basic_machine=tile-unknown
|
||||
+ os=-linux-gnu
|
||||
+ ;;
|
||||
tx39)
|
||||
basic_machine=mipstx39-unknown
|
||||
;;
|
||||
@@ -1219,7 +1258,7 @@ case $os in
|
||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||
- | -skyos* | -haiku* | -rdos* | -toppers*)
|
||||
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
||||
# Remember, each alternative MUST END IN *, to match a version number.
|
||||
;;
|
||||
-qnx*)
|
||||
@@ -1414,6 +1453,9 @@ case $basic_machine in
|
||||
m68*-cisco)
|
||||
os=-aout
|
||||
;;
|
||||
+ mep-*)
|
||||
+ os=-elf
|
||||
+ ;;
|
||||
mips*-cisco)
|
||||
os=-elf
|
||||
;;
|
||||
Index: lib/stdbool_.h
|
||||
===================================================================
|
||||
RCS file: /sources/cvs/ccvs/lib/stdbool_.h,v
|
||||
retrieving revision 1.5
|
||||
diff -u -p -r1.5 stdbool_.h
|
||||
--- lib/stdbool_.h 22 Aug 2007 12:48:45 -0000 1.5
|
||||
+++ lib/stdbool_.h 4 May 2008 09:32:38 -0000
|
||||
@@ -58,7 +58,7 @@
|
||||
|
||||
/* BeOS <sys/socket.h> already #defines false 0, true 1. We use the same
|
||||
definitions below, but temporarily we have to #undef them. */
|
||||
-#ifdef __BEOS__
|
||||
+#if defined __BEOS__ && !defined __HAIKU__
|
||||
# include <OS.h> /* defines bool but not _Bool */
|
||||
# undef false
|
||||
# undef true
|
||||
@@ -73,7 +73,7 @@
|
||||
(see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
|
||||
(see ISO C 99 6.3.1.1.(2)). So we add a negative value to the
|
||||
enum; this ensures that '_Bool' promotes to 'int'. */
|
||||
-#if defined __cplusplus || defined __BEOS__
|
||||
+#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
|
||||
/* A compiler known to have 'bool'. */
|
||||
/* If the compiler already has both 'bool' and '_Bool', we can assume they
|
||||
are the same types. */
|
||||
Index: src/buffer.c
|
||||
===================================================================
|
||||
RCS file: /sources/cvs/ccvs/src/buffer.c,v
|
||||
retrieving revision 1.73
|
||||
diff -u -p -r1.73 buffer.c
|
||||
--- src/buffer.c 4 May 2006 18:15:15 -0000 1.73
|
||||
+++ src/buffer.c 4 May 2008 09:32:45 -0000
|
||||
@@ -24,6 +24,7 @@
|
||||
/* CVS headers. */
|
||||
#include "cvs.h"
|
||||
|
||||
+#include <sys/select.h>
|
||||
|
||||
|
||||
/* Local functions. */
|
||||
@@ -2120,7 +2121,7 @@ fd_buffer_block (void *closure, bool blo
|
||||
&& sb.st_uid == devnull.st_uid
|
||||
&& sb.st_gid == devnull.st_gid
|
||||
&& sb.st_size == devnull.st_size
|
||||
- && sb.st_blocks == devnull.st_blocks
|
||||
+// && sb.st_blocks == devnull.st_blocks
|
||||
&& sb.st_blksize == devnull.st_blksize);
|
||||
if (isdevnull)
|
||||
errno = 0;
|
||||
Index: windows-NT/stdbool.h
|
||||
===================================================================
|
||||
RCS file: /sources/cvs/ccvs/windows-NT/stdbool.h,v
|
||||
retrieving revision 1.6
|
||||
diff -u -p -r1.6 stdbool.h
|
||||
--- windows-NT/stdbool.h 22 Aug 2007 13:48:49 -0000 1.6
|
||||
+++ windows-NT/stdbool.h 4 May 2008 09:35:17 -0000
|
||||
@@ -65,7 +65,7 @@
|
||||
|
||||
/* BeOS <sys/socket.h> already #defines false 0, true 1. We use the same
|
||||
definitions below, but temporarily we have to #undef them. */
|
||||
-#ifdef __BEOS__
|
||||
+#if defined __BEOS__ && !defined __HAIKU__
|
||||
# include <OS.h> /* defines bool but not _Bool */
|
||||
# undef false
|
||||
# undef true
|
||||
@@ -80,7 +80,7 @@
|
||||
(see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
|
||||
(see ISO C 99 6.3.1.1.(2)). So we add a negative value to the
|
||||
enum; this ensures that '_Bool' promotes to 'int'. */
|
||||
-#if defined __cplusplus || defined __BEOS__
|
||||
+#if defined __cplusplus || (defined __BEOS__ && !defined __HAIKU__)
|
||||
/* A compiler known to have 'bool'. */
|
||||
/* If the compiler already has both 'bool' and '_Bool', we can assume they
|
||||
are the same types. */
|
||||
Reference in New Issue
Block a user