Internationalize this port. Upgrade to 2.0.45 as well.

Submitted by:	Makoto MATSUSHITA <matusita@ics.es.osaka-u.ac.jp>

5 files changed, 214 insertions, 166 deletions

diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 8ea286c7b4e7..e2ca529bd929 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -1,25 +1,55 @@
-# New ports collection makefile for:	fvwm2
-# Version required:	2.0.43
-# Date created:		20 Jan 1996
-# Whom:			peter
+# New ports collection makefile for:	Internationalized fvwm2
+# Version required:	2.0.45
+# Date created:		02 Mar 1997
+# Whom:			Makoto Matsushita <matusita@jp.freebsd.org>,
+#			based on Hidekazu Kuroki's work of 2.0.43.
 #
-# $Id: Makefile,v 1.3 1996/07/22 04:52:15 pst Exp $
+# $Id$
 #
 
-DISTNAME=	fvwm-2.0.43
-CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
+DISTNAME=	fvwm-2.0.45
+CATEGORIES=	japanese x11
+MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/2.0.x/ \
+		ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/fvwm-users-jp/kits/ \
+		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/sources/2.0.x/ \
+		ftp://ftp.TokyoNet.AD.JP/pub/X/fvwm/fvwm-users-jp/kits/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Jan24.tar.gz
 
-MAINTAINER=	peter@FreeBSD.org
+MAINTAINER=	matusita@jp.freebsd.org
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
-XMKMF=		xmkmf
-ALL_TARGET=	Makefiles all
+
+# filenames.
+PATCH_FIXIT=	kits/patch/fix-2.0.45
+PATCH_I18N=	kits/patch/PATCH.i18n-jp
+PATCH_MAN=	kits/doc/diffs-fvwm.man
+TARBALL_SWDESK=	kits/tool/swdesk.tar.gz
+
+USE_PATCHFILES=	${PATCH_FIXES} ${PATCH_I18N} ${PATCH_MAN}
+SWDESKDIR=	${WRKDIR}/swdesk
+
+# targets for swdesk
+post-extract:
+	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${TARBALL_SWDESK} ${EXTRACT_AFTER_ARGS})
+
+pre-patch:
+	@for i in ${USE_PATCHFILES}; do \
+		${PATCH} ${PATCH_DIST_ARGS} < ${WRKDIR}/$$i; \
+	 done;
+
+post-configure:
+	@(cd ${SWDESKDIR} && ${XMKMF})
+
+post-build:
+	@(cd ${SWDESKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET})
 
 post-install:
-	@mkdir -p ${PREFIX}/include/X11/pixmaps
-	${INSTALL} -c -m 444 ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps
+	@(cd ${SWDESKDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})
+.endif
+	@${MKDIR} ${PREFIX}/lib/X11/${FVWMNAME}/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
+		${PREFIX}/lib/X11/${FVWMNAME}/pixmaps
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm24/distinfo b/x11-wm/fvwm24/distinfo
index 3ea95f3185ff..11ce315db376 100644
--- a/x11-wm/fvwm24/distinfo
+++ b/x11-wm/fvwm24/distinfo
@@ -1 +1,2 @@
-MD5 (fvwm-2.0.43.tar.gz) = 427d070b550f671a5ecede72395672a1
+MD5 (fvwm-2.0.45.tar.gz) = 6d5cfab435831ef9fd970d17c972a20c
+MD5 (fvwm-users-jp-kits.97Jan24.tar.gz) = 8312730d07e08e98075dff93f77a0836
diff --git a/x11-wm/fvwm24/pkg-comment b/x11-wm/fvwm24/pkg-comment
index ad787c80f735..00a7d135fabe 100644
--- a/x11-wm/fvwm24/pkg-comment
+++ b/x11-wm/fvwm24/pkg-comment
@@ -1 +1 @@
-beta of the fvwm window manager - requires XPM
+Internationalized (not japanised) fvwm version 2, a window manager for X
diff --git a/x11-wm/fvwm24/pkg-descr b/x11-wm/fvwm24/pkg-descr
index 7115ae6ae14c..4d0d6db8e743 100644
--- a/x11-wm/fvwm24/pkg-descr
+++ b/x11-wm/fvwm24/pkg-descr
@@ -1,5 +1,12 @@
-Fvwm is a another window manager for X11, which provides a simple virtual
-desktop, a 3-D look for windows decorations, and shaped, color icons. 
-It can be configured to use far less memory than twm, or to give a very 
-good emulation of mwm. A nice button-bar can be used to provide convenient 
-access to frequently used functions or programs.
+Fvwm is a very famous window manager for X, which provides a
+virtual/multiple disjoint desktop, a 3-D look for windows decorations,
+shaped/color icons. It gives a very good emulation of mwm. A nice
+button-bar can be used to provide convenient access to frequently used
+functions or programs.
+
+This package uses fvwm-users-jp-kits also, to add internationalized
+feature (based on X itself) to fvwm and its modules, and to
+enhance/modifies the behavior of fvwm.
+
+With this package, you may use fonts of your own language, display
+characters in everywhere in fvwm, and have fun ;-)
diff --git a/x11-wm/fvwm24/pkg-plist b/x11-wm/fvwm24/pkg-plist
index 71a0c570ff39..18f747f1707b 100644
--- a/x11-wm/fvwm24/pkg-plist
+++ b/x11-wm/fvwm24/pkg-plist
@@ -1,157 +1,167 @@
-bin/fvwm
+bin/fvwm2
 bin/xpmroot
-lib/X11/fvwm/FvwmAudio
-lib/X11/fvwm/FvwmAuto
-lib/X11/fvwm/FvwmBacker
-lib/X11/fvwm/FvwmButtons
-lib/X11/fvwm/FvwmConfig
-lib/X11/fvwm/FvwmCpp
-lib/X11/fvwm/FvwmForm
-lib/X11/fvwm/FvwmIconBox
-lib/X11/fvwm/FvwmIconMan
-lib/X11/fvwm/FvwmIdent
-lib/X11/fvwm/FvwmM4
-lib/X11/fvwm/FvwmPager
-lib/X11/fvwm/FvwmSave
-lib/X11/fvwm/FvwmSaveDesk
-lib/X11/fvwm/FvwmScroll
-lib/X11/fvwm/FvwmTalk
-lib/X11/fvwm/FvwmWinList
-lib/X11/fvwm/FvwmBanner
-lib/X11/fvwm/fvwmrc_convert
-lib/X11/fvwm/quantize_pixmaps
-lib/X11/fvwm/system.fvwmrc
-include/X11/pixmaps/Jlock.xpm
-include/X11/pixmaps/Jnews.xpm
-include/X11/pixmaps/Jrecycle.xpm
-include/X11/pixmaps/Jxlock.xpm
-include/X11/pixmaps/Mosaic.xpm
-include/X11/pixmaps/arrdown2.xpm
-include/X11/pixmaps/arrows2.xpm
-include/X11/pixmaps/arrup2.xpm
-include/X11/pixmaps/bomb.xpm
-include/X11/pixmaps/clamp.xpm
-include/X11/pixmaps/colormap.xpm
-include/X11/pixmaps/datebook.xpm
-include/X11/pixmaps/desk.xpm
-include/X11/pixmaps/dialog_box.xpm
-include/X11/pixmaps/doomface.xpm
-include/X11/pixmaps/editres.xpm
-include/X11/pixmaps/eps.xpm
-include/X11/pixmaps/exit.xpm
-include/X11/pixmaps/flow_chart.xpm
-include/X11/pixmaps/folder2.xpm
-include/X11/pixmaps/folders.xpm
-include/X11/pixmaps/fvwm.xpm
-include/X11/pixmaps/fvwm2.xpm
-include/X11/pixmaps/fvwm2_big.xpm
-include/X11/pixmaps/fvwm3.xpm
-include/X11/pixmaps/gnu-animal.xpm
-include/X11/pixmaps/graphs.xpm
-include/X11/pixmaps/jball.xpm
-include/X11/pixmaps/jbomb.xpm
-include/X11/pixmaps/jbook1.xpm
-include/X11/pixmaps/jbook2.xpm
-include/X11/pixmaps/jcalc.xpm
-include/X11/pixmaps/jclock.xpm
-include/X11/pixmaps/jf.xpm
-include/X11/pixmaps/jgraph.xpm
-include/X11/pixmaps/jline.xpm
-include/X11/pixmaps/jlower.xpm
-include/X11/pixmaps/jmag.xpm
-include/X11/pixmaps/jmail.xpm
-include/X11/pixmaps/jmove.xpm
-include/X11/pixmaps/jpaint.xpm
-include/X11/pixmaps/jraise.xpm
-include/X11/pixmaps/jresize.xpm
-include/X11/pixmaps/jterm.xpm
-include/X11/pixmaps/jwindow.xpm
-include/X11/pixmaps/jx.xpm
-include/X11/pixmaps/mag_glass.xpm
-include/X11/pixmaps/mail1.xpm
-include/X11/pixmaps/mail2.xpm
-include/X11/pixmaps/map.xpm
-include/X11/pixmaps/math4.xpm
-include/X11/pixmaps/mini.audiovol.xpm
-include/X11/pixmaps/mini.blah.xpm
-include/X11/pixmaps/mini.bomb.xpm
-include/X11/pixmaps/mini.checkmark.xpm
-include/X11/pixmaps/mini.cut.xpm
-include/X11/pixmaps/mini.destroy.xpm
-include/X11/pixmaps/mini.excl.xpm
-include/X11/pixmaps/mini.exit.xpm
-include/X11/pixmaps/mini.eye.xpm
-include/X11/pixmaps/mini.fvwm.xpm
-include/X11/pixmaps/mini.iconify.xpm
-include/X11/pixmaps/mini.letter.xpm
-include/X11/pixmaps/mini.lower.xpm
-include/X11/pixmaps/mini.maximize-horiz.xpm
-include/X11/pixmaps/mini.maximize-vert.xpm
-include/X11/pixmaps/mini.maximize.xpm
-include/X11/pixmaps/mini.maximize2.xpm
-include/X11/pixmaps/mini.move.xpm
-include/X11/pixmaps/mini.netscape.xpm
-include/X11/pixmaps/mini.rainbow.xpm
-include/X11/pixmaps/mini.raise.xpm
-include/X11/pixmaps/mini.refresh.xpm
-include/X11/pixmaps/mini.resize.xpm
-include/X11/pixmaps/mini.stick.xpm
-include/X11/pixmaps/mini.stick2.xpm
-include/X11/pixmaps/mini.xarchie.xpm
-include/X11/pixmaps/mini.xbiff.xpm
-include/X11/pixmaps/mini.xboing.xpm
-include/X11/pixmaps/mini.xlock.xpm
-include/X11/pixmaps/mini.xmag.xpm
-include/X11/pixmaps/mini.xman.xpm
-include/X11/pixmaps/mini.xpaint.xpm
-include/X11/pixmaps/mini.xpm
-include/X11/pixmaps/mini.xterm.xpm
-include/X11/pixmaps/mini.zircon.xpm
-include/X11/pixmaps/page.xpm
-include/X11/pixmaps/page2.xpm
-include/X11/pixmaps/ps.xpm
-include/X11/pixmaps/question.xpm
-include/X11/pixmaps/rbomb.xpm
-include/X11/pixmaps/rcalc.xpm
-include/X11/pixmaps/rterm.xpm
-include/X11/pixmaps/term.xpm
-include/X11/pixmaps/tiff2.xpm
-include/X11/pixmaps/toolbox.xpm
-include/X11/pixmaps/unknown1.xpm
-include/X11/pixmaps/wierd_page3.xpm
-include/X11/pixmaps/word_processor.xpm
-include/X11/pixmaps/world.xpm
-include/X11/pixmaps/xcalc.xpm
-include/X11/pixmaps/xemacs.xpm
-include/X11/pixmaps/xlock.xpm
-include/X11/pixmaps/xman.xpm
-include/X11/pixmaps/xpaint.xpm
-include/X11/pixmaps/xterm-axp.xpm
-include/X11/pixmaps/xterm-blank.xpm
-include/X11/pixmaps/xterm-dec.xpm
-include/X11/pixmaps/xterm-sgi.xpm
-include/X11/pixmaps/xterm-sol.xpm
-include/X11/pixmaps/xterm-sun.xpm
-include/X11/pixmaps/xterm.xpm
-include/X11/pixmaps/xv.xpm
-include/X11/pixmaps/xv2.xpm
-man/man1/fvwm.1.gz
+bin/swdesk
+lib/X11/fvwm2/FvwmAudio
+lib/X11/fvwm2/FvwmAuto
+lib/X11/fvwm2/FvwmBacker
+lib/X11/fvwm2/FvwmBanner
+lib/X11/fvwm2/FvwmButtons
+lib/X11/fvwm2/FvwmCascade
+lib/X11/fvwm2/FvwmCpp
+lib/X11/fvwm2/FvwmForm
+lib/X11/fvwm2/FvwmIconBox
+lib/X11/fvwm2/FvwmIconMan
+lib/X11/fvwm2/FvwmIdent
+lib/X11/fvwm2/FvwmM4
+lib/X11/fvwm2/FvwmPager
+lib/X11/fvwm2/FvwmSave
+lib/X11/fvwm2/FvwmSaveDesk
+lib/X11/fvwm2/FvwmScroll
+lib/X11/fvwm2/FvwmTalk
+lib/X11/fvwm2/FvwmTile
+lib/X11/fvwm2/FvwmWinList
+lib/X11/fvwm2/fvwmrc_convert
+lib/X11/fvwm2/quantize_pixmaps
+lib/X11/fvwm2/decor_examples
+lib/X11/fvwm2/system.fvwm2rc
+lib/X11/fvwm2/system.fvwm2rc-sample-1
+lib/X11/fvwm2/system.fvwm2rc-sample-2
+lib/X11/fvwm2/pixmaps/Jlock.xpm
+lib/X11/fvwm2/pixmaps/Jnews.xpm
+lib/X11/fvwm2/pixmaps/Jrecycle.xpm
+lib/X11/fvwm2/pixmaps/Jxlock.xpm
+lib/X11/fvwm2/pixmaps/Mosaic.xpm
+lib/X11/fvwm2/pixmaps/arrdown2.xpm
+lib/X11/fvwm2/pixmaps/arrows2.xpm
+lib/X11/fvwm2/pixmaps/arrup2.xpm
+lib/X11/fvwm2/pixmaps/bomb.xpm
+lib/X11/fvwm2/pixmaps/clamp.xpm
+lib/X11/fvwm2/pixmaps/colormap.xpm
+lib/X11/fvwm2/pixmaps/datebook.xpm
+lib/X11/fvwm2/pixmaps/desk.xpm
+lib/X11/fvwm2/pixmaps/dialog_box.xpm
+lib/X11/fvwm2/pixmaps/doomface.xpm
+lib/X11/fvwm2/pixmaps/editres.xpm
+lib/X11/fvwm2/pixmaps/eps.xpm
+lib/X11/fvwm2/pixmaps/exit.xpm
+lib/X11/fvwm2/pixmaps/flow_chart.xpm
+lib/X11/fvwm2/pixmaps/folder2.xpm
+lib/X11/fvwm2/pixmaps/folders.xpm
+lib/X11/fvwm2/pixmaps/fvwm.xpm
+lib/X11/fvwm2/pixmaps/fvwm2.xpm
+lib/X11/fvwm2/pixmaps/fvwm2_big.xpm
+lib/X11/fvwm2/pixmaps/fvwm3.xpm
+lib/X11/fvwm2/pixmaps/gnu-animal.xpm
+lib/X11/fvwm2/pixmaps/graphs.xpm
+lib/X11/fvwm2/pixmaps/jball.xpm
+lib/X11/fvwm2/pixmaps/jbomb.xpm
+lib/X11/fvwm2/pixmaps/jbook1.xpm
+lib/X11/fvwm2/pixmaps/jbook2.xpm
+lib/X11/fvwm2/pixmaps/jcalc.xpm
+lib/X11/fvwm2/pixmaps/jclock.xpm
+lib/X11/fvwm2/pixmaps/jf.xpm
+lib/X11/fvwm2/pixmaps/jgraph.xpm
+lib/X11/fvwm2/pixmaps/jline.xpm
+lib/X11/fvwm2/pixmaps/jlower.xpm
+lib/X11/fvwm2/pixmaps/jmag.xpm
+lib/X11/fvwm2/pixmaps/jmail.xpm
+lib/X11/fvwm2/pixmaps/jmove.xpm
+lib/X11/fvwm2/pixmaps/jpaint.xpm
+lib/X11/fvwm2/pixmaps/jraise.xpm
+lib/X11/fvwm2/pixmaps/jresize.xpm
+lib/X11/fvwm2/pixmaps/jterm.xpm
+lib/X11/fvwm2/pixmaps/jwindow.xpm
+lib/X11/fvwm2/pixmaps/jx.xpm
+lib/X11/fvwm2/pixmaps/mag_glass.xpm
+lib/X11/fvwm2/pixmaps/mail1.xpm
+lib/X11/fvwm2/pixmaps/mail2.xpm
+lib/X11/fvwm2/pixmaps/map.xpm
+lib/X11/fvwm2/pixmaps/math4.xpm
+lib/X11/fvwm2/pixmaps/mini.audiovol.xpm
+lib/X11/fvwm2/pixmaps/mini.blah.xpm
+lib/X11/fvwm2/pixmaps/mini.bomb.xpm
+lib/X11/fvwm2/pixmaps/mini.checkmark.xpm
+lib/X11/fvwm2/pixmaps/mini.cut.xpm
+lib/X11/fvwm2/pixmaps/mini.destroy.xpm
+lib/X11/fvwm2/pixmaps/mini.excl.xpm
+lib/X11/fvwm2/pixmaps/mini.exit.xpm
+lib/X11/fvwm2/pixmaps/mini.eye.xpm
+lib/X11/fvwm2/pixmaps/mini.fvwm.xpm
+lib/X11/fvwm2/pixmaps/mini.iconify.xpm
+lib/X11/fvwm2/pixmaps/mini.letter.xpm
+lib/X11/fvwm2/pixmaps/mini.lower.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize-horiz.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize-vert.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize.xpm
+lib/X11/fvwm2/pixmaps/mini.maximize2.xpm
+lib/X11/fvwm2/pixmaps/mini.move.xpm
+lib/X11/fvwm2/pixmaps/mini.netscape.xpm
+lib/X11/fvwm2/pixmaps/mini.rainbow.xpm
+lib/X11/fvwm2/pixmaps/mini.raise.xpm
+lib/X11/fvwm2/pixmaps/mini.refresh.xpm
+lib/X11/fvwm2/pixmaps/mini.resize.xpm
+lib/X11/fvwm2/pixmaps/mini.stick.xpm
+lib/X11/fvwm2/pixmaps/mini.stick2.xpm
+lib/X11/fvwm2/pixmaps/mini.stickpressed.xpm
+lib/X11/fvwm2/pixmaps/mini.xarchie.xpm
+lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
+lib/X11/fvwm2/pixmaps/mini.xboing.xpm
+lib/X11/fvwm2/pixmaps/mini.xlock.xpm
+lib/X11/fvwm2/pixmaps/mini.xmag.xpm
+lib/X11/fvwm2/pixmaps/mini.xman.xpm
+lib/X11/fvwm2/pixmaps/mini.xpaint.xpm
+lib/X11/fvwm2/pixmaps/mini.xpm
+lib/X11/fvwm2/pixmaps/mini.xterm.xpm
+lib/X11/fvwm2/pixmaps/mini.zircon.xpm
+lib/X11/fvwm2/pixmaps/page.xpm
+lib/X11/fvwm2/pixmaps/page2.xpm
+lib/X11/fvwm2/pixmaps/ps.xpm
+lib/X11/fvwm2/pixmaps/question.xpm
+lib/X11/fvwm2/pixmaps/rbomb.xpm
+lib/X11/fvwm2/pixmaps/rcalc.xpm
+lib/X11/fvwm2/pixmaps/rterm.xpm
+lib/X11/fvwm2/pixmaps/term.xpm
+lib/X11/fvwm2/pixmaps/tiff2.xpm
+lib/X11/fvwm2/pixmaps/toolbox.xpm
+lib/X11/fvwm2/pixmaps/unknown1.xpm
+lib/X11/fvwm2/pixmaps/wierd_page3.xpm
+lib/X11/fvwm2/pixmaps/word_processor.xpm
+lib/X11/fvwm2/pixmaps/world.xpm
+lib/X11/fvwm2/pixmaps/xcalc.xpm
+lib/X11/fvwm2/pixmaps/xemacs.xpm
+lib/X11/fvwm2/pixmaps/xlock.xpm
+lib/X11/fvwm2/pixmaps/xman.xpm
+lib/X11/fvwm2/pixmaps/xpaint.xpm
+lib/X11/fvwm2/pixmaps/xterm-axp.xpm
+lib/X11/fvwm2/pixmaps/xterm-blank.xpm
+lib/X11/fvwm2/pixmaps/xterm-dec.xpm
+lib/X11/fvwm2/pixmaps/xterm-linux.xpm
+lib/X11/fvwm2/pixmaps/xterm-sgi.xpm
+lib/X11/fvwm2/pixmaps/xterm-sol.xpm
+lib/X11/fvwm2/pixmaps/xterm-sun.xpm
+lib/X11/fvwm2/pixmaps/xterm.xpm
+lib/X11/fvwm2/pixmaps/xv.xpm
+lib/X11/fvwm2/pixmaps/xv2.xpm
+man/man1/fvwm2.1.gz
 man/man1/xpmroot.1.gz
-man/man1/FvwmIdent.1.gz
-man/man1/FvwmPager.1.gz
 man/man1/FvwmAudio.1.gz
-man/man1/FvwmSave.1.gz
 man/man1/FvwmAuto.1.gz
-man/man1/FvwmTalk.1.gz
-man/man1/FvwmM4.1.gz
 man/man1/FvwmBacker.1.gz
-man/man1/FvwmScroll.1.gz
-man/man1/FvwmCpp.1.gz
 man/man1/FvwmBanner.1.gz
-man/man1/FvwmConfig.1.gz
 man/man1/FvwmButtons.1.gz
+man/man1/FvwmCascade.1.gz
+man/man1/FvwmCpp.1.gz
 man/man1/FvwmForm.1.gz
 man/man1/FvwmIconBox.1.gz
+man/man1/FvwmIconMan.1.gz
+man/man1/FvwmIdent.1.gz
+man/man1/FvwmM4.1.gz
+man/man1/FvwmPager.1.gz
+man/man1/FvwmSave.1.gz
 man/man1/FvwmSaveDesk.1.gz
+man/man1/FvwmScroll.1.gz
+man/man1/FvwmTalk.1.gz
+man/man1/FvwmTile.1.gz
 man/man1/FvwmWinList.1.gz
-man/man1/FvwmIconMan.1.gz
+@dirrm lib/X11/fvwm2/pixmaps
+@dirrm lib/X11/fvwm2