Update for Window Maker 0.51.0.

PR:		ports/9889
Submitted by:	maintainer

7 files changed, 94 insertions, 49 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index f22358416d59..c77b8fcf4ed9 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	WindowMaker with i18n extention
-# Version required:	0.50.2
+# Version required:	0.51.0
 # Date created:		24 Nov 1998
 # Whom:			mac@jp.freebsd.org
 #
-# $Id: Makefile,v 1.48 1999/01/18 06:43:04 asami Exp $
+# $Id: Makefile,v 1.49 1999/01/23 07:05:31 vanilla Exp $
 
-DISTNAME=	WindowMaker-0.50.2
-PKGNAME=	windowmaker-i18n-0.50.2
+DISTNAME=	WindowMaker-0.51.0
+PKGNAME=	windowmaker-i18n-0.51.0
 CATEGORIES=	x11-wm windowmaker
 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}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} \
+		WindowMaker-0.51.0ja1.tar.gz
 
 MAINTAINER=	mac@jp.freebsd.org
 
@@ -21,18 +21,20 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff34
+		tiff.4:${PORTSDIR}/graphics/tiff34 \
+		PropList.1:${PORTSDIR}/devel/libPropList
 BUILD_DEPENDS=	${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext \
 		nkf:${PORTSDIR}/japanese/nkf
 
+USE_PERL5=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	X11BASE=${X11BASE}  LOCALBASE=${LOCALBASE} \
+		CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
 		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" \
+	--with-gfx-incs="-I${LOCALBASE}/include/giflib" \
 	--disable-debug --enable-kanji --disable-shared
 
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
@@ -43,8 +45,12 @@ DATAFILES=	WindowMaker-data.tar.gz
 .include <bsd.port.pre.mk>
 
 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
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
+	@${PERL} -pi -e "s|%%PERL%%|${PERL}|g" ${WRKSRC}/util/wm-oldmenu2new
+	@${CP} ${WRKDIR}/WindowMaker-0.51.0ja1/WindowMaker.ja.po \
+		${WRKSRC}/po/ja.po
+	@${CP} ${WRKDIR}/WindowMaker-0.51.0ja1/WPrefs.ja.po \
+		${WRKSRC}/WPrefs.app/po/ja.po
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
diff --git a/x11-wm/windowmaker-i18n/distinfo b/x11-wm/windowmaker-i18n/distinfo
index da528cf2bc1b..7e14386529b5 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1,2 +1,3 @@
-MD5 (WindowMaker-0.50.2.tar.gz) = 985288b835085d5a3d79652a7becf1c9
+MD5 (WindowMaker-0.51.0.tar.gz) = c88b940437efe9a0c4f7535f836ce984
 MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
+MD5 (WindowMaker-0.51.0ja1.tar.gz) = 56461e9c89d7029369a7548b53f07e85
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index 03ef02a3b1a8..7e480dc158d4 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,31 +1,13 @@
---- 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 2220 "configure"
- #include "confdefs.h"
-@@ -2314,8 +2314,8 @@
+--- configure.orig	Wed Feb  3 13:05:41 1999
++++ configure	Wed Feb  3 13:05:58 1999
+@@ -2860,8 +2860,8 @@
  
  
  
--supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro"
+-supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro dk"
 -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_locales="cs de es fr gl it ja_JP.EUC ko nl no pt ru se tr fi hr el pl ro dk"
 +supported_wprefs_locales="pt hr fr ko ja_JP.EUC cs"
  
  for lang in $LINGUAS; do
  	ok=0
-@@ -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: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 e061ced246cb..f06a6b780e41 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ak
+++ b/x11-wm/windowmaker-i18n/files/patch-ak
@@ -1,8 +1,8 @@
---- 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
+--- 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
  
 +ja_JP.EUC.po:	ja.po
 +	nkf -e ja.po > ja_JP.EUC.po
diff --git a/x11-wm/windowmaker-i18n/files/patch-al b/x11-wm/windowmaker-i18n/files/patch-al
index a4b5dd759e3a..8cb582143a54 100644
--- a/x11-wm/windowmaker-i18n/files/patch-al
+++ b/x11-wm/windowmaker-i18n/files/patch-al
@@ -1,8 +1,8 @@
---- 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
+--- 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
  
 +ja_JP.EUC.po:	ja.po
 +	nkf -e ja.po > ja_JP.EUC.po
diff --git a/x11-wm/windowmaker-i18n/files/patch-am b/x11-wm/windowmaker-i18n/files/patch-am
new file mode 100644
index 000000000000..5108aadd2983
--- /dev/null
+++ b/x11-wm/windowmaker-i18n/files/patch-am
@@ -0,0 +1,11 @@
+--- util/wm-oldmenu2new.orig	Wed Jan 20 21:39:18 1999
++++ util/wm-oldmenu2new	Wed Jan 20 21:39:29 1999
+@@ -112,7 +112,7 @@
+ # This is the interesting bit.  Edit the old style menu and
+ # convert into new style property-list menu.
+ #
+-perl - $T <<-'EOF' > $T-p
++%%PERL%% - $T <<-'EOF' > $T-p
+ 	$v=chr(22);
+ 	for (<>) {
+ 		push @foo,$_;
diff --git a/x11-wm/windowmaker-i18n/pkg-plist b/x11-wm/windowmaker-i18n/pkg-plist
index 7885d38c824a..8246ccd4c20f 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -10,6 +10,7 @@ GNUstep/Apps/WPrefs.app/tiff/cycleworkspaces.tiff
 GNUstep/Apps/WPrefs.app/tiff/dock.tiff
 GNUstep/Apps/WPrefs.app/tiff/dontlinkworkspaces.tiff
 GNUstep/Apps/WPrefs.app/tiff/ergonomic.tiff
+GNUstep/Apps/WPrefs.app/tiff/ergowood.tiff
 GNUstep/Apps/WPrefs.app/tiff/expert.tiff
 GNUstep/Apps/WPrefs.app/tiff/fonts.tiff
 GNUstep/Apps/WPrefs.app/tiff/iconprefs.tiff
@@ -23,6 +24,7 @@ GNUstep/Apps/WPrefs.app/tiff/menus.tiff
 GNUstep/Apps/WPrefs.app/tiff/minimouseleft.tiff
 GNUstep/Apps/WPrefs.app/tiff/minimousemiddle.tiff
 GNUstep/Apps/WPrefs.app/tiff/minimouseright.tiff
+GNUstep/Apps/WPrefs.app/tiff/miscprefs2.tiff
 GNUstep/Apps/WPrefs.app/tiff/moreanim.tiff
 GNUstep/Apps/WPrefs.app/tiff/mousesettings.tiff
 GNUstep/Apps/WPrefs.app/tiff/mousespeed.tiff
@@ -42,6 +44,8 @@ GNUstep/Apps/WPrefs.app/tiff/speed3.tiff
 GNUstep/Apps/WPrefs.app/tiff/speed3s.tiff
 GNUstep/Apps/WPrefs.app/tiff/speed4.tiff
 GNUstep/Apps/WPrefs.app/tiff/speed4s.tiff
+GNUstep/Apps/WPrefs.app/tiff/temp.tiff
+GNUstep/Apps/WPrefs.app/tiff/theme.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer0.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer0s.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer1.tiff
@@ -67,6 +71,7 @@ GNUstep/Apps/WPrefs.app/xpm/cycleworkspaces.xpm
 GNUstep/Apps/WPrefs.app/xpm/dock.xpm
 GNUstep/Apps/WPrefs.app/xpm/dontlinkworkspaces.xpm
 GNUstep/Apps/WPrefs.app/xpm/ergonomic.xpm
+GNUstep/Apps/WPrefs.app/xpm/ergowood.xpm
 GNUstep/Apps/WPrefs.app/xpm/expert.xpm
 GNUstep/Apps/WPrefs.app/xpm/fonts.xpm
 GNUstep/Apps/WPrefs.app/xpm/iconprefs.xpm
@@ -80,6 +85,7 @@ GNUstep/Apps/WPrefs.app/xpm/menus.xpm
 GNUstep/Apps/WPrefs.app/xpm/minimouseleft.xpm
 GNUstep/Apps/WPrefs.app/xpm/minimousemiddle.xpm
 GNUstep/Apps/WPrefs.app/xpm/minimouseright.xpm
+GNUstep/Apps/WPrefs.app/xpm/miscprefs2.xpm
 GNUstep/Apps/WPrefs.app/xpm/moreanim.xpm
 GNUstep/Apps/WPrefs.app/xpm/mousesettings.xpm
 GNUstep/Apps/WPrefs.app/xpm/mousespeed.xpm
@@ -99,6 +105,8 @@ GNUstep/Apps/WPrefs.app/xpm/speed3.xpm
 GNUstep/Apps/WPrefs.app/xpm/speed3s.xpm
 GNUstep/Apps/WPrefs.app/xpm/speed4.xpm
 GNUstep/Apps/WPrefs.app/xpm/speed4s.xpm
+GNUstep/Apps/WPrefs.app/xpm/temp.xpm
+GNUstep/Apps/WPrefs.app/xpm/theme.xpm
 GNUstep/Apps/WPrefs.app/xpm/timer0.xpm
 GNUstep/Apps/WPrefs.app/xpm/timer0s.xpm
 GNUstep/Apps/WPrefs.app/xpm/timer1.xpm
@@ -115,7 +123,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/get-wraster-flags
 bin/geticonset
 bin/getstyle
 bin/seticons
@@ -132,10 +140,7 @@ include/WINGs.h
 include/WINGsP.h
 include/WMaker.h
 include/WUtil.h
-include/proplist.h
 include/wraster.h
-lib/libPropList.a
-lib/libPropList.la
 lib/libWINGs.a
 lib/libWMaker.a
 lib/libwraster.a
@@ -151,16 +156,55 @@ share/WindowMaker/Defaults/WMState
 share/WindowMaker/Defaults/WMWindowAttributes
 share/WindowMaker/Defaults/WindowMaker
 share/WindowMaker/IconSets/Default.iconset
+share/WindowMaker/Icons/BitchX.tiff
+share/WindowMaker/Icons/BitchX.xpm
+share/WindowMaker/Icons/DefaultAppIcon.tiff
 share/WindowMaker/Icons/GNUstep.tiff
 share/WindowMaker/Icons/GNUstep.xpm
 share/WindowMaker/Icons/GNUstep3D.tiff
 share/WindowMaker/Icons/GNUstep3D.xpm
+share/WindowMaker/Icons/GNUstepGlow.tiff
+share/WindowMaker/Icons/GNUstepGlow.xpm
 share/WindowMaker/Icons/GNUterm.tiff
 share/WindowMaker/Icons/GNUterm.xpm
 share/WindowMaker/Icons/clip.tiff
 share/WindowMaker/Icons/clip.xpm
+share/WindowMaker/Icons/clip2.tiff
+share/WindowMaker/Icons/clip2.xpm
 share/WindowMaker/Icons/defaultAppIcon.tiff
 share/WindowMaker/Icons/defaultAppIcon.xpm
+share/WindowMaker/Icons/defaultterm.tiff
+share/WindowMaker/Icons/defaultterm.xpm
+share/WindowMaker/Icons/draw.tiff
+share/WindowMaker/Icons/draw.xpm
+share/WindowMaker/Icons/linuxterm.tiff
+share/WindowMaker/Icons/linuxterm.xpm
+share/WindowMaker/Icons/mixer.tiff
+share/WindowMaker/Icons/mixer.xpm
+share/WindowMaker/Icons/notepad.tiff
+share/WindowMaker/Icons/notepad.xpm
+share/WindowMaker/Icons/pdf.tiff
+share/WindowMaker/Icons/pdf.xpm
+share/WindowMaker/Icons/ps.tiff
+share/WindowMaker/Icons/ps.xpm
+share/WindowMaker/Icons/real.tiff
+share/WindowMaker/Icons/real.xpm
+share/WindowMaker/Icons/sgiterm.tiff
+share/WindowMaker/Icons/sgiterm.xpm
+share/WindowMaker/Icons/sound.tiff
+share/WindowMaker/Icons/sound.xpm
+share/WindowMaker/Icons/staroffice2.tiff
+share/WindowMaker/Icons/staroffice2.xpm
+share/WindowMaker/Icons/timer.tiff
+share/WindowMaker/Icons/timer.xpm
+share/WindowMaker/Icons/wilber.tiff
+share/WindowMaker/Icons/wilber.xpm
+share/WindowMaker/Icons/write.tiff
+share/WindowMaker/Icons/write.xpm
+share/WindowMaker/Icons/xdvi.tiff
+share/WindowMaker/Icons/xdvi.xpm
+share/WindowMaker/Icons/xv.tiff
+share/WindowMaker/Icons/xv.xpm
 share/WindowMaker/Pixmaps/Ant.xpm
 share/WindowMaker/Pixmaps/Antennae.xpm
 share/WindowMaker/Pixmaps/Bee48x48.xpm
@@ -287,6 +331,7 @@ share/WindowMaker/plmenu
 share/WindowMaker/plmenu.fr
 share/WindowMaker/plmenu.hr
 share/WindowMaker/wmmacros
+share/WindowMaker/xtree.dat
 @exec mkdir -p %B/Sounds
 share/locale/de/LC_MESSAGES/WindowMaker.mo
 share/locale/es/LC_MESSAGES/WindowMaker.mo