4 files changed, 23 insertions, 12 deletions

diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile
index a8d242b260cd..a12cb3afa7a5 100644
--- a/x11-wm/fvwm2-i18n/Makefile
+++ b/x11-wm/fvwm2-i18n/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	Internationalized fvwm2
-# Version required:	2.0.45
+# Version required:	2.0.46
 # 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.8 1997/03/04 09:38:40 asami Exp $
+# $Id: Makefile,v 1.9 1997/06/09 21:57:41 max Exp $
 #
 
-DISTNAME=	fvwm-2.0.45
+DISTNAME=	fvwm-2.0.46
 CATEGORIES=	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/ \
 		ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Jan24.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} fvwm-users-jp-kits.97Oct04.tar.gz
 
 MAINTAINER=	matusita@jp.freebsd.org
 
@@ -23,7 +23,7 @@ LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 USE_IMAKE=	yes
 
 # filenames.
-PATCH_FIXIT=	kits/patch/fix-2.0.45
+PATCH_FIXIT=	kits/patch/fix-2.0.46
 PATCH_I18N=	kits/patch/PATCH.I18N
 
 USE_PATCHFILES=	${PATCH_FIXIT} ${PATCH_I18N}
@@ -35,7 +35,9 @@ pre-patch:
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fvwm2/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm \
+	${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${WRKSRC}/icons/*.xbm \
+			${WRKSRC}/icons/*.bitmap ${WRKSRC}/icons/*.icon \
 		${PREFIX}/lib/X11/fvwm2/pixmaps
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/x11-wm/fvwm2-i18n/distinfo b/x11-wm/fvwm2-i18n/distinfo
index 11ce315db376..d79a410db3be 100644
--- a/x11-wm/fvwm2-i18n/distinfo
+++ b/x11-wm/fvwm2-i18n/distinfo
@@ -1,2 +1,2 @@
-MD5 (fvwm-2.0.45.tar.gz) = 6d5cfab435831ef9fd970d17c972a20c
-MD5 (fvwm-users-jp-kits.97Jan24.tar.gz) = 8312730d07e08e98075dff93f77a0836
+MD5 (fvwm-2.0.46.tar.gz) = da4a7d4c4e81e5de3ecdc02026fa1fa9
+MD5 (fvwm-users-jp-kits.97Oct04.tar.gz) = 7e4b5da259634142a76d0eb9e681a6ea
diff --git a/x11-wm/fvwm2-i18n/files/patch-aa b/x11-wm/fvwm2-i18n/files/patch-aa
index 0092eab0fece..36929064f002 100644
--- a/x11-wm/fvwm2-i18n/files/patch-aa
+++ b/x11-wm/fvwm2-i18n/files/patch-aa
@@ -9,7 +9,7 @@
  
  
  /**************************************************************************
-@@ -263,6 +263,9 @@
+@@ -268,6 +268,9 @@
  /* Or if you prefer a more minimal setup, you could try something like: */
  /* OPTION_DEFINES = -DSHAPE -DVECTOR_BUTTONS */
  
@@ -19,7 +19,7 @@
  
  /***************************************************************************
   * The following section only needs to be changed if you do not want
-@@ -383,7 +386,7 @@
+@@ -388,7 +391,7 @@
  #endif
  
  #ifndef FvwmIconPath
@@ -34,9 +34,8 @@
  NullMake()
  
  #if InstallSample
--InstallNonExecFile(system.fvwmrc,$(FVWMDIR))
 +/* FreeBSD ports -- maybe a bug(typo?). reported. */
-+InstallNonExecFile(system$(FVWMRC),$(FVWMDIR))
+ InstallNonExecFile(system$(FVWMRC),$(FVWMDIR))
 +/* FreeBSD ports */
 +/* FreeBSD ports -- More informations are welcomed :-) */
 +InstallNonExecFile(decor_examples,$(FVWMDIR))
diff --git a/x11-wm/fvwm2-i18n/pkg-plist b/x11-wm/fvwm2-i18n/pkg-plist
index 5e98a3d3ce48..30c4dd296d6a 100644
--- a/x11-wm/fvwm2-i18n/pkg-plist
+++ b/x11-wm/fvwm2-i18n/pkg-plist
@@ -34,9 +34,11 @@ 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/ccode.icon
 lib/X11/fvwm2/pixmaps/clamp.xpm
 lib/X11/fvwm2/pixmaps/colormap.xpm
 lib/X11/fvwm2/pixmaps/datebook.xpm
+lib/X11/fvwm2/pixmaps/default.xbm
 lib/X11/fvwm2/pixmaps/desk.xpm
 lib/X11/fvwm2/pixmaps/dialog_box.xpm
 lib/X11/fvwm2/pixmaps/doomface.xpm
@@ -46,12 +48,14 @@ 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.bitmap
 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/hcode.icon
 lib/X11/fvwm2/pixmaps/jball.xpm
 lib/X11/fvwm2/pixmaps/jbomb.xpm
 lib/X11/fvwm2/pixmaps/jbook1.xpm
@@ -99,9 +103,13 @@ 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.resize2.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.winXX-close.xpm
+lib/X11/fvwm2/pixmaps/mini.winXX-maximize.xpm
+lib/X11/fvwm2/pixmaps/mini.winXX-minimize.xpm
 lib/X11/fvwm2/pixmaps/mini.xarchie.xpm
 lib/X11/fvwm2/pixmaps/mini.xbiff.xpm
 lib/X11/fvwm2/pixmaps/mini.xboing.xpm
@@ -112,8 +120,10 @@ 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/ocode.icon
 lib/X11/fvwm2/pixmaps/page.xpm
 lib/X11/fvwm2/pixmaps/page2.xpm
+lib/X11/fvwm2/pixmaps/prog.icon
 lib/X11/fvwm2/pixmaps/ps.xpm
 lib/X11/fvwm2/pixmaps/question.xpm
 lib/X11/fvwm2/pixmaps/rbomb.xpm