7 files changed, 46 insertions, 30 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index c34b6186eb4d..98e8f9ad48ce 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	WindowMaker with i18n extention
-# Version required:	0.61.0
+# Version required:	0.62.0
 # Date created:		24 Nov 1998
 # Whom:			mac@jp.freebsd.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	WindowMaker-0.61.1
-PKGNAME=	windowmaker-i18n-0.61.1
+DISTNAME=	WindowMaker-0.62.0
+PKGNAME=	windowmaker-i18n-0.62.0
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
 MASTER_SITE_SUBDIR=	beta/srcs
@@ -42,7 +42,7 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x wsetfont.1x
 
-JA_CATALOGFILE=	WindowMaker-0.61.1ja1
+JA_CATALOGFILE=	
 
 .if defined(JA_CATALOGFILE) && !empty(JA_CATALOGFILE)
 MASTER_SITES+=	ftp://muse.brain.riken.go.jp/pub/ja.po/
@@ -64,7 +64,7 @@ pre-extract:
 
 post-extract:
 	@cd ${WRKSRC} && \
-	${TAR} xfz libwmfun-0.0.2.tar.gz
+	${TAR} xfz libwmfun-0.0.3.tar.gz
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index 6667619aa36a..88ec99c7b1f0 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1,2 +1 @@
-MD5 (WindowMaker-0.61.1.tar.bz2) = 74c4f4b74feb3fc5def8f2cfc1dc9e65
-MD5 (WindowMaker-0.61.1ja1.tar.bz2) = 3aa21dbd7b05d73d5a834e487d613a9e
+MD5 (WindowMaker-0.62.0.tar.bz2) = 104189babbc8640e81515896c26aa503
diff --git a/x11-wm/windowmaker-i18n/files/patch-bf b/x11-wm/windowmaker-i18n/files/patch-bf
new file mode 100644
index 000000000000..b326183933aa
--- /dev/null
+++ b/x11-wm/windowmaker-i18n/files/patch-bf
@@ -0,0 +1,11 @@
+--- wrlib/Makefile.in.orig	Fri Mar 31 19:46:32 2000
++++ wrlib/Makefile.in	Fri Mar 31 19:46:42 2000
+@@ -96,7 +96,7 @@
+ 
+ lib_LTLIBRARIES = libwraster.la
+ 
+-libwraster_la_LDFLAGS = -version-info 2:0:0
++libwraster_la_LDFLAGS = -version-info 3:0:0
+ 
+ bin_SCRIPTS = get-wraster-flags
+ 
diff --git a/x11-wm/windowmaker-i18n/files/patch-cc b/x11-wm/windowmaker-i18n/files/patch-cc
index 51cc67d12743..a7a9f38fb992 100644
--- a/x11-wm/windowmaker-i18n/files/patch-cc
+++ b/x11-wm/windowmaker-i18n/files/patch-cc
@@ -1,22 +1,22 @@
---- configure.orig	Tue Feb 15 16:00:11 2000
-+++ configure	Tue Feb 15 16:02:20 2000
-@@ -5398,7 +5398,8 @@
+--- configure.orig	Fri Mar 31 09:47:28 2000
++++ configure	Fri Mar 31 09:49:56 2000
+@@ -5866,7 +5866,8 @@
  	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
  	WindowMaker/Themes/Makefile \
  	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
--	WPrefs.app/po/Makefile  src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-+	WPrefs.app/po/Makefile \
-+	libwmfun-0.0.2/libwmfun/Makefile src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+-	WPrefs.app/po/Makefile contrib/WindowMaker.spec  src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
++	WPrefs.app/po/Makefile contrib/WindowMaker.spec  \
++	libwmfun-0.0.3/libwmfun/Makefile src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
-@@ -5531,7 +5532,8 @@
+@@ -5999,7 +6000,8 @@
  	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
  	WindowMaker/Themes/Makefile \
  	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
--	WPrefs.app/po/Makefile "}
-+	WPrefs.app/po/Makefile \
-+	libwmfun-0.0.2/libwmfun/Makefile "}
+-	WPrefs.app/po/Makefile contrib/WindowMaker.spec "}
++	WPrefs.app/po/Makefile contrib/WindowMaker.spec \
++	libwmfun-0.0.3/libwmfun/Makefile "}
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/x11-wm/windowmaker-i18n/files/patch-cd b/x11-wm/windowmaker-i18n/files/patch-cd
index bc74ed728fc6..a721f7f3b6dd 100644
--- a/x11-wm/windowmaker-i18n/files/patch-cd
+++ b/x11-wm/windowmaker-i18n/files/patch-cd
@@ -6,7 +6,7 @@
  
 -SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc 	contrib
 +SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc 	contrib \
-+		libwmfun-0.0.2/libwmfun
++		libwmfun-0.0.3/libwmfun
  
  
- EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL 	Install acconfig.h INSTALL.pt 	mkpatch README.KDE README.GNOME WindowMaker.lsm.in 	docklib-0.2.tar.gz libwmfun-0.0.2.tar.gz 
+ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL 	Install acconfig.h INSTALL.pt 	mkpatch README.KDE README.GNOME WindowMaker.lsm.in 	docklib-0.2.tar.gz libwmfun-0.0.3.tar.gz 
diff --git a/x11-wm/windowmaker-i18n/files/patch-ce b/x11-wm/windowmaker-i18n/files/patch-ce
index 164addce0050..4b055782f025 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ce
+++ b/x11-wm/windowmaker-i18n/files/patch-ce
@@ -1,5 +1,5 @@
---- libwmfun-0.0.2/libwmfun/Makefile.in.orig	Tue Feb 15 16:04:35 2000
-+++ libwmfun-0.0.2/libwmfun/Makefile.in	Tue Feb 15 15:44:31 2000
+--- libwmfun-0.0.3/libwmfun/Makefile.in.orig	Tue Feb 15 16:04:35 2000
++++ libwmfun-0.0.3/libwmfun/Makefile.in	Tue Feb 15 15:44:31 2000
 @@ -38,7 +38,7 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 682f2a902619..73f3523e9e0e 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -10,7 +10,6 @@ GNUstep/Apps/WPrefs.app/tiff/cycleworkspaces.tiff
 GNUstep/Apps/WPrefs.app/tiff/dock.tiff
 GNUstep/Apps/WPrefs.app/tiff/dontlinkworkspaces.tiff
 GNUstep/Apps/WPrefs.app/tiff/ergonomic.tiff
-GNUstep/Apps/WPrefs.app/tiff/ergowood.tiff
 GNUstep/Apps/WPrefs.app/tiff/expert.tiff
 GNUstep/Apps/WPrefs.app/tiff/fonts.tiff
 GNUstep/Apps/WPrefs.app/tiff/iconprefs.tiff
@@ -21,7 +20,6 @@ GNUstep/Apps/WPrefs.app/tiff/menualign1.tiff
 GNUstep/Apps/WPrefs.app/tiff/menualign2.tiff
 GNUstep/Apps/WPrefs.app/tiff/menuprefs.tiff
 GNUstep/Apps/WPrefs.app/tiff/menus.tiff
-GNUstep/Apps/WPrefs.app/tiff/miscprefs2.tiff
 GNUstep/Apps/WPrefs.app/tiff/moreanim.tiff
 GNUstep/Apps/WPrefs.app/tiff/mousesettings.tiff
 GNUstep/Apps/WPrefs.app/tiff/mousespeed.tiff
@@ -47,7 +45,6 @@ GNUstep/Apps/WPrefs.app/tiff/speed4.tiff
 GNUstep/Apps/WPrefs.app/tiff/speed4s.tiff
 GNUstep/Apps/WPrefs.app/tiff/tdel.tiff
 GNUstep/Apps/WPrefs.app/tiff/tedit.tiff
-GNUstep/Apps/WPrefs.app/tiff/temp.tiff
 GNUstep/Apps/WPrefs.app/tiff/textr.tiff
 GNUstep/Apps/WPrefs.app/tiff/theme.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer0.tiff
@@ -66,6 +63,7 @@ GNUstep/Apps/WPrefs.app/tiff/tnew.tiff
 GNUstep/Apps/WPrefs.app/tiff/whandling.tiff
 GNUstep/Apps/WPrefs.app/tiff/windowfocus.tiff
 GNUstep/Apps/WPrefs.app/tiff/workspace.tiff
+GNUstep/Apps/WPrefs.app/tiff/workspacename.tiff
 GNUstep/Apps/WPrefs.app/tiff/xis.tiff
 GNUstep/Apps/WPrefs.app/xpm/advancetonewworkspace.xpm
 GNUstep/Apps/WPrefs.app/xpm/animations.xpm
@@ -76,7 +74,6 @@ GNUstep/Apps/WPrefs.app/xpm/cycleworkspaces.xpm
 GNUstep/Apps/WPrefs.app/xpm/dock.xpm
 GNUstep/Apps/WPrefs.app/xpm/dontlinkworkspaces.xpm
 GNUstep/Apps/WPrefs.app/xpm/ergonomic.xpm
-GNUstep/Apps/WPrefs.app/xpm/ergowood.xpm
 GNUstep/Apps/WPrefs.app/xpm/expert.xpm
 GNUstep/Apps/WPrefs.app/xpm/fonts.xpm
 GNUstep/Apps/WPrefs.app/xpm/iconprefs.xpm
@@ -87,7 +84,6 @@ GNUstep/Apps/WPrefs.app/xpm/menualign1.xpm
 GNUstep/Apps/WPrefs.app/xpm/menualign2.xpm
 GNUstep/Apps/WPrefs.app/xpm/menuprefs.xpm
 GNUstep/Apps/WPrefs.app/xpm/menus.xpm
-GNUstep/Apps/WPrefs.app/xpm/miscprefs2.xpm
 GNUstep/Apps/WPrefs.app/xpm/moreanim.xpm
 GNUstep/Apps/WPrefs.app/xpm/mousesettings.xpm
 GNUstep/Apps/WPrefs.app/xpm/mousespeed.xpm
@@ -113,7 +109,6 @@ GNUstep/Apps/WPrefs.app/xpm/speed4.xpm
 GNUstep/Apps/WPrefs.app/xpm/speed4s.xpm
 GNUstep/Apps/WPrefs.app/xpm/tdel.xpm
 GNUstep/Apps/WPrefs.app/xpm/tedit.xpm
-GNUstep/Apps/WPrefs.app/xpm/temp.xpm
 GNUstep/Apps/WPrefs.app/xpm/textr.xpm
 GNUstep/Apps/WPrefs.app/xpm/theme.xpm
 GNUstep/Apps/WPrefs.app/xpm/timer0.xpm
@@ -132,8 +127,11 @@ GNUstep/Apps/WPrefs.app/xpm/tnew.xpm
 GNUstep/Apps/WPrefs.app/xpm/whandling.xpm
 GNUstep/Apps/WPrefs.app/xpm/windowfocus.xpm
 GNUstep/Apps/WPrefs.app/xpm/workspace.xpm
+GNUstep/Apps/WPrefs.app/xpm/workspacename.xpm
 GNUstep/Apps/WPrefs.app/xpm/xis.xpm
+bin/get-wings-flags
 bin/get-wraster-flags
+bin/get-wutil-flags
 bin/geticonset
 bin/getstyle
 bin/seticons
@@ -165,7 +163,7 @@ lib/libwmfun.so
 lib/libwmfun.so.0
 lib/libwraster.a
 lib/libwraster.so
-lib/libwraster.so.3
+lib/libwraster.so.2
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/WINGs/Images.tiff
@@ -185,10 +183,14 @@ share/WindowMaker/Icons/GNUstepGlow.tiff
 share/WindowMaker/Icons/GNUstepGlow.xpm
 share/WindowMaker/Icons/GNUterm.tiff
 share/WindowMaker/Icons/GNUterm.xpm
+share/WindowMaker/Icons/Terminal.tiff
+share/WindowMaker/Icons/Terminal.xpm
+share/WindowMaker/Icons/TerminalGNUstep.tiff
+share/WindowMaker/Icons/TerminalGNUstep.xpm
+share/WindowMaker/Icons/TerminalLinux.tiff
+share/WindowMaker/Icons/TerminalLinux.xpm
 share/WindowMaker/Icons/clip.tiff
 share/WindowMaker/Icons/clip.xpm
-share/WindowMaker/Icons/clip2.tiff
-share/WindowMaker/Icons/clip2.xpm
 share/WindowMaker/Icons/defaultAppIcon.tiff
 share/WindowMaker/Icons/defaultAppIcon.xpm
 share/WindowMaker/Icons/defaultterm.tiff
@@ -239,6 +241,7 @@ share/WindowMaker/Styles/Chumbo.style
 share/WindowMaker/Styles/Copper.style
 share/WindowMaker/Styles/DarkBlue.style
 share/WindowMaker/Styles/DarkRed.style
+share/WindowMaker/Styles/Emerald.style
 share/WindowMaker/Styles/Fire.style
 share/WindowMaker/Styles/Food.style
 share/WindowMaker/Styles/Golden.style
@@ -253,6 +256,7 @@ share/WindowMaker/Styles/Purple.style
 share/WindowMaker/Styles/Purplish.style
 share/WindowMaker/Styles/Red.style
 share/WindowMaker/Styles/RednBlue.style
+share/WindowMaker/Styles/Spring.style
 share/WindowMaker/Styles/Summer.style
 share/WindowMaker/Styles/Traditional.style
 share/WindowMaker/Styles/VioletBlue.style
@@ -294,6 +298,8 @@ share/WindowMaker/plmenu.de
 share/WindowMaker/plmenu.fr
 share/WindowMaker/plmenu.hr
 share/WindowMaker/plmenu.it
+share/WindowMaker/plmenu.ko
+share/WindowMaker/plmenu.pl
 share/WindowMaker/plmenu.zh_CN
 share/WindowMaker/wmmacros
 share/WindowMaker/xtree.dat