Upgrade to 0.8.5

PR:		ports/5227
Submitted by:	maintainer

7 files changed, 68 insertions, 71 deletions

diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index ebfe57d6a05e..3191998c3c9e 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -1,30 +1,34 @@
 # New ports collection makefile for:   mlvwm
-# Version required:    0.7.1
+# Version required:    0.8.5
 # Date created:        19 Januruary 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.2 1997/02/19 06:34:57 asami Exp $
+# $Id: Makefile,v 1.3 1997/06/03 08:09:40 asami Exp $
 #
 
-DISTNAME=	mlvwm-0.7.1
+DISTNAME=	mlvwm-0.8.5
 CATEGORIES=	x11
 MASTER_SITES=	http://www.bioele.nuee.nagoya-u.ac.jp/member/tak/mlvwm/ \
 		http://www.bioele.nuee.nagoya-u.ac.jp/member/tak/
-DISTFILES=	mlvwm-0.7.1.tar.gz mini-icons.tar.gz
+DISTFILES=	mlvwm-0.8.5.tar.gz mini-icons.tar.gz
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_IMAKE=	yes
-EXTRACT_ONLY=	mlvwm-0.7.1.tar.gz
+EXTRACT_ONLY=	mlvwm-0.8.5.tar.gz
+
+MAN1=		mlvwm.1
 
 post-install:
 	${MKDIR} ${PREFIX}/lib/X11/mlvwm/pixmap
 	${INSTALL_DATA} ${WRKSRC}/pixmap/*.xpm ${PREFIX}/lib/X11/mlvwm/pixmap
 	${INSTALL_DATA} ${WRKSRC}/sample_rc/Mlvwm* ${PREFIX}/lib/X11/mlvwm
 	${RM} -f ${PREFIX}/lib/X11/mlvwm/*.orig
-	tar xzvf ${DISTDIR}/${DIST_SUBDIR}/mini-icons.tar.gz \
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${DISTDIR}/mini-icons.tar.gz \
 		-C ${PREFIX}/lib/X11/mlvwm/pixmap
+	${INSTALL_MAN} ${WRKSRC}/man/mlvwm.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/mlvwm/distinfo b/x11-wm/mlvwm/distinfo
index 6e9aceaa7cbe..e16604f1139f 100644
--- a/x11-wm/mlvwm/distinfo
+++ b/x11-wm/mlvwm/distinfo
@@ -1,2 +1,2 @@
-MD5 (mlvwm-0.7.1.tar.gz) = 7d545af02a383e27e7f91a7f22ad5da3
+MD5 (mlvwm-0.8.5.tar.gz) = 8f96db91d92eb45f8e35ecbc3e335d09
 MD5 (mini-icons.tar.gz) = 3d54e199e6b6da6f077736ec0283ca85
diff --git a/x11-wm/mlvwm/files/patch-aa b/x11-wm/mlvwm/files/patch-aa
index 01f781fa53b6..3b1f31c639a4 100644
--- a/x11-wm/mlvwm/files/patch-aa
+++ b/x11-wm/mlvwm/files/patch-aa
@@ -1,21 +1,38 @@
-*** configure.h.orig	Sun May 25 18:23:55 1997
---- configure.h	Sun May 25 18:25:07 1997
+*** sample_rc/Mlvwmrc.orig	Fri Dec  5 23:31:56 1997
+--- sample_rc/Mlvwmrc	Fri Dec  5 23:33:38 1997
 ***************
-*** 17,24 ****
+*** 40,46 ****
+  Compatible
   
-  XCOMM The directory name of bindir and libdir.
+  # Set icon search path. It needs before "Style".
+! IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
+  IconMenuIcon label2.xpm
   
-! #define MlvwmBinDir /home/tak/bin
-! XCOMM #define MlvwmLibDir /home2/tak/bin/mlvwm-lib
+  # Balloon help Settings
+--- 40,46 ----
+  Compatible
   
-  XCOMM
-  XCOMM Cannot modify as follows:
---- 17,24 ----
+  # Set icon search path. It needs before "Style".
+! IconPath /usr/X11R6/lib/X11/mlvwm/pixmap:/home2/tak/bin/pixmap
+  IconMenuIcon label2.xpm
   
-  XCOMM The directory name of bindir and libdir.
+  # Balloon help Settings
+***************
+*** 68,75 ****
+  Menu Apple, Icon label1.xpm, Stick
+  "About this Workstation..." NonSelect, Gray, Action About
+  "" NonSelect
+! "Terminal"	Icon mini-display.xpm, Action Exec "kterm" exec kterm -ls
+! "Editor"  Action Exec "mule" exec mule, Icon mini-edit.xpm
+  "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
+  END
   
-! #define MlvwmBinDir /usr/X11R6/bin
-! #define MlvwmLibDir /usr/X11R6/lib/X11/mlvwm
+--- 68,75 ----
+  Menu Apple, Icon label1.xpm, Stick
+  "About this Workstation..." NonSelect, Gray, Action About
+  "" NonSelect
+! "Terminal"	Icon mini-display.xpm, Action Exec "xterm" exec xterm -ls
+! "Editor"  Action Exec "emacs" exec emacs, Icon mini-edit.xpm
+  "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
+  END
   
-  XCOMM
-  XCOMM Cannot modify as follows:
diff --git a/x11-wm/mlvwm/files/patch-ab b/x11-wm/mlvwm/files/patch-ab
index ef9cc0dfb37e..3d2b5f1b25a7 100644
--- a/x11-wm/mlvwm/files/patch-ab
+++ b/x11-wm/mlvwm/files/patch-ab
@@ -1,38 +1,19 @@
-*** sample_rc/Mlvwmrc.orig	Thu Apr 10 23:17:40 1997
---- sample_rc/Mlvwmrc	Sun May 25 19:11:32 1997
+*** sample_rc/Mlvwmrc-j.orig	Fri Dec  5 23:34:21 1997
+--- sample_rc/Mlvwmrc-j	Fri Dec  5 23:34:54 1997
 ***************
-*** 20,26 ****
-  DoubleClickTime 300
+*** 39,45 ****
+  Compatible
   
-  # Set icon search path. It needs before "Style".
+  # IconPath の指定。Style の指定の前に必要
 ! IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
   IconMenuIcon label2.xpm
   
-  # Font Settings(without LOCALE)
---- 20,26 ----
-  DoubleClickTime 300
+  # Balloon help Settings
+--- 39,45 ----
+  Compatible
   
-  # Set icon search path. It needs before "Style".
-! IconPath /usr/X11R6/lib/X11/mlvwm/pixmap:/home2/tak/bin/pixmap
+  # IconPath の指定。Style の指定の前に必要
+! IconPath /usr/X11R6/lib/X11/mlvwm/pixmaps:/home2/tak/bin/pixmap
   IconMenuIcon label2.xpm
   
-  # Font Settings(without LOCALE)
-***************
-*** 44,51 ****
-  Menu Apple, Icon label1.xpm, Stick
-  "About this Workstation..." NonSelect, Gray, Action About
-  "" NonSelect
-! "Terminal"	Icon mini-display.xpm, Action Exec "kterm" exec kterm -ls
-! "Editor"  Action Exec "mule" exec mule, Icon mini-edit.xpm
-  "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
-  END
-  
---- 44,51 ----
-  Menu Apple, Icon label1.xpm, Stick
-  "About this Workstation..." NonSelect, Gray, Action About
-  "" NonSelect
-! "Terminal"	Icon mini-display.xpm, Action Exec "xterm" exec xterm -ls
-! "Editor"  Action Exec "emacs" exec emacs, Icon mini-edit.xpm
-  "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
-  END
-  
+  # Balloon help Settings
diff --git a/x11-wm/mlvwm/files/patch-ac b/x11-wm/mlvwm/files/patch-ac
index 4186c4657ac0..13282e1ae22e 100644
--- a/x11-wm/mlvwm/files/patch-ac
+++ b/x11-wm/mlvwm/files/patch-ac
@@ -1,19 +1,11 @@
-*** sample_rc/Mlvwmrc-j.orig	Sun May 25 18:48:05 1997
---- sample_rc/Mlvwmrc-j	Sun May 25 18:48:32 1997
-***************
-*** 13,19 ****
-  DoubleClickTime 300
-  
-  # IconPath の指定。Style の指定の前に必要
-! IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
-  IconMenuIcon label2.xpm
-  
-  # Font 設定(LOCALE設定ありのサンプル)
---- 13,19 ----
-  DoubleClickTime 300
-  
-  # IconPath の指定。Style の指定の前に必要
-! IconPath /usr/X11R6/lib/X11/mlvwm/pixmaps:/home2/tak/bin/pixmap
-  IconMenuIcon label2.xpm
-  
-  # Font 設定(LOCALE設定ありのサンプル)
+--- configure.h.orig	Fri Dec  5 20:31:15 1997
++++ configure.h	Fri Dec  5 20:31:26 1997
+@@ -69,7 +69,7 @@
+ XCOMM #endif
+ 
+ XCOMM 
+-      CDEBUGFLAGS = -g -Wall -Wshadow
++      CDEBUGFLAGS += -Wall -Wshadow
+ XCOMM            CDEBUGFLAGS = -O2 -Wall
+ XCOMM            CDEBUGFLAGS = -g -Wall
+ XCOMM            CDEBUGFLAGS = -g
diff --git a/x11-wm/mlvwm/pkg-descr b/x11-wm/mlvwm/pkg-descr
index 1d90731a690f..b552698c5e13 100644
--- a/x11-wm/mlvwm/pkg-descr
+++ b/x11-wm/mlvwm/pkg-descr
@@ -20,6 +20,5 @@ the freeze or when the freeze occurs.
 
 Author:
 	tak@bioele.nuee.nagoya-u.ac.jp
-
 ------------------------------------------
 Yukihiro Nakai<Nakai@Mlab.t.u-tokyo.ac.jp>
diff --git a/x11-wm/mlvwm/pkg-plist b/x11-wm/mlvwm/pkg-plist
index bf285b0592dc..b2db111716bd 100644
--- a/x11-wm/mlvwm/pkg-plist
+++ b/x11-wm/mlvwm/pkg-plist
@@ -1,6 +1,7 @@
 bin/mlvwm
 lib/X11/mlvwm/Mlvwmrc
 lib/X11/mlvwm/Mlvwmrc-Kterm
+lib/X11/mlvwm/Mlvwmrc-Kterm-j
 lib/X11/mlvwm/Mlvwmrc-Netscape
 lib/X11/mlvwm/Mlvwmrc-j
 lib/X11/mlvwm/pixmap/MailEmpty.xpm
@@ -111,3 +112,6 @@ lib/X11/mlvwm/pixmap/mini.xpaint.xpm
 lib/X11/mlvwm/pixmap/mini.xpm
 lib/X11/mlvwm/pixmap/mini.xterm.xpm
 lib/X11/mlvwm/pixmap/mini.zircon.xpm
+man/man1/mlvwm.1.gz
+@dirrm lib/X11/mlvwm/pixmap
+@dirrm lib/X11/mlvwm