From 35d846234dcf887ddd6ee0f122aee5c2a4ab2373 Mon Sep 17 00:00:00 2001
From: kevlo <kevlo@openbsd.org>
Date: Fri, 30 Jun 2000 06:10:17 +0000
Subject: [PATCH] - Upgrade to release 1.0.4 - Bump NEED_VERSION - Add bsd icon
 - Remove FAKE=Yes and change HAS_CONFIGURE to CONFIGURE_STYLE

---
 x11/icewm/Makefile             |  18 ++--
 x11/icewm/files/bsd-daemon.xpm | 169 +++++++++++++++++++++++++++++++++
 x11/icewm/files/md5            |   6 +-
 x11/icewm/patches/patch-aa     |  14 +++
 x11/icewm/pkg/PLIST            |  14 +--
 5 files changed, 203 insertions(+), 18 deletions(-)
 create mode 100644 x11/icewm/files/bsd-daemon.xpm
 create mode 100644 x11/icewm/patches/patch-aa

diff --git a/x11/icewm/Makefile b/x11/icewm/Makefile
index f77fc64ed7a..780a423a2b1 100644
--- a/x11/icewm/Makefile
+++ b/x11/icewm/Makefile
@@ -1,13 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2000/04/05 09:47:05 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2000/06/30 06:10:17 kevlo Exp $
 
-DISTNAME=		icewm-1.0.2	
+DISTNAME=		icewm-1.0.4
 CATEGORIES=     	x11	
-NEED_VERSION=		1.89
-
+NEED_VERSION=		1.309
 
 MAINTAINER=		seanc@cginfo.sk.ca	
 
-LICENSE_TYPE=		"LGPL"
 PERMIT_PACKAGE_CDROM=	"Yes"
 PERMIT_PACKAGE_FTP=	"Yes"
 PERMIT_DISTFILES_CDROM=	"Yes"
@@ -15,15 +13,17 @@ PERMIT_DISTFILES_FTP=	"Yes"
 
 MASTER_SITES=		http://download.sourceforge.net/icewm/ \
 			http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/	
-EXTRACT_SUFX=		.src.tar.gz
+EXTRACT_SUFX=           .src.tar.gz
+
+LIB_DEPENDS=		Imlib.19::graphics/imlib
 
 USE_GMAKE=		Yes
 USE_X11=		Yes
-HAS_CONFIGURE=		Yes
-FAKE=			Yes
-CONFIGURE_ARGS=--prefix='$${DESTDIR}${PREFIX}' --sysconfdir='$${DESTDIR}/etc'
+CONFIGURE_STYLE=	gnu dest
+CONFIGURE_ARGS=		--with-imlib=${PREFIX}/bin
 
 post-install:
+	${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/lib/X11/icewm/taskbar
 	@echo "Installing docs to ${PREFIX}/share/docs/icewm"
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icewm
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/icewm/doc
diff --git a/x11/icewm/files/bsd-daemon.xpm b/x11/icewm/files/bsd-daemon.xpm
new file mode 100644
index 00000000000..abe28e3bb14
--- /dev/null
+++ b/x11/icewm/files/bsd-daemon.xpm
@@ -0,0 +1,169 @@
+/* XPM */
+static char * bsd_daemon_xpm[] = {
+"48 20 146 2",
+"  	c #D75CD75CD75C",
+". 	c #D75CD34CD75C",
+"X 	c #96588A288E38",
+"o 	c #8E3875D671C6",
+"O 	c #CF3CC71BC71B",
+"+ 	c #B6DAB2CAAEBA",
+"@ 	c #C71BC30BBEFB",
+"# 	c #96587DF779E7",
+"$ 	c #5965208128A2",
+"% 	c #79E761855965",
+"& 	c #BEFBBEFBBEFB",
+"* 	c #BEFBBAEABEFB",
+"= 	c #79E749244103",
+"- 	c #C71BC71BC71B",
+"; 	c #D75CCF3CCF3C",
+": 	c #8E3820811861",
+"> 	c #79E73CF34103",
+", 	c #8E382CB22081",
+"< 	c #79E724922081",
+"1 	c #4924249228A2",
+"2 	c #492428A230C2",
+"3 	c #96588E388E38",
+"4 	c #9E798E388E38",
+"5 	c #79E728A22081",
+"6 	c #71C6659569A6",
+"7 	c #9658410338E3",
+"8 	c #C71B9A699E79",
+"9 	c #BEFB75D671C6",
+"0 	c #BEFB92489658",
+"q 	c #861724921861",
+"w 	c #71C624922081",
+"e 	c #861724922081",
+"r 	c #6185208128A2",
+"t 	c #861779E779E7",
+"y 	c #B6DAAEBAAEBA",
+"u 	c #8E3869A671C6",
+"i 	c #9E795D755965",
+"p 	c #DF7DE79DEFBE",
+"a 	c #96582CB22081",
+"s 	c #5144208128A2",
+"d 	c #596534D338E3",
+"f 	c #79E755555144",
+"g 	c #8617618569A6",
+"h 	c #D75CC71BCF3C",
+"j 	c #9E7928A22081",
+"k 	c #69A624922081",
+"l 	c #514434D338E3",
+"z 	c #000000000000",
+"x 	c #59655D755965",
+"c 	c #410345144103",
+"v 	c #8E388E388E38",
+"b 	c #186118611040",
+"n 	c #861755555144",
+"m 	c #C71BC30BC71B",
+"M 	c #965824921861",
+"N 	c #8E381C711861",
+"B 	c #69A620812081",
+"V 	c #8E3841034103",
+"C 	c #9E795D756185",
+"Z 	c #8E3824921861",
+"A 	c #618520812081",
+"S 	c #618559655965",
+"D 	c #71C675D671C6",
+"F 	c #28A22CB228A2",
+"G 	c #8E3871C671C6",
+"H 	c #9E7996589658",
+"J 	c #71C66DB669A6",
+"K 	c #79E738E330C2",
+"L 	c #79E720811861",
+"P 	c #9E7918611040",
+"I 	c #86171C711861",
+"U 	c #AEBAAEBAAEBA",
+"Y 	c #79E761856185",
+"T 	c #9E7992489658",
+"R 	c #69A6659569A6",
+"E 	c #618555555965",
+"W 	c #8E3861855965",
+"Q 	c #86176DB669A6",
+"! 	c #69A628A228A2",
+"~ 	c #71C620812081",
+"^ 	c #5965208130C2",
+"/ 	c #8E387DF779E7",
+"( 	c #A699A699A699",
+") 	c #CF3CCF3CCF3C",
+"_ 	c #71C669A669A6",
+"` 	c #79E71C711861",
+"' 	c #79E769A669A6",
+"] 	c #79E749244924",
+"[ 	c #71C620811861",
+"{ 	c #514434D34103",
+"} 	c #A6999E799E79",
+"| 	c #69A6249228A2",
+" .	c #79E724921861",
+"..	c #79E765956185",
+"X.	c #514438E34103",
+"o.	c #965818611040",
+"O.	c #4924208128A2",
+"+.	c #AEBAA2899E79",
+"@.	c #8E3865956185",
+"#.	c #61851C712081",
+"$.	c #59651C7128A2",
+"%.	c #49241C7128A2",
+"&.	c #8E3869A66185",
+"*.	c #514428A230C2",
+"=.	c #B6DAB6DAB6DA",
+"-.	c #CF3CCB2BCF3C",
+";.	c #71C63CF338E3",
+":.	c #4103208128A2",
+">.	c #71C661856185",
+",.	c #B6DAB2CAB6DA",
+"<.	c #79E779E779E7",
+"1.	c #71C645144103",
+"2.	c #41031C711861",
+"3.	c #59652CB230C2",
+"4.	c #38E328A230C2",
+"5.	c #9E7992489E79",
+"6.	c #CF3CCB2BD75C",
+"7.	c #9E7996589E79",
+"8.	c #BEFBB6DABEFB",
+"9.	c #861771C679E7",
+"0.	c #596549244924",
+"q.	c #514438E338E3",
+"w.	c #492438E34103",
+"e.	c #A6999A699E79",
+"r.	c #618551445965",
+"t.	c #61854D345144",
+"y.	c #71C65D756185",
+"u.	c #965886178617",
+"i.	c #69A661856185",
+"p.	c #A699A699AEBA",
+"a.	c #61854D345965",
+"s.	c #51443CF34103",
+"d.	c #492438E34924",
+"f.	c #59654D345965",
+"g.	c #9E799A699E79",
+"h.	c #71C634D330C2",
+"j.	c #AEBAA699A699",
+"k.	c #61855D755965",
+"l.	c #BEFBBAEAB6DA",
+"z.	c #9658820779E7",
+"x.	c #8617451438E3",
+"c.	c #79E771C671C6",
+"v.	c #38E328A228A2",
+"b.	c #79E74D344924",
+"n.	c #69A669A66185",
+"m.	c #965892489658",
+"                                                                    . X o O       + @           ",
+"                                                                    # $ o % X &   * = -         ",
+"                                                                  ; : > , < 1 2 3 4 5 6         ",
+"                                                                  ; 7 8 9 0 q w w e r t         ",
+"                                                                  y u i 8 p a w s s d .         ",
+"                                                                  f $ r g h j k s l *           ",
+"        z z z z z x     & c z z z x     v z z z z b v       @ n m M N B V C Z A s S             ",
+"      v z x v v c z v   b b v D F z v   c z v v x z b     m G H J K 5 L P P I $ $ U             ",
+"      v z v     v z & c z v     v z v   c z       c z     Y T R E W Q ! ~ $ s ^ /               ",
+"      c z D v D b c   c z F v (         z F       c z     ) H H _ ` ' ] : [ ~ {                 ",
+"    & F z z z z z (     x b z z z D   ( z c       F z           } | s [ P  .B {                 ",
+"    v z c     & z c         & D b z   c z v     & z x             ..X.L o.~ O.$ +.              ",
+"    x z D     & z x c z D     ( b c   b z &   & c z &               @.#.$.s %.d )               ",
+"    c z x v D F z ( D z b v v F z v   z z v v F z c                 &.o.B $ %.*.=.              ",
+"    z z z z z b v     x b z z c D   v z z z z b x                   -.;.B $.%.:.>.;             ",
+"                                                          ,.=.=.,.+ <.1.u 2.3.4.l 6 y +         ",
+"                                                          5.p 6.7.8.9.0.q.2.2 w.=.e.r.t.y.u.,.  ",
+"                                                          ( J i.p.5.7.a.l s.d.f.g.      * T h.j.",
+"                                                                & * y k.k.U * l.-.  ,.z.x.u.c.v.",
+"                                                                                    ) l.b.n.n.m."};
diff --git a/x11/icewm/files/md5 b/x11/icewm/files/md5
index 2e13d41a16d..8a6f449d9af 100644
--- a/x11/icewm/files/md5
+++ b/x11/icewm/files/md5
@@ -1,3 +1,3 @@
-MD5 (icewm-1.0.2.src.tar.gz) = e6fa2311485576e6bf71ba98f3a0200b
-RMD160 (icewm-1.0.2.src.tar.gz) = 28f11f400cfc070087a6301ee6d6592a06a627bb
-SHA1 (icewm-1.0.2.src.tar.gz) = 54743d930f5c0b7bf4b74cefb8e30d61f8496b44
+MD5 (icewm-1.0.4.src.tar.gz) = 31d6fd8b94fd1becab0de15d4a8e4eb4
+RMD160 (icewm-1.0.4.src.tar.gz) = d107f8141eb5f84531c433e9e1fe01dd69e18e95
+SHA1 (icewm-1.0.4.src.tar.gz) = 5a742159daed68b1eee18573aefb6e1991615548
diff --git a/x11/icewm/patches/patch-aa b/x11/icewm/patches/patch-aa
new file mode 100644
index 00000000000..830bddecabb
--- /dev/null
+++ b/x11/icewm/patches/patch-aa
@@ -0,0 +1,14 @@
+--- src/wmtaskbar.cc.orig	Fri Jun 30 21:37:49 2000
++++ src/wmtaskbar.cc	Fri Jun 30 21:38:23 2000
+@@ -72,9 +72,9 @@
+ 
+ /** Use Linux 2.0 Penguin as start button */
+ #ifndef START_PIXMAP
+-#define START_PIXMAP "linux.xpm"
++//#define START_PIXMAP "linux.xpm"
+ //#define START_PIXMAP "debian.xpm"
+-//#define START_PIXMAP "bsd-daemon.xpm"
++#define START_PIXMAP "bsd-daemon.xpm"
+ //#define START_PIXMAP "start.xpm"
+ //#define START_PIXMAP "xfree86os2.xpm"
+ #endif
diff --git a/x11/icewm/pkg/PLIST b/x11/icewm/pkg/PLIST
index 9c996ce34e7..55ba8564605 100644
--- a/x11/icewm/pkg/PLIST
+++ b/x11/icewm/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.2 2000/06/30 06:11:04 kevlo Exp $
 bin/icewm
 bin/icewmbg
 bin/icewmhint
@@ -71,6 +72,7 @@ lib/X11/icewm/mailbox/nomail.xpm
 lib/X11/icewm/mailbox/unreadmail.xpm
 lib/X11/icewm/menu
 lib/X11/icewm/preferences
+lib/X11/icewm/taskbar/bsd-daemon.xpm
 lib/X11/icewm/taskbar/debian.xpm
 lib/X11/icewm/taskbar/linux.xpm
 lib/X11/icewm/taskbar/linux1.xpm
@@ -195,12 +197,6 @@ share/doc/icewm/COPYING
 share/doc/icewm/FAQ
 share/doc/icewm/README
 share/doc/icewm/doc/icewm-1.html
-share/doc/icewm/doc/icewm-10.html
-share/doc/icewm/doc/icewm-11.html
-share/doc/icewm/doc/icewm-12.html
-share/doc/icewm/doc/icewm-13.html
-share/doc/icewm/doc/icewm-14.html
-share/doc/icewm/doc/icewm-15.html
 share/doc/icewm/doc/icewm-2.html
 share/doc/icewm/doc/icewm-3.html
 share/doc/icewm/doc/icewm-4.html
@@ -209,6 +205,12 @@ share/doc/icewm/doc/icewm-6.html
 share/doc/icewm/doc/icewm-7.html
 share/doc/icewm/doc/icewm-8.html
 share/doc/icewm/doc/icewm-9.html
+share/doc/icewm/doc/icewm-10.html
+share/doc/icewm/doc/icewm-11.html
+share/doc/icewm/doc/icewm-12.html
+share/doc/icewm/doc/icewm-13.html
+share/doc/icewm/doc/icewm-14.html
+share/doc/icewm/doc/icewm-15.html
 share/doc/icewm/doc/icewm.html
 @dirrm share/doc/icewm/doc
 @dirrm share/doc/icewm