Upgrade to 1.0.8-6.

6 files changed, 44 insertions, 34 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 4be6ba0f35cc..85cb4fd569fd 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTVERSION=	1.0.8
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-7
+DISTNAME=	${PORTNAME}-${PORTVERSION}-6
 
 MAINTAINER=	nakai@FreeBSD.org
 
@@ -19,6 +18,7 @@ LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 WANT_GNOME=	yes
+WANT_ESOUND=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 719a70d121ce..d3bac00f31ee 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-1.0.7-7.tar.bz2) = 9818345ffc5f7cf7ba2a8ba1d979bb2a
+MD5 (icewm-1.0.8-6.tar.bz2) = 28c3d8336eedee3fe73ce57265bfbc2e
diff --git a/x11-wm/icewm/files/patch-ai b/x11-wm/icewm/files/patch-ai
index 21c7ff357ea5..48638e3dca3a 100644
--- a/x11-wm/icewm/files/patch-ai
+++ b/x11-wm/icewm/files/patch-ai
@@ -1,6 +1,6 @@
---- src/wmtaskbar.cc.orig	Mon Jan 15 06:49:41 2001
-+++ src/wmtaskbar.cc	Mon Jan 15 22:18:04 2001
-@@ -47,6 +47,12 @@
+--- 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;
  
@@ -11,21 +11,17 @@
 +#endif
 +
  static void initPixmaps() {
-     static const char *home = getenv("HOME");
-     const char *base = 0;
-@@ -74,9 +80,9 @@
- 
- /** Use Linux 2.0 Penguin as start button */
  #ifndef START_PIXMAP
 -#define START_PIXMAP "linux.xpm"
-+//#define START_PIXMAP "linux.xpm"
- //#define START_PIXMAP "debian.xpm"
--//#define START_PIXMAP "bsd-daemon.xpm"
 +#define START_PIXMAP "bsd-daemon.xpm"
- //#define START_PIXMAP "start.xpm"
- //#define START_PIXMAP "xfree86os2.xpm"
- #endif
-@@ -256,7 +262,7 @@
+ /*
+ #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 @@
      } else
          fClock = 0;
  #ifdef CONFIG_APPLET_APM
diff --git a/x11-wm/icewm/files/patch-configure.in b/x11-wm/icewm/files/patch-configure.in
index 6b868e9f5d70..9788b24300a1 100644
--- a/x11-wm/icewm/files/patch-configure.in
+++ b/x11-wm/icewm/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Sat Mar 17 05:17:36 2001
-+++ configure.in	Sat Mar 17 09:52:27 2001
-@@ -66,7 +66,7 @@
+--- configure.in.orig	Fri Apr 27 09:32:21 2001
++++ configure.in	Tue May  1 06:18:24 2001
+@@ -75,7 +75,7 @@
  AC_FUNC_SELECT_ARGTYPES
  
  dnl Configuring features
@@ -9,7 +9,7 @@
  
  dnl Checking for X11
  AC_PATH_XTRA
-@@ -103,7 +103,7 @@
+@@ -116,7 +116,7 @@
    AC_DEFINE(ENABLE_NLS, 1, [Define to enable internationalized message])
    TARGETS=$TARGETS' nls'
  
@@ -18,12 +18,12 @@
  fi
  
  dnl ============================================================= GUI Events ===
-@@ -245,7 +245,7 @@
+@@ -284,7 +284,7 @@
  
  	AC_DEFINE(GNOME, 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])
+-	AC_MSG_ERROR([gnome-config can not be found.
++	AC_MSG_WARN([gnome-config can not be found.
+ *** Install the GNOME´s development packages or use the argument of the
+ *** --with-gnome-menus switch to pass gnome-config´s location.])
        fi
-     fi ])
- 
diff --git a/x11-wm/icewm/files/patch-src_Makefile b/x11-wm/icewm/files/patch-src_Makefile
index 1ee796389e54..c70a52c83f6e 100644
--- a/x11-wm/icewm/files/patch-src_Makefile
+++ b/x11-wm/icewm/files/patch-src_Makefile
@@ -1,12 +1,12 @@
---- src/Makefile.orig	Sat Mar 17 05:17:37 2001
-+++ src/Makefile	Sat Mar 17 19:09:15 2001
-@@ -14,9 +14,9 @@
- 	-DPACKAGE='"icewm"' \
- 	-DVERSION='"$(VERSION)"' \
+--- src/Makefile.orig	Fri Apr 27 09:32:22 2001
++++ src/Makefile	Tue May  1 06:19:51 2001
+@@ -17,9 +17,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)/doc/icewm.html"' \
+-	-DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' \
 +	-DICEWMEXE='"icewm$(EXEEXT)"' \
 +	-DICEHELPEXE='"icehelp$(EXEEXT)"' \
 +	-DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"' \
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index adde910bcf89..c610aa3ed66d 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -106,6 +106,7 @@ 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/default.theme
@@ -125,6 +126,7 @@ 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/titleAB.xpm
 share/icewm/themes/Infadel2/titleAJ.xpm
 share/icewm/themes/Infadel2/titleAM.xpm
@@ -141,6 +143,17 @@ 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/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/icons/app_16x16.xpm
 share/icewm/themes/Infadel2/icons/folder_16x16.xpm
 share/icewm/themes/Infadel2/icons/folder_32x32.xpm
@@ -282,6 +295,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
 @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