5 files changed, 47 insertions, 24 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index bb308c8e314f..7afd0209ad1d 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -5,16 +5,16 @@
 #
 # $Id: Makefile,v 1.52 1999/02/21 21:51:01 billf Exp $
 
-DISTNAME=	WindowMaker-0.51.0
-PKGNAME=	windowmaker-i18n-0.51.0
+DISTNAME=	WindowMaker-0.51.2
+PKGNAME=	windowmaker-i18n-0.51.2
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
-		ftp://muse.brain.riken.go.jp/pub/ja.po/ \
-		http://jgo.local.net/cool_downloads/wm/ \
-		ftp://muse.brain.riken.go.jp/pub/rpm/contrib/
+		ftp://muse.brain.riken.go.jp/pub/ja.po/
 MASTER_SITE_SUBDIR=	beta/srcs
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} \
-		WindowMaker-0.51.0ja1.tar.gz
+		${JA_CATALOGFILE}${EXTRACT_SUFX}
+
+JA_CATALOGFILE= WindowMaker-0.51.2ja2
 
 MAINTAINER=	mac@jp.freebsd.org
 
@@ -48,9 +48,9 @@ DATAFILES=	WindowMaker-data.tar.gz
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
 	@${PERL} -pi -e "s|%%PERL%%|${PERL}|g" ${WRKSRC}/util/wm-oldmenu2new
-	@${CP} ${WRKDIR}/WindowMaker-0.51.0ja1/WindowMaker.ja.po \
+	@${CP} ${WRKDIR}/${JA_CATALOGFILE}/WindowMaker.ja.po \
 		${WRKSRC}/po/ja.po
-	@${CP} ${WRKDIR}/WindowMaker-0.51.0ja1/WPrefs.ja.po \
+	@${CP} ${WRKDIR}/${JA_CATALOGFILE}/WPrefs.ja.po \
 		${WRKSRC}/WPrefs.app/po/ja.po
 
 post-install:
@@ -59,4 +59,7 @@ post-install:
 		${PREFIX}/share/WindowMaker/Pixmaps/
 	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds/
 
+pre-build:
+	@cd ${WRKSRC}/WindowMaker/Defaults && ${MAKE} clean
+
 .include <bsd.port.post.mk>
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index 7e14386529b5..622520f096db 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1,3 +1,3 @@
-MD5 (WindowMaker-0.51.0.tar.gz) = c88b940437efe9a0c4f7535f836ce984
+MD5 (WindowMaker-0.51.2.tar.gz) = 041b07bf4771cc91bc8ddd29d2a392a2
 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
-MD5 (WindowMaker-0.51.0ja1.tar.gz) = 56461e9c89d7029369a7548b53f07e85
+MD5 (WindowMaker-0.51.2ja2.tar.gz) = b6a0d2d312d76adcd755be759b3f0849
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index 7e480dc158d4..24aa903705bb 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,13 +1,13 @@
---- configure.orig	Wed Feb  3 13:05:41 1999
-+++ configure	Wed Feb  3 13:05:58 1999
-@@ -2860,8 +2860,8 @@
+--- configure.orig	Sun Mar  7 17:10:46 1999
++++ configure	Thu Mar 11 09:05:53 1999
+@@ -2876,8 +2876,8 @@
  
  
  
--supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro dk"
--supported_wprefs_locales="pt hr fr ko ja cs"
-+supported_locales="cs de es fr gl it ja_JP.EUC ko nl no pt ru se tr fi hr el pl ro dk"
-+supported_wprefs_locales="pt hr fr ko ja_JP.EUC cs"
+-supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro dk zh_TW.Big5"
+-supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5"
++supported_locales="cs de es fr gl it ja_JP.EUC ko nl no pt ru se tr fi hr el pl ro dk zh_TW.Big5"
++supported_wprefs_locales="pt hr fr ko ja_JP.EUC cs zh_TW.Big5"
  
  for lang in $LINGUAS; do
  	ok=0
diff --git a/x11-wm/windowmaker-i18n/pkg-descr b/x11-wm/windowmaker-i18n/pkg-descr
index 157a391449ca..b17182f0b843 100644
--- a/x11-wm/windowmaker-i18n/pkg-descr
+++ b/x11-wm/windowmaker-i18n/pkg-descr
@@ -10,6 +10,8 @@ If use first, execute "wmaker.inst" and "wsetfont you_choosed_language".
 you_choosed_language is example "japanese", "korean", etc. More info about 
 wsetfont, see help of wsetfont.
 
+More Icons? Install wmicons package in graphics !!
+
 If you use with xdm, set your LANG enviroment variable in your .xsession. 
 
 Japanese notation: <URL:http://www.st.rim.or.jp/~mac/FreeBSD/wmaker/>.
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 8246ccd4c20f..ed9b4e1d8454 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -62,6 +62,10 @@ 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/xis.tiff
+GNUstep/Apps/WPrefs.app/tiff/tdel.tiff
+GNUstep/Apps/WPrefs.app/tiff/tedit.tiff
+GNUstep/Apps/WPrefs.app/tiff/textr.tiff
+GNUstep/Apps/WPrefs.app/tiff/tnew.tiff
 GNUstep/Apps/WPrefs.app/xpm/advancetonewworkspace.xpm
 GNUstep/Apps/WPrefs.app/xpm/animations.xpm
 GNUstep/Apps/WPrefs.app/xpm/appearance.xpm
@@ -129,6 +133,7 @@ bin/getstyle
 bin/seticons
 bin/setstyle
 bin/wdwrite
+bin/wkdemenu.pl
 bin/wm-oldmenu2new
 bin/wmaker
 bin/wmaker.inst
@@ -136,6 +141,11 @@ bin/wmsetbg
 bin/wsetfont
 bin/wxcopy
 bin/wxpaste
+etc/WindowMaker/WMGLOBAL
+etc/WindowMaker/WMRootMenu
+etc/WindowMaker/WMState
+etc/WindowMaker/WMWindowAttributes
+etc/WindowMaker/WindowMaker
 include/WINGs.h
 include/WINGsP.h
 include/WMaker.h
@@ -150,11 +160,6 @@ share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
 share/WINGs/defaultIcon.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
-share/WindowMaker/Defaults/WMGLOBAL
-share/WindowMaker/Defaults/WMRootMenu
-share/WindowMaker/Defaults/WMState
-share/WindowMaker/Defaults/WMWindowAttributes
-share/WindowMaker/Defaults/WindowMaker
 share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/BitchX.tiff
 share/WindowMaker/Icons/BitchX.xpm
@@ -298,10 +303,20 @@ share/WindowMaker/Styles/VioletBlue.style
 share/WindowMaker/Themes/Checker.themed/checker.xpm
 share/WindowMaker/Themes/Checker.themed/style
 share/WindowMaker/Themes/Default.style
+share/WindowMaker/Themes/LeetWM.themed/LeetWM.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb1.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb2.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMTile1.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMtb1.jpg
+share/WindowMaker/Themes/LeetWM.themed/LeetWMtb2.jpg
+share/WindowMaker/Themes/LeetWM.themed/style
 share/WindowMaker/Themes/Night.themed/SeaNight.jpeg
 share/WindowMaker/Themes/Night.themed/style
 share/WindowMaker/Themes/OpenStep.style
 share/WindowMaker/Themes/Pastel.style
+share/WindowMaker/Themes/STEP2000.themed/BlueImage2.jpeg
+share/WindowMaker/Themes/STEP2000.themed/style
+share/WindowMaker/Themes/SteelBlueSilk.style
 share/WindowMaker/autostart.sh
 share/WindowMaker/exitscript.sh
 share/WindowMaker/menu
@@ -327,6 +342,7 @@ share/WindowMaker/menu.ru
 share/WindowMaker/menu.se
 share/WindowMaker/menu.sl
 share/WindowMaker/menu.tr
+share/WindowMaker/menu.zh_TW.Big5
 share/WindowMaker/plmenu
 share/WindowMaker/plmenu.fr
 share/WindowMaker/plmenu.hr
@@ -351,18 +367,20 @@ share/locale/pl/LC_MESSAGES/WindowMaker.mo
 share/locale/pt/LC_MESSAGES/WPrefs.mo
 share/locale/pt/LC_MESSAGES/WindowMaker.mo
 share/locale/ru/LC_MESSAGES/WindowMaker.mo
-@dirrm share/WindowMaker/Themes/Checker.themed
+@dirrm share/WindowMaker/Themes/STEP2000.themed
 @dirrm share/WindowMaker/Themes/Night.themed
+@dirrm share/WindowMaker/Themes/LeetWM.themed
+@dirrm share/WindowMaker/Themes/Checker.themed
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds
 @dirrm share/WindowMaker/Pixmaps
 @dirrm share/WindowMaker/Icons
 @dirrm share/WindowMaker/IconSets
-@dirrm share/WindowMaker/Defaults
 @dirrm share/WindowMaker/Backgrounds
 @dirrm share/WindowMaker
 @dirrm share/WINGs
+@dirrm etc/WindowMaker
 @dirrm GNUstep/Apps/WPrefs.app/xpm
 @dirrm GNUstep/Apps/WPrefs.app/tiff
 @dirrm GNUstep/Apps/WPrefs.app