mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
Remove old cvs non-recipe and patches
This commit is contained in:
Ingo Weinhold
@@ -1,29 +0,0 @@
|
||||
DESCRIPTION="CVS is a version control system"
|
||||
HOMEPAGE="http://www.nongnu.org/cvs/"
|
||||
SRC_URI="http://ftp.gnu.org/non-gnu/cvs/source/feature/1.12.13/cvs-1.12.13.tar.gz"
|
||||
CHECKSUM_MD5="7a71a2e7a64973ecf255965956a1d338"
|
||||
REVISION="1"
|
||||
STATUS_HAIKU="broken"
|
||||
DEPEND=""
|
||||
BUILD()
|
||||
{
|
||||
cd cvs-1.12.13
|
||||
libtoolize --force --copy --install
|
||||
autoconf
|
||||
./configure --prefix=`finddir B_COMMON_DIRECTORY` \
|
||||
--datarootdir=`finddir B_COMMON_DATA_DIRECTORY` \
|
||||
--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
|
||||
--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
|
||||
--enable-rootcommit \
|
||||
EDITOR=nano
|
||||
make
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
cd cvs-1.12.13
|
||||
make install
|
||||
}
|
||||
LICENSE="GNU GPL v1
|
||||
GNU LGPL v2"
|
||||
COPYRIGHT="1986-2005 Free Software Foundation, Inc."
|
||||
@@ -1,58 +0,0 @@
|
||||
diff -urN cvs-1.12.13/configure cvs-1.12.13-haiku/configure
|
||||
--- cvs-1.12.13/configure 2005-10-03 13:36:42.000000000 +0000
|
||||
+++ cvs-1.12.13-haiku/configure 2008-09-30 18:38:24.000000000 +0000
|
||||
@@ -37138,7 +37138,7 @@
|
||||
rm -f conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
if test "$ac_cv_search_connect" = no; then
|
||||
- for ac_lib in xnet socket inet; do
|
||||
+ for ac_lib in xnet socket network inet; do
|
||||
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
diff -urN cvs-1.12.13/configure.in cvs-1.12.13-haiku/configure.in
|
||||
--- cvs-1.12.13/configure.in 2005-10-03 13:34:45.000000000 +0000
|
||||
+++ cvs-1.12.13-haiku/configure.in 2008-09-30 18:38:24.000000000 +0000
|
||||
@@ -515,7 +515,7 @@
|
||||
|
||||
# Try to find connect and gethostbyname.
|
||||
AC_CHECK_LIB(nsl, main)
|
||||
-AC_SEARCH_LIBS(connect, xnet socket inet,
|
||||
+AC_SEARCH_LIBS(connect, xnet socket network inet,
|
||||
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
|
||||
diff -urN cvs-1.12.13/lib/getaddrinfo.h cvs-1.12.13-haiku/lib/getaddrinfo.h
|
||||
--- cvs-1.12.13/lib/getaddrinfo.h 2005-09-08 15:55:53.000000000 +0000
|
||||
+++ cvs-1.12.13-haiku/lib/getaddrinfo.h 2008-09-30 19:33:49.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
# include <netdb.h>
|
||||
|
||||
# if !HAVE_GETADDRINFO
|
||||
-
|
||||
+#ifndef __HAIKU__
|
||||
/* Structure to contain information about address of a service provider. */
|
||||
struct addrinfo
|
||||
{
|
||||
@@ -61,6 +61,8 @@
|
||||
# define EAI_ADDRFAMILY -9 /* Address family for NAME not supported. */
|
||||
# define EAI_MEMORY -10 /* Memory allocation failure. */
|
||||
# define EAI_SYSTEM -11 /* System error returned in `errno'. */
|
||||
+#endif
|
||||
+
|
||||
# define EAI_OVERFLOW -12 /* Argument buffer overflow. */
|
||||
# ifdef __USE_GNU
|
||||
# define EAI_INPROGRESS -100 /* Processing request in progress. */
|
||||
diff -urN cvs-1.12.13/lib/getpass.c cvs-1.12.13-haiku/lib/getpass.c
|
||||
--- cvs-1.12.13/lib/getpass.c 2005-09-19 21:12:21.000000000 +0000
|
||||
+++ cvs-1.12.13-haiku/lib/getpass.c 2008-09-30 19:53:05.000000000 +0000
|
||||
@@ -104,8 +104,9 @@
|
||||
else
|
||||
{
|
||||
/* We do the locking ourselves. */
|
||||
+#ifdef __HAIKU__
|
||||
__fsetlocking (tty, FSETLOCKING_BYCALLER);
|
||||
-
|
||||
+#endif
|
||||
out = in = tty;
|
||||
}
|
||||
@@ -1,75 +0,0 @@
|
||||
diff -up cvs-1.12.13/configure.in.orig cvs-1.12.13/configure.in
|
||||
--- cvs-1.12.13/configure.in.orig 2010-04-28 23:59:18.202637312 -0600
|
||||
+++ cvs-1.12.13/configure.in 2010-04-29 00:01:51.938999808 -0600
|
||||
@@ -515,12 +515,12 @@ 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
|
||||
dnl just added libnsl above if we found it.
|
||||
-AC_SEARCH_LIBS(gethostbyname, netinet)
|
||||
+AC_SEARCH_LIBS(gethostbyname, netinet network)
|
||||
|
||||
AC_SUBST(cvs_client_objects)
|
||||
|
||||
diff -up cvs-1.12.13/lib/getpass.c.orig cvs-1.12.13/lib/getpass.c
|
||||
--- cvs-1.12.13/lib/getpass.c.orig 2005-09-19 15:12:21.001835008 -0600
|
||||
+++ cvs-1.12.13/lib/getpass.c 2010-04-28 23:55:13.523239424 -0600
|
||||
@@ -104,7 +104,7 @@ getpass (const char *prompt)
|
||||
else
|
||||
{
|
||||
/* We do the locking ourselves. */
|
||||
- __fsetlocking (tty, FSETLOCKING_BYCALLER);
|
||||
+// __fsetlocking (tty, FSETLOCKING_BYCALLER);
|
||||
|
||||
out = in = tty;
|
||||
}
|
||||
diff -up cvs-1.12.13/lib/stdbool_.h.orig cvs-1.12.13/lib/stdbool_.h
|
||||
--- cvs-1.12.13/lib/stdbool_.h.orig 2005-05-23 11:44:32.015204352 -0600
|
||||
+++ cvs-1.12.13/lib/stdbool_.h 2010-04-28 23:55:13.506724352 -0600
|
||||
@@ -55,7 +55,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
|
||||
@@ -70,7 +70,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__))
|
||||
# if !@HAVE__BOOL@
|
||||
# if defined __SUNPRO_C && (__SUNPRO_C < 0x550 || __STDC__ == 1)
|
||||
/* Avoid stupid "warning: _Bool is a keyword in ISO C99". */
|
||||
diff -up cvs-1.12.13/m4/getaddrinfo.m4.orig cvs-1.12.13/m4/getaddrinfo.m4
|
||||
--- cvs-1.12.13/m4/getaddrinfo.m4.orig 2010-04-29 00:00:46.542638080 -0600
|
||||
+++ cvs-1.12.13/m4/getaddrinfo.m4 2010-04-29 00:00:53.830996480 -0600
|
||||
@@ -6,7 +6,7 @@ dnl with or without modifications, as lo
|
||||
|
||||
AC_DEFUN([gl_GETADDRINFO],
|
||||
[
|
||||
- AC_SEARCH_LIBS(getaddrinfo, nsl socket)
|
||||
+ AC_SEARCH_LIBS(getaddrinfo, nsl socket network)
|
||||
AC_REPLACE_FUNCS(getaddrinfo gai_strerror)
|
||||
gl_PREREQ_GETADDRINFO
|
||||
])
|
||||
diff -up cvs-1.12.13/src/buffer.c.orig cvs-1.12.13/src/buffer.c
|
||||
--- cvs-1.12.13/src/buffer.c.orig 2005-10-02 09:17:20.017563648 -0600
|
||||
+++ cvs-1.12.13/src/buffer.c 2010-04-28 23:55:13.536084480 -0600
|
||||
@@ -2019,7 +2019,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;
|
||||
Reference in New Issue
Block a user