Add a file with "patch" is an ugly kludge. But the file into "${FILESDIR}"

where it belongs and copy it to "${WRKSRC}" in the "post-extract" targets.
This also prevents the installation of "bsd-daemon.xpm.orig".

3 files changed, 173 insertions, 175 deletions

diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 8bd9b0a04af..a45c1907e2c 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2001/03/03 22:01:11 tron Exp $
 #
 
 DISTNAME=	icewm-1.0.4
@@ -28,6 +28,9 @@ CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 DOCDIR=		${PREFIX}/share/doc/icewm
 HTMLDIR=	${PREFIX}/share/doc/html/icewm
 
+post-extract:
+	${CP} ${FILES} ${FILESDIR}/bsd-daemon.xpm ${WRKSRC}/lib/taskbar
+
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR} ${HTMLDIR}
 	for file in BUGS CHANGES COPYING FAQ README TODO; do \
diff --git a/wm/icewm/files/bsd-daemon.xpm b/wm/icewm/files/bsd-daemon.xpm
new file mode 100644
index 00000000000..abe28e3bb14
--- /dev/null
+++ b/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/wm/icewm/patches/patch-ag b/wm/icewm/patches/patch-ag
deleted file mode 100644
index 803cb09639e..00000000000
--- a/wm/icewm/patches/patch-ag
+++ /dev/null
@@ -1,174 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2001/02/23 17:40:25 wiz Exp $
-
---- /dev/null	Sun Jan 14 23:31:06 2001
-+++ lib/taskbar/bsd-daemon.xpm	Fri Feb 20 05:22:16 1998
-@@ -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."};