From bd6fab751f2c0f7f620d244cb4c73347fcdcd21d Mon Sep 17 00:00:00 2001
From: vanilla <vanilla@FreeBSD.org>
Date: Wed, 11 Mar 1998 07:31:19 +0000
Subject: Upgrade to 0.8.6.

---
 x11-wm/mlvwm/Makefile       | 11 ++++++-----
 x11-wm/mlvwm/distinfo       |  2 +-
 x11-wm/mlvwm/files/patch-ac | 23 +++++++++++++++++++----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index 1637e7b222d..091af7c0079 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:   mlvwm
-# Version required:    0.8.5
+# Version required:    0.8.6
 # Date created:        19 Januruary 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.5 1997/12/12 06:27:49 vanilla Exp $
+# $Id: Makefile,v 1.6 1997/12/16 20:13:09 vanilla Exp $
 #
 
-DISTNAME=	mlvwm-0.8.5
+DISTNAME=	mlvwm-0.8.6
 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.8.5.tar.gz mini-icons.tar.gz
+DISTFILES=	mlvwm-0.8.6.tar.gz mini-icons.tar.gz
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
+WRKSRC=		${WRKDIR}/mlvwm086
 USE_IMAKE=	yes
-EXTRACT_ONLY=	mlvwm-0.8.5.tar.gz
+EXTRACT_ONLY=	mlvwm-0.8.6.tar.gz
 
 MAN1=		mlvwm.1
 
diff --git a/x11-wm/mlvwm/distinfo b/x11-wm/mlvwm/distinfo
index e16604f1139..b116d1426ce 100644
--- a/x11-wm/mlvwm/distinfo
+++ b/x11-wm/mlvwm/distinfo
@@ -1,2 +1,2 @@
-MD5 (mlvwm-0.8.5.tar.gz) = 8f96db91d92eb45f8e35ecbc3e335d09
+MD5 (mlvwm-0.8.6.tar.gz) = 51f5150d1381a186a942590a0d20ecf2
 MD5 (mini-icons.tar.gz) = 3d54e199e6b6da6f077736ec0283ca85
diff --git a/x11-wm/mlvwm/files/patch-ac b/x11-wm/mlvwm/files/patch-ac
index 13282e1ae22..fd398654b6e 100644
--- a/x11-wm/mlvwm/files/patch-ac
+++ b/x11-wm/mlvwm/files/patch-ac
@@ -1,7 +1,16 @@
---- 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
+--- configure.h.orig	Fri Feb  6 07:16:26 1998
++++ configure.h	Wed Mar 11 15:25:30 1998
+@@ -33,7 +33,7 @@
+ #ifdef MlvwmLibDir
+     MLVWMLIBDIR = MlvwmLibDir
+ #else
+-    MLVWMLIBDIR = $(USRLIBDIR)/mlvwm
++    MLVWMLIBDIR = $(USRLIBDIR)/X11/mlvwm
+ #endif
+ 
+ #ifndef HasLocale
+@@ -69,12 +69,12 @@
+ #endif
  
  XCOMM 
 -      CDEBUGFLAGS = -g -Wall -Wshadow
@@ -9,3 +18,9 @@
  XCOMM            CDEBUGFLAGS = -O2 -Wall
  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)
-- 
cgit