Upgrade to 0.62.0.

Submitted by:	Brian Handy <handy@physics.montana.edu>

6 files changed, 30 insertions, 26 deletions

diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index b219a10a6093..5fce5b4622fc 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	WindowMaker
-# Version required:	0.61.1
+# Version required:	0.62.0
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
 # $FreeBSD$
 
-DISTNAME=	WindowMaker-0.61.1
-PKGNAME=	windowmaker-0.61.1
+DISTNAME=	WindowMaker-0.62.0
+PKGNAME=	windowmaker-0.62.0
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
 		http://jgo.local.net/cool_downloads/wm/
@@ -60,7 +60,7 @@ pre-extract:
 
 post-extract:
 	@cd ${WRKSRC} && \
-	${TAR} xfz libwmfun-0.0.2.tar.gz
+	${TAR} xfz libwmfun-0.0.3.tar.gz
 
 post-patch:
 	@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c \
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index 5fbd1f054ff0..bc454f226ba7 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1,2 +1,2 @@
-MD5 (WindowMaker-0.61.1.tar.bz2) = 74c4f4b74feb3fc5def8f2cfc1dc9e65
+MD5 (WindowMaker-0.62.0.tar.bz2) = 104189babbc8640e81515896c26aa503
 MD5 (WindowMaker-extra-0.1.tar.bz2) = e6fb381da0d207c320f58e7a1fea2a2b
diff --git a/x11-wm/windowmaker/files/patch-bc b/x11-wm/windowmaker/files/patch-bc
index 51cc67d12743..d8bd380ede3b 100644
--- a/x11-wm/windowmaker/files/patch-bc
+++ b/x11-wm/windowmaker/files/patch-bc
@@ -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	Thu Mar 30 15:37:36 2000
++++ configure	Fri Mar 31 00:27:19 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 contrib/WindowMaker.spec  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
++	libwmfun-0.0.3/libwmfun/Makefile contrib/WindowMaker.spec  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 contrib/WindowMaker.spec "}
 +	WPrefs.app/po/Makefile \
-+	libwmfun-0.0.2/libwmfun/Makefile "}
++	libwmfun-0.0.3/libwmfun/Makefile contrib/WindowMaker.spec "}
  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/files/patch-bd b/x11-wm/windowmaker/files/patch-bd
index bc74ed728fc6..a721f7f3b6dd 100644
--- a/x11-wm/windowmaker/files/patch-bd
+++ b/x11-wm/windowmaker/files/patch-bd
@@ -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/files/patch-be b/x11-wm/windowmaker/files/patch-be
index 164addce0050..4b055782f025 100644
--- a/x11-wm/windowmaker/files/patch-be
+++ b/x11-wm/windowmaker/files/patch-be
@@ -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/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 5f18d1c37a26..f2e49643ce2b 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/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/tnew.tiff
 GNUstep/Apps/WPrefs.app/tiff/theme.tiff
@@ -66,6 +63,7 @@ GNUstep/Apps/WPrefs.app/tiff/timer5s.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,6 +127,7 @@ 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-wraster-flags
 bin/geticonset
@@ -162,7 +158,7 @@ lib/libWMaker.a
 lib/libWUtil.a
 lib/libwraster.a
 lib/libwraster.so
-lib/libwraster.so.3
+lib/libwraster.so.2
 lib/libwmfun.a
 lib/libwmfun.so
 lib/libwmfun.so.0
@@ -180,8 +176,10 @@ share/WindowMaker/Icons/GNUstep.tiff
 share/WindowMaker/Icons/GNUstep3D.tiff
 share/WindowMaker/Icons/GNUstepGlow.tiff
 share/WindowMaker/Icons/GNUterm.tiff
+share/WindowMaker/Icons/Terminal.tiff
+share/WindowMaker/Icons/TerminalGNUstep.tiff
+share/WindowMaker/Icons/TerminalLinux.tiff
 share/WindowMaker/Icons/clip.tiff
-share/WindowMaker/Icons/clip2.tiff
 share/WindowMaker/Icons/defaultAppIcon.tiff
 share/WindowMaker/Icons/defaultterm.tiff
 share/WindowMaker/Icons/draw.tiff
@@ -204,8 +202,10 @@ share/WindowMaker/Icons/GNUstep.xpm
 share/WindowMaker/Icons/GNUstep3D.xpm
 share/WindowMaker/Icons/GNUstepGlow.xpm
 share/WindowMaker/Icons/GNUterm.xpm
+share/WindowMaker/Icons/Terminal.xpm
+share/WindowMaker/Icons/TerminalGNUstep.xpm
+share/WindowMaker/Icons/TerminalLinux.xpm
 share/WindowMaker/Icons/clip.xpm
-share/WindowMaker/Icons/clip2.xpm
 share/WindowMaker/Icons/defaultAppIcon.xpm
 share/WindowMaker/Icons/defaultterm.xpm
 share/WindowMaker/Icons/draw.xpm
@@ -300,6 +300,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
@@ -315,6 +316,7 @@ share/WindowMaker/Styles/Purplish.style
 share/WindowMaker/Styles/Red.style
 share/WindowMaker/Styles/RednBlue.style
 share/WindowMaker/Styles/Summer.style
+share/WindowMaker/Styles/Spring.style
 share/WindowMaker/Styles/Traditional.style
 share/WindowMaker/Styles/VioletBlue.style
 share/WindowMaker/Themes/Checker.themed/checker.xpm
@@ -368,6 +370,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