5 files changed, 89 insertions, 20 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 21fbb9f2c97e..d019c4dd75f7 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	WindowMaker with i18n extention
-# Version required:	0.53.0
+# Version required:	0.60.0
 # Date created:		24 Nov 1998
 # Whom:			mac@jp.freebsd.org
 #
-# $Id: Makefile,v 1.57 1999/05/01 02:43:22 steve Exp $
+# $Id: Makefile,v 1.58 1999/05/27 07:32:45 tg Exp $
+#
 
-DISTNAME=	WindowMaker-0.53.0
-PKGNAME=	windowmaker-i18n-0.53.0
+DISTNAME=	WindowMaker-0.60.0
+PKGNAME=	windowmaker-i18n-0.60.0
 CATEGORIES=	x11-wm windowmaker
-MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
-		ftp://muse.brain.riken.go.jp/pub/ja.po/
+MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
 MASTER_SITE_SUBDIR=	beta/srcs
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -28,20 +28,21 @@ RUN_DEPENDS=	${X11BASE}/share/WindowMaker/Themes/Checker.themed/style:${PORTSDIR
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
+USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}  LOCALBASE=${LOCALBASE} \
 		CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
 		LINGUAS="de es fi fr hr it ja_JP.EUC ko nl no pl pt ru"
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
-	--with-nlsdir=${PREFIX}/share/locale \
-	--disable-debug --enable-kanji --disable-shared
+	--with-nlsdir=${PREFIX}/share/locale --disable-debug
 
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
-	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
+	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x wsetfont.1x
 
-JA_CATALOGFILE=	WindowMaker-0.53.0ja1
+JA_CATALOGFILE=	WindowMaker-0.60.0ja2
 
-.if defined(JA_CATALOGFILE) && ${JA_CATALOGFILE} != ""
+.if defined(JA_CATALOGFILE) && !empty(JA_CATALOGFILE)
+MASTER_SITES+=	ftp://muse.brain.riken.go.jp/pub/ja.po/
 DISTFILES+=	${JA_CATALOGFILE}${EXTRACT_SUFX}
 .endif
 
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index 8bac0b3c197b..bf22057ab125 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1,2 +1,2 @@
-MD5 (WindowMaker-0.53.0.tar.bz2) = fecdc560c2c2c98aa1783023aaea9c92
-MD5 (WindowMaker-0.53.0ja1.tar.bz2) = c536ee5ac3bd45af365ab4dc69d74af8
+MD5 (WindowMaker-0.60.0.tar.bz2) = c1a4e199285bce02572193d358242d28
+MD5 (WindowMaker-0.60.0ja2.tar.bz2) = 82ac3e4850d1dec3308d5c8758557886
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index fa6d980b0a4b..3bd5938837db 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,13 +1,13 @@
---- configure.orig	Tue Apr 20 23:16:56 1999
-+++ configure	Thu Apr 22 10:06:36 1999
-@@ -2986,8 +2986,8 @@
+--- configure.orig	Thu Jun  3 20:42:09 1999
++++ configure	Fri Jun  4 20:23:01 1999
+@@ -3146,8 +3146,8 @@
  
  
  
 -supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN sk"
--supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN"
+-supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru"
 +supported_locales="cs de es fr gl it ja_JP.EUC ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN sk"
-+supported_wprefs_locales="pt hr fr ko ja_JP.EUC cs zh_TW.Big5 es zh_CN"
++supported_wprefs_locales="pt hr fr ko ja_JP.EUC cs zh_TW.Big5 es zh_CN fi it ru"
  
  for lang in $LINGUAS; do
  	ok=0
diff --git a/x11-wm/windowmaker-i18n/files/patch-bc b/x11-wm/windowmaker-i18n/files/patch-bc
new file mode 100644
index 000000000000..982460c1eab3
--- /dev/null
+++ b/x11-wm/windowmaker-i18n/files/patch-bc
@@ -0,0 +1,49 @@
+--- util/wsetfont.orig	Sat Jun  5 20:48:34 1999
++++ util/wsetfont	Sat Jun  5 20:53:16 1999
+@@ -58,6 +58,9 @@
+     exit
+ fi
+ 
++# set default value
++MultiByteText="NO"
++
+ case $1 in
+    default)
+ 	SystemFont=\"-*-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*\"
+@@ -118,6 +121,7 @@
+ 	IconTitleFont=\"-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-*-*\"
+ 	ClipTitleFont=\"-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-12-*,-*-*-medium-r-normal-*-*-*\"
+ 	DisplayFont=\"-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-14-*,-*-*-medium-r-normal-*-*-*\"
++	MultiByteText=\"YES\";
+ 	;;
+    korean)
+ 	SystemFont=\"-*-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-kodig-medium-r-normal--%d-*-*-*-*-*-*-*,*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*,*-*-*-*-*--%d-*-*-*-*-*-*-*,*\"
+@@ -162,10 +166,13 @@
+ 
+ $WDWRITE WMGLOBAL SystemFont "$SystemFont"
+ $WDWRITE WMGLOBAL BoldSystemFont "$BoldSystemFont"
++$WDWRITE WMGLOBAL MultiByteText "$MultiByteText"
++
+ 
+ echo
+ echo "    SystemFont=$SystemFont"
+ echo "    BoldSystemFont=$BoldSystemFont"
++echo "    MultiByteText=$MultiByteText"
+ echo
+ echo "Setting up  ~/GNUstep/Defaults/WindowMaker..."
+ 
+@@ -175,6 +182,7 @@
+ $WDWRITE WindowMaker IconTitleFont "$IconTitleFont"
+ $WDWRITE WindowMaker ClipTitleFont "$ClipTitleFont"
+ $WDWRITE WindowMaker DisplayFont "$DisplayFont"
++$WDWRITE WindowMaker MultiByteText "$MultiByteText"
+ 
+ echo
+ echo "WindowTitleFont=$WindowTitleFont"
+@@ -183,5 +191,6 @@
+ echo "IconTitleFont=$IconTitleFont"
+ echo "ClipTitleFont=$ClipTitleFont"
+ echo "DisplayFont=$DisplayFont"
++echo "MultiByteText=$MultiByteText"
+ echo
+ echo "Done."
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 2d27bbbd77e1..d28d671cb9a6 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -28,11 +28,15 @@ 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
+GNUstep/Apps/WPrefs.app/tiff/msty1.tiff
+GNUstep/Apps/WPrefs.app/tiff/msty2.tiff
+GNUstep/Apps/WPrefs.app/tiff/msty3.tiff
 GNUstep/Apps/WPrefs.app/tiff/newstyle.tiff
 GNUstep/Apps/WPrefs.app/tiff/nonopaque.tiff
 GNUstep/Apps/WPrefs.app/tiff/oldstyle.tiff
 GNUstep/Apps/WPrefs.app/tiff/opaque.tiff
 GNUstep/Apps/WPrefs.app/tiff/paths.tiff
+GNUstep/Apps/WPrefs.app/tiff/smooth.tiff
 GNUstep/Apps/WPrefs.app/tiff/sound.tiff
 GNUstep/Apps/WPrefs.app/tiff/speed0.tiff
 GNUstep/Apps/WPrefs.app/tiff/speed0s.tiff
@@ -93,11 +97,15 @@ 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
+GNUstep/Apps/WPrefs.app/xpm/msty1.xpm
+GNUstep/Apps/WPrefs.app/xpm/msty2.xpm
+GNUstep/Apps/WPrefs.app/xpm/msty3.xpm
 GNUstep/Apps/WPrefs.app/xpm/newstyle.xpm
 GNUstep/Apps/WPrefs.app/xpm/nonopaque.xpm
 GNUstep/Apps/WPrefs.app/xpm/oldstyle.xpm
 GNUstep/Apps/WPrefs.app/xpm/opaque.xpm
 GNUstep/Apps/WPrefs.app/xpm/paths.xpm
+GNUstep/Apps/WPrefs.app/xpm/smooth.xpm
 GNUstep/Apps/WPrefs.app/xpm/sound.xpm
 GNUstep/Apps/WPrefs.app/xpm/speed0.xpm
 GNUstep/Apps/WPrefs.app/xpm/speed0s.xpm
@@ -109,7 +117,10 @@ GNUstep/Apps/WPrefs.app/xpm/speed3.xpm
 GNUstep/Apps/WPrefs.app/xpm/speed3s.xpm
 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
 GNUstep/Apps/WPrefs.app/xpm/timer0s.xpm
@@ -123,6 +134,7 @@ GNUstep/Apps/WPrefs.app/xpm/timer4.xpm
 GNUstep/Apps/WPrefs.app/xpm/timer4s.xpm
 GNUstep/Apps/WPrefs.app/xpm/timer5.xpm
 GNUstep/Apps/WPrefs.app/xpm/timer5s.xpm
+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
@@ -154,7 +166,10 @@ include/wraster.h
 lib/libWINGs.a
 lib/libWMaker.a
 lib/libwraster.a
-lib/libwraster.la
+lib/libwraster.so
+lib/libwraster.so.3
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
@@ -273,9 +288,10 @@ share/WindowMaker/menu.tr
 share/WindowMaker/menu.zh_CN
 share/WindowMaker/menu.zh_TW.Big5
 share/WindowMaker/plmenu
-share/WindowMaker/plmenu.dk
+share/WindowMaker/plmenu.da
 share/WindowMaker/plmenu.fr
 share/WindowMaker/plmenu.hr
+share/WindowMaker/plmenu.it
 share/WindowMaker/plmenu.zh_CN
 share/WindowMaker/wmmacros
 share/WindowMaker/xtree.dat
@@ -283,11 +299,13 @@ share/WindowMaker/xtree.dat
 share/locale/de/LC_MESSAGES/WindowMaker.mo
 share/locale/es/LC_MESSAGES/WPrefs.mo
 share/locale/es/LC_MESSAGES/WindowMaker.mo
+share/locale/fi/LC_MESSAGES/WPrefs.mo
 share/locale/fi/LC_MESSAGES/WindowMaker.mo
 share/locale/fr/LC_MESSAGES/WPrefs.mo
 share/locale/fr/LC_MESSAGES/WindowMaker.mo
 share/locale/hr/LC_MESSAGES/WPrefs.mo
 share/locale/hr/LC_MESSAGES/WindowMaker.mo
+share/locale/it/LC_MESSAGES/WPrefs.mo
 share/locale/it/LC_MESSAGES/WindowMaker.mo
 share/locale/ja_JP.EUC/LC_MESSAGES/WPrefs.mo
 share/locale/ja_JP.EUC/LC_MESSAGES/WindowMaker.mo
@@ -298,6 +316,7 @@ share/locale/no/LC_MESSAGES/WindowMaker.mo
 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/WPrefs.mo
 share/locale/ru/LC_MESSAGES/WindowMaker.mo
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds