8 files changed, 53 insertions, 94 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 8d75757a1d02..20a0b3108d86 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	windowmaker-i18n
-PORTVERSION=	0.62.1
-PORTREVISION=	1
+PORTVERSION=	0.63.1
+# PORTREVISION=
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
 MASTER_SITE_SUBDIR=	beta/srcs
@@ -33,7 +33,7 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}  LOCALBASE=${LOCALBASE} \
 		CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
-		LINGUAS="da de es fi fr hr it ja_JP.EUC ko nl no pl pt ru zh_TW.Big5 zh_CN"
+		LINGUAS="bg cs da de el es fi fr gl hr hu it ja_JP.EUC ko nl no pl pt ro ru se sk tr zh_CN zh_TW.Big5"
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 	--with-nlsdir=${PREFIX}/share/locale \
 	--with-libs-from="-L${LOCALBASE}/lib" \
@@ -65,9 +65,9 @@ pre-extract:
 	@${ECHO} "You can add hooks for KDE by defining WITH_KDE"
 .endif
 
-post-extract:
-	@cd ${WRKSRC} && \
-	${TAR} xfz libwmfun-0.0.3.tar.gz
+# post-extract:
+# 	@cd ${WRKSRC} && \
+# 	${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-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index b6b56dda205f..5e6ef30b6a0f 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1 +1 @@
-MD5 (WindowMaker-0.62.1.tar.bz2) = 9d2deac6de78af0766392803cb414c62
+MD5 (WindowMaker-0.63.1.tar.bz2) = 681de0bf984a370236f3f0e56848392b
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index 02d5ab442ea2..f2c7c5d47f51 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,13 +1,13 @@
---- configure.orig	Thu Sep 16 12:21:30 1999
-+++ configure	Tue Sep 21 09:40:10 1999
-@@ -2865,8 +2865,8 @@
+--- configure.orig	Sat Jan  6 14:24:12 2001
++++ configure	Sat Jan  6 21:54:33 2001
+@@ -3080,8 +3080,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 fi it ru de"
-+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 fi it ru de"
+-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 bg"
+-supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru de bg"
++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 bg"
++supported_wprefs_locales="pt hr fr ko ja_JP.EUC cs zh_TW.Big5 es zh_CN fi it ru de bg"
  
  for lang in $LINGUAS; do
  	ok=0
diff --git a/x11-wm/windowmaker-i18n/files/patch-bf b/x11-wm/windowmaker-i18n/files/patch-bf
index b326183933aa..5439a57dc9a5 100644
--- a/x11-wm/windowmaker-i18n/files/patch-bf
+++ b/x11-wm/windowmaker-i18n/files/patch-bf
@@ -4,7 +4,7 @@
  
  lib_LTLIBRARIES = libwraster.la
  
--libwraster_la_LDFLAGS = -version-info 2:0:0
+-libwraster_la_LDFLAGS = -version-info 2:1: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
deleted file mode 100644
index a7a9f38fb992..000000000000
--- a/x11-wm/windowmaker-i18n/files/patch-cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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 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
- 
-@@ -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 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
deleted file mode 100644
index a721f7f3b6dd..000000000000
--- a/x11-wm/windowmaker-i18n/files/patch-cd
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.in.orig	Tue Feb 15 16:03:27 2000
-+++ Makefile.in	Tue Feb 15 15:22:24 2000
-@@ -92,7 +92,8 @@
- X_LIBRARY_PATH = @X_LIBRARY_PATH@
- wprefsdir = @wprefsdir@
- 
--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.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.3.tar.gz 
diff --git a/x11-wm/windowmaker-i18n/files/patch-ce b/x11-wm/windowmaker-i18n/files/patch-ce
deleted file mode 100644
index 4b055782f025..000000000000
--- a/x11-wm/windowmaker-i18n/files/patch-ce
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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@
- 
--top_builddir = ..
-+top_builddir = ../..
- 
- ACLOCAL = @ACLOCAL@
- AUTOCONF = @AUTOCONF@
-@@ -69,6 +69,8 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
- 
-+INCLUDES =  	-I$(top_srcdir)/wrlib	-I$(top_srcdir)/src	-I$(top_srcdir)/WINGs	@HEADER_SEARCH_PATH@
-+
- lib_LTLIBRARIES = libwmfun.la
- 
- libwmfun_la_SOURCES = bilinear.c 		fade.c 		generic.c 		generic.h 		getopt.c 		getopt.h 		getopt1.c 		wave.c
-@@ -104,12 +106,12 @@
- all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .lo .o .s
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile
--
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile
-+#
-+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+#	cd $(top_builddir) \
-+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
- 
- mostlyclean-libLTLIBRARIES:
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 75bc51f640cb..e42862c41beb 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -75,9 +75,11 @@ bin/setstyle
 bin/wdwrite
 bin/wkdemenu.pl
 bin/wm-oldmenu2new
+bin/wmagnify
 bin/wmaker
 bin/wmaker.inst
 bin/wmsetbg
+bin/wmsetup
 bin/wsetfont
 bin/wxcopy
 bin/wxpaste
@@ -86,17 +88,17 @@ etc/WindowMaker/WMRootMenu
 etc/WindowMaker/WMState
 etc/WindowMaker/WMWindowAttributes
 etc/WindowMaker/WindowMaker
-include/WINGs.h
-include/WINGsP.h
+include/WINGs/WINGs.h
+include/WINGs/WINGsP.h
+include/WINGs/WUtil.h
+include/WINGs/wtabledelegates.h
+include/WINGs/wtableview.h
 include/WMaker.h
-include/WUtil.h
 include/wraster.h
+lib/libExtraWINGs.a
 lib/libWINGs.a
 lib/libWMaker.a
 lib/libWUtil.a
-lib/libwmfun.a
-lib/libwmfun.so
-lib/libwmfun.so.0
 lib/libwraster.a
 lib/libwraster.so
 lib/libwraster.so.3
@@ -109,6 +111,7 @@ share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/BitchX.tiff
 share/WindowMaker/Icons/BitchX.xpm
 share/WindowMaker/Icons/DefaultAppIcon.tiff
+share/WindowMaker/Icons/Ftp.png
 share/WindowMaker/Icons/GNUstep.tiff
 share/WindowMaker/Icons/GNUstep.xpm
 share/WindowMaker/Icons/GNUstep3D.tiff
@@ -117,12 +120,22 @@ share/WindowMaker/Icons/GNUstepGlow.tiff
 share/WindowMaker/Icons/GNUstepGlow.xpm
 share/WindowMaker/Icons/GNUterm.tiff
 share/WindowMaker/Icons/GNUterm.xpm
+share/WindowMaker/Icons/GreenWilber.png
+share/WindowMaker/Icons/ICQ.png
+share/WindowMaker/Icons/Mozilla.png
+share/WindowMaker/Icons/Netscape.png
+share/WindowMaker/Icons/Pen.png
+share/WindowMaker/Icons/Pencil.png
+share/WindowMaker/Icons/Real.png
+share/WindowMaker/Icons/Shell.png
+share/WindowMaker/Icons/Speaker.png
 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/XChat.png
 share/WindowMaker/Icons/clip.tiff
 share/WindowMaker/Icons/clip.xpm
 share/WindowMaker/Icons/defaultAppIcon.tiff
@@ -182,7 +195,11 @@ share/WindowMaker/Styles/Golden.style
 share/WindowMaker/Styles/Green.style
 share/WindowMaker/Styles/GreyBlue.style
 share/WindowMaker/Styles/Gtk.style
+share/WindowMaker/Styles/IRednBlue.style
+share/WindowMaker/Styles/Interlace.style
 share/WindowMaker/Styles/LightBlue.style
+share/WindowMaker/Styles/NewBlue.style
+share/WindowMaker/Styles/NightSky.style
 share/WindowMaker/Styles/Pastel.style
 share/WindowMaker/Styles/Pink.style
 share/WindowMaker/Styles/Pumpkin.style
@@ -201,6 +218,7 @@ share/WindowMaker/Themes/SteelBlueSilk.style
 share/WindowMaker/autostart.sh
 share/WindowMaker/exitscript.sh
 share/WindowMaker/menu
+share/WindowMaker/menu.bg
 share/WindowMaker/menu.ca
 share/WindowMaker/menu.cz
 share/WindowMaker/menu.da
@@ -220,6 +238,7 @@ share/WindowMaker/menu.nl
 share/WindowMaker/menu.no
 share/WindowMaker/menu.pl
 share/WindowMaker/menu.pt
+share/WindowMaker/menu.ro
 share/WindowMaker/menu.ru
 share/WindowMaker/menu.se
 share/WindowMaker/menu.sl
@@ -227,27 +246,36 @@ share/WindowMaker/menu.tr
 share/WindowMaker/menu.zh_CN
 share/WindowMaker/menu.zh_TW.Big5
 share/WindowMaker/plmenu
+share/WindowMaker/plmenu.bg
 share/WindowMaker/plmenu.da
 share/WindowMaker/plmenu.de
+share/WindowMaker/plmenu.es
 share/WindowMaker/plmenu.fi
 share/WindowMaker/plmenu.fr
 share/WindowMaker/plmenu.hr
 share/WindowMaker/plmenu.it
 share/WindowMaker/plmenu.ko
 share/WindowMaker/plmenu.pl
+share/WindowMaker/plmenu.ro
 share/WindowMaker/plmenu.zh_CN
 share/WindowMaker/wmmacros
 share/WindowMaker/xtree.dat
 @exec mkdir -p %B/Sounds
+share/locale/bg/LC_MESSAGES/WPrefs.mo
+share/locale/bg/LC_MESSAGES/WindowMaker.mo
+share/locale/cs/LC_MESSAGES/WPrefs.mo
+share/locale/cs/LC_MESSAGES/WindowMaker.mo
 share/locale/da/LC_MESSAGES/WindowMaker.mo
 share/locale/de/LC_MESSAGES/WPrefs.mo
 share/locale/de/LC_MESSAGES/WindowMaker.mo
+share/locale/el/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/gl/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
@@ -261,8 +289,12 @@ 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/ro/LC_MESSAGES/WindowMaker.mo
 share/locale/ru/LC_MESSAGES/WPrefs.mo
 share/locale/ru/LC_MESSAGES/WindowMaker.mo
+share/locale/se/LC_MESSAGES/WindowMaker.mo
+share/locale/sk/LC_MESSAGES/WindowMaker.mo
+share/locale/tr/LC_MESSAGES/WindowMaker.mo
 share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
 share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/WPrefs.mo