Merge changes from ports/24975.

PR:		24975
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

5 files changed, 77 insertions, 22 deletions

diff --git a/x11-wm/xfce/files/patch-af b/x11-wm/xfce/files/patch-af
deleted file mode 100644
index c36d231..0000000
--- a/x11-wm/xfce/files/patch-af
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	Sun Oct  1 01:16:19 2000
-+++ configure	Thu Nov  2 05:45:10 2000
-@@ -2622,6 +2622,8 @@
-   if test "$cross_compiling" = yes; then
-   ac_cv_func_mmap_fixed_mapped=no
- else
-+    ac_save_LIBS="$LIBS"
-+    LIBS="-lintl  $LIBS"
-   cat > conftest.$ac_ext <<EOF
- #line 2627 "configure"
- #include "confdefs.h"
-@@ -6667,8 +6669,8 @@
- 
- 
- 
--
--
-+XFCE_DIR=`eval echo $XFCE_DIR`
-+XFCE_CONFDIR=`eval echo $XFCE_CONFDIR`
- sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/xfce_setup.in > scripts/xfce_setup
- sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/xfce_upgrade.in > scripts/xfce_upgrade
- sed -e "s%XFCE_DIR%$XFCE_DIR%g" -e "s%XFCE_CONFDIR%$XFCE_CONFDIR%g" scripts/xfhelp.in > scripts/xfhelp
diff --git a/x11-wm/xfce/files/patch-ag b/x11-wm/xfce/files/patch-ag
new file mode 100644
index 0000000..ab2b757
--- /dev/null
+++ b/x11-wm/xfce/files/patch-ag
@@ -0,0 +1,11 @@
+--- libs/configure.h.orig	Tue Sep  5 02:26:09 2000
++++ libs/configure.h	Wed Feb  7 00:53:01 2001
+@@ -22,7 +22,7 @@
+ #define CLOSE_STRING4 "quit"
+ 
+ /* #ifdef __alpha */
+-#if defined(__alpha) && !defined(linux)
++#if defined(__alpha) && !(defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__))
+ #define NEEDS_ALPHA_HEADER
+ #undef BROKEN_SUN_HEADERS
+ #endif /* (__alpha) */
diff --git a/x11-wm/xfce/files/patch-ah b/x11-wm/xfce/files/patch-ah
new file mode 100644
index 0000000..b6355b4
--- /dev/null
+++ b/x11-wm/xfce/files/patch-ah
@@ -0,0 +1,9 @@
+--- other/xfsoundrc.in.orig	Tue Sep  5 02:26:09 2000
++++ other/xfsoundrc.in	Tue Feb  6 05:07:47 2001
+@@ -1,5 +1,5 @@
+ Play
+-xfplay
++internal
+ XFCE_DIR/sounds/beep03.wav
+ XFCE_DIR/sounds/pop02.wav
+ 
diff --git a/x11-wm/xfce/files/patch-ai b/x11-wm/xfce/files/patch-ai
new file mode 100644
index 0000000..2ff5571
--- /dev/null
+++ b/x11-wm/xfce/files/patch-ai
@@ -0,0 +1,20 @@
+--- xfsound/xfdsp.c.orig	Fri Jul  7 05:51:00 2000
++++ xfsound/xfdsp.c	Tue Feb  6 04:52:16 2001
+@@ -45,7 +45,7 @@
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+-#if defined(linux)
++#if defined(linux) || defined(__FreeBSD__)
+ #include <sys/soundcard.h>	/* guess :) */
+ #endif
+ 
+@@ -62,7 +62,7 @@
+ 
+ int masterfd;
+ 
+-#if defined(linux)
++#if defined(linux) || defined(__FreeBSD__)
+ int
+ i_play (char *soundfile)
+ {
diff --git a/x11-wm/xfce/files/patch-aj b/x11-wm/xfce/files/patch-aj
new file mode 100644
index 0000000..c1dedfc
--- /dev/null
+++ b/x11-wm/xfce/files/patch-aj
@@ -0,0 +1,37 @@
+--- xfwm/session.c.orig	Wed Jan 31 04:50:16 2001
++++ xfwm/session.c	Tue Feb  6 04:56:10 2001
+@@ -566,8 +566,10 @@
+ callback_save_yourself2 (SmcConn sm_conn, SmPointer client_data)
+ {
+   char *path = NULL;
+-  char *filename = NULL;
+-  FILE *f = NULL;
++  char *filename;
++  FILE *f;
++  int fd;
++
+   Bool success = True;
+   struct passwd *pwd;
+ 
+@@ -578,16 +580,18 @@
+       path = pwd->pw_dir;
+     }
+ 
+-  filename = tempnam (path, ".fs-");
++  sprintf (filename, "path/.fs-XXXXXXXX");
++  fd = mkstemp (filename);
+ 
+   if (Scr.Options & SessionMgt)
+     {
+-      f = fopen (filename, "w");
++      f = fdopen (fd, "w");
+       success = save_session_state (sm_conn, filename, f);
+       fclose (f);
+     }
+-  if (!success)
++  if (!success || fd < 0)
+     xfwm_msg (WARN, "SaveSession", "Can't save session\n");
++  close (fd);
+   /* also save session for builtin session mgt, so user will get
+    * back to his environmnent even if he doesn't use ICE
+    */