Update to 0.50.2

Window Maker 0.52.0 needs WindowMaker-extra-0.1.tar.gz, so, I RUN_DEPEND
graphics/wmicons ports that include WindowMaker-extra-0.1.tar.gz.

PR: ports/11012
Submitted by: mac@jp.frebsd.org

5 files changed, 29 insertions, 109 deletions

diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 03b68bac6f77..6b57bc83f8a7 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -1,19 +1,17 @@
 # New ports collection makefile for:	WindowMaker with i18n extention
-# Version required:	0.51.0
+# Version required:	0.52.0
 # Date created:		24 Nov 1998
 # Whom:			mac@jp.freebsd.org
 #
-# $Id: Makefile,v 1.54 1999/03/19 16:12:03 flathill Exp $
+# $Id: Makefile,v 1.55 1999/03/19 22:43:09 asami Exp $
 
-DISTNAME=	WindowMaker-0.51.2
-PKGNAME=	windowmaker-i18n-0.51.2
+DISTNAME=	WindowMaker-0.52.0
+PKGNAME=	windowmaker-i18n-0.52.0
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	${MASTER_SITE_WINDOWMAKER} \
 		ftp://muse.brain.riken.go.jp/pub/ja.po/
 MASTER_SITE_SUBDIR=	beta/srcs
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} \
-		${JA_CATALOGFILE}${EXTRACT_SUFX}
-JA_CATALOGFILE= WindowMaker-0.51.2ja2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mac@jp.freebsd.org
 
@@ -25,6 +23,7 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		PropList.1:${PORTSDIR}/devel/libPropList \
 		intl.1:${PORTSDIR}/devel/gettext
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
+RUN_DEPENDS=	${X11BASE}/share/WindowMaker/Themes/Checker.themed/style:${PORTSDIR}/graphics/wmicons
 
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
@@ -40,25 +39,28 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x
 
-DATAFILES=	WindowMaker-data.tar.gz
+JA_CATALOGFILE=	# japanese catalog file enhancemt is not available now
+
+.if defined(JA_CATALOGFILE) && ${JA_CATALOGFILE} != ""
+DISTFILES+=	${JA_CATALOGFILE}${EXTRACT_SUFX}
+.endif
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
 	@${PERL} -pi -e "s|%%PERL%%|${PERL}|g" ${WRKSRC}/util/wm-oldmenu2new
+.if defined(JA_CATALOGFILE) && ${JA_CATALOGFILE} != ""
 	@${CP} ${WRKDIR}/${JA_CATALOGFILE}/WindowMaker.ja.po \
 		${WRKSRC}/po/ja.po
 	@${CP} ${WRKDIR}/${JA_CATALOGFILE}/WPrefs.ja.po \
 		${WRKSRC}/WPrefs.app/po/ja.po
-
-post-install:
-	@${MKDIR} ${PREFIX}/share/WindowMaker/Pixmaps/
-	@${INSTALL_DATA} ${WRKDIR}/WindowMaker-data/pixmaps/* \
-		${PREFIX}/share/WindowMaker/Pixmaps/
-	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds/
+.endif
 
 pre-build:
 	@cd ${WRKSRC}/WindowMaker/Defaults && ${MAKE} clean
 
+post-install:
+	@${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 622520f096db..60f9c2090b98 100644
--- a/x11-wm/windowmaker-i18n/distinfo
+++ b/x11-wm/windowmaker-i18n/distinfo
@@ -1,3 +1,3 @@
-MD5 (WindowMaker-0.51.2.tar.gz) = 041b07bf4771cc91bc8ddd29d2a392a2
-MD5 (WindowMaker-data.tar.gz) = 6ea0c37314ea9e9ab27e8bdf45a31a82
+MD5 (WindowMaker-0.52.0.tar.gz) = e79383dd0518db680403c6f758c465c8
+MD5 (WindowMaker-extra-0.1.tar.gz) = 07c7700daaaf232bc490f5abaabef085
 MD5 (WindowMaker-0.51.2ja2.tar.gz) = b6a0d2d312d76adcd755be759b3f0849
diff --git a/x11-wm/windowmaker-i18n/files/patch-ad b/x11-wm/windowmaker-i18n/files/patch-ad
index 24aa903705bb..7452bf8069f1 100644
--- a/x11-wm/windowmaker-i18n/files/patch-ad
+++ b/x11-wm/windowmaker-i18n/files/patch-ad
@@ -1,13 +1,13 @@
---- configure.orig	Sun Mar  7 17:10:46 1999
-+++ configure	Thu Mar 11 09:05:53 1999
-@@ -2876,8 +2876,8 @@
+--- configure.orig	Fri Apr  2 01:49:36 1999
++++ configure	Sat Apr  3 15:49:20 1999
+@@ -2996,8 +2996,8 @@
  
  
  
 -supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro dk zh_TW.Big5"
--supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5"
+-supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es"
 +supported_locales="cs de es fr gl it ja_JP.EUC ko nl no pt ru se tr fi hr el pl ro dk zh_TW.Big5"
-+supported_wprefs_locales="pt hr fr ko ja_JP.EUC cs zh_TW.Big5"
++supported_wprefs_locales="pt hr fr ko ja_JP.EUC cs zh_TW.Big5 es"
  
  for lang in $LINGUAS; do
  	ok=0
diff --git a/x11-wm/windowmaker-i18n/pkg-descr b/x11-wm/windowmaker-i18n/pkg-descr
index b17182f0b843..157a391449ca 100644
--- a/x11-wm/windowmaker-i18n/pkg-descr
+++ b/x11-wm/windowmaker-i18n/pkg-descr
@@ -10,8 +10,6 @@ If use first, execute "wmaker.inst" and "wsetfont you_choosed_language".
 you_choosed_language is example "japanese", "korean", etc. More info about 
 wsetfont, see help of wsetfont.
 
-More Icons? Install wmicons package in graphics !!
-
 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 ed9b4e1d8454..c6b19d399657 100644
--- a/x11-wm/windowmaker-i18n/pkg-plist
+++ b/x11-wm/windowmaker-i18n/pkg-plist
@@ -44,7 +44,10 @@ 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/tdel.tiff
+GNUstep/Apps/WPrefs.app/tiff/tedit.tiff
 GNUstep/Apps/WPrefs.app/tiff/temp.tiff
+GNUstep/Apps/WPrefs.app/tiff/textr.tiff
 GNUstep/Apps/WPrefs.app/tiff/theme.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer0.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer0s.tiff
@@ -58,14 +61,11 @@ GNUstep/Apps/WPrefs.app/tiff/timer4.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer4s.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer5.tiff
 GNUstep/Apps/WPrefs.app/tiff/timer5s.tiff
+GNUstep/Apps/WPrefs.app/tiff/tnew.tiff
 GNUstep/Apps/WPrefs.app/tiff/whandling.tiff
 GNUstep/Apps/WPrefs.app/tiff/windowfocus.tiff
 GNUstep/Apps/WPrefs.app/tiff/workspace.tiff
 GNUstep/Apps/WPrefs.app/tiff/xis.tiff
-GNUstep/Apps/WPrefs.app/tiff/tdel.tiff
-GNUstep/Apps/WPrefs.app/tiff/tedit.tiff
-GNUstep/Apps/WPrefs.app/tiff/textr.tiff
-GNUstep/Apps/WPrefs.app/tiff/tnew.tiff
 GNUstep/Apps/WPrefs.app/xpm/advancetonewworkspace.xpm
 GNUstep/Apps/WPrefs.app/xpm/animations.xpm
 GNUstep/Apps/WPrefs.app/xpm/appearance.xpm
@@ -210,69 +210,8 @@ 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
-share/WindowMaker/Pixmaps/Beer.xpm
-share/WindowMaker/Pixmaps/Bird.xpm
-share/WindowMaker/Pixmaps/Book.xpm
-share/WindowMaker/Pixmaps/Bookshelf.xpm
-share/WindowMaker/Pixmaps/Brain.xpm
-share/WindowMaker/Pixmaps/BulletHole.xpm
-share/WindowMaker/Pixmaps/CashRegister.xpm
-share/WindowMaker/Pixmaps/Clipboard.xpm
-share/WindowMaker/Pixmaps/Cola.xpm
-share/WindowMaker/Pixmaps/ColorGNU.xpm
-share/WindowMaker/Pixmaps/Correspondence.dir.xpm
-share/WindowMaker/Pixmaps/CrystalSkull.dir.xpm
-share/WindowMaker/Pixmaps/Daemon.xpm
-share/WindowMaker/Pixmaps/Detergent.dir.xpm
-share/WindowMaker/Pixmaps/DoomII.xpm
-share/WindowMaker/Pixmaps/Draw.xpm
-share/WindowMaker/Pixmaps/EscherCube.xpm
-share/WindowMaker/Pixmaps/EscherTriangle.xpm
-share/WindowMaker/Pixmaps/Fish5.dir.xpm
-share/WindowMaker/Pixmaps/Football.xpm
-share/WindowMaker/Pixmaps/FootballUS.xpm
-share/WindowMaker/Pixmaps/Gear.xpm
-share/WindowMaker/Pixmaps/Ghost.xpm
-share/WindowMaker/Pixmaps/HP-16C-48.xpm
-share/WindowMaker/Pixmaps/HandOpen.xpm
-share/WindowMaker/Pixmaps/HandPointing.xpm
-share/WindowMaker/Pixmaps/HandPointingLeft.xpm
-share/WindowMaker/Pixmaps/HandPunch.xpm
-share/WindowMaker/Pixmaps/HandReach.xpm
-share/WindowMaker/Pixmaps/HeroSandwich.dir.xpm
-share/WindowMaker/Pixmaps/LadyBug48x48.xpm
-share/WindowMaker/Pixmaps/Microphone.xpm
-share/WindowMaker/Pixmaps/Netscape.xpm
-share/WindowMaker/Pixmaps/NewsAgent.xpm
-share/WindowMaker/Pixmaps/PDF.xpm
-share/WindowMaker/Pixmaps/Padlock.xpm
-share/WindowMaker/Pixmaps/Paint.xpm
-share/WindowMaker/Pixmaps/Pencils.24.xpm
-share/WindowMaker/Pixmaps/Penguin.xpm
-share/WindowMaker/Pixmaps/Radio.xpm
-share/WindowMaker/Pixmaps/Reference.xpm
-share/WindowMaker/Pixmaps/Rumi.xpm
-share/WindowMaker/Pixmaps/Snail.xpm
-share/WindowMaker/Pixmaps/T2-Film.xpm
-share/WindowMaker/Pixmaps/TagIcon.xpm
-share/WindowMaker/Pixmaps/TapeIcon1.xpm
-share/WindowMaker/Pixmaps/TrueDie48.xpm
-share/WindowMaker/Pixmaps/WheelbarrowFull.xpm
-share/WindowMaker/Pixmaps/WordEditor.xpm
-share/WindowMaker/Pixmaps/Wrench-12bit.xpm
-share/WindowMaker/Pixmaps/bomb2.xpm
-share/WindowMaker/Pixmaps/inspect.xpm
-share/WindowMaker/Pixmaps/monitor.xpm
-share/WindowMaker/Pixmaps/paint.xpm
-share/WindowMaker/Pixmaps/tile.black.xpm
-share/WindowMaker/Pixmaps/tile.snow.xpm
 share/WindowMaker/Pixmaps/tile.tiff
 share/WindowMaker/Pixmaps/tile.xpm
-share/WindowMaker/Pixmaps/tile2.xpm
-share/WindowMaker/Pixmaps/xv.xpm
 share/WindowMaker/README
 share/WindowMaker/README.themes
 share/WindowMaker/Styles/Autumn.style
@@ -300,22 +239,9 @@ 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/LeetWM.themed/LeetWM.jpg
-share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb1.jpg
-share/WindowMaker/Themes/LeetWM.themed/LeetWMMenutb2.jpg
-share/WindowMaker/Themes/LeetWM.themed/LeetWMTile1.jpg
-share/WindowMaker/Themes/LeetWM.themed/LeetWMtb1.jpg
-share/WindowMaker/Themes/LeetWM.themed/LeetWMtb2.jpg
-share/WindowMaker/Themes/LeetWM.themed/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/Themes/STEP2000.themed/BlueImage2.jpeg
-share/WindowMaker/Themes/STEP2000.themed/style
 share/WindowMaker/Themes/SteelBlueSilk.style
 share/WindowMaker/autostart.sh
 share/WindowMaker/exitscript.sh
@@ -344,12 +270,14 @@ share/WindowMaker/menu.sl
 share/WindowMaker/menu.tr
 share/WindowMaker/menu.zh_TW.Big5
 share/WindowMaker/plmenu
+share/WindowMaker/plmenu.dk
 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/WPrefs.mo
 share/locale/es/LC_MESSAGES/WindowMaker.mo
 share/locale/fi/LC_MESSAGES/WindowMaker.mo
 share/locale/fr/LC_MESSAGES/WPrefs.mo
@@ -367,18 +295,10 @@ 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/STEP2000.themed
-@dirrm share/WindowMaker/Themes/Night.themed
-@dirrm share/WindowMaker/Themes/LeetWM.themed
-@dirrm share/WindowMaker/Themes/Checker.themed
-@dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Styles
 @dirrm share/WindowMaker/Sounds
-@dirrm share/WindowMaker/Pixmaps
-@dirrm share/WindowMaker/Icons
 @dirrm share/WindowMaker/IconSets
 @dirrm share/WindowMaker/Backgrounds
-@dirrm share/WindowMaker
 @dirrm share/WINGs
 @dirrm etc/WindowMaker
 @dirrm GNUstep/Apps/WPrefs.app/xpm