Update "windowmaker" package to version 0.65.1. The changes since version

0.65.0 are:
- removed FocusFollowMouse from wmaker and WPrefs
- fixed problem with alpha images showing a blue tint on big endian machines
- fixed problem with WINGs based apps exiting with a "X_RotateProperties"
  related error when text was selected in a textfiled (including WPrefs.app
  and Window Maker itself).
- fixed bug with maximization of windows with fixed resize increments
- added None geometry display type
- fixed window enumeration bug
- removed GNUisms from wsetfont (Marcelo E. Magallon <marcelo.magallon@bigfoot.com>, Masahide -mac- NODA <mac@clave.gr.jp>)
- added slovakian translations from (tomka@oalevice.sk)
- added WINGs i18n patch from tomka@oalevice.sk
- fixed wmsetbg.c to work in servers capable of multiple depths (overlay)
- added HMaximizeKey (Ruda Moura <ruda@conectiva.com.br>)
- fixed bad SIGPIPE handling setup across forks (Philippe Troin <phil@fifi.org>)
- added workaround for bug in locale handling on font set creation (Seiichi SATO <sato@cvs-net.co.jp>)
- Fixed some non-portable shell constructs used in installed scripts
  (Johnny C. Lam <lamj@stat.cmu.edu>)
- Fixed crash with long titles in the window list menu (buffer overflow)
  (Alban Hertroys <dalroi@wit401310.student.utwente.nl>, reported by
   Robert Marshall <robert@chezmarshall.freeserve.co.uk>)
- Replaced almost all sprintf() calls with snprintf()
- fixed crash when removing menu entry for Window List or Workspace submenu

9 files changed, 89 insertions, 225 deletions

diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index fff92d19e2e..b0cf9a5b529 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2001/07/23 18:54:55 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2001/08/18 18:13:27 tron Exp $
 
-DISTNAME=		WindowMaker-0.65.0
-PKGNAME=		windowmaker-0.65.0
+DISTNAME=		WindowMaker-0.65.1
+PKGNAME=		windowmaker-0.65.1
 CATEGORIES=		x11 wm
 MASTER_SITES=		ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 			ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/WindowMaker/beta/srcs/
@@ -51,8 +51,9 @@ CONFIGURE_ARGS+=	--enable-${OPTION}
 post-extract:
 	${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \
 		 ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
-		 ${WRKSRC}/WindowMaker/Defaults/WindowMaker
-	for manfile in ${WRKSRC}/doc/*.1x; \
+		 ${WRKSRC}/WindowMaker/Defaults/WindowMaker \
+		 ${WRKSRC}/po/zh_TW.Big5.po
+	for manfile in ${WRKSRC}/doc/*.1x ${WRKSRC}/doc/*/*.1x; \
 	do \
 		${MV} $${manfile} `${ECHO} $${manfile} | ${SED} "s/1x$$/1/"`; \
 	done;
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index 859d1746a22..71820d393bb 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.10 2001/07/23 18:56:19 wiz Exp $
+$NetBSD: distinfo,v 1.11 2001/08/18 18:13:27 tron Exp $
 
-SHA1 (WindowMaker-0.65.0.tar.bz2) = acc08353dbdbd0af26b0fa653322f60347c5a6fe
-Size (WindowMaker-0.65.0.tar.bz2) = 1876239 bytes
-SHA1 (patch-aa) = 2c353985edb3f993235428b0124ae00ddd74e60b
-SHA1 (patch-ab) = cb1f893635746725dd4143fb74bf16ab61f56319
+SHA1 (WindowMaker-0.65.1.tar.bz2) = 2600498e72ba3fc5a8fd9fb27ac1261b89c42826
+Size (WindowMaker-0.65.1.tar.bz2) = 1916105 bytes
+SHA1 (patch-aa) = 3d0ee91d9c7a98be2ff49614567c2af96178445a
+SHA1 (patch-ab) = 7b24ac2787ad675ba7da64444889a5334ea71a31
 SHA1 (patch-ac) = 8e4b85dc9b8b3cf211b6c76dbca46f60308ac591
-SHA1 (patch-ad) = cc41fd43ae1682bd0fe7129de4eafd8531b548c2
-SHA1 (patch-ae) = 3e9e44fb44b83278d4536319962b0df9bc22698c
-SHA1 (patch-af) = 517a32cfeb61556ff057be5cef74785e358110c5
-SHA1 (patch-ag) = 7e64472f406c9692082b3fc5f05ad8a8d260affd
+SHA1 (patch-ad) = f2ef4b942be333deb7f5f00e00653beb3081888e
+SHA1 (patch-ae) = 13c09a0cf40eb20d7866cd4855bbfe91cfc11fb0
 SHA1 (patch-ah) = 6725c4762a07f923304dc63df66afe8a6fae0253
diff --git a/wm/windowmaker/patches/patch-aa b/wm/windowmaker/patches/patch-aa
index dab4638a128..8c357e5a223 100644
--- a/wm/windowmaker/patches/patch-aa
+++ b/wm/windowmaker/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.3 2001/05/22 10:42:13 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2001/08/18 18:13:28 tron Exp $
 
---- doc/Makefile.am.orig	Sun May  2 23:23:10 1999
-+++ doc/Makefile.am
-@@ -1,16 +1,16 @@
- ## Process this file with automake to produce Makefile.in
+--- doc/Makefile.am.orig	Wed Jun  6 22:22:55 2001
++++ doc/Makefile.am	Sat Aug 18 18:24:27 2001
+@@ -3,16 +3,16 @@
+ SUBDIRS = sk
  
  man_MANS = \
 -	geticonset.1x \
diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-ab
index 94c73cd8080..47cc00bbbe8 100644
--- a/wm/windowmaker/patches/patch-ab
+++ b/wm/windowmaker/patches/patch-ab
@@ -1,10 +1,15 @@
-$NetBSD: patch-ab,v 1.5 2001/07/14 18:22:35 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2001/08/18 18:13:28 tron Exp $
 
---- configure.in.orig	Sun Apr 29 17:21:39 2001
-+++ configure.in
-@@ -223,29 +223,11 @@
- supported_locales="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.in.orig	Mon Jul 23 21:43:34 2001
++++ configure.in	Sat Aug 18 19:57:49 2001
+@@ -220,43 +220,18 @@
+ 
+ dnl List of supported locales
+ dnl -------------------------
+-supported_locales="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"
++supported_locales="cs de es et fr gl it ja ko nl no pt ru sv tr fi hr el pl ro da 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_wings_locales="sk"
  
 -for lang in $LINGUAS; do
 -	ok=0
@@ -29,15 +34,28 @@ $NetBSD: patch-ab,v 1.5 2001/07/14 18:22:35 jlam Exp $
 -	if test "$ok" = 1; then
 -		WPMOFILES="$WPMOFILES $lang.mo"
 -	fi
+-	ok=0
+-	for l in $supported_wings_locales; do
+-		if test "$l" = "$lang"; then
+-			ok=1
+-			break
+-		fi
+-	done
+-	if test "$ok" = 1; then
+-		WINGSMOFILES="$WINGSMOFILES $lang.mo"
+-	fi
 +for lang in $supported_locales; do
 +	MOFILES="$MOFILES $lang.mo"
 +done
 +for lang in $supported_wprefs_locales; do
 +	WPMOFILES="$WPMOFILES $lang.mo"
++done
++for lang in $supported_wings_locales; do
++	WINGSMOFILES="$WINGSMOFILES $lang.mo"
  done
  
  
-@@ -720,8 +702,8 @@
+@@ -732,8 +707,8 @@
      fi
  fi
  
diff --git a/wm/windowmaker/patches/patch-ad b/wm/windowmaker/patches/patch-ad
index cee4bc73edf..d257dd45843 100644
--- a/wm/windowmaker/patches/patch-ad
+++ b/wm/windowmaker/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.5 2001/06/29 16:28:51 nra Exp $
+$NetBSD: patch-ad,v 1.6 2001/08/18 18:13:28 tron Exp $
 
---- src/main.c.orig	Tue Apr 10 19:14:42 2001
-+++ src/main.c	Fri Jun 29 11:19:34 2001
+--- src/main.c.orig	Mon Jul 23 20:04:13 2001
++++ src/main.c	Sat Aug 18 19:31:43 2001
 @@ -28,6 +28,7 @@
  #include <sys/stat.h>
  #include <sys/types.h>
@@ -22,4 +22,4 @@ $NetBSD: patch-ad,v 1.5 2001/06/29 16:28:51 nra Exp $
 +    sigaction(SIGPIPE, &sa, NULL);
  
      if (multiHead) {
-     	tmp = wmalloc(strlen(DisplayName)+64);
+ 	int len = strlen(DisplayName)+64;
diff --git a/wm/windowmaker/patches/patch-ae b/wm/windowmaker/patches/patch-ae
index dd97789fc00..3eb205f8383 100644
--- a/wm/windowmaker/patches/patch-ae
+++ b/wm/windowmaker/patches/patch-ae
@@ -1,13 +1,31 @@
-$NetBSD: patch-ae,v 1.1 2001/07/15 08:43:34 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2001/08/18 18:13:28 tron Exp $
 
---- util/wmaker.inst.in.orig	Mon Feb 19 20:28:11 2001
-+++ util/wmaker.inst.in
-@@ -293,7 +293,7 @@
-  echo "menu that will be used by default is the property list one. Read"
-  echo "    $GSDIR/Library/WindowMaker/README"
-  echo "for information on how to change it."
--    if [ "${inst_menu%.*}" == "menu" ]; then
-+    if [ "${inst_menu%.*}" = "menu" ]; then
-  echo "However, since you have locale set to $LOCALE and plmenu for such locale"
-  echo "was not found, your WMRootMenu contains path to text formated menu:"
-  echo "    $GSDIR/Library/WindowMaker/$inst_menu"
+--- doc/sk/Makefile.am.orig	Wed Jun  6 22:22:55 2001
++++ doc/sk/Makefile.am	Sat Aug 18 18:25:38 2001
+@@ -3,16 +3,16 @@
+ mandir=@mandir@/sk
+ 
+ man_MANS = \
+-	geticonset.1x \
+-	setstyle.1x \
+-	wxpaste.1x \
+-	getstyle.1x \
+-	wdwrite.1x \
+-	wmsetbg.1x \
+-	wsetfont.1x \
+-	seticons.1x \
+-	wmaker.1x \
+-	wxcopy.1x
++	geticonset.1 \
++	setstyle.1 \
++	wxpaste.1 \
++	getstyle.1 \
++	wdwrite.1 \
++	wmsetbg.1 \
++	wsetfont.1 \
++	seticons.1 \
++	wmaker.1 \
++	wxcopy.1
+ 
+ EXTRA_DIST = $(man_MANS)
+ 
diff --git a/wm/windowmaker/patches/patch-af b/wm/windowmaker/patches/patch-af
deleted file mode 100644
index 4f69f5ed7a8..00000000000
--- a/wm/windowmaker/patches/patch-af
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/07/15 08:46:00 jlam Exp $
-
---- util/wmchlocale.in.orig	Fri Feb  9 11:05:49 2001
-+++ util/wmchlocale.in
-@@ -9,7 +9,7 @@
- PROGRAM=`basename $0`
- VERSION="0.1"
- 
--if [ "x$GNUSTEP_USER_ROOT" == "x" ]; then
-+if [ "x$GNUSTEP_USER_ROOT" = "x" ]; then
-     GSDIR="$HOME/GNUstep"
- else
-     GSDIR="$GNUSTEP_USER_ROOT"
-@@ -33,7 +33,7 @@
-     exit 0
- }
- 
--if (( $# == 0 )); then
-+if [ $# -eq 0 ]; then
-     help_msg
- fi
- 
-@@ -52,7 +52,7 @@
- 	fi;;
-     esac
- done
--if [ "$new_locale" == "default" ]; then
-+if [ "$new_locale" = "default" ]; then
-     new_locale=""
- fi
- 
-@@ -75,7 +75,7 @@
- 
- echo -n "Setting Window Maker root menu... "
- 
--if [ -z "$new_locale" ] || [ "$new_locale" == "en" ]; then
-+if [ -z "$new_locale" ] || [ "$new_locale" = "en" ]; then
-     menu_list="plmenu menu"
- else
-     menu_list="plmenu.$new_locale menu.$new_locale plmenu menu"
-@@ -88,7 +88,12 @@
- 	    else
- 		echo "fail (copying default)"
- 	    fi
--	    if [ "${new_menu:0:4}" == "menu" ]; then		# plain
-+	    new_menu_tmp=$new_menu
-+	    # Set new_menu_tmp to first 4 letters of $new_menu.
-+	    while [ ${#new_menu_tmp} -gt 4 ]; do
-+		new_menu_tmp=${new_menu_tmp%?}
-+	    done
-+	    if [ "${new_menu_tmp}" = "menu" ]; then		# plain
- 		echo "\"$wm_dir/$new_menu\"" >"$GSDIR/Defaults/WMRootMenu"
- 	    else						# proplist
- 		cp -f "$wm_dir/$new_menu" "$GSDIR/Defaults/WMRootMenu"
-@@ -104,7 +109,7 @@
- 
- echo -n "Setting Window Maker fonts... "
- 
--if [ -z "$new_locale" ] || [ "$new_locale" == "en" ]; then
-+if [ -z "$new_locale" ] || [ "$new_locale" = "en" ]; then
-     args="default $nodef"
- else
-     args="--locale=$new_locale $nodef"
diff --git a/wm/windowmaker/patches/patch-ag b/wm/windowmaker/patches/patch-ag
deleted file mode 100644
index 49de53ea732..00000000000
--- a/wm/windowmaker/patches/patch-ag
+++ /dev/null
@@ -1,119 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2001/07/15 08:48:01 jlam Exp $
-
---- util/wsetfont.orig	Mon Feb 19 20:28:11 2001
-+++ util/wsetfont
-@@ -115,7 +115,7 @@
- 
- for i in $DomainNames; do
-     tmp="Domain$i"
--    AllKeys="$AllKeys ${!tmp}"
-+    eval AllKeys="\"$AllKeys \$${tmp}\""
- done
- 
- #
-@@ -212,8 +212,9 @@
- 	family="default"
-     else
- 	for i in $all_codings; do
--	    for j in ${!i}; do
--		if [ "$j" == "${locale%_*}" ]; then
-+	    eval _i="\$$i"
-+	    for j in ${_i}; do
-+		if [ "$j" = "${locale%_*}" ]; then
- 		    family="$i"
- 		    break 2
- 		fi
-@@ -227,7 +228,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 +246,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 +269,22 @@
-     for i in $AllKeys; do
- 	if test -n "$is_nodef_unable"; then		# japanese,... defaults
- 	    tmp="$family$i"
--	    eval $i=${!tmp}
-+	    eval $i="\$${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="\$${tmp}"
- 	    else					# append coding
- 		tmp="Default$i"
- 		tmp1="${family}Coding"
--		eval $i="${!tmp}${!tmp1}"
-+		eval $i="\$${tmp}\$${tmp1}"
- 	    fi
- 	fi
-     done
-@@ -305,36 +306,36 @@
-     echo
-     echo "Setting up $i domain file..."
-     tmp="Domain$i"
--    for j in ${!tmp}; do
-+    eval _tmp="\$${tmp}"
-+    for j in ${_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="\$${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
-+		eval _tmp1="\$${tmp1}"
-+		eval $j=$($WDREAD $i $j | sed -e "s/\(^-.*-\).*-.*$/\1${_tmp1}/g")
-+		eval _j="\$$j"
-+		if test -z "${_j}"; then		# failed, load default
- 		    tmp2="Default$j"
--		    eval $j=${!tmp2}
-+		    eval $j="\$${tmp2}"
- 		fi
- 	    fi
- 	fi
--	tmp1="$j=\"${!j}\""			# cosmetic length workaround
--	if (( ${#tmp1} > 80 )); then
--	    tmp1=$(echo "${tmp1:0:76}...\"")
--	fi
--	echo "$tmp1"
--	$WDWRITE $i $j \"${!j}\"
-+	eval _j="\$$j"
-+	echo $j="${_j}"
-+	$WDWRITE $i $j \"${_j}\"
-     done
- done
- echo
diff --git a/wm/windowmaker/pkg/PLIST b/wm/windowmaker/pkg/PLIST
index 9172938ff7f..35227244987 100644
--- a/wm/windowmaker/pkg/PLIST
+++ b/wm/windowmaker/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2001/07/14 18:21:37 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/08/18 18:13:28 tron Exp $
 GNUstep/Apps/WPrefs.app/WPrefs
 GNUstep/Apps/WPrefs.app/WPrefs.tiff
 GNUstep/Apps/WPrefs.app/WPrefs.xpm
@@ -118,6 +118,16 @@ man/man1/wmsetbg.1
 man/man1/wsetfont.1
 man/man1/wxcopy.1
 man/man1/wxpaste.1
+man/sk/man1/geticonset.1
+man/sk/man1/getstyle.1
+man/sk/man1/seticons.1
+man/sk/man1/setstyle.1
+man/sk/man1/wdwrite.1
+man/sk/man1/wmaker.1
+man/sk/man1/wmsetbg.1
+man/sk/man1/wsetfont.1
+man/sk/man1/wxcopy.1
+man/sk/man1/wxpaste.1
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
@@ -273,6 +283,7 @@ share/WindowMaker/plmenu.fi
 share/WindowMaker/plmenu.fr
 share/WindowMaker/plmenu.hr
 share/WindowMaker/plmenu.it
+share/WindowMaker/plmenu.ja
 share/WindowMaker/plmenu.ko
 share/WindowMaker/plmenu.pl
 share/WindowMaker/plmenu.ro
@@ -320,6 +331,7 @@ ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/WindowMaker.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/WindowMaker.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/WPrefs.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/WindowMaker.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/WINGs.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/WPrefs.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/WindowMaker.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/WindowMaker.mo
@@ -327,7 +339,6 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/WindowMaker.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WPrefs.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
 ${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/WPrefs.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/WindowMaker.mo
 @dirrm share/doc/WindowMaker
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles