6 files changed, 175 insertions, 63 deletions

diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index 68a1d628c0aa..ebfe57d6a05e 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -1,24 +1,30 @@
 # New ports collection makefile for:   mlvwm
-# Version required:    0.6.2
+# Version required:    0.7.1
 # Date created:        19 Januruary 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1997/02/16 22:32:14 andreas Exp $
+# $Id: Makefile,v 1.2 1997/02/19 06:34:57 asami Exp $
 #
 
-DISTNAME=	mlvwm-0.6.2
+DISTNAME=	mlvwm-0.7.1
 CATEGORIES=	x11
-MASTER_SITES=	http://www.bioele.nuee.nagoya-u.ac.jp/member/tak/mlvwm/
+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
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
-CONFIGURE_ENV=	X11BASE=${X11BASE}
 USE_IMAKE=	yes
+EXTRACT_ONLY=	mlvwm-0.7.1.tar.gz
 
 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 \
+		-C ${PREFIX}/lib/X11/mlvwm/pixmap
 
 .include <bsd.port.mk>
diff --git a/x11-wm/mlvwm/distinfo b/x11-wm/mlvwm/distinfo
index cf5fa444a0f9..6e9aceaa7cbe 100644
--- a/x11-wm/mlvwm/distinfo
+++ b/x11-wm/mlvwm/distinfo
@@ -1 +1,2 @@
-MD5 (mlvwm-0.6.2.tar.gz) = 6a0398db81c0923ee2573beb6e1afb34
+MD5 (mlvwm-0.7.1.tar.gz) = 7d545af02a383e27e7f91a7f22ad5da3
+MD5 (mini-icons.tar.gz) = 3d54e199e6b6da6f077736ec0283ca85
diff --git a/x11-wm/mlvwm/files/patch-aa b/x11-wm/mlvwm/files/patch-aa
index 843c5290af8c..01f781fa53b6 100644
--- a/x11-wm/mlvwm/files/patch-aa
+++ b/x11-wm/mlvwm/files/patch-aa
@@ -1,22 +1,21 @@
---- configure.h.orig	Fri Dec 27 09:17:07 1996
-+++ configure.h	Sun Feb 16 23:15:49 1997
-@@ -17,8 +17,8 @@
- 
- XCOMM The directory name of bindir and libdir.
- 
--#define MlvwmBinDir /usr/local/X11R6/bin
--#define MlvwmLibDirk /usr/local/X11R6/lib/X11/mlvwm
-+#define MlvwmBinDir /usr/X11R6/bin
-+#define MlvwmLibDir /usr/X11R6/lib/X11/mlvwm
- 
- XCOMM
- XCOMM Cannot modify as follows:
-@@ -71,7 +71,7 @@
- XCOMM     DEBUG_OPTIONS =  -D_DEBUG_
- XCOMM       CDEBUGFLAGS = -g -Wall -Wshadow
- XCOMM            CDEBUGFLAGS = -O2 -Wall
--            CDEBUGFLAGS = -g -Wall
-+            CDEBUGFLAGS = -pipe -O2
- 
- MLVWMDEFINES = $(CDEBUGFLAGS) $(Locale_DEFINES)
- MLVWMLIBRARIES = $(Locale_LIBRARIES)
+*** configure.h.orig	Sun May 25 18:23:55 1997
+--- configure.h	Sun May 25 18:25:07 1997
+***************
+*** 17,24 ****
+  
+  XCOMM The directory name of bindir and libdir.
+  
+! #define MlvwmBinDir /home/tak/bin
+! XCOMM #define MlvwmLibDir /home2/tak/bin/mlvwm-lib
+  
+  XCOMM
+  XCOMM Cannot modify as follows:
+--- 17,24 ----
+  
+  XCOMM The directory name of bindir and libdir.
+  
+! #define MlvwmBinDir /usr/X11R6/bin
+! #define MlvwmLibDir /usr/X11R6/lib/X11/mlvwm
+  
+  XCOMM
+  XCOMM Cannot modify as follows:
diff --git a/x11-wm/mlvwm/files/patch-ab b/x11-wm/mlvwm/files/patch-ab
index c2cbc9afdebd..ef9cc0dfb37e 100644
--- a/x11-wm/mlvwm/files/patch-ab
+++ b/x11-wm/mlvwm/files/patch-ab
@@ -1,56 +1,38 @@
-*** sample_rc/Mlvwmrc.orig	Mon Jan 20 00:19:09 1997
---- sample_rc/Mlvwmrc	Mon Jan 20 00:21:26 1997
+*** sample_rc/Mlvwmrc.orig	Thu Apr 10 23:17:40 1997
+--- sample_rc/Mlvwmrc	Sun May 25 19:11:32 1997
 ***************
-*** 14,32 ****
+*** 20,26 ****
   DoubleClickTime 300
   
   # Set icon search path. It needs before "Style".
 ! IconPath /usr/local/include/X11/pixmaps:/home2/tak/bin/pixmap
   IconMenuIcon label2.xpm
   
-  # Window decoration
-  Style
-- "*" MiniIcon mini-cross.xpm, MaxmizeScale 90
-- "KTerm" MaxmizeScale 100, MiniIcon mini-term.xpm
-- "Netscape" MiniIcon mini-nscape.xpm
-- "Emacs" MiniIcon mini-edit.xpm
-- "xv" MiniIcon mini-xv.xpm, EnableScroll
-- "XCalc" MiniIcon mini-calc.xpm
-- "Xarchie" MiniIcon mini.xarchie.xpm
-- "Xmag" MiniIcon mini.xmag.xpm
-  "XMeter" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoTitle, NoCloseR
-  "XMeter" NoWinList, Sticky, SkipSelect
-  "*biff" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoWinList, NoCloseR
---- 14,24 ----
+  # Font Settings(without LOCALE)
+--- 20,26 ----
   DoubleClickTime 300
   
   # Set icon search path. It needs before "Style".
-! IconPath /usr/X11R6/lib/X11/mlvwm/pixmap
+! IconPath /usr/X11R6/lib/X11/mlvwm/pixmap:/home2/tak/bin/pixmap
   IconMenuIcon label2.xpm
   
-  # Window decoration
-  Style
-  "XMeter" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoTitle, NoCloseR
-  "XMeter" NoWinList, Sticky, SkipSelect
-  "*biff" NoSBarH, NoSBarV, NoResizeR, NoMinMaxR, NoWinList, NoCloseR
+  # Font Settings(without LOCALE)
 ***************
-*** 47,55 ****
-  Menu "Apple" Icon label1.xpm
+*** 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
+  "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm
   END
   
-  Menu "File" Left
---- 39,47 ----
-  Menu "Apple" Icon label1.xpm
+--- 44,51 ----
+  Menu Apple, Icon label1.xpm, Stick
   "About this Workstation..." NonSelect, Gray, Action About
   "" NonSelect
-! "Terminal"	Action Exec "xterm" exec xterm -ls
-! "Editor"  Action Exec "emacs" exec emacs
-! "calculator" Action Exec "xcal" exec xcalc
+! "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
   
-  Menu "File" Left
diff --git a/x11-wm/mlvwm/files/patch-ac b/x11-wm/mlvwm/files/patch-ac
new file mode 100644
index 000000000000..4186c4657ac0
--- /dev/null
+++ b/x11-wm/mlvwm/files/patch-ac
@@ -0,0 +1,19 @@
+*** 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設定ありのサンプル)
diff --git a/x11-wm/mlvwm/pkg-plist b/x11-wm/mlvwm/pkg-plist
index 1fd191b46dc0..bf285b0592dc 100644
--- a/x11-wm/mlvwm/pkg-plist
+++ b/x11-wm/mlvwm/pkg-plist
@@ -1,8 +1,113 @@
 bin/mlvwm
-lib/X11/mlvwm/system.mlvwmrc
+lib/X11/mlvwm/Mlvwmrc
+lib/X11/mlvwm/Mlvwmrc-Kterm
+lib/X11/mlvwm/Mlvwmrc-Netscape
+lib/X11/mlvwm/Mlvwmrc-j
 lib/X11/mlvwm/pixmap/MailEmpty.xpm
 lib/X11/mlvwm/pixmap/MailFull.xpm
 lib/X11/mlvwm/pixmap/disk.xpm
 lib/X11/mlvwm/pixmap/label1.xpm
 lib/X11/mlvwm/pixmap/label2.xpm
-@dirrm lib/X11/mlvwm
+lib/X11/mlvwm/pixmap/label3.xpm
+lib/X11/mlvwm/pixmap/mini-ball.xpm
+lib/X11/mlvwm/pixmap/mini-bball.xpm
+lib/X11/mlvwm/pixmap/mini-bomb.xpm
+lib/X11/mlvwm/pixmap/mini-book1.xpm
+lib/X11/mlvwm/pixmap/mini-book2.xpm
+lib/X11/mlvwm/pixmap/mini-bug1.xpm
+lib/X11/mlvwm/pixmap/mini-bug2.xpm
+lib/X11/mlvwm/pixmap/mini-bx2.xpm
+lib/X11/mlvwm/pixmap/mini-calc.xpm
+lib/X11/mlvwm/pixmap/mini-camera.xpm
+lib/X11/mlvwm/pixmap/mini-cdlabel.xpm
+lib/X11/mlvwm/pixmap/mini-clock.xpm
+lib/X11/mlvwm/pixmap/mini-colors.xpm
+lib/X11/mlvwm/pixmap/mini-connect.xpm
+lib/X11/mlvwm/pixmap/mini-cross.xpm
+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
+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-hammer.xpm
+lib/X11/mlvwm/pixmap/mini-happy.xpm
+lib/X11/mlvwm/pixmap/mini-hextris.xpm
+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-max1.xpm
+lib/X11/mlvwm/pixmap/mini-maze.xpm
+lib/X11/mlvwm/pixmap/mini-modules.xpm
+lib/X11/mlvwm/pixmap/mini-move.xpm
+lib/X11/mlvwm/pixmap/mini-move1.xpm
+lib/X11/mlvwm/pixmap/mini-nscape.xpm
+lib/X11/mlvwm/pixmap/mini-ofolder.xpm
+lib/X11/mlvwm/pixmap/mini-olwm.xpm
+lib/X11/mlvwm/pixmap/mini-paint.xpm
+lib/X11/mlvwm/pixmap/mini-pdf.xpm
+lib/X11/mlvwm/pixmap/mini-pencil.xpm
+lib/X11/mlvwm/pixmap/mini-perf.xpm
+lib/X11/mlvwm/pixmap/mini-question.xpm
+lib/X11/mlvwm/pixmap/mini-raise.xpm
+lib/X11/mlvwm/pixmap/mini-ray.xpm
+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-slon.xpm
+lib/X11/mlvwm/pixmap/mini-start.xpm
+lib/X11/mlvwm/pixmap/mini-stop.xpm
+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
+lib/X11/mlvwm/pixmap/mini-zoom.xpm
+lib/X11/mlvwm/pixmap/mini.audiovol.xpm
+lib/X11/mlvwm/pixmap/mini.blah.xpm
+lib/X11/mlvwm/pixmap/mini.bomb.xpm
+lib/X11/mlvwm/pixmap/mini.checkmark.xpm
+lib/X11/mlvwm/pixmap/mini.cut.xpm
+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.fvwm.xpm
+lib/X11/mlvwm/pixmap/mini.iconify.xpm
+lib/X11/mlvwm/pixmap/mini.letter.xpm
+lib/X11/mlvwm/pixmap/mini.lower.xpm
+lib/X11/mlvwm/pixmap/mini.maximize-horiz.xpm
+lib/X11/mlvwm/pixmap/mini.maximize-vert.xpm
+lib/X11/mlvwm/pixmap/mini.maximize.xpm
+lib/X11/mlvwm/pixmap/mini.maximize2.xpm
+lib/X11/mlvwm/pixmap/mini.move.xpm
+lib/X11/mlvwm/pixmap/mini.netscape.xpm
+lib/X11/mlvwm/pixmap/mini.rainbow.xpm
+lib/X11/mlvwm/pixmap/mini.raise.xpm
+lib/X11/mlvwm/pixmap/mini.refresh.xpm
+lib/X11/mlvwm/pixmap/mini.resize.xpm
+lib/X11/mlvwm/pixmap/mini.stick.xpm
+lib/X11/mlvwm/pixmap/mini.stick2.xpm
+lib/X11/mlvwm/pixmap/mini.xarchie.xpm
+lib/X11/mlvwm/pixmap/mini.xbiff.xpm
+lib/X11/mlvwm/pixmap/mini.xboing.xpm
+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