From 7cdc2017d5ee303b27699fee2809595be3baeb0d Mon Sep 17 00:00:00 2001 From: Yukihiro Nakai Date: Tue, 5 Oct 1999 03:16:42 +0000 Subject: Update to 0.9.0 (Patches from "KATO Tsuguru" ) --- x11-wm/mlvwm/Makefile | 38 +++++++++++++++++--------------------- x11-wm/mlvwm/distinfo | 2 +- x11-wm/mlvwm/files/patch-aa | 20 +++++++++----------- x11-wm/mlvwm/files/patch-ab | 10 +++++----- x11-wm/mlvwm/files/patch-ac | 39 +++++++++++++++++++-------------------- x11-wm/mlvwm/pkg-descr | 18 +----------------- 6 files changed, 52 insertions(+), 75 deletions(-) (limited to 'x11-wm') diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile index e1cc427056ba..799d294b8a2c 100644 --- a/x11-wm/mlvwm/Makefile +++ b/x11-wm/mlvwm/Makefile @@ -1,39 +1,35 @@ # New ports collection makefile for: mlvwm -# Version required: 0.8.9 +# Version required: 0.9.0 # Date created: 19 Januruary 1997 # Whom: Yukihiro Nakai # # $FreeBSD$ # -DISTNAME= mlvwm089 -PKGNAME= mlvwm-0.8.9 +DISTNAME= mlvwm090 +PKGNAME= mlvwm-0.9.0 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= mlvwm089.tgz mini-icons.tar.gz +MASTER_SITES= http://www2u.biglobe.ne.jp/~y-miyata/mlvwm/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} mini-icons.tar.gz -MAINTAINER= nacai@iname.com +MAINTAINER= nakai@FreeBSD.org LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm -WRKSRC= ${WRKDIR}/mlvwm089 USE_IMAKE= yes -EXTRACT_ONLY= mlvwm089.tgz +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAN1= mlvwm.1 -MANCOMPRESSED= no + +MLVWMLIBDIR= ${PREFIX}/lib/X11/mlvwm + +post-patch: + @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/sample_rc/Mlvwmrc* 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 - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ - ${DISTDIR}/mini-icons.tar.gz \ - ${EXTRACT_AFTER_ARGS} \ - -C ${PREFIX}/lib/X11/mlvwm/pixmap -.if !defined(NOPORTDOCS) - ${INSTALL_MAN} ${WRKSRC}/man/mlvwm.1 ${PREFIX}/man/man1 -.endif + @${RM} -f ${WRKSRC}/sample_rc/*.orig + @${MKDIR} ${MLVWMLIBDIR}/pixmap + ${INSTALL_DATA} ${WRKSRC}/pixmap/*.xpm ${MLVWMLIBDIR}/pixmap + ${INSTALL_DATA} ${WRKSRC}/sample_rc/Mlvwmrc* ${MLVWMLIBDIR} + (cd ${MLVWMLIBDIR}/pixmap; ${TAR} xzf ${DISTDIR}/mini-icons.tar.gz) .include diff --git a/x11-wm/mlvwm/distinfo b/x11-wm/mlvwm/distinfo index 3ba60aff3172..dda33f1658e5 100644 --- a/x11-wm/mlvwm/distinfo +++ b/x11-wm/mlvwm/distinfo @@ -1,2 +1,2 @@ -MD5 (mlvwm089.tgz) = ff8616575c412af93638f0754ba43e86 +MD5 (mlvwm090.tar.gz) = 79e9f2fb8c7d6307378149bb6bec46ef MD5 (mini-icons.tar.gz) = 3d54e199e6b6da6f077736ec0283ca85 diff --git a/x11-wm/mlvwm/files/patch-aa b/x11-wm/mlvwm/files/patch-aa index 3b1f31c639a4..7ae859e5c5c2 100644 --- a/x11-wm/mlvwm/files/patch-aa +++ b/x11-wm/mlvwm/files/patch-aa @@ -1,7 +1,7 @@ -*** sample_rc/Mlvwmrc.orig Fri Dec 5 23:31:56 1997 ---- sample_rc/Mlvwmrc Fri Dec 5 23:33:38 1997 +*** sample_rc/Mlvwmrc.orig Sat Jan 23 21:37:52 1999 +--- sample_rc/Mlvwmrc Thu Sep 23 00:15:13 1999 *************** -*** 40,46 **** +*** 52,58 **** Compatible # Set icon search path. It needs before "Style". @@ -9,30 +9,28 @@ IconMenuIcon label2.xpm # Balloon help Settings ---- 40,46 ---- +--- 52,58 ---- Compatible # Set icon search path. It needs before "Style". -! IconPath /usr/X11R6/lib/X11/mlvwm/pixmap:/home2/tak/bin/pixmap +! IconPath %%PREFIX%%/lib/X11/pixmaps IconMenuIcon label2.xpm # Balloon help Settings *************** -*** 68,75 **** +*** 80,86 **** 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 + "Editor" Action Exec "mule" exec mule, Icon mini-edit.xpm "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm END - ---- 68,75 ---- +--- 80,86 ---- 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 + "Editor" Action Exec "mule" exec mule, Icon mini-edit.xpm "calculator" Action Exec "xcal" exec xcalc, Icon mini-calc.xpm END - diff --git a/x11-wm/mlvwm/files/patch-ab b/x11-wm/mlvwm/files/patch-ab index 606f3afec77f..583f9c263784 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 18 17:58:12 1998 ---- sample_rc/Mlvwmrc-j Fri Dec 18 17:58:32 1998 +*** sample_rc/Mlvwmrc-j.orig Wed Mar 24 00:03:23 1999 +--- sample_rc/Mlvwmrc-j Thu Sep 23 00:16:35 1999 *************** -*** 49,55 **** +*** 52,58 **** Compatible # IconPath の指定。Style の指定の前に必要 @@ -9,11 +9,11 @@ IconMenuIcon label2.xpm # Balloon help Settings ---- 49,55 ---- +--- 52,58 ---- Compatible # IconPath の指定。Style の指定の前に必要 -! IconPath /usr/X11R6/lib/X11/mlvwm/pixmap:/home2/tak/bin/pixmap +! IconPath %%PREFIX%%/lib/X11/mlvwm/pixmaps IconMenuIcon label2.xpm # Balloon help Settings diff --git a/x11-wm/mlvwm/files/patch-ac b/x11-wm/mlvwm/files/patch-ac index 1122e78e7fc5..fd4f1f49cc68 100644 --- a/x11-wm/mlvwm/files/patch-ac +++ b/x11-wm/mlvwm/files/patch-ac @@ -1,20 +1,19 @@ ---- 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 - #else -- MLVWMLIBDIR = $(USRLIBDIR)/mlvwm -+ MLVWMLIBDIR = $(USRLIBDIR)/X11/mlvwm - #endif - - #ifndef HasLocale -@@ -74,7 +74,7 @@ - XCOMM CDEBUGFLAGS = -g -Wall - XCOMM CDEBUGFLAGS = -g - --ICONPATH = /usr/X11R6/include/pixmaps -+ICONPATH = /usr/X11R6/include/X11/pixmaps - - MLVWMDEFINES = $(Locale_DEFINES) $(COMPATIBLE) - MLVWMLIBRARIES = $(Locale_LIBRARIES) +*** configure.h.orig Tue Jul 13 00:35:34 1999 +--- configure.h Thu Sep 23 00:19:06 1999 +*************** +*** 74,80 **** + XCOMM CDEBUGFLAGS = -g -Wall + XCOMM CDEBUGFLAGS = -g + +! ICONPATH = /usr/X11R6/include/pixmaps + + MLVWMDEFINES = $(Locale_DEFINES) $(COMPATIBLE) + MLVWMLIBRARIES = $(Locale_LIBRARIES) +--- 74,80 ---- + XCOMM CDEBUGFLAGS = -g -Wall + XCOMM CDEBUGFLAGS = -g + +! ICONPATH = /usr/X11R6/include/X11/pixmaps + + MLVWMDEFINES = $(Locale_DEFINES) $(COMPATIBLE) + MLVWMLIBRARIES = $(Locale_LIBRARIES) diff --git a/x11-wm/mlvwm/pkg-descr b/x11-wm/mlvwm/pkg-descr index b552698c5e13..07348cde9139 100644 --- a/x11-wm/mlvwm/pkg-descr +++ b/x11-wm/mlvwm/pkg-descr @@ -1,24 +1,8 @@ Mlvwm is a Macintosh like window manager. -Execute: - mlvwm [-f config_file] [-d display_name] [-c] [-debug] - - -f Specify the configuration file. - -d Change display on which mlvwm run - -c Compatible mode. Change the window border to dot line - when move or resize the window. This causes speed down. - -debug Show debug message. - Configuration: Copy /usr/X11R6/lib/X11/mlvwm/system.mlvwmrc(default) to $HOME/.mlvwmrc . Please refer to the comment in that sample mlvwmrc. -Send HUP signal to let mlvwm show debug message when it freezes. Please -e-mail to the author with the debug information such as how to replay -the freeze or when the freeze occurs. - -Author: - tak@bioele.nuee.nagoya-u.ac.jp ------------------------------------------- -Yukihiro Nakai +WWW: http://www2u.biglobe.ne.jp/~y-miyata/mlvwm.html -- cgit v1.2.3