Update to 0.65.

PR:		27488
Submitted by:	maintainer

9 files changed, 142 insertions, 110 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index cf46b13f3d46..5e18795cf5e1 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	windowmaker-i18n
-PORTVERSION=	0.64.0
+PORTVERSION=	0.65.0
 # PORTREVISION=
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER}
@@ -16,9 +16,9 @@ DISTNAME=	WindowMaker-${PORTVERSION}
 MAINTAINER=	mac@jp.freebsd.org
 
 LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.4:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
+		Hermes.1:${PORTSDIR}/graphics/Hermes \
 		PropList.2:${PORTSDIR}/devel/libPropList \
 		intl.1:${PORTSDIR}/devel/gettext
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
@@ -33,12 +33,13 @@ USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}  LOCALBASE=${LOCALBASE} \
 		CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
-		LINGUAS="cs de es fr gl it ja_JP.EUC ko nl no pt ru sv tr fi hr el pl ro da zh_TW.Big5 zh_CN sk bg hu"
+		LINGUAS="cs de es et fr gl it ja ko nl no pt ru sv tr fi hr el pl ro da zh_TW.Big5 zh_CN sk bg hu"
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 	--with-nlsdir=${PREFIX}/share/locale \
 	--with-libs-from="-L${LOCALBASE}/lib" \
 	--with-incs-from="-I${LOCALBASE}/include" \
 	--with-appspath="${PREFIX}/GNUstep/Apps" \
+	--enable-hermes \
 	--disable-debug
 
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index b07c506a99e7..247107c24370 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1 +1 @@
-MD5 (WindowMaker-0.64.0.tar.bz2) = f03a6e99eb62c6edc2b452b7d6c54edb
+MD5 (WindowMaker-0.65.0.tar.bz2) = d17f6b206db4c4157248e36422fc9cbb
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
deleted file mode 100644
index b0937e4babd3..000000000000
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Sun Feb 11 04:46:34 2001
-+++ configure	Sun Feb 11 16:35:26 2001
-@@ -3083,8 +3083,8 @@
- 
- 
- 
--supported_locales="cs de es fr gl it ja ko nl no pt ru sv tr fi hr el pl ro da zh_TW.Big5 zh_CN sk bg hu"
--supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN fi it ru de bg hu sk"
-+supported_locales="cs de es fr gl it ja_JP.EUC ko nl no pt ru sv tr fi hr el pl ro da zh_TW.Big5 zh_CN sk bg hu"
-+supported_wprefs_locales="pt hr fr ko ja_JP.EUC cs zh_TW.Big5 es zh_CN fi it ru de bg hu sk"
- 
- for lang in $LINGUAS; do
- 	ok=0
diff --git a/x11-wm/windowmaker-i18n/files/patch-ak b/x11-wm/windowmaker-i18n/files/patch-ak
index f06a6b780e41..6948fc0632a7 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ak
+++ b/x11-wm/windowmaker-i18n/files/patch-ak
@@ -1,11 +1,7 @@
---- po/Makefile.in.orig	Thu Jan 21 00:00:00 1999
-+++ po/Makefile.in	Fri Jan 29 10:23:01 1999
-@@ -206,12 +206,14 @@
- mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+--- po/Makefile.in.orig	Mon Apr 30 07:17:51 2001
++++ po/Makefile.in	Fri May 11 10:23:26 2001
+@@ -212,10 +212,10 @@
  
-+ja_JP.EUC.po:	ja.po
-+	nkf -e ja.po > ja_JP.EUC.po
  
  .po.mo: 
 -	msgfmt -o $@ $<
diff --git a/x11-wm/windowmaker-i18n/files/patch-al b/x11-wm/windowmaker-i18n/files/patch-al
index 8cb582143a54..a6d468d34588 100644
--- a/x11-wm/windowmaker-i18n/files/patch-al
+++ b/x11-wm/windowmaker-i18n/files/patch-al
@@ -1,11 +1,7 @@
---- WPrefs.app/po/Makefile.in.orig	Fri Jan 29 01:38:16 1999
-+++ WPrefs.app/po/Makefile.in	Fri Jan 29 10:23:34 1999
-@@ -205,12 +205,14 @@
- mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+--- WPrefs.app/po/Makefile.in.orig	Mon Apr 30 07:17:57 2001
++++ WPrefs.app/po/Makefile.in	Fri May 11 10:23:45 2001
+@@ -212,10 +212,10 @@
  
-+ja_JP.EUC.po:	ja.po
-+	nkf -e ja.po > ja_JP.EUC.po
  
  .po.mo: 
 -	msgfmt -o $@ $<
diff --git a/x11-wm/windowmaker-i18n/files/patch-bc b/x11-wm/windowmaker-i18n/files/patch-bc
deleted file mode 100644
index b886059bda74..000000000000
--- a/x11-wm/windowmaker-i18n/files/patch-bc
+++ /dev/null
@@ -1,65 +0,0 @@
---- util/wsetfont.orig	Fri Feb  9 07:43:01 2001
-+++ util/wsetfont	Sun Feb 11 16:41:09 2001
-@@ -76,6 +76,9 @@
-     exit
- fi
- 
-+# set default value
-+MultiByteText="NO"
-+
- case $1 in
-    default)
- 	SystemFont=\"-*-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*\"
-@@ -175,6 +178,7 @@
- 	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-*-*-*\"
- 	LargeDisplayFont=\"-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*,-*-*-medium-r-normal-*-24-*,-*-*-medium-r-normal-*-*-*\"
-+	MultiByteText=\"YES\";
- 	;;
-    korean)
- 	SystemFont=\"-*-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-kodig-medium-r-normal--%d-*-*-*-*-*-*-*,*-*-medium-r-normal-*-%d-*-*-*-*-*-*-*,*-*-*-*-*--%d-*-*-*-*-*-*-*,*\"
-@@ -186,6 +190,7 @@
- 	ClipTitleFont=\"-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*,-*-kodig-medium-r-normal--10-*-*-*-*-*-*-*,*-*-medium-r-normal--10-*-*-*-*-*-*-*,*-*-medium-r-normal--*-*-*-*-*-*-*-*,*-*-*-r-normal--*-*-*-*-*-*-*-*,*\"
- 	DisplayFont=\"-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-kodig-medium-r-normal--12-*-*-*-*-*-*-*,*-*-medium-r-normal--12-*-*-*-*-*-*-*,*-*-medium-r-normal--*-*-*-*-*-*-*-*,*-*-*-r-normal--*-*-*-*-*-*-*-*,*\"
- 	LargeDisplayFont=\"-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*,-*-kodig-bold-r-normal--24-*-*-*-*-*-*-*,-*-*-medium-r-normal--24-*-*-*-*-*-*-*,*-*-bold-r-normal-*-24-*-*-*-*-*-*-*,*-*-*-*-*--24-*-*-*-*-*-*-*,*\"
-+	MultiByteText=\"YES\";
- 	;;
-    korean2)
- 	SystemFont=\"-*-helvetica-medium-r-normal-*-%d-*-*-*-*-*-*-*,-*-medium-r-normal-*-%d-*,-*-medium-r-normal-*\"
-@@ -197,6 +202,7 @@
- 	ClipTitleFont=\"-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-12-*-*-*-*-*-ksc5601.1987-*\"
- 	DisplayFont=\"-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*,-*-gothic-medium-r-normal-*-16-*-*-*-*-*-ksc5601.1987-*\"
- 	LargeDisplayFont=\"-*-helvetica-bold-r-normal-*-24-*-*-*-*-*-*-*,-*-medium-r-normal-*-24-*,-*-medium-r-normal-*\"
-+	MultiByteText=\"YES\";
- 	;;
-    *)
- 	echo "NOTICE:"
-@@ -221,10 +227,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..."
- 
-@@ -235,6 +244,7 @@
- $WDWRITE WindowMaker ClipTitleFont "$ClipTitleFont"
- $WDWRITE WindowMaker DisplayFont "$DisplayFont"
- $WDWRITE WindowMaker LargeDisplayFont "$LargeDisplayFont"
-+$WDWRITE WindowMaker MultiByteText "$MultiByteText"
- 
- echo
- echo "WindowTitleFont=$WindowTitleFont"
-@@ -244,5 +254,6 @@
- echo "ClipTitleFont=$ClipTitleFont"
- echo "DisplayFont=$DisplayFont"
- echo "LargeDisplayFont=$LargeDisplayFont"
-+echo "MultiByteText=$MultiByteText"
- echo
- echo "Done."
diff --git a/x11-wm/windowmaker-i18n/files/patch-bf b/x11-wm/windowmaker-i18n/files/patch-bf
deleted file mode 100644
index 5439a57dc9a5..000000000000
--- a/x11-wm/windowmaker-i18n/files/patch-bf
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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:1:0
-+libwraster_la_LDFLAGS = -version-info 3:0:0
- 
- bin_SCRIPTS = get-wraster-flags
- 
diff --git a/x11-wm/windowmaker-i18n/files/patch-wsetfont b/x11-wm/windowmaker-i18n/files/patch-wsetfont
new file mode 100644
index 000000000000..b2d89dd0deb1
--- /dev/null
+++ b/x11-wm/windowmaker-i18n/files/patch-wsetfont
@@ -0,0 +1,127 @@
+--- util/wsetfont.orig	Fri May 18 22:09:24 2001
++++ util/wsetfont	Fri May 18 22:09:40 2001
+@@ -77,7 +77,7 @@
+     "--auto")
+ 	auto="YES";;
+     *)
+-	if echo $i |grep "^--locale=" &>/dev/null; then
++	if echo $i |grep "^--locale=" >/dev/null 2>&1; then
+ 	    new_locale=$(echo $i |sed -e "s|--locale=||" -)
+ 	elif [ -z $family ]; then
+ 	    family=$i
+@@ -115,7 +115,7 @@
+ 
+ for i in $DomainNames; do
+     tmp="Domain$i"
+-    AllKeys="$AllKeys ${!tmp}"
++    AllKeys="$AllKeys `eval echo '${'$tmp'}'`"
+ done
+ 
+ #
+@@ -212,8 +212,8 @@
+ 	family="default"
+     else
+ 	for i in $all_codings; do
+-	    for j in ${!i}; do
+-		if [ "$j" == "${locale%_*}" ]; then
++	    for j in `eval echo '${'$i'}'`; do
++		if [ "$j" = "${locale%_*}" ]; then
+ 		    family="$i"
+ 		    break 2
+ 		fi
+@@ -227,7 +227,7 @@
+ #
+ is_supported=""
+ for i in $Supported; do
+-    if test "$family" == "$i"; then
++    if test "$family" = "$i"; then
+ 	is_supported="YES"
+ 	break
+     fi
+@@ -245,7 +245,7 @@
+ #
+ is_nodef_unable=""
+ for i in $NodefUnable; do
+-    if test "$family" == "$i"; then
++    if test "$family" = "$i"; then
+ 	if test -n "$nodef"; then	# --nodef with one from $NodefUnable
+ 	    echo -e "\n"\
+ 		"Sorry, --nodef argument is not allowed for these font codings:\n"\
+@@ -268,22 +268,22 @@
+     for i in $AllKeys; do
+ 	if test -n "$is_nodef_unable"; then		# japanese,... defaults
+ 	    tmp="$family$i"
+-	    eval $i=${!tmp}
++	    eval $i=`eval echo '${'$tmp'}'`
+ 	else						# rest, load defaults
+ 	    not_font=""
+ 	    for j in $NotFont; do
+-		if test "$i" == "$j"; then
++		if test "$i" = "$j"; then
+ 		    not_font="YES"
+ 		    break
+ 		fi
+ 	    done
+ 	    if test -n "$not_font"; then  # don't append coding (not default!)
+ 		tmp="${family}$i"
+-		eval $i="${!tmp}"
++		eval $i="`eval echo '${'$tmp'}'`"
+ 	    else					# append coding
+ 		tmp="Default$i"
+ 		tmp1="${family}Coding"
+-		eval $i="${!tmp}${!tmp1}"
++		eval $i="`eval echo '${'$tmp'}${'$tmp1'}'`"
+ 	    fi
+ 	fi
+     done
+@@ -305,36 +305,38 @@
+     echo
+     echo "Setting up $i domain file..."
+     tmp="Domain$i"
+-    for j in ${!tmp}; do
++    for j in `eval echo '${'$tmp'}'`; do
+ 	if test -n "$nodef"; then		# --nodef, change coding only
+ 	    not_font=""
+ 	    for k in $NotFont; do
+-		if test "$k" == "$j"; then
++		if test "$k" = "$j"; then
+ 		    not_font="YES"
+ 		    break;
+ 		fi
+ 	    done
+ 	    if test -n "$not_font"; then		# don't append coding
+ 		tmp1="${family}$j"
+-		eval $j=${!tmp1}
++		eval $j=`eval echo '${'$tmp1'}'`
+ 	    else					# append coding
+ #TODO:make this funny sed script a lot smarter to let us make changes in font
+ #     lists, etc... (then we can enable --nodef for NodefUnable codings)
+ #TODO:better (or at least any) check, whether wmaker is installed...
+-		tmp1="${family}Coding"
+-		eval $j=$($WDREAD $i $j | sed -e "s/\(^-.*-\).*-.*$/\1${!tmp1}/g")
+-		if test -z "${!j}"; then		# failed, load default
++		tmp1="`eval echo '${'${family}Coding'}'`"
++		eval $j=`$WDREAD $i $j | sed -e "s/\(^-.*-\).*-.*$/\1${tmp1}/g"`
++		if test -z "`eval echo '${'$j'}'`"; then		# failed, load default
+ 		    tmp2="Default$j"
+-		    eval $j=${!tmp2}
++		    eval $j=`eval echo '${'$tmp2'}'`
+ 		fi
+ 	    fi
+ 	fi
+-	tmp1="$j=\"${!j}\""			# cosmetic length workaround
+-	if (( ${#tmp1} > 80 )); then
+-	    tmp1=$(echo "${tmp1:0:76}...\"")
++	tmp1="$j=\"`eval echo '${'$j'}'`\""			# cosmetic length workaround
++        echo '<<<<'
++	if [ ${#tmp1} -lt 80 ]; then
++	    tmp1=`echo $tmp1 | sed -e 's/^\(.\{1,76\}\).*/\1/'`
+ 	fi
++        echo '>>>>'
+ 	echo "$tmp1"
+-	$WDWRITE $i $j \"${!j}\"
++	$WDWRITE $i $j \"`eval echo '${'$j'}'`\"
+     done
+ done
+ echo
+
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 97ddb2d02b73..65be087eb454 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -103,7 +103,7 @@ lib/libWMaker.a
 lib/libWUtil.a
 lib/libwraster.a
 lib/libwraster.so
-lib/libwraster.so.3
+lib/libwraster.so.4
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
@@ -275,6 +275,7 @@ 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/et/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
@@ -286,8 +287,8 @@ share/locale/hu/LC_MESSAGES/WPrefs.mo
 share/locale/hu/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
+share/locale/ja/LC_MESSAGES/WPrefs.mo
+share/locale/ja/LC_MESSAGES/WindowMaker.mo
 share/locale/ko/LC_MESSAGES/WPrefs.mo
 share/locale/ko/LC_MESSAGES/WindowMaker.mo
 share/locale/nl/LC_MESSAGES/WindowMaker.mo