diff options
author | Pietro Cerutti <gahr@FreeBSD.org> | 2010-08-24 09:12:56 +0000 |
---|---|---|
committer | Pietro Cerutti <gahr@FreeBSD.org> | 2010-08-24 09:12:56 +0000 |
commit | bb6999cba98eeef7e3dec02d3bc44747f251b751 (patch) | |
tree | 4d5e64f7dbcbfbe4c0d0f35bcd104589a1e204ad /x11-fm/xfe/files | |
parent | a6391c84b91b01d1b7a6577a66d43c8d453dc769 (diff) |
- Update to 1.32.1
- Take maintainship
Notes
Notes:
svn path=/head/; revision=259895
Diffstat (limited to 'x11-fm/xfe/files')
-rw-r--r-- | x11-fm/xfe/files/patch-src_XFilePackage.cpp | 10 | ||||
-rw-r--r-- | x11-fm/xfe/files/patch-src_xfeutils.cpp | 20 | ||||
-rw-r--r-- | x11-fm/xfe/files/patch-xvt_command.c | 16 | ||||
-rw-r--r-- | x11-fm/xfe/files/patch-xvt_ttyinit.c | 25 | ||||
-rw-r--r-- | x11-fm/xfe/files/patch-xvt_xvt.h | 17 |
5 files changed, 88 insertions, 0 deletions
diff --git a/x11-fm/xfe/files/patch-src_XFilePackage.cpp b/x11-fm/xfe/files/patch-src_XFilePackage.cpp new file mode 100644 index 000000000000..2b5b79cca5c3 --- /dev/null +++ b/x11-fm/xfe/files/patch-src_XFilePackage.cpp @@ -0,0 +1,10 @@ +--- src/XFilePackage.cpp.orig 2010-08-24 07:46:45.000000000 +0000 ++++ src/XFilePackage.cpp 2010-08-24 07:47:15.000000000 +0000 +@@ -11,6 +11,7 @@ + #include <unistd.h> + #include <sys/stat.h> + #include <sys/wait.h> ++#include <sys/signal.h> + + #include "xfedefs.h" + #include "icons.h" diff --git a/x11-fm/xfe/files/patch-src_xfeutils.cpp b/x11-fm/xfe/files/patch-src_xfeutils.cpp new file mode 100644 index 000000000000..b75fbb8d494f --- /dev/null +++ b/x11-fm/xfe/files/patch-src_xfeutils.cpp @@ -0,0 +1,20 @@ +--- src/xfeutils.cpp.orig 2010-08-24 07:44:57.000000000 +0000 ++++ src/xfeutils.cpp 2010-08-24 07:45:25.000000000 +0000 +@@ -512,7 +512,7 @@ + + + // Replacement of the stat function +-inline FXint statrep(const FXchar* filename, struct stat* buf) ++FXint statrep(const FXchar* filename, struct stat* buf) + { + #if defined(linux) + +@@ -546,7 +546,7 @@ + + + // Replacement of the lstat function +-inline FXint lstatrep(const FXchar* filename, struct stat* buf) ++FXint lstatrep(const FXchar* filename, struct stat* buf) + { + #if defined(linux) + diff --git a/x11-fm/xfe/files/patch-xvt_command.c b/x11-fm/xfe/files/patch-xvt_command.c new file mode 100644 index 000000000000..5662b0b5b161 --- /dev/null +++ b/x11-fm/xfe/files/patch-xvt_command.c @@ -0,0 +1,16 @@ +--- xvt/command.c.orig 2010-08-24 07:23:55.000000000 +0000 ++++ xvt/command.c 2010-08-24 07:25:30.000000000 +0000 +@@ -36,7 +36,12 @@ + #include <unistd.h> + #include <signal.h> + #include <fcntl.h> +-#include <utmp.h> ++#include <sys/param.h> ++#if __FreeBSD_version >= 900007 ++# include <utmpx.h> ++#else ++# include <utmp.h> ++#endif + #include <errno.h> + #include <string.h> + #include "xvt.h" diff --git a/x11-fm/xfe/files/patch-xvt_ttyinit.c b/x11-fm/xfe/files/patch-xvt_ttyinit.c new file mode 100644 index 000000000000..5b2a4c8b5b50 --- /dev/null +++ b/x11-fm/xfe/files/patch-xvt_ttyinit.c @@ -0,0 +1,25 @@ +--- xvt/ttyinit.c.orig 2010-08-24 07:28:17.000000000 +0000 ++++ xvt/ttyinit.c 2010-08-24 07:31:01.000000000 +0000 +@@ -37,7 +37,12 @@ + #include <unistd.h> + #include <signal.h> + #include <fcntl.h> +-#include <utmp.h> ++#include <sys/param.h> ++#if __FreeBSD_version >= 900007 ++# include <utmpx.h> ++#else ++# include <utmp.h> ++#endif + #include <grp.h> + #include <pwd.h> + #include <errno.h> +@@ -398,7 +403,7 @@ + */ + static char* get_pseudo_tty(int* pmaster, int* pslave) + { +-#ifdef BSD_PTY ++#if defined(BSD_PTY) || defined(__FreeBSD__) + int mfd, sfd; + char *s3, *s4; + static char ptyc3[] = "pqrstuvwxyz"; diff --git a/x11-fm/xfe/files/patch-xvt_xvt.h b/x11-fm/xfe/files/patch-xvt_xvt.h new file mode 100644 index 000000000000..78aece0423cd --- /dev/null +++ b/x11-fm/xfe/files/patch-xvt_xvt.h @@ -0,0 +1,17 @@ +--- xvt/xvt.h.orig 2010-08-24 07:26:11.000000000 +0000 ++++ xvt/xvt.h 2010-08-24 07:27:42.000000000 +0000 +@@ -59,10 +59,14 @@ + int unlockpt(int); + char *ptsname(int); + #else /* !SUNOS5 */ ++#ifdef __FreeBSD__ ++#include <sys/ioctl.h> ++#else /* !FreeBSD */ + /*#ifndef LINUX*/ + #ifndef linux + int ioctl(int fd, unsigned request, char *arg); + #endif /* LINUX */ ++#endif /* FreeBSD */ + #endif /* !SUNOS5 */ + + |