From mac@clave.gr.jp  Sun May 20 22:24:23 2001
Return-Path: <mac@clave.gr.jp>
Received: from rumba.clave.gr.jp (rumba.clave.gr.jp [202.248.115.186])
	by hub.freebsd.org (Postfix) with ESMTP id 1035737B424
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 20 May 2001 22:24:23 -0700 (PDT)
	(envelope-from mac@clave.gr.jp)
Received: (from mac@localhost)
	by rumba.clave.gr.jp (8.9.3+3.2W/3.7W) id OAA31729;
	Mon, 21 May 2001 14:24:22 +0900 (JST)
Message-Id: <200105210524.OAA31729@rumba.clave.gr.jp>
Date: Mon, 21 May 2001 14:24:22 +0900 (JST)
From: mac@clave.gr.jp
Reply-To: mac@clave.gr.jp
To: FreeBSD-gnats-submit@freebsd.org
Subject: windowmaker-i18n update to 0.65.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         27488
>Category:       ports
>Synopsis:       windowmaker-i18n update to 0.65.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 20 22:30:01 PDT 2001
>Closed-Date:    Sun May 27 11:02:51 PDT 2001
>Last-Modified:  Sun May 27 11:03:49 PDT 2001
>Originator:     Masahide -mac- NODA
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD berlog 4.3-STABLE FreeBSD 4.3-STABLE #0: Tue May 15 09:12:29 GMT 2001 mac@berlog:/usr/src/sys/compile/BERLOG i386

>Description:

update windowmaker-i18n ports :
    - Window Maker 0.65.0
    - japanese po files now store in ja ( not ja_JP.EUC )
    - Hermes support enable
    - wsetfont script running with /bin/sh

>How-To-Repeat:
	<code/input/activities to reproduce the problem (multiple lines)>
>Fix:

attach this patch and remove follwo size 0 files:
	files/patch-ad
	files/patch-bc
	files/patch-bf

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-wm/windowmaker-i18n/Makefile,v
retrieving revision 1.82
diff -u -r1.82 Makefile
--- Makefile	2001/02/27 04:59:21	1.82
+++ Makefile	2001/05/21 03:23:14
@@ -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}
@@ -19,6 +19,7 @@
 		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 +34,13 @@
 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 \
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/x11-wm/windowmaker-i18n/distinfo,v
retrieving revision 1.35
diff -u -r1.35 distinfo
--- distinfo	2001/02/27 04:59:21	1.35
+++ distinfo	2001/05/10 23:44:28
@@ -1 +1 @@
-MD5 (WindowMaker-0.64.0.tar.bz2) = f03a6e99eb62c6edc2b452b7d6c54edb
+MD5 (WindowMaker-0.65.0.tar.bz2) = d17f6b206db4c4157248e36422fc9cbb
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/x11-wm/windowmaker-i18n/pkg-plist,v
retrieving revision 1.33
diff -u -r1.33 pkg-plist
--- pkg-plist	2001/02/27 04:59:21	1.33
+++ pkg-plist	2001/05/19 08:33:08
@@ -103,7 +103,7 @@
 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/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/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
? files/patch-wsetfont
Index: files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/x11-wm/windowmaker-i18n/files/patch-ad,v
retrieving revision 1.23
diff -u -r1.23 patch-ad
--- files/patch-ad	2001/02/27 04:59:25	1.23
+++ files/patch-ad	2001/05/21 05:14:12
@@ -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
Index: files/patch-ak
===================================================================
RCS file: /home/ncvs/ports/x11-wm/windowmaker-i18n/files/patch-ak,v
retrieving revision 1.4
diff -u -r1.4 patch-ak
--- files/patch-ak	1999/02/11 07:23:10	1.4
+++ files/patch-ak	2001/05/21 05:14:12
@@ -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 $@ $<
Index: files/patch-al
===================================================================
RCS file: /home/ncvs/ports/x11-wm/windowmaker-i18n/files/patch-al,v
retrieving revision 1.4
diff -u -r1.4 patch-al
--- files/patch-al	1999/02/11 07:23:10	1.4
+++ files/patch-al	2001/05/21 05:14:12
@@ -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 $@ $<
Index: files/patch-bc
===================================================================
RCS file: /home/ncvs/ports/x11-wm/windowmaker-i18n/files/patch-bc,v
retrieving revision 1.4
diff -u -r1.4 patch-bc
--- files/patch-bc	2001/02/27 04:59:25	1.4
+++ files/patch-bc	2001/05/21 05:14:12
@@ -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."
Index: files/patch-bf
===================================================================
RCS file: /home/ncvs/ports/x11-wm/windowmaker-i18n/files/patch-bf,v
retrieving revision 1.2
diff -u -r1.2 patch-bf
--- files/patch-bf	2001/01/11 00:18:30	1.2
+++ files/patch-bf	2001/05/21 05:14:12
@@ -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
- 


>Release-Note:
>Audit-Trail:

From: Masahide -mac- NODA <mac@clave.gr.jp>
To: FreeBSD-gnats-submit@FreeBSD.ORG
Cc:  
Subject: Re: ports/27488: windowmaker-i18n update to 0.65.0
Date: Fri, 25 May 2001 13:01:50 +0900 (JST)

 Sorry, I forgot one file. Please put this file in files/patch-wsetfont.
 
 
 --- 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
 
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Sun May 27 11:02:51 PDT 2001 
State-Changed-Why:  
committed by sobomax, thanks 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=27488 
>Unformatted:
