8 files changed, 252 insertions, 40 deletions

diff --git a/x11-wm/icewm/files/patch-ai b/x11-wm/icewm/files/patch-ai
index 48638e3dca3a..e19360105b66 100644
--- a/x11-wm/icewm/files/patch-ai
+++ b/x11-wm/icewm/files/patch-ai
@@ -1,27 +1,15 @@
---- src/wmtaskbar.cc.orig	Fri Apr 27 09:32:22 2001
-+++ src/wmtaskbar.cc	Tue May  1 06:15:49 2001
-@@ -47,12 +47,18 @@
- YPixmap *windowsPixmap = 0;
- YPixmap *taskbackPixmap = 0;
+--- src/wmtaskbar.cc.orig	Tue Oct  9 23:54:04 2001
++++ src/wmtaskbar.cc	Tue Feb 19 14:10:04 2002
+@@ -66,7 +66,7 @@
+ #endif
  
-+#ifdef __FreeBSD__
-+#define APMDEV "/dev/apm"
-+#else
-+#define APMDEV "/proc/apm"
-+#endif
-+
- static void initPixmaps() {
  #ifndef START_PIXMAP
 -#define START_PIXMAP "linux.xpm"
 +#define START_PIXMAP "bsd-daemon.xpm"
  /*
  #define START_PIXMAP "debian.xpm"
--#define START_PIXMAP "bsd-daemon.xpm"
-+#define START_PIXMAP "linux.xpm"
- #define START_PIXMAP "start.xpm"
- #define START_PIXMAP "xfree86os2.xpm"
- */
-@@ -240,7 +246,7 @@
+ #define START_PIXMAP "bsd-daemon.xpm"
+@@ -287,7 +287,7 @@
      } else
          fClock = 0;
  #ifdef CONFIG_APPLET_APM
diff --git a/x11-wm/icewm/files/patch-ak b/x11-wm/icewm/files/patch-ak
index 88a64b028ff6..d678ae2be492 100644
--- a/x11-wm/icewm/files/patch-ak
+++ b/x11-wm/icewm/files/patch-ak
@@ -1,6 +1,6 @@
---- src/aapm.cc.orig	Mon Jan 15 06:49:39 2001
-+++ src/aapm.cc	Mon Jan 15 22:18:05 2001
-@@ -21,15 +21,32 @@
+--- src/aapm.cc.orig	Tue Oct  9 23:54:03 2001
++++ src/aapm.cc	Tue Feb 19 14:39:19 2002
+@@ -23,6 +23,13 @@
  #include <string.h>
  #include <stdio.h>
  
@@ -14,15 +14,9 @@
  #ifdef CONFIG_APPLET_APM
  
  YColor *YApm::apmBg = 0;
- YColor *YApm::apmFg = 0;
- YFont *YApm::apmFont = 0;
+@@ -32,8 +39,12 @@
+ extern YPixmap *taskbackPixmap;
  
-+#ifdef __FreeBSD__
-+#define APMDEV "/dev/apm"
-+#else
-+#define APMDEV "/proc/apm"
-+#endif
-+
  void ApmStr(char *s, bool Tool) {
 +#ifdef __FreeBSD__
 +    struct apm_info ai;
@@ -34,7 +28,7 @@
      char driver[16];
      char apmver[16];
      int apmflags;
-@@ -41,9 +58,27 @@
+@@ -45,9 +56,27 @@
      char units[16];
  
      if (fd == -1) {
@@ -63,10 +57,16 @@
      len = read(fd, buf, sizeof(buf) - 1);
      close(fd);
  
-@@ -61,6 +96,7 @@
+@@ -61,10 +90,11 @@
+         static int error = 1;
+         if (error) {
+             error = 0;
+-            warn(_("/proc/apm - unknown format (%d)"), i);
++            warn(_("%s - unknown format (%d)"), APMDEV, i);
          }
          return ;
      }
 +#endif
      if (BATlife == -1)
          BATlife = 0;
+ 
diff --git a/x11-wm/icewm/files/patch-an b/x11-wm/icewm/files/patch-an
new file mode 100644
index 000000000000..119083e60b6c
--- /dev/null
+++ b/x11-wm/icewm/files/patch-an
@@ -0,0 +1,15 @@
+--- src/aapm.h.orig	Tue Feb 19 14:08:56 2002
++++ src/aapm.h	Tue Feb 19 14:09:30 2002
+@@ -2,6 +2,12 @@
+ #include "ywindow.h"
+ #include "ytimer.h"
+ 
++#ifdef __FreeBSD__
++#define APMDEV "/dev/apm"
++#else
++#define APMDEV "/proc/apm"
++#endif
++
+ #ifdef CONFIG_APPLET_APM
+ class YApm: public YWindow, public YTimerListener {
+ public:
diff --git a/x11-wm/icewm/files/patch-ao b/x11-wm/icewm/files/patch-ao
new file mode 100644
index 000000000000..d316e1d8c634
--- /dev/null
+++ b/x11-wm/icewm/files/patch-ao
@@ -0,0 +1,67 @@
+--- src/ylocale.cc.orig	Tue Oct  9 23:54:04 2001
++++ src/ylocale.cc	Wed Feb 20 17:32:28 2002
+@@ -18,7 +18,9 @@
+ 
+ #ifdef CONFIG_I18N
+ #include <errno.h>
++#if __FreeBSD__ >= 5
+ #include <langinfo.h>
++#endif
+ #include <locale.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -31,6 +33,41 @@
+ YLocale * YLocale::locale(NULL);
+ #endif
+ 
++#ifdef CONFIG_I18N
++#if __FreeBSD__ < 5
++#undef CONFIG_NL_CODESETS
++#define CONFIG_NL_CODESETS 0
++char* icewm_nl_langinfo(void* item) {
++  char* mylocale = setlocale(LC_ALL, "");
++
++  if( mylocale == NULL || *mylocale == '\0' )
++    return NULL;
++
++  if( strncmp(mylocale, "ja", strlen("ja")) == 0 ) {
++    return strdup("EUC-JP");
++  } if( strncmp(mylocale, "zh_TW", strlen("zh_TW")) == 0 ) {
++    return strdup("BIG5");
++  } if( strncmp(mylocale, "ko", strlen("ko")) == 0 ) {
++    return strdup("EUC-KR");
++  } if( strncmp(mylocale, "ru", strlen("ru")) == 0 ) {
++    return "KOI8-R";
++  } if( strncmp(mylocale, "ro", strlen("ro")) == 0 ) {
++    return "ISO-8859-2";
++  } if( strncmp(mylocale, "hr", strlen("hr")) == 0 ) {
++    return "ISO-8859-2";
++  } if( strncmp(mylocale, "hu", strlen("hu")) == 0 ) {
++    return "ISO-8859-2";
++  } if( strncmp(mylocale, "pl", strlen("pl")) == 0 ) {
++    return "ISO-8859-2";
++  } if( strncmp(mylocale, "lt", strlen("lt")) == 0 ) {
++    return "ISO-8859-13";
++  }
++
++  return NULL;
++}
++#endif
++#endif /* CONFIG_I18N */
++
+ #ifndef CONFIG_I18N
+ YLocale::YLocale(char const * ) {
+ #else
+@@ -45,8 +82,12 @@
+     char const * codeset("");
+     int const codesetItems[] = { CONFIG_NL_CODESETS };
+ 
++#if __FreeBSD__ >= 5
+     for (int const * csi(codesetItems); *csi && 
+          NULL != (codeset = nl_langinfo(*csi)) && '\0' == *codeset; ++csi);
++#else
++    codeset = icewm_nl_langinfo(NULL);
++#endif
+ 
+     if (NULL == codeset || '\0' == *codeset) {
+         warn(_("Failed to determinate the current locale's codeset. "
diff --git a/x11-wm/icewm/files/patch-ap b/x11-wm/icewm/files/patch-ap
new file mode 100644
index 000000000000..5b72d10b0f6e
--- /dev/null
+++ b/x11-wm/icewm/files/patch-ap
@@ -0,0 +1,20 @@
+--- aclocal.m4.orig	Tue Oct  9 23:54:02 2001
++++ aclocal.m4	Wed Feb 20 14:18:56 2002
+@@ -103,11 +103,15 @@
+ dnl
+ AC_DEFUN(ICE_CHECK_CONVERSION, [
+   AC_MSG_CHECKING([whether iconv converts from $1 to $2])
++  LIBS="-lgiconv $LIBS"
+   AC_TRY_RUN([
+-    #include <iconv.h>
++    #include <giconv.h>
++    #include <locale.h>
+     
+     int main() {
+-        iconv_t cd = iconv_open("$2", "$1");
++        iconv_t cd;
++	setlocale(LC_ALL, "");
++        cd = iconv_open("$2", "$1");
+ 	iconv_close(cd);
+ 	return ((iconv_t) -1 == cd);
+     }],
diff --git a/x11-wm/icewm/files/patch-aq b/x11-wm/icewm/files/patch-aq
new file mode 100644
index 000000000000..ced8375bf1cd
--- /dev/null
+++ b/x11-wm/icewm/files/patch-aq
@@ -0,0 +1,20 @@
+--- src/ylocale.h.orig	Tue Oct  9 23:54:04 2001
++++ src/ylocale.h	Wed Feb 20 15:08:20 2002
+@@ -9,14 +9,16 @@
+ #define __YLOCALE_H
+ 
+ #ifdef CONFIG_I18N
+-#include <iconv.h>
++#include <giconv.h>
+ 
++/*
+ #if defined(CONFIG_LIBICONV) && !defined (_LIBICONV_VERSION)
+ #error libiconv in use but included iconv.h not from libiconv
+ #endif
+ #if !defined(CONFIG_LIBICONV) && defined (_LIBICONV_VERSION)
+ #error libiconv not in use but included iconv.h is from libiconv
+ #endif
++*/
+ 
+ #endif
+ 
diff --git a/x11-wm/icewm/files/patch-ar b/x11-wm/icewm/files/patch-ar
new file mode 100644
index 000000000000..eb9db0320c2c
--- /dev/null
+++ b/x11-wm/icewm/files/patch-ar
@@ -0,0 +1,12 @@
+--- src/sysdep.h.orig	Tue Oct  9 23:54:03 2001
++++ src/sysdep.h	Wed Feb 20 15:22:43 2002
+@@ -57,7 +57,9 @@
+ 
+ #ifdef CONFIG_I18N
+ #include <locale.h>
++#if __FreeBSD__ >= 5
+ #include <langinfo.h>
++#endif
+ #endif
+ 
+ #endif
diff --git a/x11-wm/icewm/files/patch-configure.in b/x11-wm/icewm/files/patch-configure.in
index 9788b24300a1..433bd0cf0eef 100644
--- a/x11-wm/icewm/files/patch-configure.in
+++ b/x11-wm/icewm/files/patch-configure.in
@@ -1,26 +1,116 @@
---- configure.in.orig	Fri Apr 27 09:32:21 2001
-+++ configure.in	Tue May  1 06:18:24 2001
-@@ -75,7 +75,7 @@
+--- configure.in.orig	Tue Oct  9 23:54:02 2001
++++ configure.in	Tue Feb 19 16:22:42 2002
+@@ -83,7 +83,7 @@
  AC_FUNC_SELECT_ARGTYPES
  
  dnl Configuring features
 -TARGETS='base docs'
 +TARGETS='base'
+ APPLICATIONS='genpref icewm icesh icewmhint icewmbg'
  
  dnl Checking for X11
- AC_PATH_XTRA
-@@ -116,7 +116,7 @@
-   AC_DEFINE(ENABLE_NLS, 1, [Define to enable internationalized message])
+@@ -108,27 +108,28 @@
+ AC_ARG_ENABLE(i18n,
+   [  --enable-i18n           Enable internationalization],
+   [ if test "$enable_i18n" != "no"; then
+-      AC_CHECK_HEADERS(langinfo.h,,
+-      [ AC_MSG_ERROR([I18N support has been requested but langinfo.h wasn´t found.
+-*** Check your installation.])])
+-      AC_CHECK_FUNC(nl_langinfo,,
+-      [ AC_MSG_ERROR([I18N support has been requested but nl_langinfo wasn´t found.
+-*** Check your installation.])])
+-
+-      ice_nl_codesets=""
+-
++dnl       AC_CHECK_HEADERS(langinfo.h,,
++dnl       [ AC_MSG_ERROR([I18N support has been requested but langinfo.h wasn´t found.
++dnl *** Check your installation.])])
++dnl       AC_CHECK_FUNC(nl_langinfo,,
++dnl       [ AC_MSG_ERROR([I18N support has been requested but nl_langinfo wasn´t found.
++dnl *** Check your installation.])])
++dnl 
++dnl       ice_nl_codesets=""
++dnl 
+       ICE_CHECK_NL_ITEM(_NL_MESSAGES_CODESET,
+         [ ice_nl_codesets="${ice_nl_codesets} _NL_MESSAGES_CODESET," ])
+       ICE_CHECK_NL_ITEM(_NL_CTYPE_CODESET_NAME,
+         [ ice_nl_codesets="${ice_nl_codesets} _NL_CTYPE_CODESET_NAME," ])
+       ICE_CHECK_NL_ITEM(CODESET,
+         [ ice_nl_codesets="${ice_nl_codesets} CODESET," ])
+-
++dnl 
+       if test "${ice_nl_codesets}" = ""; then
+-        AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't
+-*** return any information about the locale's codeset. Check your manuals.
+-*** Ask your vendor. Contact icewm-devel@lists.sourceforge.net when you know 
+-*** the name of the locale-dependent parameter for your platform.])
++dnl         AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't
++dnl *** return any information about the locale's codeset. Check your manuals.
++dnl *** Ask your vendor. Contact icewm-devel@lists.sourceforge.net when you know 
++dnl *** the name of the locale-dependent parameter for your platform.])
++        ice_nl_codesets="CODESET"
+       fi
+       
+       ice_nl_codesets="${ice_nl_codesets} 0"
+@@ -136,20 +137,20 @@
+ 
+       ice_iconv_cxxflags="${CXXFLAGS}"
+ 
+-      AC_CHECK_HEADERS(iconv.h,,
+-      [ AC_MSG_ERROR([I18N support has been requested but iconv.h wasn´t found.
++      AC_CHECK_HEADERS(giconv.h,,
++      [ AC_MSG_ERROR([I18N support has been requested but giconv.h wasn´t found.
+ *** Check your installation. Upgrade your C library or install GNU libiconv
+ *** available at ftp://ftp.gnu.org/pub/gnu/libiconv/.])])
+ 
+       AC_CHECK_DECL(_libiconv_version,
+-      [ AC_MSG_RESULT(assuming iconv.h belongs to GNU libiconv)
+-        AC_CHECK_LIB(iconv, iconv,
+-        AC_CHECK_LIB(iconv, iconv_open,
+-        AC_CHECK_LIB(iconv, iconv_close,
+-	CXXFLAGS="${CXXFLAGS} -liconv"
+-	CORE_LIBS="${CORE_LIBS} -liconv"
+-	AC_DEFINE(CONFIG_LIBICONV, 1, Define when using libiconv),
+-        AC_MSG_ERROR([iconv.h appears to be part of libiconv but linking failed.
++      [ AC_MSG_RESULT(assuming giconv.h belongs to GNU libiconv)
++        AC_CHECK_LIB(giconv, iconv,
++        AC_CHECK_LIB(giconv, iconv_open,
++        AC_CHECK_LIB(giconv, iconv_close,
++	CXXFLAGS="${CXXFLAGS} -lgiconv"
++	CORE_LIBS="${CORE_LIBS} -lgiconv"
++	AC_DEFINE(CONFIG_LIBICONV, 1, Define when using libgiconv),
++        AC_MSG_ERROR([giconv.h appears to be part of libiconv but linking failed.
+ *** Check your installation. Upgrade your C library (glibc 2.2) or install
+ *** GNU libiconv available at ftp://ftp.gnu.org/pub/gnu/libiconv/.]))))],
+ 
+@@ -158,13 +159,13 @@
+         AC_MSG_ERROR([iconv.h appears to be part of libc but linking failed.
+ *** Check your installation. Upgrade your C library (glibc 2.2) or install
+ *** GNU libiconv available at ftp://ftp.gnu.org/pub/gnu/libiconv/.]))],
+-      [#include <iconv.h>])
++      [#include <giconv.h>])
+ 
+       AC_ARG_WITH(unicode-set,
+         [  --unicode-set=CODESET   your iconv's unicode set in machine endian encoding
+                           (e.g. WCHAR_T, UCS-4-INTERNAL, UCS-4LE, UCS-4BE)],
+ 	   AC_DEFINE_UNQUOTED(CONFIG_UNICODE_SET, "$with_unicode_set"),
+-	   with_unicode_set=UCS-4//TRANSLIT)
++	   with_unicode_set=ISO-8859-1)
+ 
+       ice_sufficent_iconv=no
+       ICE_CHECK_CONVERSION(ISO-8859-1,$with_unicode_set,no,$ice_libiconv,
+@@ -203,7 +204,7 @@
+   features="${features} nls"
    TARGETS=$TARGETS' nls'
  
 -  localedir='${datadir}/locale'
 +  localedir='${prefix}/share/locale'
  fi
  
- dnl ============================================================= GUI Events ===
-@@ -284,7 +284,7 @@
+ dnl ======================================================= /proc/wm-session ===
+@@ -464,7 +465,7 @@
  
- 	AC_DEFINE(GNOME, 1, [Define to make IceWM more GNOME-friendly])
+ 	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
        else
 -	AC_MSG_ERROR([gnome-config can not be found.
 +	AC_MSG_WARN([gnome-config can not be found.