- Update to version 1.2.14

PR:		ports/67087
Submitted by:	Ports Fury

13 files changed, 373 insertions, 702 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 32c93f0b3177..01f7dbec50f8 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.2.13
-PORTREVISION=	1
+PORTVERSION=	1.2.14
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +19,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOCONF_VER=	257
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS=	--enable-shaped-decorations \
@@ -31,14 +30,6 @@ CONFIGURE_ARGS=	--enable-shaped-decorations \
 		--with-docdir=${PREFIX}/share/doc \
 		--with-mkfontdir=${NONEXISTENT}
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mgnomedesktop}!=""
@@ -80,6 +71,14 @@ CONFIGURE_ARGS+=	--disable-xinerama
 CONFIGURE_ARGS+=	--disable-x86-asm
 .endif
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 post-patch:
 .for file in src/gnome2.cc
 	@${REINPLACE_CMD} -e \
@@ -97,7 +96,5 @@ post-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
 .endif
-	${CHOWN} root:kmem ${PREFIX}/bin/icewm
-	${CHMOD} 2555 ${PREFIX}/bin/icewm
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 51351f948113..938bfc06aa11 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1,2 +1,2 @@
-MD5 (icewm-1.2.13.tar.gz) = d189afcf15f2386a0a0397c376e297c6
-SIZE (icewm-1.2.13.tar.gz) = 839636
+MD5 (icewm-1.2.14.tar.gz) = 1a5670fd074731766a64d5905bad773f
+SIZE (icewm-1.2.14.tar.gz) = 932635
diff --git a/x11-wm/icewm/files/patch-am b/x11-wm/icewm/files/patch-am
deleted file mode 100644
index da482f7634b8..000000000000
--- a/x11-wm/icewm/files/patch-am
+++ /dev/null
@@ -1,49 +0,0 @@
---- src/apppstatus.cc.orig	Sat Mar 17 00:17:37 2001
-+++ src/apppstatus.cc	Thu Apr  5 22:45:29 2001
-@@ -270,6 +270,7 @@
-       return isUpIsdn();
- #endif
- 
-+#ifndef __FreeBSD__
-     char buffer[32 * sizeof(struct ifreq)];
-     struct ifconf ifc;
-     struct ifreq *ifr;
-@@ -301,6 +302,38 @@
-     }
- 
-     close(s);
-+
-+#else // __FreeBSD__
-+    // FreeBSD code by Ronald Klop <ronald@cs.vu.nl>
-+    struct ifmibdata ifmd;
-+    size_t ifmd_size=sizeof(ifmibdata);
-+    int nr_network_devs;
-+    size_t int_size=sizeof(int);
-+    int name[6];
-+    name[0] = CTL_NET;
-+    name[1] = PF_LINK;
-+    name[2] = NETLINK_GENERIC;
-+    name[3] = IFMIB_IFDATA;
-+    name[5] = IFDATA_GENERAL;
-+
-+    if(sysctlbyname("net.link.generic.system.ifcount",&nr_network_devs,
-+                                       &int_size,(void*)0,0) == -1) {
-+               printf("%s@%d: %s\n",__FILE__,__LINE__,strerror(errno));
-+       } else {
-+               for(int i=1;i<=nr_network_devs;i++) {
-+                       name[4] = i; /* row of the ifmib table */
-+
-+               if(sysctl(name, 6, &ifmd, &ifmd_size, (void *)0, 0) == -1) {
-+                               printf(_("%s@%d: %s\n"),__FILE__,__LINE__,strerror(errno));
-+                               continue;
-+                       }
-+
-+               if (strcmp(ifmd.ifmd_name, netDevice) == 0 && (ifmd.ifmd_flags & IFF_RUNNING)) {
-+                               return true;
-+                       }
-+               }
-+       }
-+#endif // __FreeBSD__
-     return false;
- #endif // if 0
- }
diff --git a/x11-wm/icewm/files/patch-at b/x11-wm/icewm/files/patch-at
deleted file mode 100644
index dee6b6bfec5a..000000000000
--- a/x11-wm/icewm/files/patch-at
+++ /dev/null
@@ -1,210 +0,0 @@
---- src/acpustatus.cc.orig	Tue Aug 19 15:16:17 2003
-+++ src/acpustatus.cc	Tue Aug 26 00:30:57 2003
-@@ -27,7 +27,16 @@
- 
- #include "intl.h"
- 
--#if (defined(linux) || defined(HAVE_KSTAT_H))
-+#if (defined(linux) || defined(HAVE_KSTAT_H) || defined(__FreeBSD__))
-+
-+#ifdef __FreeBSD__
-+#include <fcntl.h>
-+#include <kvm.h>
-+#include <nlist.h>
-+#include <sys/dkstat.h>
-+#include <sys/resource.h>
-+#include <devstat.h>
-+#endif
- 
- #define UPDATE_INTERVAL 500
- 
-@@ -50,13 +59,42 @@
-     color[IWM_SYS]  = new YColor(clrCpuSys);
-     color[IWM_IDLE] = *clrCpuIdle
-     		    ? new YColor(clrCpuIdle) : NULL;
--
-+#ifdef __FreeBSD__
-+    color[IWM_INTR] = new YColor(clrCpuIntr);
-+    for (unsigned int i = 0; i < taskBarCPUSamples; i++) {
-+        cpu[i][IWM_USER] = cpu[i][IWM_NICE] =
-+        cpu[i][IWM_SYS] = cpu[i][IWM_INTR] = 0;
-+        cpu[i][IWM_IDLE] = 1;
-+    }
-+    setSize(taskBarCPUSamples, 20);
-+    last_cpu[IWM_USER] = last_cpu[IWM_NICE] = last_cpu[IWM_SYS] =
-+    last_cpu[IWM_IDLE] = last_cpu[IWM_INTR] = 0;
-+    if( setegid( 2 ) == 0 ) {
-+       char errbuf[_POSIX2_LINE_MAX];
-+       kd = kvm_openfiles( NULL, NULL, NULL, O_RDONLY, errbuf );
-+       setegid( getgid() );
-+       if( kd == NULL )
-+           fprintf( stderr, "kvm_openfiles: %s\n", errbuf );
-+       else {
-+           memset( namelist, 0, sizeof(namelist) );
-+           namelist[0].n_name = (char*)("_cp_time");
-+           if( kvm_nlist( kd, namelist ) != 0 ) {
-+               kvm_close( kd );
-+               kd = NULL;
-+           }
-+       }
-+    } else {
-+       fprintf( stderr, "can't setegid(2), I'm not a setgid exec ?\n" );
-+       kd = NULL;
-+    }
-+#else
-     for (int i(0); i < taskBarCPUSamples; i++) {
-         cpu[i][IWM_USER] = cpu[i][IWM_NICE] = cpu[i][IWM_SYS] = 0;
-         cpu[i][IWM_IDLE] = 1;
-     }
-     setSize(taskBarCPUSamples, 20);
-     last_cpu[IWM_USER] = last_cpu[IWM_NICE] = last_cpu[IWM_SYS] = last_cpu[IWM_IDLE] = 0;
-+#endif
-     getStatus();
-     updateStatus();
-     updateToolTip();
-@@ -71,6 +109,13 @@
-     delete color[IWM_NICE]; color[IWM_NICE] = 0;
-     delete color[IWM_SYS];  color[IWM_SYS]  = 0;
-     delete color[IWM_IDLE]; color[IWM_IDLE] = 0;
-+#ifdef __FreeBSD__
-+    delete color[IWM_INTR]; color[IWM_INTR] = 0;
-+    if( kd != NULL ) {
-+       kvm_close( kd );
-+       kd = NULL;
-+    }
-+#endif
- }
- 
- void CPUStatus::paint(Graphics &g, const YRect &/*r*/) {
-@@ -81,13 +126,34 @@
-         int nice = cpu[i][IWM_NICE];
-         int sys = cpu[i][IWM_SYS];
-         int idle = cpu[i][IWM_IDLE];
-+#ifdef __FreeBSD__
-+        int intr = cpu[i][IWM_INTR];
-+        int total = user + sys + intr + nice + idle;
-+	int totald = total;
-+#else
-         int total = user + sys + nice + idle;
-+#endif
- 
-         int y = height() - 1;
- 
-         if (total > 0) {
-+#ifdef __FreeBSD__
-+           if (intr) {
-+               totald -= intr;
-+                n = (h * totald) / total; // check rounding
-+                if (n >= y) n = y;
-+                g.setColor(color[IWM_INTR]);
-+                g.drawLine(i, y, i, n);
-+                y = n - 1;
-+            }
-+#endif
-             if (sys) {
-+#ifdef __FreeBSD__
-+                totald -= sys;
-+                n = (h * totald)/ total;
-+#else
-                 n = (h * (total - sys)) / total; // check rounding
-+#endif
-                 if (n >= y) n = y;
-                 g.setColor(color[IWM_SYS]);
-                 g.drawLine(i, y, i, n);
-@@ -95,7 +161,12 @@
-             }
- 
-             if (nice) {
-+#ifdef __FreeBSD__
-+                totald -= nice;
-+                n = (h * totald)/ total;
-+#else
-                 n = (h * (total - sys - nice))/ total;
-+#endif
-                 if (n >= y) n = y;
-                 g.setColor(color[IWM_NICE]);
-                 g.drawLine(i, y, i, n);
-@@ -103,7 +174,12 @@
-             }
- 
-             if (user) {
-+#ifdef __FreeBSD__
-+                totald -= user;
-+                n = (h * totald)/ total;
-+#else
-                 n = (h * (total - sys - nice - user))/ total;
-+#endif
-                 if (n >= y) n = y;
-                 g.setColor(color[IWM_USER]);
-                 g.drawLine(i, y, i, n);
-@@ -153,6 +229,14 @@
-     sprintf(load, _("CPU Load: %3.2f %3.2f %3.2f, %d processes."),
-             l1, l5, l15, sys.procs);
-     setToolTip(load);
-+#elif defined(__FreeBSD__)
-+    char load[31]; // enough for "CPU Load: 999.99 999.99 999.99\0"
-+    double loadavg[3];
-+    if( kd != NULL && kvm_getloadavg( kd, loadavg, 3 ) != 3 )
-+       return;
-+    snprintf(load, sizeof(load), "CPU Load: %3.2f %3.2f %3.2f",
-+            loadavg[0], loadavg[1], loadavg[2]);
-+    setToolTip(load);
- #endif
- }
- 
-@@ -170,13 +254,43 @@
-         cpu[i - 1][IWM_NICE] = cpu[i][IWM_NICE];
-         cpu[i - 1][IWM_SYS]  = cpu[i][IWM_SYS];
-         cpu[i - 1][IWM_IDLE] = cpu[i][IWM_IDLE];
-+#ifdef __FreeBSD__
-+        cpu[i - 1][IWM_INTR] = cpu[i][IWM_INTR];
-+#endif
-     }
-     getStatus(),
-     repaint();
- }
- 
- void CPUStatus::getStatus() {
--#ifdef linux
-+#ifdef __FreeBSD__
-+    
-+    cpu[taskBarCPUSamples-1][IWM_USER] = 0;
-+    cpu[taskBarCPUSamples-1][IWM_NICE] = 0;
-+    cpu[taskBarCPUSamples-1][IWM_SYS] = 0;
-+    cpu[taskBarCPUSamples-1][IWM_INTR] = 0;
-+    cpu[taskBarCPUSamples-1][IWM_IDLE] = 0;
-+
-+    if( kd == NULL ) return;
-+
-+    long cp_time[CPUSTATES];
-+    int c = sizeof( cp_time );
-+    if (kvm_read(kd, namelist[0].n_value, &cp_time, c) != c)
-+       return;
-+
-+    long cur[IWM_STATES];
-+    cur[IWM_USER] = cp_time[CP_USER];
-+    cur[IWM_NICE] = cp_time[CP_NICE];
-+    cur[IWM_SYS] = cp_time[CP_SYS];
-+    cur[IWM_INTR] = cp_time[CP_INTR];
-+    cur[IWM_IDLE] = cp_time[CP_IDLE];
-+
-+    for (int i = 0; i < IWM_STATES; i++) {
-+        cpu[taskBarCPUSamples-1][i] = cur[i] - last_cpu[i];
-+       last_cpu[i] = cur[i];
-+    }
-+
-+#elif defined(linux)
-     char *p, buf[128];
-     long cur[IWM_STATES];
-     int len, fd = open("/proc/stat", O_RDONLY);
-@@ -210,8 +324,8 @@
-             cpu[taskBarCPUSamples-1][IWM_USER], cpu[taskBarCPUSamples-1][IWM_NICE],
-             cpu[taskBarCPUSamples-1][IWM_SYS],  cpu[taskBarCPUSamples-1][IDLE]);
- #endif
--#endif /* linux */
--#ifdef HAVE_KSTAT_H
-+
-+#elif defined(HAVE_KSTAT_H)
- #ifdef HAVE_OLD_KSTAT
- #define ui32 ul
- #endif
diff --git a/x11-wm/icewm/files/patch-au b/x11-wm/icewm/files/patch-au
deleted file mode 100644
index bbee4e712182..000000000000
--- a/x11-wm/icewm/files/patch-au
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/acpustatus.h.orig	Sun Mar  9 04:37:52 2003
-+++ src/acpustatus.h	Sun Apr 13 12:02:47 2003
-@@ -1,19 +1,29 @@
- #ifndef __CPUSTATUS_H
- #define __CPUSTATUS_H
- 
--#if defined(linux) || defined(HAVE_KSTAT_H)
-+#if (defined(linux) || defined(HAVE_KSTAT_H)) || defined (__FreeBSD__)
- 
- #ifdef HAVE_KSTAT_H
- #include <kstat.h>
- #include <sys/sysinfo.h>
- #endif /* have_kstat_h */
- 
-+#ifdef __FreeBSD__
-+#include <kvm.h>
-+#include <nlist.h>
-+#endif
- 
- #define IWM_USER   (0)
- #define IWM_NICE   (1)
- #define IWM_SYS    (2)
-+#ifdef __FreeBSD__
-+#define IWM_INTR   (3)
-+#define IWM_IDLE   (4)
-+#define IWM_STATES (5)
-+#else
- #define IWM_IDLE   (3)
- #define IWM_STATES (4)
-+#endif
- 
- #include "ywindow.h"
- #include "ytimer.h"
-@@ -38,6 +48,10 @@
-     long last_cpu[IWM_STATES];
-     YColor *color[IWM_STATES];
-     YTimer *fUpdateTimer;
-+#ifdef __FreeBSD__
-+    struct nlist namelist[2];
-+    kvm_t *kd;
-+#endif
- };
- #else
- #undef CONFIG_APPLET_CPU_STATUS
diff --git a/x11-wm/icewm/files/patch-av b/x11-wm/icewm/files/patch-av
deleted file mode 100644
index 5167594e4e3c..000000000000
--- a/x11-wm/icewm/files/patch-av
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/default.h.orig	Thu May 16 14:00:02 2002
-+++ src/default.h	Tue May 28 04:44:02 2002
-@@ -455,6 +455,7 @@
- XSV(const char *, clrLabelText,                 "rgb:00/00/00")
- XSV(const char *, clrCpuUser,                   "rgb:00/FF/00")
- XSV(const char *, clrCpuSys,                    "rgb:FF/00/00")
-+XSV(const char *, clrCpuIntr,                   "rgb:FF/FF/00")
- XSV(const char *, clrCpuNice,                   "rgb:00/00/FF")
- XSV(const char *, clrCpuIdle,                   "rgb:00/00/00")
- XSV(const char *, clrNetSend,                   "rgb:FF/FF/00")
-@@ -837,6 +838,7 @@
- #ifdef CONFIG_APPLET_CPU_STATUS
-     OSV("ColorCPUStatusUser",                   &clrCpuUser,                    "User load on the CPU monitor"),
-     OSV("ColorCPUStatusSystem",                 &clrCpuSys,                     "System load on the CPU monitor"),
-+    OSV("ColorCPUStatusInterrupts",             &clrCpuIntr,                    "Inturrupts on the CPU monitor"),
-     OSV("ColorCPUStatusNice",                   &clrCpuNice,                    "Nice load on the CPU monitor"),
-     OSV("ColorCPUStatusIdle",                   &clrCpuIdle,                    "Idle (non) load on the CPU monitor, leave empty to force transparency"),
- #endif    
diff --git a/x11-wm/icewm/files/patch-aw b/x11-wm/icewm/files/patch-aw
deleted file mode 100644
index 750c25ddb965..000000000000
--- a/x11-wm/icewm/files/patch-aw
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/wmapp.cc.orig	Sun Mar  9 04:37:52 2003
-+++ src/wmapp.cc	Sun Apr 13 00:09:19 2003
-@@ -1503,6 +1503,9 @@
- #endif
- 
- int main(int argc, char **argv) {
-+#ifdef __FreeBSD__
-+    setegid( getgid() );
-+#endif
-     YLocale locale;
- 
- #ifndef NO_CONFIGURE
diff --git a/x11-wm/icewm/files/patch-ax b/x11-wm/icewm/files/patch-ax
deleted file mode 100644
index 1e12bd630eb6..000000000000
--- a/x11-wm/icewm/files/patch-ax
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/wmclient.h.orig	Tue Mar 26 14:29:05 2002
-+++ src/wmclient.h	Tue Mar 26 14:29:13 2002
-@@ -5,6 +5,8 @@
- #include "ymenu.h"
- #include "MwmUtil.h"
- 
-+#include <X11/Xutil.h>
-+
- class YFrameWindow;
- class WindowListItem;
- 
diff --git a/x11-wm/icewm/files/patch-configure b/x11-wm/icewm/files/patch-configure
deleted file mode 100644
index f32d878f7811..000000000000
--- a/x11-wm/icewm/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Mar 15 03:48:52 2004
-+++ configure	Mon Mar 15 03:49:27 2004
-@@ -3332,7 +3332,7 @@
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-   if test x"$ac_cv_c_compiler_gnu" != x; then
--    CXX_LINK=${CC}
-+    CXX_LINK=${CXX}
-   fi
- 
- 
diff --git a/x11-wm/icewm/files/patch-configure.in b/x11-wm/icewm/files/patch-configure.in
index 56a54e511fc4..86fa0c8893e8 100644
--- a/x11-wm/icewm/files/patch-configure.in
+++ b/x11-wm/icewm/files/patch-configure.in
@@ -1,38 +1,56 @@
---- configure.in.orig	Mon Mar 15 03:46:35 2004
-+++ configure.in	Mon Mar 15 03:46:25 2004
-@@ -25,35 +25,6 @@
+--- configure.in.orig	Sun May 23 15:18:18 2004
++++ configure.in	Mon May 24 14:00:32 2004
+@@ -21,53 +21,8 @@
+ 
+ dnl ---------- Checking for a C compiler in hope that it understands C++ too ---
+ dnl
+-ICE_PROG_CXX_LIGHT
  AC_LANG_CPLUSPLUS
  AC_PROG_CXX
- 
+-
 -dnl ----------- If both CC and CXX are GNU compilers, it is better to use CC ---
--dnl ---- for linking. Also check how to turn off RTTI and exception handling ---
--if test x"$ac_cv_prog_gxx" != x; then
+-dnl ---- for linking. 
+-if test x"$ac_cv_prog_gxx" = x; then
 -  AC_PROG_CC
--  if test x"$ac_cv_prog_gcc" != x; then
+-  if test x"$ac_cv_prog_gcc" = x; then
 -    CXX_LINK=${CC}
 -  fi
--  
+-fi
+-
+-dnl ---------- Also check how to turn off RTTI and exception handling ---
+-
+-dnl --- SunONE C++ supports no-rtti flag only in compat=4 mode
+-if test -z "`${CXX} -V 2>&1 | grep Sun`"; then
 -  ICE_CXX_FLAG_ACCEPT(no_rtti, -fno-rtti)
--  dnl --- Intel C++ supports -fno-rtti, but doens't support -fno-*-exceptions
--  if test $(basename $CXX) != "icc"; then
--    ICE_CXX_FLAG_ACCEPT(no_exceptions, -fno-exceptions)
+-fi
+-dnl --- Intel C++ supports -fno-rtti, but doens't support -fno-*-exceptions
+-if test $(basename $CXX) != "icc"; then
+-  if test -n "`${CXX} -V 2>&1 | grep Sun`"; then
+-    dnl --- Sun ONE C++ syntax for "no exceptions"
+-    ICE_CXX_FLAG_ACCEPT(no_exceptions, -features=no%except)
+-  else
+-    if test $(basename $CXX) = "g++" ||
+-       test $(basename $CXX) = "gcc"; then
+-      ICE_CXX_FLAG_ACCEPT(no_exceptions, -fno-exceptions)
 -      if test x"$no_exceptions_ok" = xno; then
--      ICE_CXX_FLAG_ACCEPT(no_exceptions, -fno-handle-exceptions)
+-        ICE_CXX_FLAG_ACCEPT(no_exceptions, -fno-handle-exceptions)
+-      fi
 -    fi
 -  fi
 -fi
 -
--if test x"$ac_cv_prog_gxx" != x; then
+-if test $(basename $CXX) = "g++" ||
+-   test $(basename $CXX) = "gcc" ; then
+-  ICE_CXX_FLAG_ACCEPT(warn_xxx, -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Winline -Woverloaded-virtual -W)
+-  ICE_CXX_FLAG_ACCEPT(permissive, -fpermissive)  
+-else
+-  dnl --- Sun ONE doesn't support GCC -W* and -fpermissive
 -  dnl --- Intel C++ doesn't supports lots of GCC -W* and -fpermissive
 -  if test $(basename $CXX) = "icc"; then
 -    dnl --- Using -w0 to avoid noisy "remark" messages 
 -    ICE_CXX_FLAG_ACCEPT(warn_xxx, -w0)
--  else
--    ICE_CXX_FLAG_ACCEPT(warn_xxx, -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Winline -Woverloaded-virtual -W)
--    ICE_CXX_FLAG_ACCEPT(permissive, -fpermissive)
 -  fi
 -fi
--
+ 
  if test x"$CXX_LINK" = x; then
    CXX_LINK=$CXX
- fi
diff --git a/x11-wm/icewm/files/patch-src_Makefile.in b/x11-wm/icewm/files/patch-src_Makefile.in
index a3349e7980bb..42e5bed90daf 100644
--- a/x11-wm/icewm/files/patch-src_Makefile.in
+++ b/x11-wm/icewm/files/patch-src_Makefile.in
@@ -12,12 +12,3 @@
  	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
  LFLAGS =	@LDFLAGS@
  LIBS =          @LIBS@
-@@ -53,7 +53,7 @@
- 	genpref.o
- 
- icewm_LIBS = \
--	$(CORE_LIBS) $(IMAGE_LIBS)
-+	$(CORE_LIBS) $(IMAGE_LIBS) -lkvm
- icewm_OBJS = \
-         ymsgbox.o ydialog.o yurl.o \
-         wmsession.o wmwinlist.o wmtaskbar.o wmwinmenu.o \
diff --git a/x11-wm/icewm/files/patch-src_ylocale.cc b/x11-wm/icewm/files/patch-src_ylocale.cc
new file mode 100644
index 000000000000..0ca66acf6c4d
--- /dev/null
+++ b/x11-wm/icewm/files/patch-src_ylocale.cc
@@ -0,0 +1,12 @@
+--- src/ylocale.cc.orig	Wed Apr 21 05:06:34 2004
++++ src/ylocale.cc	Sun Apr 25 19:40:07 2004
+@@ -149,7 +149,8 @@
+ 	return NULL;
+ 
+     YUChar * uStr(new YUChar[lLen + 1]);
+-    char * inbuf((char *) lStr), * outbuf((char *) uStr);
++    const char * inbuf((char *) lStr);
++    char * outbuf((char *) uStr);
+     size_t inlen(lLen), outlen(4 * lLen);
+ 
+     if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 6fee2ed06beb..628b131b45ec 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -33,296 +33,303 @@ bin/icewmtray
 %%PORTDOCS%%%%DOCSDIR%%/icewm-9.html
 %%PORTDOCS%%%%DOCSDIR%%/icewm.html
 %%GNOMEDESKTOP%%share/gnome/wm-properties/IceWM.desktop
-share/icewm/icons/app_16x16.xpm
-share/icewm/icons/app_32x32.xpm
-share/icewm/icons/bomb_16x16.xpm
-share/icewm/icons/bomb_32x32.xpm
-share/icewm/icons/communicator-abook_16x16.xpm
-share/icewm/icons/communicator-abook_32x32.xpm
-share/icewm/icons/communicator-browser_16x16.xpm
-share/icewm/icons/communicator-browser_32x32.xpm
-share/icewm/icons/communicator-composer_16x16.xpm
-share/icewm/icons/communicator-composer_32x32.xpm
-share/icewm/icons/communicator-discussion_16x16.xpm
-share/icewm/icons/communicator-discussion_32x32.xpm
-share/icewm/icons/communicator-mail_16x16.xpm
-share/icewm/icons/communicator-mail_32x32.xpm
-share/icewm/icons/emacs_16x16.xpm
-share/icewm/icons/emacs_32x32.xpm
-share/icewm/icons/file_16x16.xpm
-share/icewm/icons/file_32x32.xpm
-share/icewm/icons/folder_16x16.xpm
-share/icewm/icons/folder_32x32.xpm
-share/icewm/icons/fte_16x16.xpm
-share/icewm/icons/fte_32x32.xpm
-share/icewm/icons/gimp_16x16.xpm
-share/icewm/icons/gimp_32x32.xpm
-share/icewm/icons/gnome_16x16.xpm
-share/icewm/icons/java_16x16.xpm
-share/icewm/icons/java_32x32.xpm
-share/icewm/icons/kde_16x16.xpm
-share/icewm/icons/koules_16x16.xpm
-share/icewm/icons/koules_32x32.xpm
-share/icewm/icons/navigator_16x16.xpm
-share/icewm/icons/navigator_32x32.xpm
-share/icewm/icons/netscape_16x16.xpm
-share/icewm/icons/netscape_32x32.xpm
-share/icewm/icons/pdf_16x16.xpm
-share/icewm/icons/pdf_32x32.xpm
-share/icewm/icons/vim_16x16.xpm
-share/icewm/icons/vim_32x32.xpm
-share/icewm/icons/vim_48x48.xpm
-share/icewm/icons/xisp_16x16.xpm
-share/icewm/icons/xisp_32x32.xpm
-share/icewm/icons/xload_16x16.xpm
-share/icewm/icons/xload_32x32.xpm
-share/icewm/icons/xterm_16x16.xpm
-share/icewm/icons/xterm_32x32.xpm
-share/icewm/icons/xv_16x16.xpm
-share/icewm/icons/xv_32x32.xpm
-share/icewm/keys
-share/icewm/ledclock/a.xpm
-share/icewm/ledclock/colon.xpm
-share/icewm/ledclock/dot.xpm
-share/icewm/ledclock/m.xpm
-share/icewm/ledclock/n0.xpm
-share/icewm/ledclock/n1.xpm
-share/icewm/ledclock/n2.xpm
-share/icewm/ledclock/n3.xpm
-share/icewm/ledclock/n4.xpm
-share/icewm/ledclock/n5.xpm
-share/icewm/ledclock/n6.xpm
-share/icewm/ledclock/n7.xpm
-share/icewm/ledclock/n8.xpm
-share/icewm/ledclock/n9.xpm
-share/icewm/ledclock/p.xpm
-share/icewm/ledclock/percent.xpm
-share/icewm/ledclock/slash.xpm
-share/icewm/ledclock/space.xpm
-share/icewm/mailbox/errmail.xpm
-share/icewm/mailbox/mail.xpm
-share/icewm/mailbox/newmail.xpm
-share/icewm/mailbox/nomail.xpm
-share/icewm/mailbox/unreadmail.xpm
-share/icewm/menu
-share/icewm/preferences
-share/icewm/taskbar/bsd-daemon.xpm
-share/icewm/taskbar/debian.xpm
-share/icewm/taskbar/icewm.xpm
-share/icewm/taskbar/linux.xpm
-share/icewm/taskbar/linux1.xpm
-share/icewm/taskbar/linux2.xpm
-share/icewm/taskbar/linux20.xpm
-share/icewm/taskbar/start.xpm
-share/icewm/taskbar/windows.xpm
-share/icewm/taskbar/xfreeos2.xpm
-share/icewm/themes/Infadel2/Ergonomic.theme
-share/icewm/themes/Infadel2/Overloaded.theme
-share/icewm/themes/Infadel2/closeA.xpm
-share/icewm/themes/Infadel2/closeI.xpm
-share/icewm/themes/Infadel2/cursors/left.xpm
-share/icewm/themes/Infadel2/cursors/move.xpm
-share/icewm/themes/Infadel2/cursors/right.xpm
-share/icewm/themes/Infadel2/cursors/sizeB.xpm
-share/icewm/themes/Infadel2/cursors/sizeBL.xpm
-share/icewm/themes/Infadel2/cursors/sizeBR.xpm
-share/icewm/themes/Infadel2/cursors/sizeL.xpm
-share/icewm/themes/Infadel2/cursors/sizeR.xpm
-share/icewm/themes/Infadel2/cursors/sizeT.xpm
-share/icewm/themes/Infadel2/cursors/sizeTL.xpm
-share/icewm/themes/Infadel2/cursors/sizeTR.xpm
-share/icewm/themes/Infadel2/default.theme
-share/icewm/themes/Infadel2/depthA.xpm
-share/icewm/themes/Infadel2/depthI.xpm
-share/icewm/themes/Infadel2/fonts.dir
-share/icewm/themes/Infadel2/hideA.xpm
-share/icewm/themes/Infadel2/hideI.xpm
-share/icewm/themes/Infadel2/icons/app_16x16.xpm
-share/icewm/themes/Infadel2/icons/folder_16x16.xpm
-share/icewm/themes/Infadel2/icons/folder_32x32.xpm
-share/icewm/themes/Infadel2/mailbox/errmail.xpm
-share/icewm/themes/Infadel2/mailbox/mail.xpm
-share/icewm/themes/Infadel2/mailbox/newmail.xpm
-share/icewm/themes/Infadel2/mailbox/nomail.xpm
-share/icewm/themes/Infadel2/mailbox/unreadmail.xpm
-share/icewm/themes/Infadel2/maximizeA.xpm
-share/icewm/themes/Infadel2/maximizeI.xpm
-share/icewm/themes/Infadel2/menuButtonA.xpm
-share/icewm/themes/Infadel2/menuButtonI.xpm
-share/icewm/themes/Infadel2/minimizeA.xpm
-share/icewm/themes/Infadel2/minimizeI.xpm
-share/icewm/themes/Infadel2/restoreA.xpm
-share/icewm/themes/Infadel2/restoreI.xpm
-share/icewm/themes/Infadel2/rolldownA.xpm
-share/icewm/themes/Infadel2/rolldownI.xpm
-share/icewm/themes/Infadel2/rollupA.xpm
-share/icewm/themes/Infadel2/rollupI.xpm
-share/icewm/themes/Infadel2/snap.pcf
-share/icewm/themes/Infadel2/taskbar/linux.xpm
-share/icewm/themes/Infadel2/taskbar/windows.xpm
-share/icewm/themes/Infadel2/titleAB.xpm
-share/icewm/themes/Infadel2/titleAJ.xpm
-share/icewm/themes/Infadel2/titleAM.xpm
-share/icewm/themes/Infadel2/titleAP.xpm
-share/icewm/themes/Infadel2/titleAQ.xpm
-share/icewm/themes/Infadel2/titleAR.xpm
-share/icewm/themes/Infadel2/titleAS.xpm
-share/icewm/themes/Infadel2/titleAT.xpm
-share/icewm/themes/Infadel2/titleIB.xpm
-share/icewm/themes/Infadel2/titleIJ.xpm
-share/icewm/themes/Infadel2/titleIM.xpm
-share/icewm/themes/Infadel2/titleIP.xpm
-share/icewm/themes/Infadel2/titleIQ.xpm
-share/icewm/themes/Infadel2/titleIR.xpm
-share/icewm/themes/Infadel2/titleIS.xpm
-share/icewm/themes/Infadel2/titleIT.xpm
-share/icewm/themes/gtk2/closeA.xpm
-share/icewm/themes/gtk2/closeI.xpm
-share/icewm/themes/gtk2/default.theme
-share/icewm/themes/gtk2/maximizeA.xpm
-share/icewm/themes/gtk2/maximizeI.xpm
-share/icewm/themes/gtk2/menuButtonA.xpm
-share/icewm/themes/gtk2/menuButtonI.xpm
-share/icewm/themes/gtk2/minimizeA.xpm
-share/icewm/themes/gtk2/minimizeI.xpm
-share/icewm/themes/gtk2/restoreA.xpm
-share/icewm/themes/gtk2/restoreI.xpm
-share/icewm/themes/icedesert/closeA.xpm
-share/icewm/themes/icedesert/closeI.xpm
-share/icewm/themes/icedesert/default.theme
-share/icewm/themes/icedesert/maximizeA.xpm
-share/icewm/themes/icedesert/maximizeI.xpm
-share/icewm/themes/icedesert/menuButtonA.xpm
-share/icewm/themes/icedesert/menuButtonI.xpm
-share/icewm/themes/icedesert/minimizeA.xpm
-share/icewm/themes/icedesert/minimizeI.xpm
-share/icewm/themes/icedesert/restoreA.xpm
-share/icewm/themes/icedesert/restoreI.xpm
-share/icewm/themes/icedesert/titleAB.xpm
-share/icewm/themes/icedesert/titleAT.xpm
-share/icewm/themes/icedesert/titleIB.xpm
-share/icewm/themes/icedesert/titleIT.xpm
-share/icewm/themes/metal2/closeA.xpm
-share/icewm/themes/metal2/closeI.xpm
-share/icewm/themes/metal2/default.theme
-share/icewm/themes/metal2/depthA.xpm
-share/icewm/themes/metal2/depthI.xpm
-share/icewm/themes/metal2/dframeAB.xpm
-share/icewm/themes/metal2/dframeABL.xpm
-share/icewm/themes/metal2/dframeABR.xpm
-share/icewm/themes/metal2/dframeAL.xpm
-share/icewm/themes/metal2/dframeAR.xpm
-share/icewm/themes/metal2/dframeAT.xpm
-share/icewm/themes/metal2/dframeATL.xpm
-share/icewm/themes/metal2/dframeATR.xpm
-share/icewm/themes/metal2/dframeIB.xpm
-share/icewm/themes/metal2/dframeIBL.xpm
-share/icewm/themes/metal2/dframeIBR.xpm
-share/icewm/themes/metal2/dframeIL.xpm
-share/icewm/themes/metal2/dframeIR.xpm
-share/icewm/themes/metal2/dframeIT.xpm
-share/icewm/themes/metal2/dframeITL.xpm
-share/icewm/themes/metal2/dframeITR.xpm
-share/icewm/themes/metal2/frameAB.xpm
-share/icewm/themes/metal2/frameABL.xpm
-share/icewm/themes/metal2/frameABR.xpm
-share/icewm/themes/metal2/frameAL.xpm
-share/icewm/themes/metal2/frameAR.xpm
-share/icewm/themes/metal2/frameAT.xpm
-share/icewm/themes/metal2/frameATL.xpm
-share/icewm/themes/metal2/frameATR.xpm
-share/icewm/themes/metal2/frameIB.xpm
-share/icewm/themes/metal2/frameIBL.xpm
-share/icewm/themes/metal2/frameIBR.xpm
-share/icewm/themes/metal2/frameIL.xpm
-share/icewm/themes/metal2/frameIR.xpm
-share/icewm/themes/metal2/frameIT.xpm
-share/icewm/themes/metal2/frameITL.xpm
-share/icewm/themes/metal2/frameITR.xpm
-share/icewm/themes/metal2/hideA.xpm
-share/icewm/themes/metal2/hideI.xpm
-share/icewm/themes/metal2/maximizeA.xpm
-share/icewm/themes/metal2/maximizeI.xpm
-share/icewm/themes/metal2/menuButtonA.xpm
-share/icewm/themes/metal2/menuButtonI.xpm
-share/icewm/themes/metal2/minimizeA.xpm
-share/icewm/themes/metal2/minimizeI.xpm
-share/icewm/themes/metal2/restoreA.xpm
-share/icewm/themes/metal2/restoreI.xpm
-share/icewm/themes/metal2/rolldownA.xpm
-share/icewm/themes/metal2/rolldownI.xpm
-share/icewm/themes/metal2/rollupA.xpm
-share/icewm/themes/metal2/rollupI.xpm
-share/icewm/themes/metal2/titleAB.xpm
-share/icewm/themes/metal2/titleAL.xpm
-share/icewm/themes/metal2/titleAM.xpm
-share/icewm/themes/metal2/titleAP.xpm
-share/icewm/themes/metal2/titleAR.xpm
-share/icewm/themes/metal2/titleAS.xpm
-share/icewm/themes/metal2/titleAT.xpm
-share/icewm/themes/metal2/titleIB.xpm
-share/icewm/themes/metal2/titleIL.xpm
-share/icewm/themes/metal2/titleIM.xpm
-share/icewm/themes/metal2/titleIP.xpm
-share/icewm/themes/metal2/titleIR.xpm
-share/icewm/themes/metal2/titleIS.xpm
-share/icewm/themes/metal2/titleIT.xpm
-share/icewm/themes/motif/close.xpm
-share/icewm/themes/motif/default.theme
-share/icewm/themes/motif/maximize.xpm
-share/icewm/themes/motif/menu.xpm
-share/icewm/themes/motif/minimize.xpm
-share/icewm/themes/motif/restore.xpm
-share/icewm/themes/nice/blue.theme
-share/icewm/themes/nice/close.xpm
-share/icewm/themes/nice/default.theme
-share/icewm/themes/nice/hide.xpm
-share/icewm/themes/nice/maximize.xpm
-share/icewm/themes/nice/minimize.xpm
-share/icewm/themes/nice/restore.xpm
-share/icewm/themes/nice/rolldown.xpm
-share/icewm/themes/nice/rollup.xpm
-share/icewm/themes/nice2/closeA.xpm
-share/icewm/themes/nice2/closeI.xpm
-share/icewm/themes/nice2/default.theme
-share/icewm/themes/nice2/maximizeA.xpm
-share/icewm/themes/nice2/maximizeI.xpm
-share/icewm/themes/nice2/menuButtonA.xpm
-share/icewm/themes/nice2/menuButtonI.xpm
-share/icewm/themes/nice2/minimizeA.xpm
-share/icewm/themes/nice2/minimizeI.xpm
-share/icewm/themes/nice2/restoreA.xpm
-share/icewm/themes/nice2/restoreI.xpm
-share/icewm/themes/nice2/titleAB.xpm
-share/icewm/themes/nice2/titleAT.xpm
-share/icewm/themes/nice2/titleIB.xpm
-share/icewm/themes/nice2/titleIT.xpm
-share/icewm/themes/warp3/close.xpm
-share/icewm/themes/warp3/default.theme
-share/icewm/themes/warp3/hide.xpm
-share/icewm/themes/warp3/maximize.xpm
-share/icewm/themes/warp3/minimize.xpm
-share/icewm/themes/warp3/restore.xpm
-share/icewm/themes/warp3/rolldown.xpm
-share/icewm/themes/warp3/rollup.xpm
-share/icewm/themes/warp4/close.xpm
-share/icewm/themes/warp4/default.theme
-share/icewm/themes/warp4/hide.xpm
-share/icewm/themes/warp4/maximize.xpm
-share/icewm/themes/warp4/minimize.xpm
-share/icewm/themes/warp4/restore.xpm
-share/icewm/themes/win95/close.xpm
-share/icewm/themes/win95/default.theme
-share/icewm/themes/win95/maximize.xpm
-share/icewm/themes/win95/minimize.xpm
-share/icewm/themes/win95/restore.xpm
-share/icewm/toolbar
-share/icewm/winoptions
+%%DATADIR%%/icons/app_16x16.xpm
+%%DATADIR%%/icons/app_32x32.xpm
+%%DATADIR%%/icons/bomb_16x16.xpm
+%%DATADIR%%/icons/bomb_32x32.xpm
+%%DATADIR%%/icons/communicator-abook_16x16.xpm
+%%DATADIR%%/icons/communicator-abook_32x32.xpm
+%%DATADIR%%/icons/communicator-browser_16x16.xpm
+%%DATADIR%%/icons/communicator-browser_32x32.xpm
+%%DATADIR%%/icons/communicator-composer_16x16.xpm
+%%DATADIR%%/icons/communicator-composer_32x32.xpm
+%%DATADIR%%/icons/communicator-discussion_16x16.xpm
+%%DATADIR%%/icons/communicator-discussion_32x32.xpm
+%%DATADIR%%/icons/communicator-mail_16x16.xpm
+%%DATADIR%%/icons/communicator-mail_32x32.xpm
+%%DATADIR%%/icons/emacs_16x16.xpm
+%%DATADIR%%/icons/emacs_32x32.xpm
+%%DATADIR%%/icons/file_16x16.xpm
+%%DATADIR%%/icons/file_32x32.xpm
+%%DATADIR%%/icons/folder_16x16.xpm
+%%DATADIR%%/icons/folder_32x32.xpm
+%%DATADIR%%/icons/fte_16x16.xpm
+%%DATADIR%%/icons/fte_32x32.xpm
+%%DATADIR%%/icons/gimp_16x16.xpm
+%%DATADIR%%/icons/gimp_32x32.xpm
+%%DATADIR%%/icons/gnome_16x16.xpm
+%%DATADIR%%/icons/java_16x16.xpm
+%%DATADIR%%/icons/java_32x32.xpm
+%%DATADIR%%/icons/kde_16x16.xpm
+%%DATADIR%%/icons/koules_16x16.xpm
+%%DATADIR%%/icons/koules_32x32.xpm
+%%DATADIR%%/icons/navigator_16x16.xpm
+%%DATADIR%%/icons/navigator_32x32.xpm
+%%DATADIR%%/icons/netscape_16x16.xpm
+%%DATADIR%%/icons/netscape_32x32.xpm
+%%DATADIR%%/icons/pdf_16x16.xpm
+%%DATADIR%%/icons/pdf_32x32.xpm
+%%DATADIR%%/icons/vim_16x16.xpm
+%%DATADIR%%/icons/vim_32x32.xpm
+%%DATADIR%%/icons/vim_48x48.xpm
+%%DATADIR%%/icons/xisp_16x16.xpm
+%%DATADIR%%/icons/xisp_32x32.xpm
+%%DATADIR%%/icons/xload_16x16.xpm
+%%DATADIR%%/icons/xload_32x32.xpm
+%%DATADIR%%/icons/xterm_16x16.xpm
+%%DATADIR%%/icons/xterm_32x32.xpm
+%%DATADIR%%/icons/xv_16x16.xpm
+%%DATADIR%%/icons/xv_32x32.xpm
+%%DATADIR%%/keys
+%%DATADIR%%/ledclock/a.xpm
+%%DATADIR%%/ledclock/colon.xpm
+%%DATADIR%%/ledclock/dot.xpm
+%%DATADIR%%/ledclock/m.xpm
+%%DATADIR%%/ledclock/n0.xpm
+%%DATADIR%%/ledclock/n1.xpm
+%%DATADIR%%/ledclock/n2.xpm
+%%DATADIR%%/ledclock/n3.xpm
+%%DATADIR%%/ledclock/n4.xpm
+%%DATADIR%%/ledclock/n5.xpm
+%%DATADIR%%/ledclock/n6.xpm
+%%DATADIR%%/ledclock/n7.xpm
+%%DATADIR%%/ledclock/n8.xpm
+%%DATADIR%%/ledclock/n9.xpm
+%%DATADIR%%/ledclock/p.xpm
+%%DATADIR%%/ledclock/percent.xpm
+%%DATADIR%%/ledclock/slash.xpm
+%%DATADIR%%/ledclock/space.xpm
+%%DATADIR%%/mailbox/errmail.xpm
+%%DATADIR%%/mailbox/mail.xpm
+%%DATADIR%%/mailbox/newmail.xpm
+%%DATADIR%%/mailbox/nomail.xpm
+%%DATADIR%%/mailbox/unreadmail.xpm
+%%DATADIR%%/menu
+%%DATADIR%%/preferences
+%%DATADIR%%/taskbar/bsd-daemon.xpm
+%%DATADIR%%/taskbar/debian.xpm
+%%DATADIR%%/taskbar/desktop.xpm
+%%DATADIR%%/taskbar/icewm.xpm
+%%DATADIR%%/taskbar/linux.xpm
+%%DATADIR%%/taskbar/linux1.xpm
+%%DATADIR%%/taskbar/linux2.xpm
+%%DATADIR%%/taskbar/linux20.xpm
+%%DATADIR%%/taskbar/start.xpm
+%%DATADIR%%/taskbar/windows.xpm
+%%DATADIR%%/taskbar/xfreeos2.xpm
+%%DATADIR%%/themes/Infadel2/Ergonomic.theme
+%%DATADIR%%/themes/Infadel2/Overloaded.theme
+%%DATADIR%%/themes/Infadel2/closeA.xpm
+%%DATADIR%%/themes/Infadel2/closeI.xpm
+%%DATADIR%%/themes/Infadel2/cursors/left.xpm
+%%DATADIR%%/themes/Infadel2/cursors/move.xpm
+%%DATADIR%%/themes/Infadel2/cursors/right.xpm
+%%DATADIR%%/themes/Infadel2/cursors/sizeB.xpm
+%%DATADIR%%/themes/Infadel2/cursors/sizeBL.xpm
+%%DATADIR%%/themes/Infadel2/cursors/sizeBR.xpm
+%%DATADIR%%/themes/Infadel2/cursors/sizeL.xpm
+%%DATADIR%%/themes/Infadel2/cursors/sizeR.xpm
+%%DATADIR%%/themes/Infadel2/cursors/sizeT.xpm
+%%DATADIR%%/themes/Infadel2/cursors/sizeTL.xpm
+%%DATADIR%%/themes/Infadel2/cursors/sizeTR.xpm
+%%DATADIR%%/themes/Infadel2/default.theme
+%%DATADIR%%/themes/Infadel2/depthA.xpm
+%%DATADIR%%/themes/Infadel2/depthI.xpm
+%%DATADIR%%/themes/Infadel2/fonts.dir
+%%DATADIR%%/themes/Infadel2/hideA.xpm
+%%DATADIR%%/themes/Infadel2/hideI.xpm
+%%DATADIR%%/themes/Infadel2/icons/app_16x16.xpm
+%%DATADIR%%/themes/Infadel2/icons/folder_16x16.xpm
+%%DATADIR%%/themes/Infadel2/icons/folder_32x32.xpm
+%%DATADIR%%/themes/Infadel2/mailbox/errmail.xpm
+%%DATADIR%%/themes/Infadel2/mailbox/mail.xpm
+%%DATADIR%%/themes/Infadel2/mailbox/newmail.xpm
+%%DATADIR%%/themes/Infadel2/mailbox/nomail.xpm
+%%DATADIR%%/themes/Infadel2/mailbox/unreadmail.xpm
+%%DATADIR%%/themes/Infadel2/maximizeA.xpm
+%%DATADIR%%/themes/Infadel2/maximizeI.xpm
+%%DATADIR%%/themes/Infadel2/menuButtonA.xpm
+%%DATADIR%%/themes/Infadel2/menuButtonI.xpm
+%%DATADIR%%/themes/Infadel2/minimizeA.xpm
+%%DATADIR%%/themes/Infadel2/minimizeI.xpm
+%%DATADIR%%/themes/Infadel2/restoreA.xpm
+%%DATADIR%%/themes/Infadel2/restoreI.xpm
+%%DATADIR%%/themes/Infadel2/rolldownA.xpm
+%%DATADIR%%/themes/Infadel2/rolldownI.xpm
+%%DATADIR%%/themes/Infadel2/rollupA.xpm
+%%DATADIR%%/themes/Infadel2/rollupI.xpm
+%%DATADIR%%/themes/Infadel2/snap.pcf
+%%DATADIR%%/themes/Infadel2/taskbar/linux.xpm
+%%DATADIR%%/themes/Infadel2/taskbar/windows.xpm
+%%DATADIR%%/themes/Infadel2/titleAB.xpm
+%%DATADIR%%/themes/Infadel2/titleAJ.xpm
+%%DATADIR%%/themes/Infadel2/titleAM.xpm
+%%DATADIR%%/themes/Infadel2/titleAP.xpm
+%%DATADIR%%/themes/Infadel2/titleAQ.xpm
+%%DATADIR%%/themes/Infadel2/titleAR.xpm
+%%DATADIR%%/themes/Infadel2/titleAS.xpm
+%%DATADIR%%/themes/Infadel2/titleAT.xpm
+%%DATADIR%%/themes/Infadel2/titleIB.xpm
+%%DATADIR%%/themes/Infadel2/titleIJ.xpm
+%%DATADIR%%/themes/Infadel2/titleIM.xpm
+%%DATADIR%%/themes/Infadel2/titleIP.xpm
+%%DATADIR%%/themes/Infadel2/titleIQ.xpm
+%%DATADIR%%/themes/Infadel2/titleIR.xpm
+%%DATADIR%%/themes/Infadel2/titleIS.xpm
+%%DATADIR%%/themes/Infadel2/titleIT.xpm
+%%DATADIR%%/themes/gtk2/closeA.xpm
+%%DATADIR%%/themes/gtk2/closeI.xpm
+%%DATADIR%%/themes/gtk2/default.theme
+%%DATADIR%%/themes/gtk2/maximizeA.xpm
+%%DATADIR%%/themes/gtk2/maximizeI.xpm
+%%DATADIR%%/themes/gtk2/menuButtonA.xpm
+%%DATADIR%%/themes/gtk2/menuButtonI.xpm
+%%DATADIR%%/themes/gtk2/minimizeA.xpm
+%%DATADIR%%/themes/gtk2/minimizeI.xpm
+%%DATADIR%%/themes/gtk2/restoreA.xpm
+%%DATADIR%%/themes/gtk2/restoreI.xpm
+%%DATADIR%%/themes/icedesert/closeA.xpm
+%%DATADIR%%/themes/icedesert/closeI.xpm
+%%DATADIR%%/themes/icedesert/closeO.xpm
+%%DATADIR%%/themes/icedesert/default.theme
+%%DATADIR%%/themes/icedesert/maximizeA.xpm
+%%DATADIR%%/themes/icedesert/maximizeI.xpm
+%%DATADIR%%/themes/icedesert/maximizeO.xpm
+%%DATADIR%%/themes/icedesert/menuButtonA.xpm
+%%DATADIR%%/themes/icedesert/menuButtonI.xpm
+%%DATADIR%%/themes/icedesert/menuButtonO.xpm
+%%DATADIR%%/themes/icedesert/minimizeA.xpm
+%%DATADIR%%/themes/icedesert/minimizeI.xpm
+%%DATADIR%%/themes/icedesert/minimizeO.xpm
+%%DATADIR%%/themes/icedesert/restoreA.xpm
+%%DATADIR%%/themes/icedesert/restoreI.xpm
+%%DATADIR%%/themes/icedesert/restoreO.xpm
+%%DATADIR%%/themes/icedesert/titleAB.xpm
+%%DATADIR%%/themes/icedesert/titleAT.xpm
+%%DATADIR%%/themes/icedesert/titleIB.xpm
+%%DATADIR%%/themes/icedesert/titleIT.xpm
+%%DATADIR%%/themes/metal2/closeA.xpm
+%%DATADIR%%/themes/metal2/closeI.xpm
+%%DATADIR%%/themes/metal2/default.theme
+%%DATADIR%%/themes/metal2/depthA.xpm
+%%DATADIR%%/themes/metal2/depthI.xpm
+%%DATADIR%%/themes/metal2/dframeAB.xpm
+%%DATADIR%%/themes/metal2/dframeABL.xpm
+%%DATADIR%%/themes/metal2/dframeABR.xpm
+%%DATADIR%%/themes/metal2/dframeAL.xpm
+%%DATADIR%%/themes/metal2/dframeAR.xpm
+%%DATADIR%%/themes/metal2/dframeAT.xpm
+%%DATADIR%%/themes/metal2/dframeATL.xpm
+%%DATADIR%%/themes/metal2/dframeATR.xpm
+%%DATADIR%%/themes/metal2/dframeIB.xpm
+%%DATADIR%%/themes/metal2/dframeIBL.xpm
+%%DATADIR%%/themes/metal2/dframeIBR.xpm
+%%DATADIR%%/themes/metal2/dframeIL.xpm
+%%DATADIR%%/themes/metal2/dframeIR.xpm
+%%DATADIR%%/themes/metal2/dframeIT.xpm
+%%DATADIR%%/themes/metal2/dframeITL.xpm
+%%DATADIR%%/themes/metal2/dframeITR.xpm
+%%DATADIR%%/themes/metal2/frameAB.xpm
+%%DATADIR%%/themes/metal2/frameABL.xpm
+%%DATADIR%%/themes/metal2/frameABR.xpm
+%%DATADIR%%/themes/metal2/frameAL.xpm
+%%DATADIR%%/themes/metal2/frameAR.xpm
+%%DATADIR%%/themes/metal2/frameAT.xpm
+%%DATADIR%%/themes/metal2/frameATL.xpm
+%%DATADIR%%/themes/metal2/frameATR.xpm
+%%DATADIR%%/themes/metal2/frameIB.xpm
+%%DATADIR%%/themes/metal2/frameIBL.xpm
+%%DATADIR%%/themes/metal2/frameIBR.xpm
+%%DATADIR%%/themes/metal2/frameIL.xpm
+%%DATADIR%%/themes/metal2/frameIR.xpm
+%%DATADIR%%/themes/metal2/frameIT.xpm
+%%DATADIR%%/themes/metal2/frameITL.xpm
+%%DATADIR%%/themes/metal2/frameITR.xpm
+%%DATADIR%%/themes/metal2/hideA.xpm
+%%DATADIR%%/themes/metal2/hideI.xpm
+%%DATADIR%%/themes/metal2/maximizeA.xpm
+%%DATADIR%%/themes/metal2/maximizeI.xpm
+%%DATADIR%%/themes/metal2/menuButtonA.xpm
+%%DATADIR%%/themes/metal2/menuButtonI.xpm
+%%DATADIR%%/themes/metal2/minimizeA.xpm
+%%DATADIR%%/themes/metal2/minimizeI.xpm
+%%DATADIR%%/themes/metal2/restoreA.xpm
+%%DATADIR%%/themes/metal2/restoreI.xpm
+%%DATADIR%%/themes/metal2/rolldownA.xpm
+%%DATADIR%%/themes/metal2/rolldownI.xpm
+%%DATADIR%%/themes/metal2/rollupA.xpm
+%%DATADIR%%/themes/metal2/rollupI.xpm
+%%DATADIR%%/themes/metal2/titleAB.xpm
+%%DATADIR%%/themes/metal2/titleAL.xpm
+%%DATADIR%%/themes/metal2/titleAM.xpm
+%%DATADIR%%/themes/metal2/titleAP.xpm
+%%DATADIR%%/themes/metal2/titleAR.xpm
+%%DATADIR%%/themes/metal2/titleAS.xpm
+%%DATADIR%%/themes/metal2/titleAT.xpm
+%%DATADIR%%/themes/metal2/titleIB.xpm
+%%DATADIR%%/themes/metal2/titleIL.xpm
+%%DATADIR%%/themes/metal2/titleIM.xpm
+%%DATADIR%%/themes/metal2/titleIP.xpm
+%%DATADIR%%/themes/metal2/titleIR.xpm
+%%DATADIR%%/themes/metal2/titleIS.xpm
+%%DATADIR%%/themes/metal2/titleIT.xpm
+%%DATADIR%%/themes/motif/close.xpm
+%%DATADIR%%/themes/motif/default.theme
+%%DATADIR%%/themes/motif/maximize.xpm
+%%DATADIR%%/themes/motif/menu.xpm
+%%DATADIR%%/themes/motif/minimize.xpm
+%%DATADIR%%/themes/motif/restore.xpm
+%%DATADIR%%/themes/nice/blue.theme
+%%DATADIR%%/themes/nice/close.xpm
+%%DATADIR%%/themes/nice/default.theme
+%%DATADIR%%/themes/nice/hide.xpm
+%%DATADIR%%/themes/nice/maximize.xpm
+%%DATADIR%%/themes/nice/minimize.xpm
+%%DATADIR%%/themes/nice/restore.xpm
+%%DATADIR%%/themes/nice/rolldown.xpm
+%%DATADIR%%/themes/nice/rollup.xpm
+%%DATADIR%%/themes/nice2/closeA.xpm
+%%DATADIR%%/themes/nice2/closeI.xpm
+%%DATADIR%%/themes/nice2/default.theme
+%%DATADIR%%/themes/nice2/maximizeA.xpm
+%%DATADIR%%/themes/nice2/maximizeI.xpm
+%%DATADIR%%/themes/nice2/menuButtonA.xpm
+%%DATADIR%%/themes/nice2/menuButtonI.xpm
+%%DATADIR%%/themes/nice2/minimizeA.xpm
+%%DATADIR%%/themes/nice2/minimizeI.xpm
+%%DATADIR%%/themes/nice2/restoreA.xpm
+%%DATADIR%%/themes/nice2/restoreI.xpm
+%%DATADIR%%/themes/nice2/titleAB.xpm
+%%DATADIR%%/themes/nice2/titleAT.xpm
+%%DATADIR%%/themes/nice2/titleIB.xpm
+%%DATADIR%%/themes/nice2/titleIT.xpm
+%%DATADIR%%/themes/warp3/close.xpm
+%%DATADIR%%/themes/warp3/default.theme
+%%DATADIR%%/themes/warp3/hide.xpm
+%%DATADIR%%/themes/warp3/maximize.xpm
+%%DATADIR%%/themes/warp3/minimize.xpm
+%%DATADIR%%/themes/warp3/restore.xpm
+%%DATADIR%%/themes/warp3/rolldown.xpm
+%%DATADIR%%/themes/warp3/rollup.xpm
+%%DATADIR%%/themes/warp4/close.xpm
+%%DATADIR%%/themes/warp4/default.theme
+%%DATADIR%%/themes/warp4/hide.xpm
+%%DATADIR%%/themes/warp4/maximize.xpm
+%%DATADIR%%/themes/warp4/minimize.xpm
+%%DATADIR%%/themes/warp4/restore.xpm
+%%DATADIR%%/themes/win95/close.xpm
+%%DATADIR%%/themes/win95/default.theme
+%%DATADIR%%/themes/win95/maximize.xpm
+%%DATADIR%%/themes/win95/minimize.xpm
+%%DATADIR%%/themes/win95/restore.xpm
+%%DATADIR%%/toolbar
+%%DATADIR%%/winoptions
 %%NLS%%share/locale/be/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/de/LC_MESSAGES/icewm.mo
+%%NLS%%share/locale/el/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/en/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/es/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/icewm.mo
@@ -341,27 +348,28 @@ share/icewm/winoptions
 %%NLS%%share/locale/ru/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/icewm.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/icewm.mo
 %%NLS%%share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
-@dirrm share/icewm/themes/win95
-@dirrm share/icewm/themes/warp4
-@dirrm share/icewm/themes/warp3
-@dirrm share/icewm/themes/nice2
-@dirrm share/icewm/themes/nice
-@dirrm share/icewm/themes/motif
-@dirrm share/icewm/themes/metal2
-@dirrm share/icewm/themes/icedesert
-@dirrm share/icewm/themes/gtk2
-@dirrm share/icewm/themes/Infadel2/taskbar
-@dirrm share/icewm/themes/Infadel2/mailbox
-@dirrm share/icewm/themes/Infadel2/icons
-@dirrm share/icewm/themes/Infadel2/cursors
-@dirrm share/icewm/themes/Infadel2
-@dirrm share/icewm/themes
-@dirrm share/icewm/taskbar
-@dirrm share/icewm/mailbox
-@dirrm share/icewm/ledclock
-@dirrm share/icewm/icons
-@dirrm share/icewm
+@dirrm %%DATADIR%%/themes/win95
+@dirrm %%DATADIR%%/themes/warp4
+@dirrm %%DATADIR%%/themes/warp3
+@dirrm %%DATADIR%%/themes/nice2
+@dirrm %%DATADIR%%/themes/nice
+@dirrm %%DATADIR%%/themes/motif
+@dirrm %%DATADIR%%/themes/metal2
+@dirrm %%DATADIR%%/themes/icedesert
+@dirrm %%DATADIR%%/themes/gtk2
+@dirrm %%DATADIR%%/themes/Infadel2/taskbar
+@dirrm %%DATADIR%%/themes/Infadel2/mailbox
+@dirrm %%DATADIR%%/themes/Infadel2/icons
+@dirrm %%DATADIR%%/themes/Infadel2/cursors
+@dirrm %%DATADIR%%/themes/Infadel2
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/taskbar
+@dirrm %%DATADIR%%/mailbox
+@dirrm %%DATADIR%%/ledclock
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%