From 233aebac0d805c07128a845a32a78374ae1419e7 Mon Sep 17 00:00:00 2001
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Wed, 17 Mar 1999 06:41:25 +0000
Subject: * Update 0.9.29 -> 0.9.34 * Move data files from lib/X11/icewm ->
 share/icewm

---
 x11-wm/icewm/Makefile       | 6 +++---
 x11-wm/icewm/distinfo       | 2 +-
 x11-wm/icewm/files/patch-aa | 9 ---------
 x11-wm/icewm/files/patch-ab | 7 ++++---
 4 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'x11-wm/icewm')

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 76e92c6450f9..a9ac1f16f105 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -3,10 +3,10 @@
 # Date created:		10 August 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.30 1999/01/17 10:04:44 vanilla Exp $
+# $Id: Makefile,v 1.31 1999/01/17 19:48:00 vanilla Exp $
 #
 
-DISTNAME=	icewm-0.9.29
+DISTNAME=	icewm-0.9.34
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.kiss.uni-lj.si/~k4fr0235/icewm/devel/ \
 		http://www.freebsd.org/~vanilla/
@@ -49,7 +49,7 @@ do-configure:
 	( cd ${WRKSRC}; ${SH} config ${ICEOPTION} )
 
 post-install:
-	${CP} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/lib/X11/icewm/taskbar
+	${CP} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/share/icewm/taskbar
 	strip ${PREFIX}/bin/icewm
 	strip ${PREFIX}/bin/icewmbg
 	strip ${PREFIX}/bin/icewmhint
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index cc9cc1ac11be..57e5138858d0 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-0.9.29.src.tar.gz) = e4bb3cfe962aef2a0719722fe84ed2e3
+MD5 (icewm-0.9.34.src.tar.gz) = 53a5bcacc0ddd57b3d2e9b0f5030691a
diff --git a/x11-wm/icewm/files/patch-aa b/x11-wm/icewm/files/patch-aa
index 786de3fcf55c..e6f79af6ef11 100644
--- a/x11-wm/icewm/files/patch-aa
+++ b/x11-wm/icewm/files/patch-aa
@@ -10,12 +10,3 @@
  
  doc:
  	cd doc ; $(MAKE)
-@@ -57,7 +56,7 @@
-                 $(INSTALLLIB) $$config $(LIBDIR)/themes/$$theme; \
-             done; \
-             for l in $(XPMDIRS) ; do \
--                if [ -a lib/themes/$$theme/$$l ] ; then \
-+                if [ -d lib/themes/$$theme/$$l ] ; then \
-                     $(INSTALLDIR) $(LIBDIR)/themes/$$theme/$$l; \
-                     for f in lib/themes/$$theme/$$l/* ; do \
-                         $(INSTALLLIB) $$f $(LIBDIR)/themes/$$theme/$$l; \
diff --git a/x11-wm/icewm/files/patch-ab b/x11-wm/icewm/files/patch-ab
index 058efa0f8a64..c07068aae666 100644
--- a/x11-wm/icewm/files/patch-ab
+++ b/x11-wm/icewm/files/patch-ab
@@ -1,11 +1,12 @@
---- install.inc.orig	Wed Oct  7 16:35:35 1998
-+++ install.inc	Wed Oct  7 16:36:29 1998
+--- install.inc.orig	Sat Feb 20 10:33:06 1999
++++ install.inc	Wed Mar 17 00:11:05 1999
 @@ -1,10 +1,10 @@
 -PREFIX      = /usr/local
 +PREFIX      = $(X11BASE)
  BINDIR      = $(PREFIX)/bin
- LIBDIR      = $(PREFIX)/lib/X11/icewm
+-LIBDIR      = $(PREFIX)/lib/X11/icewm
 -ETCDIR      = /etc/X11/icewm
++LIBDIR      = $(PREFIX)/share/icewm
 +ETCDIR      = $(LIBDIR)
  
  INSTALL     = install -c
-- 
cgit v1.2.3