- Update to version 1.2.11

PR:		55875
Submitted by:	Ports Fury

5 files changed, 3 insertions, 82 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 942402e23439..1e8b28835366 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.2.10
-PORTREVISION=	1
+PORTVERSION=	1.2.11
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 086564cf7b37..6cff1ac5bfaa 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-1.2.10.tar.gz) = 3c6835d0e17ad158922ea1ddd0cb60de
+MD5 (icewm-1.2.11.tar.gz) = 4aeb61b5c28e86edbbb8a8d360785010
diff --git a/x11-wm/icewm/files/patch-ao b/x11-wm/icewm/files/patch-ao
deleted file mode 100644
index d316e1d8c634..000000000000
--- a/x11-wm/icewm/files/patch-ao
+++ /dev/null
@@ -1,67 +0,0 @@
---- 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-ar b/x11-wm/icewm/files/patch-ar
deleted file mode 100644
index eb9db0320c2c..000000000000
--- a/x11-wm/icewm/files/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/pkg-plist b/x11-wm/icewm/pkg-plist
index d408b842f065..e37c73b61cd1 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -318,6 +318,7 @@ share/icewm/themes/win95/restore.xpm
 share/icewm/toolbar
 share/icewm/winoptions
 share/locale/be/LC_MESSAGES/icewm.mo
+share/locale/bg/LC_MESSAGES/icewm.mo
 share/locale/ca/LC_MESSAGES/icewm.mo
 share/locale/cs/LC_MESSAGES/icewm.mo
 share/locale/de/LC_MESSAGES/icewm.mo