7 files changed, 251 insertions, 23 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index bee6760a9b5e..d53494243e1b 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -1,19 +1,21 @@
 # New ports collection makefile for:   icewm
-# Version required:    0.8.9
+# Version required:    0.8.11
 # Date created:        10 August 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1997/11/14 13:11:28 tg Exp $
+# $Id: Makefile,v 1.2 1997/12/27 17:14:18 max Exp $
 #
 
-DISTNAME=	icewm-0.8.9
+DISTNAME=	icewm-0.8.11
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/window-managers
+MASTER_SITES=	http://ixtas.fri.uni-lj.si/%7Emarkom/icewm/
 EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
 USE_X11=	yes
 
+post-install:
+	${CP} ${FILESDIR}/bsd-daemon.xpm ${PREFIX}/lib/X11/icewm/taskbar
+
 .include <bsd.port.mk>
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 9e030abdb8bf..bb1363d997e2 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-0.8.9.src.tar.gz) = 19ff01b9ef4b1916e4db354882229d14
+MD5 (icewm-0.8.11.src.tar.gz) = f7f2af4dcb2231c721b0279ed1414261
diff --git a/x11-wm/icewm/files/bsd-daemon.xpm b/x11-wm/icewm/files/bsd-daemon.xpm
new file mode 100644
index 000000000000..abe28e3bb140
--- /dev/null
+++ b/x11-wm/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-wm/icewm/files/patch-aa b/x11-wm/icewm/files/patch-aa
index 05763e897db6..3864b95edf70 100644
--- a/x11-wm/icewm/files/patch-aa
+++ b/x11-wm/icewm/files/patch-aa
@@ -1,27 +1,30 @@
---- Makefile.orig	Wed Sep 10 23:04:51 1997
-+++ Makefile	Sun Dec 28 02:03:35 1997
-@@ -1,11 +1,11 @@
+--- Makefile.orig	Tue Dec  2 05:49:07 1997
++++ Makefile	Wed Feb 18 01:30:17 1998
+@@ -1,12 +1,12 @@
  
 -PREFIX      = /usr/local
 +PREFIX      = $(X11BASE)
  BINDIR      = $(PREFIX)/bin
  LIBDIR      = $(PREFIX)/lib/X11/icewm
 -ETCDIR      = /etc/X11/icewm
-+ETCDIR      = ${LIBDIR}
++ETCDIR      = $(LIBDIR)
  
 -INSTALL     = install
 -INSTALLDIR  = $(INSTALL) -m 755 -d
+-INSTALLBIN  = $(INSTALL) -m 555
 +INSTALL     = install -c
 +INSTALLDIR  = mkdir -p
- INSTALLBIN  = $(INSTALL) -m 555
++INSTALLBIN  = $(INSTALL) $(STRIP) -m 555
  INSTALLLIB  = $(INSTALL) -m 444
  #INSTALLETC  = $(INSTALL) -m 644
-@@ -17,7 +17,7 @@
+ 
+@@ -16,8 +16,7 @@
+ XPMDIRS     = themes/nice themes/motif themes/win95 themes/warp3 themes/warp4 themes/win31 ledclock taskbar icons
  
  all:
- 	(cd doc ; make)
+-	(cd doc ; make)
 -	(cd src ; make LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR))
-+	(cd src ; make LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR) PREFIX=$(PREFIX) )
++	(cd src ; make LIBDIR=$(LIBDIR) ETCDIR=$(ETCDIR) PREFIX=$(PREFIX))
  
  clean:
  	(cd doc ; make clean)
diff --git a/x11-wm/icewm/files/patch-ab b/x11-wm/icewm/files/patch-ab
index ad39e6c81713..1805bd578f44 100644
--- a/x11-wm/icewm/files/patch-ab
+++ b/x11-wm/icewm/files/patch-ab
@@ -1,22 +1,23 @@
---- src/Makefile.orig	Sun Jul  6 10:39:29 1997
-+++ src/Makefile	Fri Nov 14 14:05:57 1997
+--- src/Makefile.orig	Fri Feb 13 06:57:37 1998
++++ src/Makefile	Fri Feb 13 06:58:21 1998
 @@ -1,8 +1,8 @@
  include ../VERSION
  
  # Linux
--INCSDIR     =
+-INCSDIR     = -I/usr/X11R6/include
 -LIBSDIR     = -L/usr/X11R6/lib
 +INCSDIR     = -I$(PREFIX)/include
 +LIBSDIR     = -L$(PREFIX)/lib
  # overriden by upper makefile
  LIBDIR=../lib
  ETCDIR=../lib
-@@ -22,7 +22,7 @@
- 	-DVERSION='"$(VERSION)"' \
- 
+@@ -24,7 +24,8 @@
  #OPTIMIZE    = -g
--OPTIMIZE   = -O -g
-+OPTIMIZE   = $(CFLAGS)
+ #OPTIMIZE   = -O -g
  #OPTIMIZE   = -O -g -pg
- #OPTIMIE     = -O -s
+-OPTIMIZE     = -O -s
++#OPTIMIZE     = -O -s
++OPTIMIZE     = $(CFLAGS)
  #OPTIMIZE   = -O2 -s
+ 
+ LIBS        = -lXpm $(SHAPELIB) -lX11
diff --git a/x11-wm/icewm/pkg-descr b/x11-wm/icewm/pkg-descr
index 04979eb526f6..b7296c051fe4 100644
--- a/x11-wm/icewm/pkg-descr
+++ b/x11-wm/icewm/pkg-descr
@@ -1 +1,3 @@
 cool window manager developped in a very hot day in a winter
+
+'bsd-daemon.xpm' is from Steve Farrel.
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 15ba99decae7..51ad3e3f931b 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -35,6 +35,7 @@ lib/X11/icewm/ledclock/n9.xpm
 lib/X11/icewm/ledclock/nc.xpm
 lib/X11/icewm/menu
 lib/X11/icewm/preferences
+lib/X11/icewm/taskbar/bsd-daemon.xpm
 lib/X11/icewm/taskbar/linux.xpm
 lib/X11/icewm/taskbar/mail.xpm
 lib/X11/icewm/taskbar/newmail.xpm
@@ -65,6 +66,55 @@ lib/X11/icewm/themes/warp4/hide.xpm
 lib/X11/icewm/themes/warp4/maximize.xpm
 lib/X11/icewm/themes/warp4/minimize.xpm
 lib/X11/icewm/themes/warp4/restore.xpm
+lib/X11/icewm/themes/win31/close.xpm
+lib/X11/icewm/themes/win31/default.theme
+lib/X11/icewm/themes/win31/dframeAB.xpm
+lib/X11/icewm/themes/win31/dframeABL.xpm
+lib/X11/icewm/themes/win31/dframeABR.xpm
+lib/X11/icewm/themes/win31/dframeAL.xpm
+lib/X11/icewm/themes/win31/dframeAR.xpm
+lib/X11/icewm/themes/win31/dframeAT.xpm
+lib/X11/icewm/themes/win31/dframeATL.xpm
+lib/X11/icewm/themes/win31/dframeATR.xpm
+lib/X11/icewm/themes/win31/dframeIB.xpm
+lib/X11/icewm/themes/win31/dframeIBL.xpm
+lib/X11/icewm/themes/win31/dframeIBR.xpm
+lib/X11/icewm/themes/win31/dframeIL.xpm
+lib/X11/icewm/themes/win31/dframeIR.xpm
+lib/X11/icewm/themes/win31/dframeIT.xpm
+lib/X11/icewm/themes/win31/dframeITL.xpm
+lib/X11/icewm/themes/win31/dframeITR.xpm
+lib/X11/icewm/themes/win31/frameAB.xpm
+lib/X11/icewm/themes/win31/frameABL.xpm
+lib/X11/icewm/themes/win31/frameABR.xpm
+lib/X11/icewm/themes/win31/frameAL.xpm
+lib/X11/icewm/themes/win31/frameAR.xpm
+lib/X11/icewm/themes/win31/frameAT.xpm
+lib/X11/icewm/themes/win31/frameATL.xpm
+lib/X11/icewm/themes/win31/frameATR.xpm
+lib/X11/icewm/themes/win31/frameIB.xpm
+lib/X11/icewm/themes/win31/frameIBL.xpm
+lib/X11/icewm/themes/win31/frameIBR.xpm
+lib/X11/icewm/themes/win31/frameIL.xpm
+lib/X11/icewm/themes/win31/frameIR.xpm
+lib/X11/icewm/themes/win31/frameIT.xpm
+lib/X11/icewm/themes/win31/frameITL.xpm
+lib/X11/icewm/themes/win31/frameITR.xpm
+lib/X11/icewm/themes/win31/maximize.xpm
+lib/X11/icewm/themes/win31/menuButtonA.xpm
+lib/X11/icewm/themes/win31/menuButtonI.xpm
+lib/X11/icewm/themes/win31/minimize.xpm
+lib/X11/icewm/themes/win31/restore.xpm
+lib/X11/icewm/themes/win31/titleAB.xpm
+lib/X11/icewm/themes/win31/titleAL.xpm
+lib/X11/icewm/themes/win31/titleAM.xpm
+lib/X11/icewm/themes/win31/titleAR.xpm
+lib/X11/icewm/themes/win31/titleAT.xpm
+lib/X11/icewm/themes/win31/titleIB.xpm
+lib/X11/icewm/themes/win31/titleIL.xpm
+lib/X11/icewm/themes/win31/titleIM.xpm
+lib/X11/icewm/themes/win31/titleIR.xpm
+lib/X11/icewm/themes/win31/titleIT.xpm
 lib/X11/icewm/themes/win95/close.xpm
 lib/X11/icewm/themes/win95/default.theme
 lib/X11/icewm/themes/win95/maximize.xpm
@@ -78,6 +128,7 @@ lib/X11/icewm/winoptions
 @dirrm lib/X11/icewm/themes/nice
 @dirrm lib/X11/icewm/themes/warp3
 @dirrm lib/X11/icewm/themes/warp4
+@dirrm lib/X11/icewm/themes/win31
 @dirrm lib/X11/icewm/themes/win95
 @dirrm lib/X11/icewm/themes
 @dirrm lib/X11/icewm