haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge all changes from trunk

Browse Source
This commit is contained in:
Oliver Tappe
2013-03-29 14:04:07 +00:00
parent 888e133171
commit 94cc6aaf85
1052 changed files with 65053 additions and 2541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dev-vcs/cvs/cvs-1.12.13.bep
View File

@@ -9,7 +9,12 @@ BUILD {
cd cvs-1.12.13
libtoolize --force --copy --install
autoconf
./configure --prefix=/boot/common --enable-rootcommit EDITOR=nano
./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
}

132
dev-vcs/cvs/patches/cvs-1.12.13.1.patch
View File

@@ -1,19 +1,7 @@
diff -ur cvs-1.12.13.1/configure cvs-1.12.13.1-haiku/configure
--- cvs-1.12.13.1/configure 2006-07-07 15:31:08.000000000 -0600
+++ cvs-1.12.13.1-haiku/configure 2009-11-24 15:37:33.000000000 -0700
@@ -45920,7 +45920,7 @@
return 0;
}
_ACEOF
-for ac_lib in '' xnet socket inet; do
+for ac_lib in '' xnet network socket inet; do
if test -z "$ac_lib"; then
ac_res="none required"
else
diff -ur cvs-1.12.13.1/configure.in cvs-1.12.13.1-haiku/configure.in
--- cvs-1.12.13.1/configure.in 2006-06-29 09:13:10.000000000 -0600
+++ cvs-1.12.13.1-haiku/configure.in 2009-11-24 15:37:33.000000000 -0700
@@ -541,7 +541,7 @@
diff -up cvs-1.12.13.1/configure.in.orig cvs-1.12.13.1/configure.in
--- cvs-1.12.13.1/configure.in.orig 2006-06-29 09:13:10.006815744 -0600
+++ cvs-1.12.13.1/configure.in 2012-05-02 20:46:57.544735232 -0600
@@ -541,7 +541,7 @@ CVS_FUNC_PRINTF_PTR
# Try to find connect and gethostbyname.
AC_CHECK_LIB(nsl, main)
@@ -22,10 +10,58 @@ diff -ur cvs-1.12.13.1/configure.in cvs-1.12.13.1-haiku/configure.in
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 -ur cvs-1.12.13.1/src/cvs.h cvs-1.12.13.1-haiku/src/cvs.h
--- cvs-1.12.13.1/src/cvs.h 2006-04-25 14:01:47.000000000 -0600
+++ cvs-1.12.13.1-haiku/src/cvs.h 2009-11-24 15:37:33.000000000 -0700
@@ -181,8 +181,13 @@
diff -up cvs-1.12.13.1/configure.orig cvs-1.12.13.1/configure
--- cvs-1.12.13.1/configure.orig 2006-07-07 15:31:08.010485760 -0600
+++ cvs-1.12.13.1/configure 2012-05-02 20:56:54.292290560 -0600
@@ -9566,7 +9566,7 @@ return getaddrinfo ();
return 0;
}
_ACEOF
-for ac_lib in '' nsl socket; do
+for ac_lib in '' nsl network socket; do
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -10083,7 +10083,7 @@ return getservbyname ();
return 0;
}
_ACEOF
-for ac_lib in '' inet nsl socket xnet; do
+for ac_lib in '' inet nsl network socket xnet; do
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -21471,7 +21471,7 @@ return getaddrinfo ();
return 0;
}
_ACEOF
-for ac_lib in '' nsl socket; do
+for ac_lib in '' nsl network socket; do
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -21988,7 +21988,7 @@ return getservbyname ();
return 0;
}
_ACEOF
-for ac_lib in '' inet nsl socket xnet; do
+for ac_lib in '' inet nsl network socket xnet; do
if test -z "$ac_lib"; then
ac_res="none required"
else
@@ -45920,7 +45920,7 @@ return connect ();
return 0;
}
_ACEOF
-for ac_lib in '' xnet socket inet; do
+for ac_lib in '' xnet network socket inet; do
if test -z "$ac_lib"; then
ac_res="none required"
else
diff -up cvs-1.12.13.1/src/cvs.h.orig cvs-1.12.13.1/src/cvs.h
--- cvs-1.12.13.1/src/cvs.h.orig 2006-04-25 14:01:47.044302336 -0600
+++ cvs-1.12.13.1/src/cvs.h 2012-05-02 20:46:57.547356672 -0600
@@ -181,8 +181,13 @@ char *strerror (int);
#define CVSRFLPAT "#cvs.rfl.*" /* wildcard expr to match read locks */
#define CVSEXT_LOG ",t"
#define CVSPREFIX ",,"
@@ -39,9 +75,9 @@ diff -ur cvs-1.12.13.1/src/cvs.h cvs-1.12.13.1-haiku/src/cvs.h
/* Command attributes -- see function lookup_command_attribute(). */
#define CVS_CMD_IGNORE_ADMROOT 1
diff -ur cvs-1.12.13.1/src/cvsrc.c cvs-1.12.13.1-haiku/src/cvsrc.c
--- cvs-1.12.13.1/src/cvsrc.c 2006-03-31 14:54:57.000000000 -0700
+++ cvs-1.12.13.1-haiku/src/cvsrc.c 2009-11-24 15:37:33.000000000 -0700
diff -up cvs-1.12.13.1/src/cvsrc.c.orig cvs-1.12.13.1/src/cvsrc.c
--- cvs-1.12.13.1/src/cvsrc.c.orig 2006-03-31 14:54:57.034603008 -0700
+++ cvs-1.12.13.1/src/cvsrc.c 2012-05-02 20:46:57.549715968 -0600
@@ -20,7 +20,11 @@
/* this file is to be found in the user's home directory */
@@ -55,7 +91,7 @@ diff -ur cvs-1.12.13.1/src/cvsrc.c cvs-1.12.13.1-haiku/src/cvsrc.c
#endif
char cvsrc[] = CVSRC_FILENAME;
@@ -64,7 +68,7 @@
@@ -64,7 +68,7 @@ read_cvsrc (int *argc, char ***argv, con
/* determine filename for ~/.cvsrc */
@@ -64,9 +100,9 @@ diff -ur cvs-1.12.13.1/src/cvsrc.c cvs-1.12.13.1-haiku/src/cvsrc.c
/* If we can't find a home directory, ignore ~/.cvsrc. This may
make tracking down problems a bit of a pain, but on the other
hand it might be obnoxious to complain when CVS will function
diff -ur cvs-1.12.13.1/src/filesubr.c cvs-1.12.13.1-haiku/src/filesubr.c
--- cvs-1.12.13.1/src/filesubr.c 2006-07-05 20:14:08.000000000 -0600
+++ cvs-1.12.13.1-haiku/src/filesubr.c 2009-11-24 15:51:02.000000000 -0700
diff -up cvs-1.12.13.1/src/filesubr.c.orig cvs-1.12.13.1/src/filesubr.c
--- cvs-1.12.13.1/src/filesubr.c.orig 2006-07-05 20:14:08.035913728 -0600
+++ cvs-1.12.13.1/src/filesubr.c 2012-05-02 20:46:57.553385984 -0600
@@ -32,6 +32,11 @@
/* CVS */
#include "cvs.h"
@@ -79,7 +115,7 @@ diff -ur cvs-1.12.13.1/src/filesubr.c cvs-1.12.13.1-haiku/src/filesubr.c
static int deep_remove_dir (const char *path);
@@ -859,6 +864,36 @@
@@ -859,6 +864,36 @@ get_homedir (void)
return home;
}
@@ -116,10 +152,10 @@ diff -ur cvs-1.12.13.1/src/filesubr.c cvs-1.12.13.1-haiku/src/filesubr.c
/* Compose a path to a file in the home directory. This is necessary because
* of different behavior on UNIX and VMS. See the notes in vms/filesubr.c.
*
diff -ur cvs-1.12.13.1/src/filesubr.h cvs-1.12.13.1-haiku/src/filesubr.h
--- cvs-1.12.13.1/src/filesubr.h 2006-07-05 20:14:08.000000000 -0600
+++ cvs-1.12.13.1-haiku/src/filesubr.h 2009-11-24 15:37:33.000000000 -0700
@@ -33,6 +33,7 @@
diff -up cvs-1.12.13.1/src/filesubr.h.orig cvs-1.12.13.1/src/filesubr.h
--- cvs-1.12.13.1/src/filesubr.h.orig 2006-07-05 20:14:08.035913728 -0600
+++ cvs-1.12.13.1/src/filesubr.h 2012-05-02 20:46:57.554696704 -0600
@@ -33,6 +33,7 @@ bool isreadable (const char *file);
bool iswritable (const char *file);
bool isaccessible (const char *file, const int mode);
char *get_homedir (void);
@@ -127,10 +163,10 @@ diff -ur cvs-1.12.13.1/src/filesubr.h cvs-1.12.13.1-haiku/src/filesubr.h
char *strcat_filename_onto_homedir (const char *, const char *);
char *cvs_temp_name (void);
FILE *cvs_temp_file (char **filename);
diff -ur cvs-1.12.13.1/src/history.c cvs-1.12.13.1-haiku/src/history.c
--- cvs-1.12.13.1/src/history.c 2006-06-09 15:28:17.000000000 -0600
+++ cvs-1.12.13.1-haiku/src/history.c 2009-11-24 15:37:33.000000000 -0700
@@ -807,7 +807,7 @@
diff -up cvs-1.12.13.1/src/history.c.orig cvs-1.12.13.1/src/history.c
--- cvs-1.12.13.1/src/history.c.orig 2006-06-09 15:28:17.036700160 -0600
+++ cvs-1.12.13.1/src/history.c 2012-05-02 20:46:57.558891008 -0600
@@ -807,7 +807,7 @@ history_write (int type, const char *upd
{
char *pwdir;
@@ -139,10 +175,10 @@ diff -ur cvs-1.12.13.1/src/history.c cvs-1.12.13.1-haiku/src/history.c
PrCurDir = CurDir;
if (pwdir != NULL)
{
diff -ur cvs-1.12.13.1/src/ignore.c cvs-1.12.13.1-haiku/src/ignore.c
--- cvs-1.12.13.1/src/ignore.c 2006-04-24 12:50:26.000000000 -0600
+++ cvs-1.12.13.1-haiku/src/ignore.c 2009-11-24 15:37:33.000000000 -0700
@@ -98,7 +98,7 @@
diff -up cvs-1.12.13.1/src/ignore.c.orig cvs-1.12.13.1/src/ignore.c
--- cvs-1.12.13.1/src/ignore.c.orig 2006-04-24 12:50:26.036700160 -0600
+++ cvs-1.12.13.1/src/ignore.c 2012-05-02 20:46:57.561512448 -0600
@@ -98,7 +98,7 @@ ign_setup (void)
}
/* Then add entries found in home dir, (if user has one) and file exists */
@@ -151,9 +187,9 @@ diff -ur cvs-1.12.13.1/src/ignore.c cvs-1.12.13.1-haiku/src/ignore.c
/* If we can't find a home directory, ignore ~/.cvsignore. This may
make tracking down problems a bit of a pain, but on the other
hand it might be obnoxious to complain when CVS will function
diff -ur cvs-1.12.13.1/src/login.c cvs-1.12.13.1-haiku/src/login.c
--- cvs-1.12.13.1/src/login.c 2006-06-28 08:25:26.000000000 -0600
+++ cvs-1.12.13.1-haiku/src/login.c 2009-11-24 15:37:33.000000000 -0700
diff -up cvs-1.12.13.1/src/login.c.orig cvs-1.12.13.1/src/login.c
--- cvs-1.12.13.1/src/login.c.orig 2006-06-28 08:25:26.037748736 -0600
+++ cvs-1.12.13.1/src/login.c 2012-05-02 20:46:57.563871744 -0600
@@ -28,7 +28,11 @@
@@ -167,7 +203,7 @@ diff -ur cvs-1.12.13.1/src/login.c cvs-1.12.13.1-haiku/src/login.c
#endif
/* If non-NULL, get_cvs_password() will just return this. */
@@ -49,7 +53,7 @@
@@ -49,7 +53,7 @@ construct_cvspass_filename (void)
/* Construct absolute pathname to user's password file. */
/* todo: does this work under OS/2 ? */
@@ -176,10 +212,10 @@ diff -ur cvs-1.12.13.1/src/login.c cvs-1.12.13.1-haiku/src/login.c
if (! homedir)
{
/* FIXME? This message confuses a lot of users, at least
diff -ur cvs-1.12.13.1/src/wrapper.c cvs-1.12.13.1-haiku/src/wrapper.c
--- cvs-1.12.13.1/src/wrapper.c 2006-04-24 12:50:27.000000000 -0600
+++ cvs-1.12.13.1-haiku/src/wrapper.c 2009-11-24 15:37:33.000000000 -0700
@@ -125,7 +125,7 @@
diff -up cvs-1.12.13.1/src/wrapper.c.orig cvs-1.12.13.1/src/wrapper.c
--- cvs-1.12.13.1/src/wrapper.c.orig 2006-04-24 12:50:27.043778048 -0600
+++ cvs-1.12.13.1/src/wrapper.c 2012-05-02 20:46:57.566493184 -0600
@@ -125,7 +125,7 @@ void wrap_setup(void)
/* Then add entries found in home dir, (if user has one) and file
exists. */