Update to: 0.20.3

Note Maintainer's introduce page on pkg/DESCR.
PR:	ports/9022
Submitted by:	Maintainer

7 files changed, 62 insertions, 55 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 572f3f76028a..610e3585d0c9 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	WindowMaker with i18n extention
-# Version required:	0.20.2
+# Version required:	0.20.3
 # Date created:		24 Nov 1998
 # Whom:			mac@jp.freebsd.org
 #
 # $Id: Makefile,v 1.42 1998/11/25 23:05:42 asami Exp $
 
-DISTNAME=	WindowMaker-0.20.2
-PKGNAME=	windowmaker-i18n-0.20.2
+DISTNAME=	WindowMaker-0.20.3
+PKGNAME=	windowmaker-i18n-0.20.3
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/ \
 		ftp://ftp.io.com/pub/mirror/windowmaker/beta/srcs/ \
 		http://jgo.local.net/cool_downloads/wm/ \
-		http://www.itlb.te.noda.sut.ac.jp/~manome/wmaker/archive/ \
-		ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/misc/wmaker/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} setlinguas-0.4.gz \
-		WindowMaker-0.20.2-ko.po.gz WPrefs-0.20.2-ko.po.gz
+		ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/misc/wmaker/ 
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} \
+		WindowMaker-0.20.3-ko.po.gz WPrefs-0.20.3-ko.po.gz 
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	mac@jp.freebsd.org
 
@@ -26,18 +26,15 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 BUILD_DEPENDS=	${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext \
 		nkf:${PORTSDIR}/japanese/nkf
 
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
-
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	X11BASE=${X11BASE} LOCALBASE=${LOCALBASE}\
+CONFIGURE_ENV=	X11BASE=${X11BASE}  LOCALBASE=${LOCALBASE} \
 		LINGUAS="de es fi fr hr it ja_JP.EUC ja_JP.SJIS ko nl no pl pt ru"
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 	--with-nlsdir=${PREFIX}/share/locale \
 	--with-gfx-libs="-L${LOCALBASE}/lib" \
-	--with-gfx-incs="-I${LOCALBASE}/include/tiff34 -I${LOCALBASE}/include" \
+	--with-gfx-incs="-I${LOCALBASE}/include -I${LOCALBASE}/include/giflib" \
 	--disable-debug --enable-kanji
-MAKE_ENV=	LOCALBASE=${LOCALBASE}
 
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
@@ -47,15 +44,15 @@ DATAFILES=	WindowMaker-data.tar.gz
 .include <bsd.port.pre.mk>
 
 post-extract:
-	@${GUNZIP_CMD} -c < ${_DISTDIR}/setlinguas-0.4.gz > ${WRKDIR}/setlinguas
-	@${GUNZIP_CMD} -c < ${_DISTDIR}/WindowMaker-0.20.2-ko.po.gz > ${WRKSRC}/po/ko.po
-	@${GUNZIP_CMD} -c < ${_DISTDIR}/WPrefs-0.20.2-ko.po.gz > ${WRKSRC}/WPrefs.app/po/ko.po
+	@${GUNZIP_CMD} -c < ${_DISTDIR}/WindowMaker-0.20.3-ko.po.gz \
+			> ${WRKSRC}/po/ko.po
+	@${GUNZIP_CMD} -c < ${_DISTDIR}/WPrefs-0.20.3-ko.po.gz \
+			> ${WRKSRC}/WPrefs.app/po/ko.po
 
 post-patch:
 	@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
 
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/setlinguas ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
 	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds/
 	@${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index 7bfe477e1d0f..b29b41d6a21d 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1,5 +1,4 @@
-MD5 (WindowMaker-0.20.2.tar.gz) = 26f92b4697238911f51566530f1915a3
+MD5 (WindowMaker-0.20.3.tar.gz) = fb79baa4ae084a0747a5d3683eebc686
 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
-MD5 (setlinguas-0.4.gz) = 21b3e4bb93b730f1c5f72bd9d73aae42
-MD5 (WindowMaker-0.20.2-ko.po.gz) = daf05a48c3a2445f7935a8142a029a5f
-MD5 (WPrefs-0.20.2-ko.po.gz) = b49a72d95984b7ced07696cc7fd61566
+MD5 (WindowMaker-0.20.3-ko.po.gz) = d2a0881ad7de172168f1fc94945d02cc
+MD5 (WPrefs-0.20.3-ko.po.gz) = d8f2508b75d7edcbb17a59c9abb04a54
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index ea6fb676d9e9..53bcbe7bb0a8 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,15 +1,15 @@
---- configure.orig	Fri Oct 23 21:49:55 1998
-+++ configure	Sun Nov 22 21:44:52 1998
-@@ -2000,7 +2000,7 @@
+--- configure.orig	Fri Nov 27 20:24:31 1998
++++ configure	Sat Dec  5 21:46:08 1998
+@@ -2012,7 +2012,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lintl  $LIBS"
-+LIBS="-L$LOCALBASE/lib -lintl  $LIBS"
++LIBS="-L${LOCALBASE}/lib -lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2006 "configure"
+ #line 2018 "configure"
  #include "confdefs.h"
-@@ -2100,8 +2100,8 @@
+@@ -2112,8 +2112,8 @@
  
  
  
@@ -20,21 +20,12 @@
  
  for lang in $LINGUAS; do
  	ok=0
-@@ -3678,7 +3678,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lgif $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $LIBS"
-+LIBS="-lgif $GFX_INC_PATH $GFX_LIB_PATH $XLFLAGS $XLIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3684 "configure"
- #include "confdefs.h"
-@@ -4178,7 +4178,7 @@
+@@ -4151,7 +4151,7 @@
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+ac_try="$ac_cpp -I$LOCALBASE/include conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:4183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_try="$ac_cpp -I${LOCALBASE}/include conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:4156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
diff --git a/x11-wm/windowmaker-i18n/files/patch-ak b/x11-wm/windowmaker-i18n/files/patch-ak
index 303dc04205a2..df874727b15d 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ak
+++ b/x11-wm/windowmaker-i18n/files/patch-ak
@@ -1,6 +1,6 @@
---- po/Makefile.in.orig	Fri Oct 23 22:02:30 1998
-+++ po/Makefile.in	Sun Nov 22 22:04:06 1998
-@@ -215,6 +215,11 @@
+--- po/Makefile.in.orig	Sat Dec  5 21:56:08 1998
++++ po/Makefile.in	Sat Dec  5 21:56:36 1998
+@@ -216,12 +216,17 @@
  clean-generic maintainer-clean-generic clean mostlyclean distclean \
  maintainer-clean
  
@@ -11,4 +11,12 @@
 +	nkf -e ja.po > ja_JP.SJIS.po
  
  .po.mo: 
- 	msgfmt -o $@ $<
+-	msgfmt -o $@ $<
++	${LOCALBASE}/bin/msgfmt -o $@ $<
+ 
+ WindowMaker.pot: $(POTFILES)
+-	xgettext --default-domain=WindowMaker \
++	${LOCALBASE}/bin/xgettext --default-domain=WindowMaker \
+ 	--add-comments --keyword=_ $(POTFILES)
+ 	if cmp -s WindowMaker.po WindowMaker.pot; then \
+ 	    rm -f WindowMaker.po; \
diff --git a/x11-wm/windowmaker-i18n/files/patch-al b/x11-wm/windowmaker-i18n/files/patch-al
index 682d2df22842..c3a076ffb460 100644
--- a/x11-wm/windowmaker-i18n/files/patch-al
+++ b/x11-wm/windowmaker-i18n/files/patch-al
@@ -1,6 +1,6 @@
---- WPrefs.app/po/Makefile.in.orig	Fri Oct 23 22:03:53 1998
-+++ WPrefs.app/po/Makefile.in	Sun Nov 22 22:05:50 1998
-@@ -205,6 +205,11 @@
+--- WPrefs.app/po/Makefile.in.orig	Sat Dec  5 21:56:20 1998
++++ WPrefs.app/po/Makefile.in	Sat Dec  5 21:56:36 1998
+@@ -206,12 +206,17 @@
  clean-generic maintainer-clean-generic clean mostlyclean distclean \
  maintainer-clean
  
@@ -11,4 +11,12 @@
 +	nkf -e ja.po > ja_JP.SJIS.po
  
  .po.mo: 
- 	msgfmt -o $@ $<
+-	msgfmt -o $@ $<
++	${LOCALBASE}/bin/msgfmt -o $@ $<
+ 
+ WPrefs.pot: $(POTFILES)
+-	xgettext --default-domain=WPrefs \
++	${LOCALBASE}/bin/xgettext --default-domain=WPrefs \
+ 	--add-comments --keyword=_ $(POTFILES)
+ 	if cmp -s WPrefs.po WPrefs.pot; then \
+ 	    rm -f WPrefs.po; \
diff --git a/x11-wm/windowmaker-i18n/pkg-descr b/x11-wm/windowmaker-i18n/pkg-descr
index e59bdd3de6bc..157a391449ca 100644
--- a/x11-wm/windowmaker-i18n/pkg-descr
+++ b/x11-wm/windowmaker-i18n/pkg-descr
@@ -6,6 +6,10 @@ does lack features. When it is completed, it will be a GNUSTEP compliant
 Windowmanager that requires no editing of messy configuration files.
 
 This port based on x11-wm/windowmaker ports skelton, enhanced i18n. 
-If use first, execute "wmaker.inst" and "setlinguas you_choosed_language".
+If use first, execute "wmaker.inst" and "wsetfont you_choosed_language".
 you_choosed_language is example "japanese", "korean", etc. More info about 
-setlinguas, see help of setlinguas.
+wsetfont, see help of wsetfont.
+
+If you use with xdm, set your LANG enviroment variable in your .xsession. 
+
+Japanese notation: <URL:http://www.st.rim.or.jp/~mac/FreeBSD/wmaker/>.
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index d567eb6836f0..782a69482dea 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -117,7 +117,6 @@ GNUstep/Apps/WPrefs.app/xpm/workspace.xpm
 GNUstep/Apps/WPrefs.app/xpm/xis.xpm
 bin/geticonset
 bin/getstyle
-bin/setlinguas
 bin/seticons
 bin/setstyle
 bin/wdwrite
@@ -125,6 +124,7 @@ bin/wm-oldmenu2new
 bin/wmaker
 bin/wmaker.inst
 bin/wmsetbg
+bin/wsetfont
 bin/wxcopy
 bin/wxpaste
 include/WINGs.h
@@ -286,22 +286,22 @@ share/WindowMaker/wmmacros
 share/locale/de/LC_MESSAGES/WindowMaker.mo
 share/locale/es/LC_MESSAGES/WindowMaker.mo
 share/locale/fi/LC_MESSAGES/WindowMaker.mo
-share/locale/fr/LC_MESSAGES/WindowMaker.mo
 share/locale/fr/LC_MESSAGES/WPrefs.mo
-share/locale/hr/LC_MESSAGES/WindowMaker.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/WindowMaker.mo
-share/locale/ja_JP.EUC/LC_MESSAGES/WindowMaker.mo
 share/locale/ja_JP.EUC/LC_MESSAGES/WPrefs.mo
-share/locale/ja_JP.SJIS/LC_MESSAGES/WindowMaker.mo
+share/locale/ja_JP.EUC/LC_MESSAGES/WindowMaker.mo
 share/locale/ja_JP.SJIS/LC_MESSAGES/WPrefs.mo
-share/locale/ko/LC_MESSAGES/WindowMaker.mo
+share/locale/ja_JP.SJIS/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
 share/locale/no/LC_MESSAGES/WindowMaker.mo
 share/locale/pl/LC_MESSAGES/WindowMaker.mo
-share/locale/pt/LC_MESSAGES/WindowMaker.mo
 share/locale/pt/LC_MESSAGES/WPrefs.mo
+share/locale/pt/LC_MESSAGES/WindowMaker.mo
 share/locale/ru/LC_MESSAGES/WindowMaker.mo
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles