Upgrade to 1.2.7

PR:		ports/51065
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

17 files changed, 124 insertions, 326 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index b1354071cb9e..775f5ca556d6 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.2.0
+PORTVERSION=	1.2.7
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,17 +14,16 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	nakai@FreeBSD.org
 COMMENT=	Window Manager designed for speed, usability and consistency
 
-BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-i18n --enable-nls \
+USE_AUTOCONF_VER=	253
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ARGS=	--disable-xfreetype \
 		--with-cfgdir=${PREFIX}/share/icewm \
 		--with-libdir=${PREFIX}/share/icewm \
 		--with-kdedatadir=${LOCALBASE}/share \
@@ -40,6 +39,7 @@ CONFIGURE_ARGS+=	--with-imlib --without-xpm --with-gnome-menus \
 			--enable-guievents --with-icesound=esound
 INSTALL_TARGET=		install install-gnome
 PLIST_SUB+=	ESOUND=""
+PKGNAMESUFFIX=	-gnome
 .else
 USE_XPM=	yes
 CONFIGURE_ARGS+=	--without-imlib --with-xpm --without-gnome-menus
@@ -52,9 +52,6 @@ PLIST_SUB+=	ESOUND="@comment "
 .endif
 .endif
 
-pre-configure:
-	@cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/autoconf
-
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${DATADIR}/taskbar
 .if !defined(NOPORTDOCS)
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 0fce647ba6b8..9d7ccbeb4aca 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-1.2.0.tar.gz) = 0972000f4f0569c34ff03c8db200d396
+MD5 (icewm-1.2.7.tar.gz) = b2423bdcf841a552d8c60a03858a1116
diff --git a/x11-wm/icewm/files/patch-aa b/x11-wm/icewm/files/patch-aa
deleted file mode 100644
index 80690ba1275f..000000000000
--- a/x11-wm/icewm/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	Wed Jun 12 13:56:52 2002
-+++ Makefile.in	Wed Jun 12 21:46:20 2002
-@@ -19,7 +19,7 @@
- 
- GNOMEFILES  = lib/IceWM.desktop
- 
--WMPROPDIR   = $(shell gnome-config --datadir)/gnome/wm-properties/
-+WMPROPDIR   = $(shell gnome-config --datadir)/wm-properties/
- 
- all:		@TARGETS@
- install:	@TARGETS_INSTALL@
-@@ -111,7 +111,7 @@
- 		  echo "         $(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \
- 		  echo "         You better setup your path to point to mkfontdir or use the"; \
- 		  echo "         --with-mkfontdir option of the configure script."; \
--		  $(INSTALLLIB) "$(DESTDIR)/lib/themes/$$theme/fonts.dir.default" \
-+		  $(INSTALLLIB) "lib/themes/$$theme/fonts.dir.default" \
- 				"$(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \
- 		fi; \
- 	    fi; \
diff --git a/x11-wm/icewm/files/patch-ab b/x11-wm/icewm/files/patch-ab
deleted file mode 100644
index 16a33b666d77..000000000000
--- a/x11-wm/icewm/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- install.in.orig	Mon Jan 15 06:49:39 2001
-+++ install.in	Mon Jan 15 22:18:04 2001
-@@ -13,7 +13,7 @@
- DOCDIR	    = @docdir@
- 
- INSTALL     = @INSTALL@
--INSTALLDIR  = @INSTALL@ -m 755 -d
-+INSTALLDIR  = mkdir -p
- INSTALLBIN  = @INSTALL_PROGRAM@
- INSTALLLIB  = @INSTALL_DATA@
- #INSTALLETC  = @INSTALL_DATA@
diff --git a/x11-wm/icewm/files/patch-ai b/x11-wm/icewm/files/patch-ai
index e2358ab5e99e..baa4bd8a3369 100644
--- a/x11-wm/icewm/files/patch-ai
+++ b/x11-wm/icewm/files/patch-ai
@@ -1,47 +1,16 @@
---- src/wmtaskbar.cc.orig	Tue Oct  9 23:54:04 2001
-+++ src/wmtaskbar.cc	Wed Feb 20 20:17:52 2002
-@@ -66,7 +66,7 @@
+--- src/wmtaskbar.cc.orig	Mon Jan 20 00:43:27 2003
++++ src/wmtaskbar.cc	Wed Jan 22 03:08:53 2003
+@@ -67,10 +67,12 @@
  #endif
  
  #ifndef START_PIXMAP
 -#define START_PIXMAP "linux.xpm"
-+#define START_PIXMAP "bsd-daemon.xpm"
  /*
++#define START_PIXMAP "linux.xpm"
  #define START_PIXMAP "debian.xpm"
++*/
  #define START_PIXMAP "bsd-daemon.xpm"
-@@ -253,7 +253,7 @@
-     fAddressBar = 0;
- 
- #ifdef CONFIG_APPLET_CPU_STATUS
--#if (defined(linux) || defined(HAVE_KSTAT_H))
-+#if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(__FreeBSD__)
-     if (taskBarShowCPUStatus)
-         fCPUStatus = new CPUStatus(this);
-     else
-@@ -287,7 +287,7 @@
-     } else
-         fClock = 0;
- #ifdef CONFIG_APPLET_APM
--    if (taskBarShowApm && access("/proc/apm", 0) == 0) {
-+    if (taskBarShowApm && access(APMDEV, 0) == 0) {
-         fApm = new YApm(this);
-         if (fApm->height() + ADD1 > ht) ht = fApm->height() + ADD1;
-     } else
-@@ -400,7 +400,7 @@
- 	    }
- #endif
- #ifdef CONFIG_APPLET_CPU_STATUS
--#if (defined(linux) || defined(HAVE_KSTAT_H))
-+#if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(__FreeBSD__)
-         if (fCPUStatus) {
-             fCPUStatus->setPosition(rightX - fCPUStatus->width() - 1,
-                                     BASE1 + (ht - ADD1 - fCPUStatus->height()) / 2);
-@@ -497,7 +497,7 @@
-             }
- #endif
- #ifdef CONFIG_APPLET_CPU_STATUS
--#if (defined(linux) || defined(HAVE_KSTAT_H))
-+#if (defined(linux) || defined(HAVE_KSTAT_H)) || defined(__FreeBSD__)
-         if (fCPUStatus) {
-             fCPUStatus->setPosition(rightX - fCPUStatus->width() - 1,
-                                     BASE1 + (ht - ADD1 - fCPUStatus->height()) / 2);
++/*
+ #define START_PIXMAP "start.xpm"
+ #define START_PIXMAP "xfree86os2.xpm"
+ */
diff --git a/x11-wm/icewm/files/patch-aj b/x11-wm/icewm/files/patch-aj
deleted file mode 100644
index 42e56d9b58c2..000000000000
--- a/x11-wm/icewm/files/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/ysocket.h.orig	Mon Jan 15 06:49:41 2001
-+++ src/ysocket.h	Mon Jan 15 22:18:05 2001
-@@ -2,6 +2,9 @@
- #define YSOCKET_H_
- 
- #include <sys/types.h>
-+#ifdef __FreeBSD__
-+#include <db.h>
-+#endif
- #include <netinet/in.h>
- 
- class YSocketListener {
diff --git a/x11-wm/icewm/files/patch-ak b/x11-wm/icewm/files/patch-ak
index d678ae2be492..016a4048d9d7 100644
--- a/x11-wm/icewm/files/patch-ak
+++ b/x11-wm/icewm/files/patch-ak
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/aapm.cc.orig	Sat Jan  4 01:25:45 2003
++++ src/aapm.cc	Mon Jan  6 19:00:50 2003
+@@ -26,6 +26,13 @@
  #include <string.h>
  #include <stdio.h>
  
@@ -11,24 +11,24 @@
 +#include <machine/apm_bios.h>
 +#endif
 +
- #ifdef CONFIG_APPLET_APM
- 
  YColor *YApm::apmBg = 0;
-@@ -32,8 +39,12 @@
- extern YPixmap *taskbackPixmap;
+ YColor *YApm::apmFg = 0;
+ YFont *YApm::apmFont = 0;
+@@ -47,8 +54,12 @@
+ 
  
  void ApmStr(char *s, bool Tool) {
 +#ifdef __FreeBSD__
 +    struct apm_info ai;
 +#else
-     char buf[45];
+     char buf[80];
 -    int len, i, fd = open("/proc/apm", O_RDONLY);
 +#endif
 +    int len, i, fd = open(APMDEV, O_RDONLY);
      char driver[16];
      char apmver[16];
      int apmflags;
-@@ -45,9 +56,27 @@
+@@ -60,9 +71,27 @@
      char units[16];
  
      if (fd == -1) {
@@ -57,7 +57,7 @@
      len = read(fd, buf, sizeof(buf) - 1);
      close(fd);
  
-@@ -61,10 +90,11 @@
+@@ -76,10 +105,11 @@
          static int error = 1;
          if (error) {
              error = 0;
diff --git a/x11-wm/icewm/files/patch-an b/x11-wm/icewm/files/patch-an
deleted file mode 100644
index 119083e60b6c..000000000000
--- a/x11-wm/icewm/files/patch-an
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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-ap b/x11-wm/icewm/files/patch-ap
deleted file mode 100644
index 043e5d06096d..000000000000
--- a/x11-wm/icewm/files/patch-ap
+++ /dev/null
@@ -1,19 +0,0 @@
---- aclocal.m4.orig	Tue Oct  9 23:54:02 2001
-+++ aclocal.m4	Sat Mar 23 13:46:01 2002
-@@ -103,11 +103,15 @@
- dnl
- AC_DEFUN(ICE_CHECK_CONVERSION, [
-   AC_MSG_CHECKING([whether iconv converts from $1 to $2])
-+  LIBS="-liconv $LIBS"
-   AC_TRY_RUN([
-     #include <iconv.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-as b/x11-wm/icewm/files/patch-as
deleted file mode 100644
index bbbc3312bbae..000000000000
--- a/x11-wm/icewm/files/patch-as
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/wmtaskbar.h.orig	Wed Feb 20 20:18:07 2002
-+++ src/wmtaskbar.h	Wed Feb 20 20:18:28 2002
-@@ -15,7 +15,7 @@
- #define ADD2 5
- 
- class ObjectBar;
--#if (defined(linux)||defined(HAVE_KSTAT_H))
-+#if (defined(linux)||defined(HAVE_KSTAT_H)) || defined(__FreeBSD__)
- class CPUStatus;
- #endif
- #ifdef HAVE_NET_STATUS
-@@ -90,7 +90,7 @@
-     MailBoxStatus **fMailBoxStatus;
- #endif
- #ifdef CONFIG_APPLET_CPU_STATUS
--#if (defined(linux)||defined(HAVE_KSTAT_H))
-+#if (defined(linux)||defined(HAVE_KSTAT_H)) || defined(__FreeBSD__)
-     CPUStatus *fCPUStatus;
- #endif
- #endif
diff --git a/x11-wm/icewm/files/patch-au b/x11-wm/icewm/files/patch-au
index 7842944dcf63..bbee4e712182 100644
--- a/x11-wm/icewm/files/patch-au
+++ b/x11-wm/icewm/files/patch-au
@@ -1,10 +1,10 @@
---- src/acpustatus.h.orig	Wed Feb 20 20:11:52 2002
-+++ src/acpustatus.h	Wed Feb 20 20:14:16 2002
+--- 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)
 +#if (defined(linux) || defined(HAVE_KSTAT_H)) || defined (__FreeBSD__)
  
  #ifdef HAVE_KSTAT_H
@@ -40,5 +40,5 @@
 +    kvm_t *kd;
 +#endif
  };
- 
- #endif
+ #else
+ #undef CONFIG_APPLET_CPU_STATUS
diff --git a/x11-wm/icewm/files/patch-aw b/x11-wm/icewm/files/patch-aw
index 2d1adcd7b723..750c25ddb965 100644
--- a/x11-wm/icewm/files/patch-aw
+++ b/x11-wm/icewm/files/patch-aw
@@ -1,35 +1,7 @@
---- src/wmapp.cc.orig	Tue Oct  9 23:54:03 2001
-+++ src/wmapp.cc	Wed Feb 20 20:55:39 2002
-@@ -220,10 +220,10 @@
- 	    char ** fontPath(XGetFontPath(app->display(), &ndirs));
- 
- 	    char ** newFontPath = new char *[ndirs + 1];
--	    newFontPath[0] = fontsdir;
-+	    newFontPath[ndirs] = fontsdir;
- 
- 	    if (fontPath)
--		memcpy(newFontPath + 1, fontPath, ndirs * sizeof (char *));
-+		memcpy(newFontPath, fontPath, ndirs * sizeof (char *));
- 	    else
- 		warn(_("Unable to get current font path."));
- 
-@@ -245,11 +245,10 @@
- 				   (unsigned char **) &icewmFontPath) ==
- 				   Success && icewmFontPath) {
- 		if (r_type == XA_STRING && r_format == 8) {
--		    for (int n(ndirs); n > 0; --n) // ---- remove death paths ---
-+		    for (int n(ndirs-1); n > 0; --n) // ---- remove death paths ---
- 			if (!strcmp(icewmFontPath, newFontPath[n])) {
--			    if (n != ndirs)
--				memmove(newFontPath + n, newFontPath + n + 1,
--					(ndirs - n) * sizeof(char *));
-+			    memmove(newFontPath + n, newFontPath + n + 1,
-+				(ndirs - n) * sizeof(char *));
- 			    --ndirs;
- 			}
- 		} else
-@@ -1308,6 +1307,9 @@
- }
+--- 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__
diff --git a/x11-wm/icewm/files/patch-configure.in b/x11-wm/icewm/files/patch-configure.in
index 1786562250c5..d5e97b5b37eb 100644
--- a/x11-wm/icewm/files/patch-configure.in
+++ b/x11-wm/icewm/files/patch-configure.in
@@ -1,70 +1,42 @@
---- configure.in.orig	Mon Jul  1 01:05:18 2002
-+++ configure.in	Tue Jul 30 22:52:43 2002
-@@ -108,15 +108,15 @@
- AC_ARG_ENABLE(i18n,
-   [  --enable-i18n           Enable internationalization],
-   [ if test "$enable_i18n" != "no"; then
--      AC_CHECK_HEADERS(langinfo.h,,
+--- configure.in.orig	Sat Jan  4 01:25:44 2003
++++ configure.in	Mon Jan  6 19:03:51 2003
+@@ -130,10 +130,10 @@
+   [  --disable-i18n          Disable 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_WARN([I18N support has been requested but langinfo.h wasn´t found.
+ *** Check your system configuration.])])
+       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,
-@@ -124,12 +124,12 @@
-       ICE_CHECK_NL_ITEM(CODESET,
++      [ AC_MSG_WARN([I18N support has been requested but nl_langinfo wasn´t found.
+ *** Check your system configuration.])])
+ 
+       ice_nl_codesets=""
+@@ -146,7 +146,7 @@
          [ ice_nl_codesets="${ice_nl_codesets} CODESET," ])
  
--      if test "${ice_nl_codesets}" = ""; then
+       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.])
--      fi
-+dnl      if test "${ice_nl_codesets}" = ""; then
-+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.])
-+dnl      fi
-       
-       ice_nl_codesets="${ice_nl_codesets} 0"
-       AC_DEFINE_UNQUOTED(CONFIG_NL_CODESETS, ${ice_nl_codesets})
-@@ -164,7 +164,7 @@
-         [  --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 +203,7 @@
-   features="${features} nls"
-   TARGETS=$TARGETS' nls'
++        AC_MSG_WARN([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.])
+@@ -277,7 +277,7 @@
+   AC_SUBST(NLS_POXFILES)
+   AC_SUBST(NLS_MOFILES)
  
 -  localedir='${datadir}/locale'
 +  localedir='${prefix}/share/locale'
  fi
  
- dnl ======================================================= /proc/wm-session ===
-@@ -464,7 +464,7 @@
- 
+ dnl ================================================ Features of the XServer ===
+@@ -582,9 +582,9 @@
  	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
+ 
+ 	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome1"
+-        GWMDIR="`${GNOME_CONFIG} --datadir`/gnome/wm-properties/"
++        GWMDIR="`${GNOME_CONFIG} --datadir`/wm-properties/"
        else
 -	AC_MSG_ERROR([gnome-config can not be found.
 +	AC_MSG_WARN([gnome-config can not be found.
diff --git a/x11-wm/icewm/files/patch-src_Makefile b/x11-wm/icewm/files/patch-src_Makefile
deleted file mode 100644
index 29a0eddc79c2..000000000000
--- a/x11-wm/icewm/files/patch-src_Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/Makefile.orig	Tue Oct  9 23:54:03 2001
-+++ src/Makefile	Wed Feb 20 19:54:01 2002
-@@ -18,9 +18,9 @@
- 	-DHOSTOS='"$(shell uname -s || echo unknown)"' \
- 	-DHOSTCPU='"$(shell uname -m || echo unknown)"' \
- 	-DEXEEXT='"$(EXEEXT)"' \
--	-DICEWMEXE='"icewm"EXEEXT' \
--	-DICEHELPEXE='"icehelp"EXEEXT' \
--	-DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' \
-+	-DICEWMEXE='"icewm$(EXEEXT)"' \
-+	-DICEHELPEXE='"icehelp$(EXEEXT)"' \
-+	-DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"' \
-         $(SYS_CFLAGS) $(SYS_INCDIRS)
- LFLAGS = $(SYS_LIBDIRS) 
- LIBS = $(SYS_LIBS)
-@@ -37,7 +37,7 @@
- 	genpref.o
- 
- icewm_LIBS = \
--	$(CORE_LIBS) $(IMAGE_LIBS) $(GNOME_LIBS)
-+	$(CORE_LIBS) $(IMAGE_LIBS) $(GNOME_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_wmprog.cc b/x11-wm/icewm/files/patch-src_wmprog.cc
deleted file mode 100644
index 6cbd0492dade..000000000000
--- a/x11-wm/icewm/files/patch-src_wmprog.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/wmprog.cc.orig	Mon Jan 15 06:49:41 2001
-+++ src/wmprog.cc	Mon Jan 15 22:18:07 2001
-@@ -474,7 +474,7 @@
- 
- #ifdef GNOME
-     if (autoReloadMenus) {
--        char *gnomeAppsMenu = gnome_datadir_file("gnome/apps/");
-+        char *gnomeAppsMenu = gnome_datadir_file("apps/");
-         char *gnomeUserMenu = gnome_util_home_file("apps/");
-         const char *kdeMenu = strJoin(kdeDataDir, "/applnk", 0);
- 
-@@ -535,7 +535,7 @@
-         YIcon *gnomeicon = 0;
-         YIcon *kdeicon = 0;
- 
--        char *gnomeAppsMenu = gnome_datadir_file("gnome/apps/");
-+        char *gnomeAppsMenu = gnome_datadir_file("apps/");
-         char *gnomeUserMenu = gnome_util_home_file("apps/");
-         const char *kdeMenu = strJoin(kdeDataDir, "/applnk", 0);
diff --git a/x11-wm/icewm/files/patch-sysdep.in b/x11-wm/icewm/files/patch-sysdep.in
deleted file mode 100644
index 39ada837e28e..000000000000
--- a/x11-wm/icewm/files/patch-sysdep.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- sysdep.in.orig	Tue Oct  9 23:54:02 2001
-+++ sysdep.in	Sat Mar 23 15:48:48 2002
-@@ -4,8 +4,8 @@
- SYS_CFLAGS = \
- 	@DEBUG@ @CXXFLAGS@ @DEFS@ \
- 	@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ @GNOME_CFLAGS@
--SYS_INCDIRS =
--SYS_LIBDIRS =
-+SYS_INCDIRS = @CPPFLAGS@
-+SYS_LIBDIRS = @LDFLAGS@
- SYS_LIBS = @LIBS@
- 
- CORE_LIBS = @CORE_LIBS@
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index a9e6ce818f74..857e64e478f2 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -1,8 +1,8 @@
-bin/genpref
 bin/icehelp
-%%ESOUND%%bin/icesound
 bin/icesh
+%%ESOUND%%bin/icesound
 bin/icewm
+%%GNOME:%%bin/icewm-menu-gnome1
 bin/icewmbg
 bin/icewmhint
 %%PORTDOCS%%share/doc/icewm/CHANGES
@@ -18,6 +18,8 @@ bin/icewmhint
 %%PORTDOCS%%share/doc/icewm/icewm-14.html
 %%PORTDOCS%%share/doc/icewm/icewm-15.html
 %%PORTDOCS%%share/doc/icewm/icewm-16.html
+%%PORTDOCS%%share/doc/icewm/icewm-17.html
+%%PORTDOCS%%share/doc/icewm/icewm-18.html
 %%PORTDOCS%%share/doc/icewm/icewm-2.html
 %%PORTDOCS%%share/doc/icewm/icewm-3.html
 %%PORTDOCS%%share/doc/icewm/icewm-4.html
@@ -42,6 +44,8 @@ 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
@@ -50,8 +54,6 @@ 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/gimp_hi_16x16.xpm
-share/icewm/icons/gimp_hi_32x32.xpm
 share/icewm/icons/gnome_16x16.xpm
 share/icewm/icons/java_16x16.xpm
 share/icewm/icons/java_32x32.xpm
@@ -91,6 +93,7 @@ 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
@@ -100,6 +103,7 @@ share/icewm/mailbox/nomail.xpm
 share/icewm/mailbox/unreadmail.xpm
 share/icewm/menu
 share/icewm/preferences
+share/icewm/programs
 share/icewm/taskbar/bsd-daemon.xpm
 share/icewm/taskbar/debian.xpm
 share/icewm/taskbar/icewm.xpm
@@ -181,6 +185,21 @@ 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
@@ -261,6 +280,21 @@ 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
@@ -282,6 +316,7 @@ share/icewm/themes/win95/minimize.xpm
 share/icewm/themes/win95/restore.xpm
 share/icewm/toolbar
 share/icewm/winoptions
+share/locale/be/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
@@ -294,29 +329,35 @@ share/locale/hu/LC_MESSAGES/icewm.mo
 share/locale/it/LC_MESSAGES/icewm.mo
 share/locale/ja/LC_MESSAGES/icewm.mo
 share/locale/lt/LC_MESSAGES/icewm.mo
+share/locale/nl/LC_MESSAGES/icewm.mo
+share/locale/no/LC_MESSAGES/icewm.mo
 share/locale/pl/LC_MESSAGES/icewm.mo
 share/locale/pt_BR/LC_MESSAGES/icewm.mo
 share/locale/ro/LC_MESSAGES/icewm.mo
 share/locale/ru/LC_MESSAGES/icewm.mo
+share/locale/sl/LC_MESSAGES/icewm.mo
 share/locale/sv/LC_MESSAGES/icewm.mo
+share/locale/uk/LC_MESSAGES/icewm.mo
 share/locale/zh_CN.gb2312/LC_MESSAGES/icewm.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
-%%PORTDOCS%%@dirrm share/doc/icewm
-@dirrm share/icewm/icons
-@dirrm share/icewm/ledclock
-@dirrm share/icewm/mailbox
-@dirrm share/icewm/taskbar
-@dirrm share/icewm/themes/Infadel2/cursors
-@dirrm share/icewm/themes/Infadel2/icons
-@dirrm share/icewm/themes/Infadel2/mailbox
+@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/gtk2
-@dirrm share/icewm/themes/metal2
-@dirrm share/icewm/themes/motif
-@dirrm share/icewm/themes/nice
-@dirrm share/icewm/themes/warp3
-@dirrm share/icewm/themes/warp4
-@dirrm share/icewm/themes/win95
 @dirrm share/icewm/themes
+@dirrm share/icewm/taskbar
+@dirrm share/icewm/mailbox
+@dirrm share/icewm/ledclock
+@dirrm share/icewm/icons
 @dirrm share/icewm
+%%PORTDOCS%%@dirrm share/doc/icewm