5 files changed, 24 insertions, 27 deletions

diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index dd9053a2c39d..f60b9454bc1b 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -1,24 +1,25 @@
 # New ports collection makefile for:   mlvwm
-# Version required:    0.8.6
+# Version required:    0.8.9
 # Date created:        19 Januruary 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.10 1998/09/15 11:13:36 asami Exp $
+# $Id: Makefile,v 1.11 1998/09/17 00:32:58 asami Exp $
 #
 
-DISTNAME=	mlvwm-0.8.6
+DISTNAME=	mlvwm089
+PKGNAME=	mlvwm-0.8.9
 CATEGORIES=	x11-wm
 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.8.6.tar.gz mini-icons.tar.gz
+DISTFILES=	mlvwm089.tgz mini-icons.tar.gz
 
-MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
+MAINTAINER=	Nakai@technologist.com
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-WRKSRC=		${WRKDIR}/mlvwm086
+WRKSRC=		${WRKDIR}/mlvwm089
 USE_IMAKE=	yes
-EXTRACT_ONLY=	mlvwm-0.8.6.tar.gz
+EXTRACT_ONLY=	mlvwm089.tgz
 MAN1=		mlvwm.1
 MANCOMPRESSED=	no
 
@@ -30,6 +31,8 @@ post-install:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		${DISTDIR}/mini-icons.tar.gz \
 		-C ${PREFIX}/lib/X11/mlvwm/pixmap
+.if !defined(NOPORTDOCS)
 	${INSTALL_MAN} ${WRKSRC}/man/mlvwm.1 ${PREFIX}/man/man1
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/mlvwm/distinfo b/x11-wm/mlvwm/distinfo
index b116d1426ceb..3ba60aff3172 100644
--- a/x11-wm/mlvwm/distinfo
+++ b/x11-wm/mlvwm/distinfo
@@ -1,2 +1,2 @@
-MD5 (mlvwm-0.8.6.tar.gz) = 51f5150d1381a186a942590a0d20ecf2
+MD5 (mlvwm089.tgz) = ff8616575c412af93638f0754ba43e86
 MD5 (mini-icons.tar.gz) = 3d54e199e6b6da6f077736ec0283ca85
diff --git a/x11-wm/mlvwm/files/patch-ab b/x11-wm/mlvwm/files/patch-ab
index 3d2b5f1b25a7..606f3afec77f 100644
--- a/x11-wm/mlvwm/files/patch-ab
+++ b/x11-wm/mlvwm/files/patch-ab
@@ -1,7 +1,7 @@
-*** sample_rc/Mlvwmrc-j.orig	Fri Dec  5 23:34:21 1997
---- sample_rc/Mlvwmrc-j	Fri Dec  5 23:34:54 1997
+*** sample_rc/Mlvwmrc-j.orig	Fri Dec 18 17:58:12 1998
+--- sample_rc/Mlvwmrc-j	Fri Dec 18 17:58:32 1998
 ***************
-*** 39,45 ****
+*** 49,55 ****
   Compatible
   
   # IconPath の指定。Style の指定の前に必要
@@ -9,11 +9,11 @@
   IconMenuIcon label2.xpm
   
   # Balloon help Settings
---- 39,45 ----
+--- 49,55 ----
   Compatible
   
   # IconPath の指定。Style の指定の前に必要
-! IconPath /usr/X11R6/lib/X11/mlvwm/pixmaps:/home2/tak/bin/pixmap
+! IconPath /usr/X11R6/lib/X11/mlvwm/pixmap:/home2/tak/bin/pixmap
   IconMenuIcon label2.xpm
   
   # Balloon help Settings
diff --git a/x11-wm/mlvwm/files/patch-ac b/x11-wm/mlvwm/files/patch-ac
index fd398654b6e2..1122e78e7fc5 100644
--- a/x11-wm/mlvwm/files/patch-ac
+++ b/x11-wm/mlvwm/files/patch-ac
@@ -1,5 +1,5 @@
---- configure.h.orig	Fri Feb  6 07:16:26 1998
-+++ configure.h	Wed Mar 11 15:25:30 1998
+--- configure.h.orig	Fri Dec 18 17:59:21 1998
++++ configure.h	Fri Dec 18 18:00:53 1998
 @@ -33,7 +33,7 @@
  #ifdef MlvwmLibDir
      MLVWMLIBDIR = MlvwmLibDir
@@ -9,13 +9,7 @@
  #endif
  
  #ifndef HasLocale
-@@ -69,12 +69,12 @@
- #endif
- 
- XCOMM 
--      CDEBUGFLAGS = -g -Wall -Wshadow
-+      CDEBUGFLAGS += -Wall -Wshadow
- XCOMM            CDEBUGFLAGS = -O2 -Wall
+@@ -74,7 +74,7 @@
  XCOMM            CDEBUGFLAGS = -g -Wall
  XCOMM            CDEBUGFLAGS = -g
  
diff --git a/x11-wm/mlvwm/pkg-plist b/x11-wm/mlvwm/pkg-plist
index 8c068bda406e..15a84214b9c6 100644
--- a/x11-wm/mlvwm/pkg-plist
+++ b/x11-wm/mlvwm/pkg-plist
@@ -1,8 +1,8 @@
 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-Xterm
 lib/X11/mlvwm/Mlvwmrc-j
 lib/X11/mlvwm/pixmap/MailEmpty.xpm
 lib/X11/mlvwm/pixmap/MailFull.xpm
@@ -29,7 +29,6 @@ lib/X11/mlvwm/pixmap/mini-diff.xpm
 lib/X11/mlvwm/pixmap/mini-display.xpm
 lib/X11/mlvwm/pixmap/mini-doc.xpm
 lib/X11/mlvwm/pixmap/mini-edit.xpm
-lib/X11/mlvwm/pixmap/mini-gv.xpm
 lib/X11/mlvwm/pixmap/mini-exclam.xpm
 lib/X11/mlvwm/pixmap/mini-exp.xpm
 lib/X11/mlvwm/pixmap/mini-eyes.xpm
@@ -37,6 +36,7 @@ lib/X11/mlvwm/pixmap/mini-filemgr.xpm
 lib/X11/mlvwm/pixmap/mini-fractal.xpm
 lib/X11/mlvwm/pixmap/mini-frame.xpm
 lib/X11/mlvwm/pixmap/mini-gball.xpm
+lib/X11/mlvwm/pixmap/mini-gv.xpm
 lib/X11/mlvwm/pixmap/mini-hammer.xpm
 lib/X11/mlvwm/pixmap/mini-happy.xpm
 lib/X11/mlvwm/pixmap/mini-hextris.xpm
@@ -44,6 +44,7 @@ lib/X11/mlvwm/pixmap/mini-lock.xpm
 lib/X11/mlvwm/pixmap/mini-lower.xpm
 lib/X11/mlvwm/pixmap/mini-mail.xpm
 lib/X11/mlvwm/pixmap/mini-manual.xpm
+lib/X11/mlvwm/pixmap/mini-sh.xpm
 lib/X11/mlvwm/pixmap/mini-max1.xpm
 lib/X11/mlvwm/pixmap/mini-maze.xpm
 lib/X11/mlvwm/pixmap/mini-modules.xpm
@@ -63,8 +64,8 @@ lib/X11/mlvwm/pixmap/mini-rball.xpm
 lib/X11/mlvwm/pixmap/mini-resize.xpm
 lib/X11/mlvwm/pixmap/mini-roach.xpm
 lib/X11/mlvwm/pixmap/mini-run.xpm
-lib/X11/mlvwm/pixmap/mini-sh.xpm
 lib/X11/mlvwm/pixmap/mini-sh1.xpm
+lib/X11/mlvwm/pixmap/mini-x.xpm
 lib/X11/mlvwm/pixmap/mini-slon.xpm
 lib/X11/mlvwm/pixmap/mini-start.xpm
 lib/X11/mlvwm/pixmap/mini-stop.xpm
@@ -72,7 +73,6 @@ lib/X11/mlvwm/pixmap/mini-term.xpm
 lib/X11/mlvwm/pixmap/mini-tetris.xpm
 lib/X11/mlvwm/pixmap/mini-turn.xpm
 lib/X11/mlvwm/pixmap/mini-windows.xpm
-lib/X11/mlvwm/pixmap/mini-x.xpm
 lib/X11/mlvwm/pixmap/mini-x2.xpm
 lib/X11/mlvwm/pixmap/mini-xmahjongg.xpm
 lib/X11/mlvwm/pixmap/mini-xv.xpm
@@ -86,6 +86,7 @@ lib/X11/mlvwm/pixmap/mini.destroy.xpm
 lib/X11/mlvwm/pixmap/mini.excl.xpm
 lib/X11/mlvwm/pixmap/mini.exit.xpm
 lib/X11/mlvwm/pixmap/mini.eye.xpm
+lib/X11/mlvwm/pixmap/mini.xpm
 lib/X11/mlvwm/pixmap/mini.fvwm.xpm
 lib/X11/mlvwm/pixmap/mini.iconify.xpm
 lib/X11/mlvwm/pixmap/mini.letter.xpm
@@ -109,7 +110,6 @@ lib/X11/mlvwm/pixmap/mini.xlock.xpm
 lib/X11/mlvwm/pixmap/mini.xmag.xpm
 lib/X11/mlvwm/pixmap/mini.xman.xpm
 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
 @dirrm lib/X11/mlvwm/pixmap