diff --git a/x11/icewm/Makefile b/x11/icewm/Makefile
index c6e254b13e6..d58ae2173eb 100644
--- a/x11/icewm/Makefile
+++ b/x11/icewm/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.14 2004/02/05 21:22:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2004/05/21 17:00:08 naddy Exp $
COMMENT= "small, fast window manager"
-DISTNAME= icewm-1.0.9-2
-PKGNAME= icewm-1.0.9.2
+DISTNAME= icewm-1.2.13
CATEGORIES= x11
HOMEPAGE= http://www.icewm.org/
@@ -20,19 +19,20 @@ LIB_DEPENDS= Imlib.19::graphics/imlib
USE_X11= Yes
NO_REGRESS= Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE= autoconf dest
-AUTOCONF_VERSION= 2.52
+CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --with-imlib=${PREFIX}/bin \
--with-docdir=${PREFIX}/share/doc \
--with-libdir=${PREFIX}/share/icewm \
- --with-cfgdir=${SYSCONFDIR}/icewm
+ --with-cfgdir=${SYSCONFDIR}/icewm \
+ --disable-i18n \
+ --enable-shaped-decorations \
+ --enable-gradients
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-WRKDIST= ${WRKDIR}/icewm-1.0.9
-
post-install:
- ${INSTALL_DATA} ${FILESDIR}/openbsd.xpm ${PREFIX}/share/icewm/taskbar
+ @perl -pi -e 's:%%SYSCONFDIR%%:${SYSCONFDIR}:g;' \
+ -e 's:%%PREFIX%%:${TRUEPREFIX}:g;' \
+ ${PREFIX}/share/doc/icewm/icewm-7.html
.include
diff --git a/x11/icewm/distinfo b/x11/icewm/distinfo
index f462f9d6e9f..3c80b8906bf 100644
--- a/x11/icewm/distinfo
+++ b/x11/icewm/distinfo
@@ -1,3 +1,3 @@
-MD5 (icewm-1.0.9-2.tar.gz) = 076d02415b694518b61b569ddd12822c
-RMD160 (icewm-1.0.9-2.tar.gz) = cb68ee90e879d2bcf8aa3a4d9bf5b1959c1fecde
-SHA1 (icewm-1.0.9-2.tar.gz) = a875bda267309ec804e52d74504dbfc3379d194f
+MD5 (icewm-1.2.13.tar.gz) = d189afcf15f2386a0a0397c376e297c6
+RMD160 (icewm-1.2.13.tar.gz) = 81810eb4975c7d1d3a55482b4387c0dbf0f0ff6c
+SHA1 (icewm-1.2.13.tar.gz) = ebfe807cbe3a9d931386833033eb9cb1792ea485
diff --git a/x11/icewm/files/bsd-daemon.xpm b/x11/icewm/files/bsd-daemon.xpm
deleted file mode 100644
index abe28e3bb14..00000000000
--- a/x11/icewm/files/bsd-daemon.xpm
+++ /dev/null
@@ -1,169 +0,0 @@
-/* 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/openbsd.xpm b/x11/icewm/files/openbsd.xpm
deleted file mode 100644
index efdf6b102b9..00000000000
--- a/x11/icewm/files/openbsd.xpm
+++ /dev/null
@@ -1,40 +0,0 @@
-/* XPM */
-static char * openbsd_xpm[] = {
-"60 20 17 1",
-" c None",
-". c #050303",
-"+ c #D10908",
-"@ c #FEFA1F",
-"# c #021EFE",
-"$ c #EAE5E5",
-"% c #950907",
-"& c #C5C1C1",
-"* c #9B9A89",
-"= c #660606",
-"- c #D59190",
-"; c #867C47",
-"> c #4B0C0C",
-", c #BD6769",
-"' c #727272",
-") c #9D6243",
-"! c #390706",
-" @@@@ ++ ",
-" ##### @ ;@@ +%! ",
-" ## ## @@ @!%+%%+= ",
-" ## # ## ### ### ## ### % @@ .>+++%++++! ",
-" # # ### ## # ## ## ## %+ @*;>%%++%,$,+% ",
-" # # ## ## ## ## # # !++ @@)%,;%++,$$+% ",
-" # ## ## ## ####### # ## =++++%=)&$*+++$$$+ ",
-" ## # ## # ## # ## =%+++==)&$$)%+&>'-+ ",
-" #### ##### ##### ### ### !%%%%>='&&**=%)).',+ ",
-" # !=%=>%'&'.*>!%++>-+%",
-" ## ...... .... ...... !==>+'&>.*>!%++++++",
-" #### .. ... .. .. ... .. !!=+'*>.*%!%%++++%",
-" .. .. .. .. .. ... !=+%**'-=!>==+++%",
-" .. .. ... .. .. !=++%,,+%=!!%+%+=",
-" ...... ..... .. .. =%+%%%++++%%=++ ",
-" .. .. .. .. .. !=%%===%%==%++= ",
-" .. .. .. .. .. ... !>==!!!!=%+++% ",
-" .. .. ... ... ... .. !%%+++++%%%% ",
-" ...... ..... ...... !!!!====== ",
-" !!!> "};
diff --git a/x11/icewm/patches/patch-FAQ b/x11/icewm/patches/patch-FAQ
deleted file mode 100644
index 5114d9ed3b8..00000000000
--- a/x11/icewm/patches/patch-FAQ
+++ /dev/null
@@ -1,18 +0,0 @@
-$OpenBSD: patch-FAQ,v 1.1 2002/01/20 19:54:13 naddy Exp $
-# Fix the location of the configuration files in FAQ
---- FAQ.orig Sun Jan 13 03:21:32 2002
-+++ FAQ Sun Jan 13 03:27:35 2002
-@@ -345,11 +345,8 @@
- places - the location depends upon the method you used to install
- IceWM.
-
-- In a plain vanilla source install, the global version of the files
-- will be located in "/usr/local/lib/Xll/icewm/". If you installed the
-- standard RPM, they will be in "/usr/X11R6/lib/X11/icewm/". The system
-- wide configuration files for the Debian package seem to be in
-- "/etc/X11/icewm/".
-+ The global version of the files is in "/usr/local/share/icewm/".
-+ The system wide configuration files are in "/etc/icewm/".
-
- However, if you wish to make a configuration of your own you should
- not edit these global config files but create a subdirectory of your
diff --git a/x11/icewm/patches/patch-Makefile_in b/x11/icewm/patches/patch-Makefile_in
index 57fd7feac3b..159ad724068 100644
--- a/x11/icewm/patches/patch-Makefile_in
+++ b/x11/icewm/patches/patch-Makefile_in
@@ -1,98 +1,18 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2003/08/30 07:16:35 sturm Exp $
-# 1. Don't install some doc files
-# 2. Make sure that fake works correctly
---- Makefile.in.orig 2001-10-09 16:53:40.000000000 +0200
-+++ Makefile.in 2003-08-30 00:15:07.000000000 +0200
-@@ -11,7 +11,7 @@ include ./VERSION
+$OpenBSD: patch-Makefile_in,v 1.4 2004/05/21 17:00:09 naddy Exp $
+--- Makefile.in.orig 2003-09-27 02:54:45.000000000 -0500
++++ Makefile.in 2004-02-15 16:12:50.000000000 -0600
+@@ -112,12 +112,9 @@ install-base: base
- BINFILES = $(foreach APP,$(APPLICATIONS),src/$(APP))
- LIBFILES = lib/preferences lib/menu lib/toolbar lib/winoptions lib/keys
--DOCFILES = README TODO CHANGES COPYING AUTHORS FAQ INSTALL VERSION icewm.lsm
-+DOCFILES = README COPYING FAQ
- XPMDIRS = icons ledclock taskbar mailbox cursors
- THEMES = nice motif win95 warp3 warp4 metal2 gtk2 Infadel2
- SPEC = icewm.spec
-@@ -75,66 +75,63 @@ install-base: base
- @for app in $(BINFILES) ; do \
- $(INSTALLBIN) "$$app" $(BINDIR); \
- done
-- @echo "Installing defaults, icons and themes in $(LIBDIR)"
-- @$(INSTALLDIR) $(LIBDIR)
-- @$(INSTALLDIR) $(CFGDIR)
-+ @echo "Installing defaults, icons and themes in $(DESTDIR)$(LIBDIR)"
-+ @$(INSTALLDIR) $(DESTDIR)$(LIBDIR)
- @for lib in $(LIBFILES) ; do \
-- $(INSTALLLIB) "$$lib" $(LIBDIR); \
-+ $(INSTALLLIB) "$$lib" $(DESTDIR)$(LIBDIR); \
- done
- @for xpmdir in $(XPMDIRS); do \
- if test -d lib/$$xpmdir; then \
-- $(INSTALLDIR) $(LIBDIR)/$$xpmdir; \
-+ $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/$$xpmdir; \
- for pixmap in lib/$$xpmdir/*.xpm ; do \
-- $(INSTALLLIB) "$$pixmap" $(LIBDIR)/$$xpmdir; \
-+ $(INSTALLLIB) "$$pixmap" $(DESTDIR)$(LIBDIR)/$$xpmdir; \
- done; \
- fi; \
- done
+ install-docs: docs
@echo ------------------------------------------
- @for theme in $(THEMES) ; do \
- echo "Installing theme: $$theme"; \
-- $(INSTALLDIR) $(LIBDIR)/themes/$$theme; \
-+ $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme; \
- for pixmap in lib/themes/$$theme/*.xpm; do \
-- $(INSTALLLIB) "$$pixmap" $(LIBDIR)/themes/$$theme; \
-+ $(INSTALLLIB) "$$pixmap" $(DESTDIR)$(LIBDIR)/themes/$$theme; \
- done; \
- for subtheme in lib/themes/$$theme/*.theme; do \
-- $(INSTALLLIB) "$$subtheme" $(LIBDIR)/themes/$$theme; \
-+ $(INSTALLLIB) "$$subtheme" $(DESTDIR)$(LIBDIR)/themes/$$theme; \
- done; \
- if test -f lib/themes/$$theme/*.pcf; then \
- for fontfile in lib/themes/$$theme/*.pcf; do \
-- $(INSTALLLIB) "$$fontfile" $(LIBDIR)/themes/$$theme; \
-+ $(INSTALLLIB) "$$fontfile" $(DESTDIR)$(LIBDIR)/themes/$$theme; \
- done; \
- if test -x "$(MKFONTDIR)"; then \
-- cwd=$$PWD; cd "$(LIBDIR)/themes/$$theme"; \
-+ cwd=$$PWD; cd "$(DESTDIR)$(LIBDIR)/themes/$$theme"; \
- $(MKFONTDIR); \
- cd $$cwd; \
- else \
- echo "WARNING: A dummy file has been copied to"; \
-- echo " $(LIBDIR)/themes/$$theme/fonts.dir"; \
-+ echo " $(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \
- echo " You better setup your path to point to mkfontdir or use the"; \
- echo " --with-mkfontdir option of the configure script."; \
- $(INSTALLLIB) "lib/themes/$$theme/fonts.dir.default" \
-- "$(LIBDIR)/themes/$$theme/fonts.dir"; \
-+ "$(DESTDIR)$(LIBDIR)/themes/$$theme/fonts.dir"; \
- fi; \
- fi; \
- for xpmdir in $(XPMDIRS) ; do \
- if [ -d lib/themes/$$theme/$$xpmdir ] ; then \
-- $(INSTALLDIR) $(LIBDIR)/themes/$$theme/$$xpmdir; \
-+ $(INSTALLDIR) $(DESTDIR)$(LIBDIR)/themes/$$theme/$$xpmdir; \
- for f in lib/themes/$$theme/$$xpmdir/*.xpm ; do \
-- $(INSTALLLIB) "$$f" $(LIBDIR)/themes/$$theme/$$xpmdir; \
-+ $(INSTALLLIB) "$$f" $(DESTDIR)$(LIBDIR)/themes/$$theme/$$xpmdir; \
- done;\
- fi;\
- done;\
- done
-- @#for a in $(ETCFILES) ; do $(INSTALLETC) "$$a" $(CFGDIR) ; done
- @echo ------------------------------------------
-
- install-docs: docs $(LSM)
- @echo ------------------------------------------
-- @rm -fr $(DOCDIR)/icewm-$(VERSION)
-- @$(INSTALLDIR) $(DOCDIR)/icewm-$(VERSION)
-+ @$(INSTALLDIR) $(DESTDIR)$(DOCDIR)/icewm/doc
- @echo Installing documentation in $(DOCDIR); \
-- cp $(DOCFILES) $(DOCDIR)/icewm-$(VERSION); \
-- cp -r doc/*.sgml doc/*.html $(DOCDIR)/icewm-$(VERSION)
-+ ${BSD_INSTALL_DATA} $(DOCFILES) $(DESTDIR)$(DOCDIR)/icewm
-+ ${BSD_INSTALL_DATA} doc/*.html $(DESTDIR)$(DOCDIR)/icewm/doc
+- @rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+- @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
++ @$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm"
+ @echo "Installing documentation in $(DESTDIR)$(DOCDIR)"
+- @$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+- @$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
+- @$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
++ ${BSD_INSTALL_DATA} "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/icewm"
@echo ------------------------------------------
install-nls: nls
diff --git a/x11/icewm/patches/patch-configure b/x11/icewm/patches/patch-configure
new file mode 100644
index 00000000000..09a66da21f2
--- /dev/null
+++ b/x11/icewm/patches/patch-configure
@@ -0,0 +1,22 @@
+$OpenBSD: patch-configure,v 1.1 2004/05/21 17:00:09 naddy Exp $
+--- configure.orig 2003-09-27 09:54:49.000000000 +0200
++++ configure 2004-05-21 17:38:49.000000000 +0200
+@@ -1439,7 +1439,7 @@ test -n "$target_alias" &&
+ NONENONEs,x,x, &&
+ program_prefix=${target_alias}-
+
+-TARGETS=base
++TARGETS='base docs'
+ APPLICATIONS='icewm icewm-session icesh icewmhint icewmbg icewmtray'
+ TESTCASES=`echo src/test*.cc | sed 's%src/\([^ ]*\)\.cc%\1%g'`
+ TESTCASES="$TESTCASES iceview icesame iceicon icerun icelist" # iceclock
+@@ -3331,9 +3331,6 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+- if test x"$ac_cv_c_compiler_gnu" != x; then
+- CXX_LINK=${CC}
+- fi
+
+
+
diff --git a/x11/icewm/patches/patch-configure_in b/x11/icewm/patches/patch-configure_in
deleted file mode 100644
index 02ad23f869b..00000000000
--- a/x11/icewm/patches/patch-configure_in
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.1 2004/01/30 15:00:46 naddy Exp $
---- configure.in.orig 2001-10-09 16:54:02.000000000 +0200
-+++ configure.in 2004-01-30 15:18:38.000000000 +0100
-@@ -27,7 +27,7 @@ if test x"$ac_cv_prog_gxx" != x; then
- fi
-
- if test x"$ac_cv_prog_gxx" != x; then
-- ICE_CXX_FLAG_ACCEPT(warn_xxx, -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Winline -Woverloaded-virtual -W)
-+ ICE_CXX_FLAG_ACCEPT(warn_xxx, -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Winline -Woverloaded-virtual -W)
- ICE_CXX_FLAG_ACCEPT(permissive, -fpermissive)
- fi
-
-@@ -193,8 +193,8 @@ AC_ARG_ENABLE(nls,
- [ --disable-nls Disable internationalized message])
-
- if test "$enable_nls" != "no"; then
-- AC_CHECK_FUNC(gettext,,
-- [ AC_CHECK_LIB(intl, gettext,,
-+ AC_CHECK_FUNC(bindtextdomain,,
-+ [ AC_CHECK_LIB(intl, bindtextdomain,,
- [ AC_MSG_ERROR([NLS support has been requested but libintl wasnīt found.
- *** Install your vendorīs version or GNU gettext available at
- *** ftp://ftp.gnu.org/pub/gnu/gettext/.])])])
diff --git a/x11/icewm/patches/patch-doc_icewm-7_html b/x11/icewm/patches/patch-doc_icewm-7_html
index 435d0e24a6a..ca69f962f19 100644
--- a/x11/icewm/patches/patch-doc_icewm-7_html
+++ b/x11/icewm/patches/patch-doc_icewm-7_html
@@ -1,16 +1,25 @@
-$OpenBSD: patch-doc_icewm-7_html,v 1.2 2002/01/20 19:54:13 naddy Exp $
-# Fix the location of the configuration files in on-line help
---- doc/icewm-7.html.orig Tue Oct 9 09:54:34 2001
-+++ doc/icewm-7.html Sun Jan 13 03:19:37 2002
-@@ -20,9 +20,8 @@ directories:
-
+$OpenBSD: patch-doc_icewm-7_html,v 1.3 2004/05/21 17:00:09 naddy Exp $
+--- doc/icewm-7.html.orig 2003-09-27 02:54:58.000000000 -0500
++++ doc/icewm-7.html 2004-02-15 16:12:50.000000000 -0600
+@@ -25,17 +25,16 @@ directories:
- - $HOME/.icewm
user's personal customization
--
- /etc/X11/icewm
system-wide customized defaults
--
- /usr/local/lib/X11/icewm
compiled-in default directory with default files
--(for .rpm packages the default is /usr/X11R6/lib/X11/icewm)
-+
- /etc/icewm
system-wide customized defaults
-+
- /usr/local/share/icewm
compiled-in default directory with default files
+
- $HOME/.icewm
user's personal customization. This location can
+ be customized by setting the $ICEWM_PRIVCFG environment variable.
+-- /etc/X11/icewm
system-wide customized defaults
+-- /usr/local/share/icewm
compiled-in default directory with default files
+-(for .rpm packages the default is /usr/share/icewm)
++- %%SYSCONFDIR%%/icewm
system-wide customized defaults
++- %%PREFIX%%/share/icewm
compiled-in default directory with default files
+
The directories are searched in the above order, so any file located
in the system/install directory can be overridden by the user by creating
+ the same directory hierarchy under $HOME/.icewm
.
+ To customize icewm yourself, you should create the $HOME/.icewm directory and copy
+-the files that you wish to modify (preferences, winoptions),from /etc/X11/icewm,
+-/usr/share/icewm or /usr/local/share/icewm and then modify as you like.
++the files that you wish to modify (preferences, winoptions, etc.) from %%SYSCONFDIR%%/icewm
++or %%PREFIX%%/share/icewm and then modify them as you like.
+ To customize the default themes, you should create the $HOME/.icewm/themes directory
+ and copy all the theme files there and then modify as necessary.
+
diff --git a/x11/icewm/patches/patch-lib_icons_bomb_16x16_xpm b/x11/icewm/patches/patch-lib_icons_bomb_16x16_xpm
deleted file mode 100644
index 509c30ef185..00000000000
--- a/x11/icewm/patches/patch-lib_icons_bomb_16x16_xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-$OpenBSD: patch-lib_icons_bomb_16x16_xpm,v 1.1 2002/01/20 19:54:13 naddy Exp $
-# Fix broken icon, so it can be displayed correctly on Sparc too
---- lib/icons/bomb_16x16.xpm.orig Sun Jan 13 20:34:29 2002
-+++ lib/icons/bomb_16x16.xpm Sun Jan 13 20:34:39 2002
-@@ -1,25 +1,25 @@
- /* XPM */
--static char * mini-bomb_xpm[] = {
-+static char * bomb_16x16_xpm[] = {
- "16 16 6 1",
--" c None s None",
--". c black",
--"X c gray50",
--"o c gray85",
--"O c yellow",
--"# c white",
-+" c None",
-+". c #000000",
-+"+ c #7F7F7F",
-+"@ c #FFFFFF",
-+"# c #D9D9D9",
-+"$ c #FFFF00",
- " ",
- " ... ",
- " . . ",
- " . . ",
- " ... . ",
- " ..... . ",
--" .X#o... . ",
--" X.#X....X . ",
--" ..oX..... O O",
--" .......O. O OO ",
--" ......Xo. OOO ",
--" X.....X.X O ",
-+" .+@#... . ",
-+" +.@+....+ . ",
-+" ..#+..... $ $",
-+" .......$. $ $$ ",
-+" ......+#. $$$ ",
-+" +.....+.+ $ ",
- " ....... ",
--" X...X ",
-+" +...+ ",
- " ",
- " "};
diff --git a/x11/icewm/patches/patch-lib_icons_bomb_32x32_xpm b/x11/icewm/patches/patch-lib_icons_bomb_32x32_xpm
deleted file mode 100644
index 77f6e5d03b6..00000000000
--- a/x11/icewm/patches/patch-lib_icons_bomb_32x32_xpm
+++ /dev/null
@@ -1,84 +0,0 @@
-$OpenBSD: patch-lib_icons_bomb_32x32_xpm,v 1.1 2002/01/20 19:54:13 naddy Exp $
-# Fix broken icon, so it can be displayed correctly on Sparc too
---- lib/icons/bomb_32x32.xpm.orig Sun Jan 13 20:33:42 2002
-+++ lib/icons/bomb_32x32.xpm Sun Jan 13 20:33:56 2002
-@@ -1,18 +1,15 @@
- /* XPM */
--static char * icl8_11432_xpm[] = {
--/* width height ncolors chars_per_pixel */
-+static char * bomb_32x32_xpm[] = {
- "32 32 9 1",
--/* colors */
--" s None c None",
--"o c #999999",
--"O c black",
--"+ c #333333",
--"@ c #111111",
--"# c #FF6666",
--"$ c #FEFE00",
--"% c #DDDDDD",
--"& c #BBBBBB",
--/* pixels */
-+" c None",
-+". c #999999",
-+"+ c #000000",
-+"@ c #333333",
-+"# c #111111",
-+"$ c #FF6666",
-+"% c #FEFE00",
-+"& c #DDDDDD",
-+"* c #BBBBBB",
- " ",
- " ",
- " ",
-@@ -21,27 +18,27 @@ static char * icl8_11432_xpm[] = {
- " ",
- " ",
- " ",
--" oOoOo ",
--" O Oo ",
--" o O ",
--" O o ",
--" +++++ O ",
--" +@@@+ o ",
--" +@@O@@+ O ",
--" ++@OOO@O@++ o # $",
--" +@@OOOOOOO@@+ O $ # ",
--" +@OOOOOOOOOOO@+ o $ ",
--" +@OOOOOO%&oOO@+ O # $ ",
--" +@OOOOOOOO%&oOO@+ o ",
--" +@OOOOOOOOOOOOO@+ OoO # $ #",
--" +@OOOOOOOOO%&oO@+ ",
--" +@OOOOOOOOO%&oO@+ $ $ ",
--" +@OOOOOOOOO%&oO@+ # # ",
--" +@OOOOOOOO%&oOO@+ # ",
--" +@OOOOOOOO%&oOO@+ $ $ $",
--" +@OOOOOO%&oOO@+ ",
--" +@OOOOOOOOOOO@+ # ",
--" +@@OOOOOOO@@+ ",
--" ++@@@@@@@++ ",
--" +++++++ ",
-+" .+.+. ",
-+" + +. ",
-+" . + ",
-+" + . ",
-+" @@@@@ + ",
-+" @###@ . ",
-+" @##+##@ + ",
-+" @@#+++#+#@@ . $ %",
-+" @##+++++++##@ + % $ ",
-+" @#+++++++++++#@ . % ",
-+" @#++++++&*.++#@ + $ % ",
-+" @#++++++++&*.++#@ . ",
-+" @#+++++++++++++#@ +.+ $ % $",
-+" @#+++++++++&*.+#@ ",
-+" @#+++++++++&*.+#@ % % ",
-+" @#+++++++++&*.+#@ $ $ ",
-+" @#++++++++&*.++#@ $ ",
-+" @#++++++++&*.++#@ % % %",
-+" @#++++++&*.++#@ ",
-+" @#+++++++++++#@ $ ",
-+" @##+++++++##@ ",
-+" @@#######@@ ",
-+" @@@@@@@ ",
- " "};
diff --git a/x11/icewm/patches/patch-lib_icons_file_16x16_xpm b/x11/icewm/patches/patch-lib_icons_file_16x16_xpm
deleted file mode 100644
index 2b4f63b5ad1..00000000000
--- a/x11/icewm/patches/patch-lib_icons_file_16x16_xpm
+++ /dev/null
@@ -1,49 +0,0 @@
-$OpenBSD: patch-lib_icons_file_16x16_xpm,v 1.1 2002/01/20 19:54:13 naddy Exp $
-# Fix broken icon, so it can be displayed correctly on Sparc too
---- lib/icons/file_16x16.xpm.orig Tue Oct 9 09:54:03 2001
-+++ lib/icons/file_16x16.xpm Sun Jan 13 21:09:18 2002
-@@ -1,26 +1,23 @@
- /* XPM */
--static char * folder_16x16_xpm[] = {
--/* width height num_colors chars_per_pixel */
-+static char * file_16x16_xpm[] = {
- "16 16 4 1",
--/* colors */
--" s None c none",
--". c white",
--"* c #C0C0C0",
--"# c black",
--/* pixels */
-+" c None",
-+". c #000000",
-+"+ c #FFFFFF",
-+"@ c #C0C0C0",
- " ",
- " ",
--" ######## ",
--" #......## ",
--" #......#*# ",
--" #......#**# ",
--" #......##### ",
--" #..........# ",
--" #..........# ",
--" #..........# ",
--" #..........# ",
--" #..........# ",
--" #..........# ",
--" #..........# ",
--" ############ ",
-+" ........ ",
-+" .++++++.. ",
-+" .++++++.@. ",
-+" .++++++.@@. ",
-+" .++++++..... ",
-+" .++++++++++. ",
-+" .++++++++++. ",
-+" .++++++++++. ",
-+" .++++++++++. ",
-+" .++++++++++. ",
-+" .++++++++++. ",
-+" .++++++++++. ",
-+" ............ ",
- " "};
diff --git a/x11/icewm/patches/patch-lib_icons_folder_16x16_xpm b/x11/icewm/patches/patch-lib_icons_folder_16x16_xpm
deleted file mode 100644
index fe4cdcf33d3..00000000000
--- a/x11/icewm/patches/patch-lib_icons_folder_16x16_xpm
+++ /dev/null
@@ -1,50 +0,0 @@
-$OpenBSD: patch-lib_icons_folder_16x16_xpm,v 1.1 2002/01/20 19:54:13 naddy Exp $
-# Fix broken icon, so it can be displayed correctly on Sparc too
---- lib/icons/folder_16x16.xpm.orig Tue Oct 9 09:54:03 2001
-+++ lib/icons/folder_16x16.xpm Sun Jan 13 20:56:37 2002
-@@ -1,28 +1,25 @@
- /* XPM */
- static char * folder_16x16_xpm[] = {
--/* width height num_colors chars_per_pixel */
- "16 16 6 1",
--/* colors */
--" s None c none",
-+" c None",
- ". c #808080",
--"X c white",
--"o c #ffff80",
--"O c #808040",
--"+ c black",
--/* pixels */
-+"+ c #FFFFFF",
-+"@ c #FFFF80",
-+"# c #808040",
-+"$ c #000000",
- " ",
- " ",
- " ..... ",
--" .Xoooo. ",
--".XoooooO....... ",
--".XXXXXXXXXXXXXo+",
--".XooooooooooooO+",
--".XooooooooooooO+",
--".XooooooooooooO+",
--".XooooooooooooO+",
--".XooooooooooooO+",
--".XooooooooooooO+",
--".XooooooooooooO+",
--".oOOOOOOOOOOOOO+",
--" +++++++++++++++",
-+" .+@@@@. ",
-+".+@@@@@#....... ",
-+".+++++++++++++@$",
-+".+@@@@@@@@@@@@#$",
-+".+@@@@@@@@@@@@#$",
-+".+@@@@@@@@@@@@#$",
-+".+@@@@@@@@@@@@#$",
-+".+@@@@@@@@@@@@#$",
-+".+@@@@@@@@@@@@#$",
-+".+@@@@@@@@@@@@#$",
-+".@#############$",
-+" $$$$$$$$$$$$$$$",
- " "};
diff --git a/x11/icewm/patches/patch-lib_icons_vim_16x16_xpm b/x11/icewm/patches/patch-lib_icons_vim_16x16_xpm
deleted file mode 100644
index f844c9d8d14..00000000000
--- a/x11/icewm/patches/patch-lib_icons_vim_16x16_xpm
+++ /dev/null
@@ -1,60 +0,0 @@
-$OpenBSD: patch-lib_icons_vim_16x16_xpm,v 1.1 2002/01/20 19:54:13 naddy Exp $
-# Fix broken icon, so it can be displayed correctly on Sparc too
---- lib/icons/vim_16x16.xpm.orig Sun Jan 13 20:35:25 2002
-+++ lib/icons/vim_16x16.xpm Sun Jan 13 20:35:39 2002
-@@ -1,30 +1,27 @@
- /* XPM */
--static char *magick[] = {
--/* columns rows colors chars-per-pixel */
-+static char * vim_16x16_xpm[] = {
- "16 16 8 1",
--" c Gray0",
--". c #000080",
--"X c #008000",
--"o c Green",
--"O c #808080",
--"+ c #c0c0c0",
--"@ c Gray100",
--"# c None",
--/* pixels */
--"## o # ##",
--"# @@@@@ X @@@@ #",
--"# +++++O ++++O ",
--"## +++O X @++O #",
--"## +++O @++O ##",
--"## +++O @++O ##",
--"#o +++O@++O XX #",
--"oX +++@++O XXXX ",
--" X +++++ XXXX.#",
--"# ++++ + X ##",
--"## ++++ ++ + #",
--"## +++ ++ +++++ ",
--"## ++O + + + + ",
--"## +O X + + + + ",
--"### # ++ + + + ",
--"####### # # # #"
--};
-+" c None",
-+". c #000000",
-+"+ c #00FF00",
-+"@ c #FFFFFF",
-+"# c #008000",
-+"$ c #C0C0C0",
-+"% c #808080",
-+"& c #000080",
-+" .....+. .... ",
-+" .@@@@@.#.@@@@. ",
-+" .$$$$$%..$$$$%.",
-+" .$$$%.#.@$$%. ",
-+" .$$$%..@$$%. ",
-+" .$$$%.@$$%.. ",
-+" +.$$$%@$$%.##. ",
-+"+#.$$$@$$%.####.",
-+".#.$$$$$..####& ",
-+" ..$$$$.$...#. ",
-+" .$$$$...$$.$. ",
-+" .$$$.$$.$$$$$.",
-+" .$$%..$.$.$.$.",
-+" .$%.#.$.$.$.$.",
-+" .. .$$.$.$.$.",
-+" .. . . . "};
diff --git a/x11/icewm/patches/patch-lib_icons_xterm_16x16_xpm b/x11/icewm/patches/patch-lib_icons_xterm_16x16_xpm
deleted file mode 100644
index d9502c9199b..00000000000
--- a/x11/icewm/patches/patch-lib_icons_xterm_16x16_xpm
+++ /dev/null
@@ -1,57 +0,0 @@
-$OpenBSD: patch-lib_icons_xterm_16x16_xpm,v 1.1 2002/01/20 19:54:13 naddy Exp $
-# Fix broken icon, so it can be displayed correctly on Sparc too
---- lib/icons/xterm_16x16.xpm.orig Sun Jan 13 20:32:11 2002
-+++ lib/icons/xterm_16x16.xpm Sun Jan 13 20:32:33 2002
-@@ -1,29 +1,25 @@
- /* XPM */
--static char *xterm_16x16[] = {
--/* width height num_colors chars_per_pixel */
--" 16 16 6 1",
--/* colors */
--" c None s None",
--". c Black",
--"# c gray50",
--"a c blue",
--"b c White",
--"c c gray85",
--/* pixels */
-+static char * xterm_16x16_xpm[] = {
-+"16 16 6 1",
-+" c None",
-+". c #7F7F7F",
-+"+ c #D9D9D9",
-+"@ c #000000",
-+"# c #FFFFFF",
-+"$ c #0000FF",
- " ",
--" ######### ",
--" #cccccccc#. ",
--" #bbbbbbbb##. ",
--" #b......b##. ",
--" #b.aaaaab##. ",
--" #b.aaaaab##. ",
--" #b.aaaaab##. ",
--" #bbbbbbbb#.##",
--" #.........#c.",
--" #bbbbbbbbb#c#.",
--" ##.#.#.#.#.##.",
--" #c.c.c.c.c.c.. ",
--"#bbbbbbbbbbbc. ",
--"............. ",
--" "
--};
-+" ......... ",
-+" .++++++++.@ ",
-+" .########..@ ",
-+" .#@@@@@@#..@ ",
-+" .#@$$$$$#..@ ",
-+" .#@$$$$$#..@ ",
-+" .#@$$$$$#..@ ",
-+" .########.@..",
-+" .@@@@@@@@@.+@",
-+" .#########.+.@",
-+" ..@.@.@.@.@..@",
-+" .+@+@+@+@+@+@@ ",
-+".###########+@ ",
-+"@@@@@@@@@@@@@ ",
-+" "};
diff --git a/x11/icewm/patches/patch-lib_menu_in b/x11/icewm/patches/patch-lib_menu_in
index 80b57b6e27c..9ec9a20313a 100644
--- a/x11/icewm/patches/patch-lib_menu_in
+++ b/x11/icewm/patches/patch-lib_menu_in
@@ -1,84 +1,128 @@
-$OpenBSD: patch-lib_menu_in,v 1.1 2002/01/20 19:54:13 naddy Exp $
-# Add some additional entries to start menu
-# Only installed applications will be shown in the menu.
-#
-# If I can get permission to add more stuff here, then I can list
-# almost every X app that is available for OpenBSD.
-# I can create the appropriate icons too (made some of them already),
-# but that will greatly increase number of files in this port.
-# I will try to talk to IceWM developers about adding more applications
-# from OpenBSD ports tree to the default menu.
-#
---- lib/menu.in.orig Tue Oct 9 09:54:03 2001
-+++ lib/menu.in Sun Jan 13 20:02:35 2002
-@@ -5,6 +5,8 @@
+$OpenBSD: patch-lib_menu_in,v 1.2 2004/05/21 17:00:09 naddy Exp $
+--- lib/menu.in.orig Sat Sep 27 03:54:45 2003
++++ lib/menu.in Fri Feb 20 20:39:04 2004
+@@ -5,15 +5,114 @@
# (re)install icewm.
#
prog xterm xterm xterm
+prog Eterm Eterm Eterm
+prog aterm aterm aterm
prog rxvt xterm rxvt -bg black -cr green -fg white -C -fn 9x15 -sl 500
- prog fte fte fte
- prog Netscape netscape netscape
-@@ -12,6 +14,8 @@ prog Gimp gimp gimp
+-prog fte fte fte
+-prog NEdit nedit nedit
+-prog Mozilla mozilla mozilla
+-prog XChat xchat xchat
+-prog Gimp gimp gimp
separator
- menu Applications folder {
- menu Editors folder {
-+ prog vi vi xterm -e vi
-+ prog mg mg xterm -e mg
- prog fte fte fte
- prog vim vim gvim
- prog xemacs xemacs xemacs
-@@ -21,15 +25,26 @@ menu Applications folder {
- }
- menu "WWW Browsers" folder {
- prog Netscape netscape netscape
+-menuprog Gnome folder icewm-menu-gnome1 --list @CONFIG_GNOME1_MENU_DIR@
+-menuprog Gnome folder icewm-menu-gnome2 --list @CONFIG_GNOME2_MENU_DIR@
+-menuprog KDE folder icewm-menu-gnome@GNOME_VER@ --list @CONFIG_KDE_MENU_DIR@
+-menufile Programs folder programs
+-menufile Tool_bar folder toolbar
++#menufile Programs folder programs
++#menufile Tool_bar folder toolbar
++menu Applications folder {
++ menu Editors folder {
++ prog NEdit nedit nedit
++ prog fte fte fte
++ prog vim vim gvim
++ prog xemacs xemacs xemacs
++ prog emacs emacs emacs
++ prog xed_it xedit xedit
++ prog Lyx emacs lyx
++ prog Anj_uta anjuta anjuta
++ prog Abiword abiword abiword
++ prog Xc_oral xcoral xcoral
++ }
++ menu "WWW Browsers" folder {
++ prog Netscape netscape netscape
+ prog Konqueror konqueror konqueror
++ prog Mozilla mozilla mozilla
++ prog Firefox firefox firefox
++ prog Galeon galeon galeon
++ prog Opera opera opera
++ prog Dillo dillo dillo
+ prog Amaya amaya amaya
- prog Arena arena arena
- prog Lynx lynx xterm -e lynx
- }
++ prog Lynx lynx xterm -T Lynx -e lynx
++ }
+ menu "Mail and News" folder {
++ prog Kmail kmail kmail
+ prog Sylpheed sylpheed sylpheed
-+ prog TkRat tkrat tkrat
++ prog Tk_Rat tkrat tkrat
++ prog Thunderbird thunderbird thunderbird
++ prog Elm elm xterm -T Elm -e elm
++ prog Mutt mutt xterm -T Mutt -e mutt
++ prog Pine pine xterm -T Pine -e pine
++ }
++ menu "Internet Utilities" folder {
++ prog XChat xchat xchat
++ prog GTK-Gnutella gtk-gnutella gtk-gnutella
++ }
++ menu Graphics folder {
++ prog Dia dia dia
++ prog Blender blender blender
++ prog gtksee gtksee gtksee
++ prog ImageMagic display display
++ prog PornView pornview pornview
++ prog Gimp gimp gimp
++ prog XV xv xv
++ prog XPaint xpaint xpaint
++ prog XFig xfig xfig
+ }
- menu Graphics folder {
- prog Gimp gimp gimp
- prog XV xv xv
- prog XPaint xpaint xpaint
- prog XFig xfig xfig
- }
+ menu Multimedia folder {
-+ prog XPlayCD xplaycd xplaycd
-+ prog XMixer xmixer xmixer
++ prog XPlay_CD xplaycd xplaycd
++ prog XM_ixer xmixer xmixer
+ prog XMMS xmms xmms
++ prog Mplayer gmplayer gmplayer
+ }
- menu Devel folder {
- prog ddd ddd ddd
- }
-@@ -46,15 +61,12 @@ menu Games folder {
- prog XDemineur xdemineur xdemineur
- }
- menu System folder {
-- prog "Control Panel" redhat control-panel
++ menu "System Utilities" folder {
++ prog xosview xosview xosview
++ prog HexCalc hexcalc hexcalc
++ prog "Northern Captain" xnc xnc
++ prog xfm xfm xfm
++ prog "Acrobat Reader" pdf acroread
++ prog Xpdf pdf xpdf
++ prog "DVI Previewer" xdvi xdvi
++ prog Ghostview ghostview gv
++ }
++}
++menu Games folder {
++ prog "Koules for X" koules xkoules -f
++ prog Xboing xboing xboing
++ prog Xboard xboard xboard
++ prog XGalaga xgalaga xgal
++ prog XDemineur xdemineur xdemineur
++ prog "X Scavenger" scavenger scavenger
++ prog Xkobo xkobo xkobo -doublesize
++ prog "Eboard (chess)" eboard eboard
++ prog Quake-2 quake2 quake2
++}
++menu Utilities folder {
+ prog top top xterm -e top
- prog xload xload xload
- prog xosview xosview xosview
- }
- menu Utilities folder {
-- menu Multimedia folder {
-- prog XPlayCD xplaycd xplaycd
-- prog XMixer xmixer xmixer
-- }
++ prog xload xload xload
+ prog Xman xman xman
- prog "Font Selector" xfontsel xfontsel
- prog Clock xclock xclock
- prog Magnify xmag xmag
-@@ -73,4 +85,7 @@ menu "Window Managers" folder {
- restart blackbox - blackbox
- restart fvwm2 - fvwm2
- restart fvwm - fvwm
-+ restart wm2 - wm2
++ prog "Font Selector" xfontsel xfontsel
++ prog Clock xclock xclock
++ prog Magnify xmag xmag
++ prog Calculator xcalc xcalc
++ prog Colormap xcolormap xcmap
++ prog Clip_board xclip xclipboard
++ prog xkill bomb xkill
++ separator
++ prog "Screen Saver" xlock xlock -nolock
++ prog "Screen _Lock" xlock xlock
++}
++menu "Window _Managers" folder {
++ restart icewm - icewm
++ restart wmaker - wmaker
++ restart enlightenment - enlightenment
++ restart blackbox - blackbox
++ restart fl_uxbox - fluxbox
++ restart fvwm_2 - fvwm2
++ restart fvwm - fvwm
++ restart w_m2 - wm2
++ restart pwm - pwm
++ restart twm - twm
+ restart KDE - startkde
-+ restart Golem - golem
- }
++ restart Gnome - gnome-session
++}
diff --git a/x11/icewm/patches/patch-lib_taskbar_windows_xpm b/x11/icewm/patches/patch-lib_taskbar_windows_xpm
deleted file mode 100644
index f17ac7fb225..00000000000
--- a/x11/icewm/patches/patch-lib_taskbar_windows_xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-$OpenBSD: patch-lib_taskbar_windows_xpm,v 1.1 2002/01/20 19:54:13 naddy Exp $
-# Fix broken icon, so it looks better when used in other themes
---- lib/taskbar/windows.xpm.orig Sun Jan 13 21:13:39 2002
-+++ lib/taskbar/windows.xpm Sun Jan 13 21:13:44 2002
-@@ -1,29 +1,26 @@
- /* XPM */
--static char *windows[] = {
--/* width height num_colors chars_per_pixel */
--" 20 20 2 1",
--/* colors */
--". c #c0c0c0",
--"# c #000000",
--/* pixels */
--"....................",
--"....................",
--".##########.........",
--".##########.........",
--".#........#.........",
--".#........#.........",
--".#...##########.....",
--".#...##########.....",
--".#...#........#.....",
--".#...#........#.....",
--".#####...##########.",
--".....#...##########.",
--".....#...#........#.",
--".....#...#........#.",
--".....#####........#.",
--".........#........#.",
--".........#........#.",
--".........#........#."
--".........##########.",
--"....................",
--};
-+static char * windows_xpm[] = {
-+"20 20 3 1",
-+" c None",
-+". c #000000",
-+"+ c #C0C0C0",
-+" ",
-+" ",
-+" .......... ",
-+" .......... ",
-+" .++++++++. ",
-+" .++++++++. ",
-+" .+++.......... ",
-+" .+++.......... ",
-+" .+++.++++++++. ",
-+" .+++.++++++++. ",
-+" .....+++.......... ",
-+" .+++.......... ",
-+" .+++.++++++++. ",
-+" .+++.++++++++. ",
-+" .....++++++++. ",
-+" .++++++++. ",
-+" .++++++++. ",
-+" .++++++++. ",
-+" .......... ",
-+" "};
diff --git a/x11/icewm/patches/patch-po_bg_po b/x11/icewm/patches/patch-po_bg_po
new file mode 100644
index 00000000000..da33f2fa1dd
--- /dev/null
+++ b/x11/icewm/patches/patch-po_bg_po
@@ -0,0 +1,12 @@
+$OpenBSD: patch-po_bg_po,v 1.1 2004/05/21 17:00:09 naddy Exp $
+--- po/bg.po.orig 2004-05-21 17:39:06.000000000 +0200
++++ po/bg.po 2004-05-21 17:39:15.000000000 +0200
+@@ -11,7 +11,7 @@ msgstr "Project-Id-Version: IceWM 1.2.1
+ "Last-Translator: Pavel Pyuter \n"
+ "Language-Team: Bulgarian\n"
+ "MIME-Version: 1.0\n"
+- "Content-Type: text/plain; charset=WINDOWS-1251\n"
++ "Content-Type: text/plain; charset=CP1251\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+ #: ../src/aapm.cc:79
diff --git a/x11/icewm/patches/patch-src_Makefile b/x11/icewm/patches/patch-src_Makefile
deleted file mode 100644
index 2d2db367555..00000000000
--- a/x11/icewm/patches/patch-src_Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-$OpenBSD: patch-src_Makefile,v 1.2 2002/01/20 19:54:13 naddy Exp $
-# 1. Install on-line help to /usr/local/share/doc/icewm/doc
-# 2. LD - was in original icewm port, I left it as it was
-# 3. CXX - was in original icewm port, I left it as it was
---- src/Makefile.orig Tue Oct 9 09:54:03 2001
-+++ src/Makefile Thu Jan 10 23:56:46 2002
-@@ -20,7 +20,7 @@ CXXFLAGS = \
- -DEXEEXT='"$(EXEEXT)"' \
- -DICEWMEXE='"icewm"EXEEXT' \
- -DICEHELPEXE='"icehelp"EXEEXT' \
-- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"' \
-+ -DICEHELPIDX='"${DOCDIR}/icewm/doc/icewm.html"' \
- $(SYS_CFLAGS) $(SYS_INCDIRS)
- LFLAGS = $(SYS_LIBDIRS)
- LIBS = $(SYS_LIBS)
-@@ -124,8 +124,7 @@ clean:
- ################################################################################
-
- $(BINARIES):
-- @echo Linking $@...
-- @$(LD) -o $@ $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
-+ $(LD) -o $@ $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
-
- libice.so: $(COREOBJS)
- -@rm -f $@
-@@ -142,11 +141,9 @@ wmabout.o: ../VERSION
- ################################################################################
-
- %.p: %.cc
-- @echo Analysing dependencies for $^...
-- @$(CXX) $(CXXFLAGS) -M -c $< > $@
-+ $(CXX) $(CXXFLAGS) -M -c $< > $@
-
- %.o: %.cc
-- @echo Compiling $@...
-- @$(CXX) $(CXXFLAGS) -c $<
-+ $(CXX) $(CXXFLAGS) -c $<
-
- ################################################################################
diff --git a/x11/icewm/patches/patch-src_Makefile_in b/x11/icewm/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..55cd2d4827b
--- /dev/null
+++ b/x11/icewm/patches/patch-src_Makefile_in
@@ -0,0 +1,26 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2004/05/21 17:00:09 naddy Exp $
+--- src/Makefile.in.orig 2003-09-27 02:54:45.000000000 -0500
++++ src/Makefile.in 2004-02-15 16:12:51.000000000 -0600
+@@ -29,7 +29,7 @@ DEFS = @DEFS@ \
+ -DICEWMEXE='"icewm$(EXEEXT)"' \
+ -DICEWMBGEXE='"icewmbg$(EXEEXT)"' \
+ -DICEHELPEXE='"icehelp$(EXEEXT)"' \
+- -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
++ -DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"'
+
+ CXXFLAGS = @CXXFLAGS@ $(DEBUG) $(DEFS) \
+ @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
+@@ -202,11 +202,11 @@ clean:
+
+ %.o: %.cc
+ @echo Compiling $@...
+- @$(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
++ $(CXX) $(CXXFLAGS) $(GCCDEP) -c $<
+
+ genpref $(BINARIES):
+ @echo Linking $@...
+- @$(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
++ $(LD) -o $@$(EXEEXT) $($@_OBJS) $(LFLAGS) $($@_LFLAGS) $(LIBS) $($@_LIBS)
+
+ ################################################################################
+
diff --git a/x11/icewm/patches/patch-src_default_h b/x11/icewm/patches/patch-src_default_h
index eba14e00611..207ff1b199e 100644
--- a/x11/icewm/patches/patch-src_default_h
+++ b/x11/icewm/patches/patch-src_default_h
@@ -1,43 +1,14 @@
-$OpenBSD: patch-src_default_h,v 1.1 2002/01/20 19:54:13 naddy Exp $
-#1,2 Change the default theme to motif, reduce the borders just a bit
-# reasons: icewm should still be useful on slower platforms with
-# 256colors only (e.g. Sparc), plus motif uses OpenBSD branded
-# start button :)
-# 3. Replace pine with mail, so the mail can be checked even if
-# there is no additional mail client installed
-#
---- src/default.h.orig Tue Oct 9 09:54:03 2001
-+++ src/default.h Fri Jan 11 09:19:52 2002
-@@ -10,8 +10,8 @@
- #define BOLDTTFONT(pt) "-adobe-courier-bold-r-*-*-*-" #pt "-*-*-*-*-*-*"
- #endif
+$OpenBSD: patch-src_default_h,v 1.2 2004/05/21 17:00:09 naddy Exp $
+--- src/default.h.orig 2003-09-27 02:54:45.000000000 -0500
++++ src/default.h 2004-02-15 17:42:38.000000000 -0600
+@@ -188,8 +188,8 @@ XSV(const char *, moveSizeFontName,
--#define CONFIG_DEFAULT_LOOK lookNice
--#define CONFIG_DEFAULT_THEME "Infadel2/default.theme"
-+#define CONFIG_DEFAULT_LOOK lookMotif
-+#define CONFIG_DEFAULT_THEME "motif/default.theme"
-
- #ifdef CFGDEF
- #define XSV(t,a,b) t a(b);
-@@ -261,8 +261,8 @@ XIV(bool, haveXft, true)
- XIV(bool, protectClientWindow, true)
- #endif
- XIV(WMLook, wmLook, CONFIG_DEFAULT_LOOK)
--XIV(int, wsBorderX, 6)
--XIV(int, wsBorderY, 6)
-+XIV(int, wsBorderX, 4)
-+XIV(int, wsBorderY, 4)
- XIV(int, wsDlgBorderX, 2)
- XIV(int, wsDlgBorderY, 2)
- XIV(int, wsCornerX, 24)
-@@ -353,8 +353,8 @@ XSV(const char *, libDir, LIBDIR)
- XSV(const char *, configDir, CFGDIR)
- XSV(const char *, kdeDataDir, KDEDIR)
- XSV(const char *, mailBoxPath, 0)
--XSV(const char *, mailCommand, "xterm -name pine -title PINE -e pine")
--XSV(const char *, mailClassHint, "pine.XTerm")
-+XSV(const char *, mailCommand, "xterm -name mail -title MAIL -e mail")
-+XSV(const char *, mailClassHint, "mail.XTerm")
- XSV(const char *, newMailCommand, 0)
- XSV(const char *, lockCommand, "xlock")
- XSV(const char *, clockCommand, "xclock -name icewm -title Clock")
+ XSV(const char *, kdeDataDir, KDEDIR)
+ XSV(const char *, mailBoxPath, 0)
+-XSV(const char *, mailCommand, "xterm -name pine -title PINE -e pine")
+-XSV(const char *, mailClassHint, "pine.XTerm")
++XSV(const char *, mailCommand, "xterm -name mail -title MAIL -e mail")
++XSV(const char *, mailClassHint, "mail.XTerm")
+ XSV(const char *, newMailCommand, 0)
+ XSV(const char *, lockCommand, "xlock")
+ XSV(const char *, clockCommand, "xclock -name icewm -title Clock")
diff --git a/x11/icewm/patches/patch-src_themes_cc b/x11/icewm/patches/patch-src_themes_cc
new file mode 100644
index 00000000000..53c607afcba
--- /dev/null
+++ b/x11/icewm/patches/patch-src_themes_cc
@@ -0,0 +1,13 @@
+$OpenBSD: patch-src_themes_cc,v 1.1 2004/05/21 17:00:09 naddy Exp $
+--- src/themes.cc.orig 2003-09-27 09:54:45.000000000 +0200
++++ src/themes.cc 2004-05-21 17:36:57.000000000 +0200
+@@ -61,9 +61,6 @@ void DTheme::open() {
+
+ setDefaultTheme(fTheme);
+
+- const char *bg[] = { ICEWMBGEXE, "-r", 0 };
+- int pid = app->runProgram(bg[0], bg);
+- app->waitProgram(pid);
+
+ YStringArray args(4);
+
diff --git a/x11/icewm/patches/patch-src_wmapp_cc b/x11/icewm/patches/patch-src_wmapp_cc
index d68bd0d678a..2e09baaa95b 100644
--- a/x11/icewm/patches/patch-src_wmapp_cc
+++ b/x11/icewm/patches/patch-src_wmapp_cc
@@ -1,17 +1,44 @@
-$OpenBSD: patch-src_wmapp_cc,v 1.1 2002/12/29 00:10:48 pvalchev Exp $
---- src/wmapp.cc.orig Sat Dec 28 15:21:46 2002
-+++ src/wmapp.cc Sat Dec 28 15:22:19 2002
-@@ -883,11 +883,11 @@ void runRestart(const char *str, const c
+$OpenBSD: patch-src_wmapp_cc,v 1.2 2004/05/21 17:00:09 naddy Exp $
+--- src/wmapp.cc.orig 2003-09-27 09:54:45.000000000 +0200
++++ src/wmapp.cc 2004-05-21 17:36:57.000000000 +0200
+@@ -681,7 +681,7 @@ static void initMenus() {
+
+ logoutMenu->addItem(_("Lock _Workstation"), -2, "", actionLock);
+ logoutMenu->addItem(_("Re_boot"), -2, "", actionReboot);
+- logoutMenu->addItem(_("Shut_down"), -2, "", actionReboot);
++ logoutMenu->addItem(_("Shut_down"), -2, "", actionShutdown);
+ logoutMenu->addSeparator();
+
+ DProgram *restartIcewm =
+@@ -909,11 +909,11 @@ void runRestart(const char *path, char *
if (args) {
- execvp(str, (char * const *) args);
+ execvp(path, args);
} else {
-- execlp(str, str, 0);
-+ execlp(str, str, (void *)NULL);
+- execlp(path, path, 0);
++ execlp(path, path, (void *)NULL);
}
} else {
const char *c = configArg ? "-c" : NULL;
-- execlp(ICEWMEXE, ICEWMEXE, c, configArg, 0);
-+ execlp(ICEWMEXE, ICEWMEXE, c, configArg, (void *)NULL);
+- execlp(ICEWMEXE, ICEWMEXE, "--restart", c, configArg, 0);
++ execlp(ICEWMEXE, ICEWMEXE, "--restart", c, configArg, (void *)NULL);
}
app->alert();
+@@ -1507,6 +1507,8 @@ static void print_usage(const char *argv
+
+ int main(int argc, char **argv) {
+ YLocale locale;
++
++ const char *bg[] = { "icewmbg", 0 };
+
+ for (char ** arg = argv + 1; arg < argv + argc; ++arg) {
+ if (**arg == '-') {
+@@ -1549,6 +1551,8 @@ int main(int argc, char **argv) {
+ #endif
+ YWMApp app(&argc, &argv);
+
++ app.runProgram(bg[0], bg);
++
+ #ifdef CONFIG_GUIEVENTS
+ app.signalGuiEvent(geStartup);
+ #endif
diff --git a/x11/icewm/patches/patch-src_wmclient_h b/x11/icewm/patches/patch-src_wmclient_h
deleted file mode 100644
index 3fd0fefbcd8..00000000000
--- a/x11/icewm/patches/patch-src_wmclient_h
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_wmclient_h,v 1.1 2004/01/30 15:00:46 naddy Exp $
---- src/wmclient.h.orig 2004-01-30 15:45:59.000000000 +0100
-+++ src/wmclient.h 2004-01-30 15:46:08.000000000 +0100
-@@ -10,13 +10,6 @@ class WindowListItem;
-
- typedef int FrameState;
-
--#ifndef __YIMP_UTIL__
--//!!! remove these if possible
--typedef struct XWMHints;
--typedef struct XSizeHints;
--typedef struct XClassHint;
--#endif
--
- class ClientData {
- public:
- #ifdef CONFIG_WINLIST
diff --git a/x11/icewm/patches/patch-src_wmsession_cc b/x11/icewm/patches/patch-src_wmsession_cc
deleted file mode 100644
index 18cc081d5ac..00000000000
--- a/x11/icewm/patches/patch-src_wmsession_cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_wmsession_cc,v 1.1 2002/12/13 07:27:39 pvalchev Exp $
---- src/wmsession.cc.orig Tue Oct 9 09:54:04 2001
-+++ src/wmsession.cc Thu Dec 12 23:46:25 2002
-@@ -198,7 +198,7 @@ static int rd_str(char *s, char *d) {
- c = *s++;
- }
-
-- while (c != EOF) {
-+ while (c != 0) {
- if (c == '"' && !old) {
- c = *s++;
- break;
diff --git a/x11/icewm/patches/patch-src_wmtaskbar_cc b/x11/icewm/patches/patch-src_wmtaskbar_cc
deleted file mode 100644
index 30a2022fda0..00000000000
--- a/x11/icewm/patches/patch-src_wmtaskbar_cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_wmtaskbar_cc,v 1.2 2002/01/20 19:54:13 naddy Exp $
-# Replace IceWM start button with OpenBSD branded icon
---- src/wmtaskbar.cc.orig Sun Jan 13 00:44:11 2002
-+++ src/wmtaskbar.cc Sun Jan 13 00:45:32 2002
-@@ -62,7 +62,7 @@ YPixbuf *taskbuttonminimizedPixbuf(NULL)
-
- static void initPixmaps() {
- #ifndef ICEWM_PIXMAP
--#define ICEWM_PIXMAP "icewm.xpm"
-+#define ICEWM_PIXMAP "openbsd.xpm"
- #endif
-
- #ifndef START_PIXMAP
diff --git a/x11/icewm/patches/patch-src_yapp_cc b/x11/icewm/patches/patch-src_yapp_cc
index cd4f2a39713..f79b2b38bdd 100644
--- a/x11/icewm/patches/patch-src_yapp_cc
+++ b/x11/icewm/patches/patch-src_yapp_cc
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_yapp_cc,v 1.1 2002/12/29 00:10:48 pvalchev Exp $
---- src/yapp.cc.orig Sat Dec 28 15:21:52 2002
-+++ src/yapp.cc Sat Dec 28 15:22:32 2002
-@@ -1370,7 +1370,7 @@ void YApplication::runProgram(const char
+$OpenBSD: patch-src_yapp_cc,v 1.2 2004/05/21 17:00:09 naddy Exp $
+--- src/yapp.cc.orig 2003-09-27 02:54:45.000000000 -0500
++++ src/yapp.cc 2004-02-15 16:12:51.000000000 -0600
+@@ -1304,7 +1304,7 @@ int YApplication::runProgram(const char
if (args)
- execvp(str, (char **)args);
+ execvp(path, (char **)args);
else
-- execlp(str, str, 0);
-+ execlp(str, str, (void *)NULL);
- _exit(1);
+- execlp(path, path, 0);
++ execlp(path, path, (void *)NULL);
+
+ _exit(99);
}
- }
diff --git a/x11/icewm/patches/patch-sysdep_in b/x11/icewm/patches/patch-sysdep_in
deleted file mode 100644
index 2e0a6f0bd04..00000000000
--- a/x11/icewm/patches/patch-sysdep_in
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-sysdep_in,v 1.2 2002/01/20 19:54:13 naddy Exp $
-# was in original icewm port, I left it as it was
---- sysdep.in.orig Tue Oct 9 09:54:02 2001
-+++ sysdep.in Thu Jan 10 23:56:46 2002
-@@ -5,7 +5,7 @@ SYS_CFLAGS = \
- @DEBUG@ @CXXFLAGS@ @DEFS@ \
- @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ @GNOME_CFLAGS@
- SYS_INCDIRS =
--SYS_LIBDIRS =
-+SYS_LIBDIRS = @LDFLAGS@
- SYS_LIBS = @LIBS@
-
- CORE_LIBS = @CORE_LIBS@
diff --git a/x11/icewm/pkg/PLIST b/x11/icewm/pkg/PLIST
index a02f4de41f2..f5e3f10939b 100644
--- a/x11/icewm/pkg/PLIST
+++ b/x11/icewm/pkg/PLIST
@@ -1,30 +1,31 @@
-@comment $OpenBSD: PLIST,v 1.5 2003/12/16 21:01:38 naddy Exp $
-bin/genpref
+@comment $OpenBSD: PLIST,v 1.6 2004/05/21 17:00:09 naddy Exp $
bin/icehelp
bin/icesh
bin/icewm
+bin/icewm-session
bin/icewmbg
bin/icewmhint
-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-16.html
-share/doc/icewm/doc/icewm-2.html
-share/doc/icewm/doc/icewm-3.html
-share/doc/icewm/doc/icewm-4.html
-share/doc/icewm/doc/icewm-5.html
-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.html
+bin/icewmtray
+share/doc/icewm/icewm-1.html
+share/doc/icewm/icewm-10.html
+share/doc/icewm/icewm-11.html
+share/doc/icewm/icewm-12.html
+share/doc/icewm/icewm-13.html
+share/doc/icewm/icewm-14.html
+share/doc/icewm/icewm-15.html
+share/doc/icewm/icewm-16.html
+share/doc/icewm/icewm-17.html
+share/doc/icewm/icewm-18.html
+share/doc/icewm/icewm-19.html
+share/doc/icewm/icewm-2.html
+share/doc/icewm/icewm-3.html
+share/doc/icewm/icewm-4.html
+share/doc/icewm/icewm-5.html
+share/doc/icewm/icewm-6.html
+share/doc/icewm/icewm-7.html
+share/doc/icewm/icewm-8.html
+share/doc/icewm/icewm-9.html
+share/doc/icewm/icewm.html
share/icewm/icons/app_16x16.xpm
share/icewm/icons/app_32x32.xpm
share/icewm/icons/bomb_16x16.xpm
@@ -39,6 +40,8 @@ share/icewm/icons/communicator-discussion_16x16.xpm
share/icewm/icons/communicator-discussion_32x32.xpm
share/icewm/icons/communicator-mail_16x16.xpm
share/icewm/icons/communicator-mail_32x32.xpm
+share/icewm/icons/emacs_16x16.xpm
+share/icewm/icons/emacs_32x32.xpm
share/icewm/icons/file_16x16.xpm
share/icewm/icons/file_32x32.xpm
share/icewm/icons/folder_16x16.xpm
@@ -47,8 +50,6 @@ share/icewm/icons/fte_16x16.xpm
share/icewm/icons/fte_32x32.xpm
share/icewm/icons/gimp_16x16.xpm
share/icewm/icons/gimp_32x32.xpm
-share/icewm/icons/gimp_hi_16x16.xpm
-share/icewm/icons/gimp_hi_32x32.xpm
share/icewm/icons/gnome_16x16.xpm
share/icewm/icons/java_16x16.xpm
share/icewm/icons/java_32x32.xpm
@@ -63,7 +64,6 @@ share/icewm/icons/pdf_16x16.xpm
share/icewm/icons/pdf_32x32.xpm
share/icewm/icons/vim_16x16.xpm
share/icewm/icons/vim_32x32.xpm
-share/icewm/icons/vim_48x48.xpm
share/icewm/icons/xisp_16x16.xpm
share/icewm/icons/xisp_32x32.xpm
share/icewm/icons/xload_16x16.xpm
@@ -88,6 +88,7 @@ share/icewm/ledclock/n7.xpm
share/icewm/ledclock/n8.xpm
share/icewm/ledclock/n9.xpm
share/icewm/ledclock/p.xpm
+share/icewm/ledclock/percent.xpm
share/icewm/ledclock/slash.xpm
share/icewm/ledclock/space.xpm
share/icewm/mailbox/errmail.xpm
@@ -97,16 +98,8 @@ share/icewm/mailbox/nomail.xpm
share/icewm/mailbox/unreadmail.xpm
share/icewm/menu
share/icewm/preferences
-share/icewm/taskbar/debian.xpm
share/icewm/taskbar/icewm.xpm
-share/icewm/taskbar/linux.xpm
-share/icewm/taskbar/linux1.xpm
-share/icewm/taskbar/linux2.xpm
-share/icewm/taskbar/linux20.xpm
-share/icewm/taskbar/openbsd.xpm
-share/icewm/taskbar/start.xpm
share/icewm/taskbar/windows.xpm
-share/icewm/taskbar/xfreeos2.xpm
share/icewm/themes/Infadel2/Ergonomic.theme
share/icewm/themes/Infadel2/Overloaded.theme
share/icewm/themes/Infadel2/closeA.xpm
@@ -178,6 +171,21 @@ share/icewm/themes/gtk2/minimizeA.xpm
share/icewm/themes/gtk2/minimizeI.xpm
share/icewm/themes/gtk2/restoreA.xpm
share/icewm/themes/gtk2/restoreI.xpm
+share/icewm/themes/icedesert/closeA.xpm
+share/icewm/themes/icedesert/closeI.xpm
+share/icewm/themes/icedesert/default.theme
+share/icewm/themes/icedesert/maximizeA.xpm
+share/icewm/themes/icedesert/maximizeI.xpm
+share/icewm/themes/icedesert/menuButtonA.xpm
+share/icewm/themes/icedesert/menuButtonI.xpm
+share/icewm/themes/icedesert/minimizeA.xpm
+share/icewm/themes/icedesert/minimizeI.xpm
+share/icewm/themes/icedesert/restoreA.xpm
+share/icewm/themes/icedesert/restoreI.xpm
+share/icewm/themes/icedesert/titleAB.xpm
+share/icewm/themes/icedesert/titleAT.xpm
+share/icewm/themes/icedesert/titleIB.xpm
+share/icewm/themes/icedesert/titleIT.xpm
share/icewm/themes/metal2/closeA.xpm
share/icewm/themes/metal2/closeI.xpm
share/icewm/themes/metal2/default.theme
@@ -258,6 +266,21 @@ share/icewm/themes/nice/minimize.xpm
share/icewm/themes/nice/restore.xpm
share/icewm/themes/nice/rolldown.xpm
share/icewm/themes/nice/rollup.xpm
+share/icewm/themes/nice2/closeA.xpm
+share/icewm/themes/nice2/closeI.xpm
+share/icewm/themes/nice2/default.theme
+share/icewm/themes/nice2/maximizeA.xpm
+share/icewm/themes/nice2/maximizeI.xpm
+share/icewm/themes/nice2/menuButtonA.xpm
+share/icewm/themes/nice2/menuButtonI.xpm
+share/icewm/themes/nice2/minimizeA.xpm
+share/icewm/themes/nice2/minimizeI.xpm
+share/icewm/themes/nice2/restoreA.xpm
+share/icewm/themes/nice2/restoreI.xpm
+share/icewm/themes/nice2/titleAB.xpm
+share/icewm/themes/nice2/titleAT.xpm
+share/icewm/themes/nice2/titleIB.xpm
+share/icewm/themes/nice2/titleIT.xpm
share/icewm/themes/warp3/close.xpm
share/icewm/themes/warp3/default.theme
share/icewm/themes/warp3/hide.xpm
@@ -279,7 +302,10 @@ share/icewm/themes/win95/minimize.xpm
share/icewm/themes/win95/restore.xpm
share/icewm/toolbar
share/icewm/winoptions
+share/locale/be/LC_MESSAGES/icewm.mo
+share/locale/bg/LC_MESSAGES/icewm.mo
share/locale/ca/LC_MESSAGES/icewm.mo
+share/locale/cs/LC_MESSAGES/icewm.mo
share/locale/de/LC_MESSAGES/icewm.mo
share/locale/en/LC_MESSAGES/icewm.mo
share/locale/es/LC_MESSAGES/icewm.mo
@@ -289,45 +315,35 @@ share/locale/hr/LC_MESSAGES/icewm.mo
share/locale/hu/LC_MESSAGES/icewm.mo
share/locale/it/LC_MESSAGES/icewm.mo
share/locale/ja/LC_MESSAGES/icewm.mo
+share/locale/ko/LC_MESSAGES/icewm.mo
share/locale/lt/LC_MESSAGES/icewm.mo
+share/locale/nl/LC_MESSAGES/icewm.mo
+share/locale/no/LC_MESSAGES/icewm.mo
share/locale/pl/LC_MESSAGES/icewm.mo
share/locale/pt_BR/LC_MESSAGES/icewm.mo
share/locale/ro/LC_MESSAGES/icewm.mo
share/locale/ru/LC_MESSAGES/icewm.mo
+share/locale/sl/LC_MESSAGES/icewm.mo
+share/locale/sv/LC_MESSAGES/icewm.mo
+share/locale/uk/LC_MESSAGES/icewm.mo
+share/locale/zh_CN/LC_MESSAGES/icewm.mo
share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
-@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrm share/locale/zh_TW.Big5
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/lt/LC_MESSAGES
-@dirrm share/locale/lt
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/en/LC_MESSAGES
-@dirrm share/locale/en
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
@dirrm share/icewm/themes/win95
@dirrm share/icewm/themes/warp4
@dirrm share/icewm/themes/warp3
+@dirrm share/icewm/themes/nice2
@dirrm share/icewm/themes/nice
@dirrm share/icewm/themes/motif
@dirrm share/icewm/themes/metal2
+@dirrm share/icewm/themes/icedesert
@dirrm share/icewm/themes/gtk2
@dirrm share/icewm/themes/Infadel2/taskbar
@dirrm share/icewm/themes/Infadel2/mailbox
@dirrm share/icewm/themes/Infadel2/icons
@dirrm share/icewm/themes/Infadel2/cursors
@dirrm share/icewm/themes/Infadel2
-@dirrm share/icewm/themes
@dirrm share/icewm/taskbar
@dirrm share/icewm/mailbox
@dirrm share/icewm/ledclock
@dirrm share/icewm/icons
-@dirrm share/icewm
-@dirrm share/doc/icewm/doc
@dirrm share/doc/icewm