Update to version 0.50.2.

PR:		9465
Submitted by:	maintainer

6 files changed, 69 insertions, 86 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 9608de9eff75..f44eb97bce65 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -1,21 +1,19 @@
 # New ports collection makefile for:	WindowMaker with i18n extention
-# Version required:	0.20.3
+# Version required:	0.50.2
 # Date created:		24 Nov 1998
 # Whom:			mac@jp.freebsd.org
 #
-# $Id: Makefile,v 1.45 1998/12/10 22:24:31 sada Exp $
+# $Id: Makefile,v 1.46 1998/12/21 13:15:39 flathill Exp $
 
-DISTNAME=	WindowMaker-0.20.3
-PKGNAME=	windowmaker-i18n-0.20.3
+DISTNAME=	WindowMaker-0.50.2
+PKGNAME=	windowmaker-i18n-0.50.2
 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/ \
 		ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/misc/wmaker/ \
 		ftp://muse.brain.riken.go.jp/pub/rpm/contrib/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} \
-		WindowMaker-0.20.3-ko.po.gz WPrefs-0.20.3-ko.po.gz \
-		WindowMaker-0.20.3ja3.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
 
 MAINTAINER=	mac@jp.freebsd.org
 
@@ -27,17 +25,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} \
-		WindowMaker-0.20.3ja3.tar.gz
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 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"
+		LINGUAS="de es fi fr hr it ja_JP.EUC 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 -I${LOCALBASE}/include/giflib" \
-	--disable-debug --enable-kanji
+	--disable-debug --enable-kanji --disable-shared
 
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
@@ -46,23 +42,14 @@ DATAFILES=	WindowMaker-data.tar.gz
 
 .include <bsd.port.pre.mk>
 
-post-extract:
-	@${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
-	@${CP} ${WRKDIR}/WindowMaker-0.20.3ja3/WindowMaker.ja.po \
-			${WRKSRC}/po/ja.po
-	@${CP} ${WRKDIR}/WindowMaker-0.20.3ja3/WPrefs.ja.po \
-			${WRKSRC}/WPrefs.app/po/ja.po
-
 post-patch:
 	@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
+	@${CP} ${FILESDIR}/WPrefs.hr.po ${WRKSRC}/WPrefs.app/po/hr.po
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
-	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds/
 	@${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \
 		${PREFIX}/share/WindowMaker/Pixmaps/
+	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds/
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index b5c0c31ce74b..da528cf2bc1b 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1,5 +1,2 @@
-MD5 (WindowMaker-0.20.3.tar.gz) = fb79baa4ae084a0747a5d3683eebc686
+MD5 (WindowMaker-0.50.2.tar.gz) = 985288b835085d5a3d79652a7becf1c9
 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
-MD5 (WindowMaker-0.20.3-ko.po.gz) = d2a0881ad7de172168f1fc94945d02cc
-MD5 (WPrefs-0.20.3-ko.po.gz) = d8f2508b75d7edcbb17a59c9abb04a54
-MD5 (WindowMaker-0.20.3ja3.tar.gz) = 2829fd8c53840b16703dd972e3703cf0
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index 53bcbe7bb0a8..03ef02a3b1a8 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,31 +1,31 @@
---- configure.orig	Fri Nov 27 20:24:31 1998
-+++ configure	Sat Dec  5 21:46:08 1998
-@@ -2012,7 +2012,7 @@
+--- configure.orig	Sun Jan 10 10:55:54 1999
++++ configure	Mon Jan 11 09:36:16 1999
+@@ -2214,7 +2214,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lintl  $LIBS"
 +LIBS="-L${LOCALBASE}/lib -lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2018 "configure"
+ #line 2220 "configure"
  #include "confdefs.h"
-@@ -2112,8 +2112,8 @@
+@@ -2314,8 +2314,8 @@
  
  
  
 -supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro"
--supported_wprefs_locales="pt hr fr ko ja"
-+supported_locales="cs de es fr gl it ja_JP.EUC ja_JP.SJIS ko nl no pt ru se tr fi hr el pl ro"
-+supported_wprefs_locales="pt hr fr ko ja_JP.EUC ja_JP.SJIS"
+-supported_wprefs_locales="pt hr fr ko ja cs"
++supported_locales="cs de es fr gl it ja_JP.EUC ko nl no pt ru se tr fi hr el pl ro"
++supported_wprefs_locales="pt hr fr ko ja_JP.EUC cs"
  
  for lang in $LINGUAS; do
  	ok=0
-@@ -4151,7 +4151,7 @@
+@@ -4356,7 +4356,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:4156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ { (eval echo configure:4361: \"$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 df874727b15d..e061ced246cb 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ak
+++ b/x11-wm/windowmaker-i18n/files/patch-ak
@@ -1,14 +1,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 @@
+--- po/Makefile.in.orig	Sun Jan 10 10:55:56 1999
++++ po/Makefile.in	Mon Jan 11 09:36:57 1999
+@@ -221,12 +221,14 @@
  clean-generic maintainer-clean-generic clean mostlyclean distclean \
  maintainer-clean
  
 +ja_JP.EUC.po:	ja.po
 +	nkf -e ja.po > ja_JP.EUC.po
-+
-+ja_JP.SJIS.po:	ja.po
-+	nkf -e ja.po > ja_JP.SJIS.po
  
  .po.mo: 
 -	msgfmt -o $@ $<
diff --git a/x11-wm/windowmaker-i18n/files/patch-al b/x11-wm/windowmaker-i18n/files/patch-al
index c3a076ffb460..a4b5dd759e3a 100644
--- a/x11-wm/windowmaker-i18n/files/patch-al
+++ b/x11-wm/windowmaker-i18n/files/patch-al
@@ -1,14 +1,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 @@
+--- WPrefs.app/po/Makefile.in.orig	Sun Jan 10 10:55:54 1999
++++ WPrefs.app/po/Makefile.in	Mon Jan 11 09:37:16 1999
+@@ -213,12 +213,14 @@
  clean-generic maintainer-clean-generic clean mostlyclean distclean \
  maintainer-clean
  
 +ja_JP.EUC.po:	ja.po
 +	nkf -e ja.po > ja_JP.EUC.po
-+
-+ja_JP.SJIS.po:	ja.po
-+	nkf -e ja.po > ja_JP.SJIS.po
  
  .po.mo: 
 -	msgfmt -o $@ $<
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 782a69482dea..7885d38c824a 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -115,6 +115,7 @@ GNUstep/Apps/WPrefs.app/xpm/whandling.xpm
 GNUstep/Apps/WPrefs.app/xpm/windowfocus.xpm
 GNUstep/Apps/WPrefs.app/xpm/workspace.xpm
 GNUstep/Apps/WPrefs.app/xpm/xis.xpm
+bin/WINGs-flags
 bin/geticonset
 bin/getstyle
 bin/seticons
@@ -134,22 +135,22 @@ include/WUtil.h
 include/proplist.h
 include/wraster.h
 lib/libPropList.a
+lib/libPropList.la
 lib/libWINGs.a
 lib/libWMaker.a
 lib/libwraster.a
+lib/libwraster.la
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff
 share/WINGs/defaultIcon.xpm
 share/WindowMaker/Backgrounds/BlueImage.jpeg
-share/WindowMaker/Backgrounds/BlueWaves.jpeg
-share/WindowMaker/Backgrounds/SeaNight.jpeg
 share/WindowMaker/Defaults/WMGLOBAL
 share/WindowMaker/Defaults/WMRootMenu
 share/WindowMaker/Defaults/WMState
 share/WindowMaker/Defaults/WMWindowAttributes
 share/WindowMaker/Defaults/WindowMaker
-share/WindowMaker/IconSets/Default
+share/WindowMaker/IconSets/Default.iconset
 share/WindowMaker/Icons/GNUstep.tiff
 share/WindowMaker/Icons/GNUstep.xpm
 share/WindowMaker/Icons/GNUstep3D.tiff
@@ -224,42 +225,43 @@ share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/Pixmaps/tile2.xpm
 share/WindowMaker/Pixmaps/xv.xpm
 share/WindowMaker/README
-share/WindowMaker/Styles/Autumn
-share/WindowMaker/Styles/Black
-share/WindowMaker/Styles/Blue
-share/WindowMaker/Styles/BlueAluminum
-share/WindowMaker/Styles/BlueDawn
-share/WindowMaker/Styles/BlueishGreen
-share/WindowMaker/Styles/Brown
-share/WindowMaker/Styles/Chumbo
-share/WindowMaker/Styles/Copper
-share/WindowMaker/Styles/DarkBlue
-share/WindowMaker/Styles/DarkRed
-share/WindowMaker/Styles/Fire
-share/WindowMaker/Styles/Food
-share/WindowMaker/Styles/Golden
-share/WindowMaker/Styles/Green
-share/WindowMaker/Styles/GreyBlue
-share/WindowMaker/Styles/Gtk
-share/WindowMaker/Styles/LightBlue
-share/WindowMaker/Styles/Pastel
-share/WindowMaker/Styles/Pink
-share/WindowMaker/Styles/Pumpkin
-share/WindowMaker/Styles/Purple
-share/WindowMaker/Styles/Red
-share/WindowMaker/Styles/RednBlue
-share/WindowMaker/Styles/ShinyBrown
-share/WindowMaker/Styles/Summer
-share/WindowMaker/Styles/Traditional
-share/WindowMaker/Styles/VioletBlue
-share/WindowMaker/Themes/BlueWaves
-share/WindowMaker/Themes/Default
-share/WindowMaker/Themes/Night
-share/WindowMaker/Themes/OpenStep
-share/WindowMaker/Themes/Pastel
+share/WindowMaker/README.themes
+share/WindowMaker/Styles/Autumn.style
+share/WindowMaker/Styles/Black.style
+share/WindowMaker/Styles/BlackTexture.style
+share/WindowMaker/Styles/Blue.style
+share/WindowMaker/Styles/BlueDawn.style
+share/WindowMaker/Styles/BlueishGreen.style
+share/WindowMaker/Styles/Brown.style
+share/WindowMaker/Styles/Chumbo.style
+share/WindowMaker/Styles/Copper.style
+share/WindowMaker/Styles/DarkBlue.style
+share/WindowMaker/Styles/DarkRed.style
+share/WindowMaker/Styles/Fire.style
+share/WindowMaker/Styles/Food.style
+share/WindowMaker/Styles/Golden.style
+share/WindowMaker/Styles/Green.style
+share/WindowMaker/Styles/GreyBlue.style
+share/WindowMaker/Styles/Gtk.style
+share/WindowMaker/Styles/LightBlue.style
+share/WindowMaker/Styles/Pastel.style
+share/WindowMaker/Styles/Purple.style
+share/WindowMaker/Styles/Red.style
+share/WindowMaker/Styles/RednBlue.style
+share/WindowMaker/Styles/Summer.style
+share/WindowMaker/Styles/Traditional.style
+share/WindowMaker/Styles/VioletBlue.style
+share/WindowMaker/Themes/Checker.themed/checker.xpm
+share/WindowMaker/Themes/Checker.themed/style
+share/WindowMaker/Themes/Default.style
+share/WindowMaker/Themes/Night.themed/SeaNight.jpeg
+share/WindowMaker/Themes/Night.themed/style
+share/WindowMaker/Themes/OpenStep.style
+share/WindowMaker/Themes/Pastel.style
 share/WindowMaker/autostart.sh
 share/WindowMaker/exitscript.sh
 share/WindowMaker/menu
+share/WindowMaker/menu.ca
 share/WindowMaker/menu.cz
 share/WindowMaker/menu.de
 share/WindowMaker/menu.dk
@@ -270,6 +272,7 @@ share/WindowMaker/menu.fr
 share/WindowMaker/menu.gl
 share/WindowMaker/menu.he
 share/WindowMaker/menu.hr
+share/WindowMaker/menu.hu
 share/WindowMaker/menu.it
 share/WindowMaker/menu.ja
 share/WindowMaker/menu.ko
@@ -281,6 +284,8 @@ share/WindowMaker/menu.se
 share/WindowMaker/menu.sl
 share/WindowMaker/menu.tr
 share/WindowMaker/plmenu
+share/WindowMaker/plmenu.fr
+share/WindowMaker/plmenu.hr
 share/WindowMaker/wmmacros
 @exec mkdir -p %B/Sounds
 share/locale/de/LC_MESSAGES/WindowMaker.mo
@@ -293,8 +298,6 @@ share/locale/hr/LC_MESSAGES/WindowMaker.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_JP.SJIS/LC_MESSAGES/WPrefs.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
@@ -303,6 +306,8 @@ share/locale/pl/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/Checker.themed
+@dirrm share/WindowMaker/Themes/Night.themed
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds