6 files changed, 56 insertions, 57 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index eaf2a0085870..704ce1772570 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,22 +6,19 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.0.9.2
+PORTVERSION=	1.2.0
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
 
 MAINTAINER=	nakai@FreeBSD.org
 
 BUILD_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf
 LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-WANT_GNOME=	yes
-WANT_ESOUND=	yes
-USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+WANT_ESOUND=	yes
+WANT_GNOME=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
@@ -37,14 +34,15 @@ CONFIGURE_ARGS=	--enable-i18n --enable-nls \
 .include <bsd.port.pre.mk>
 
 .if defined(HAVE_GNOME)
+.undef HAVE_ESOUND
 USE_GNOME=	yes
-CONFIGURE_ARGS+=	--with-imlib --without-xpm --with-gnome-menus
+CONFIGURE_ARGS+=	--with-imlib --without-xpm --with-gnome-menus \
+			--enable-guievents --with-icesound=esound
 INSTALL_TARGET=		install install-gnome
+PLIST_SUB+=	ESOUND=""
 .else
 USE_XPM=	yes
 CONFIGURE_ARGS+=	--without-imlib --with-xpm --without-gnome-menus
-.endif
-
 .if defined(HAVE_ESOUND)
 USE_ESOUND=	yes
 CONFIGURE_ARGS+=	--enable-guievents --with-icesound=esound
@@ -52,8 +50,9 @@ PLIST_SUB+=	ESOUND=""
 .else
 PLIST_SUB+=	ESOUND="@comment "
 .endif
+.endif
 
-post-patch:
+pre-configure:
 	@cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/autoconf
 
 post-install:
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index b970f67962e9..0fce647ba6b8 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-1.0.9-2.tar.bz2) = b52444c9f2854f364eeee553c0790003
+MD5 (icewm-1.2.0.tar.gz) = 0972000f4f0569c34ff03c8db200d396
diff --git a/x11-wm/icewm/files/patch-aa b/x11-wm/icewm/files/patch-aa
index fab7b5ab0c89..80690ba1275f 100644
--- a/x11-wm/icewm/files/patch-aa
+++ b/x11-wm/icewm/files/patch-aa
@@ -1,7 +1,7 @@
---- Makefile.in.orig	Mon Jan 15 06:49:38 2001
-+++ Makefile.in	Mon Jan 15 23:07:09 2001
-@@ -14,7 +14,7 @@
- GUIEVENTSFILES = src/icesound
+--- 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/
@@ -9,3 +9,12 @@
  
  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-av b/x11-wm/icewm/files/patch-av
index f32d2db48aeb..5167594e4e3c 100644
--- a/x11-wm/icewm/files/patch-av
+++ b/x11-wm/icewm/files/patch-av
@@ -1,18 +1,18 @@
---- src/default.h.orig	Wed Feb 20 20:14:24 2002
-+++ src/default.h	Wed Feb 20 20:16:04 2002
+--- 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")
+ 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"),
+     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-configure.in b/x11-wm/icewm/files/patch-configure.in
index 2052fcefd97f..8bd54589f9cf 100644
--- a/x11-wm/icewm/files/patch-configure.in
+++ b/x11-wm/icewm/files/patch-configure.in
@@ -1,15 +1,6 @@
---- configure.in.orig	Tue Oct  9 23:54:02 2001
-+++ configure.in	Sat May 25 05:50:23 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
-@@ -108,27 +108,28 @@
+--- configure.in.orig	Fri Jul 26 19:06:25 2002
++++ configure.in	Fri Jul 26 19:09:33 2002
+@@ -108,15 +108,15 @@
  AC_ARG_ENABLE(i18n,
    [  --enable-i18n           Enable internationalization],
    [ if test "$enable_i18n" != "no"; then
@@ -22,37 +13,34 @@
 -
 -      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       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       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
++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,
+@@ -125,10 +125,10 @@
          [ 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         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"
-@@ -164,7 +165,7 @@
+@@ -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"),
@@ -61,7 +49,7 @@
  
        ice_sufficent_iconv=no
        ICE_CHECK_CONVERSION(ISO-8859-1,$with_unicode_set,no,$ice_libiconv,
-@@ -203,7 +204,7 @@
+@@ -203,7 +203,7 @@
    features="${features} nls"
    TARGETS=$TARGETS' nls'
  
@@ -70,7 +58,7 @@
  fi
  
  dnl ======================================================= /proc/wm-session ===
-@@ -464,7 +465,7 @@
+@@ -464,7 +464,7 @@
  
  	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
        else
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index a87f56aa24bd..a9e6ce818f74 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -283,6 +283,7 @@ share/icewm/themes/win95/restore.xpm
 share/icewm/toolbar
 share/icewm/winoptions
 share/locale/ca/LC_MESSAGES/icewm.mo
+share/locale/cs/LC_MESSAGES/icewm.mo
 share/locale/de/LC_MESSAGES/icewm.mo
 share/locale/en/LC_MESSAGES/icewm.mo
 share/locale/es/LC_MESSAGES/icewm.mo
@@ -297,6 +298,8 @@ 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/sv/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