2 files changed, 186 insertions, 165 deletions

diff --git a/x11-wm/icewm/files/patch-af b/x11-wm/icewm/files/patch-af
new file mode 100644
index 000000000000..a43afa18bd3c
--- /dev/null
+++ b/x11-wm/icewm/files/patch-af
@@ -0,0 +1,11 @@
+--- icewm.spec.in.orig	Wed Mar 17 00:12:01 1999
++++ icewm.spec.in	Wed Mar 17 00:12:22 1999
+@@ -36,7 +36,7 @@
+ %files
+ %defattr(-,root,root)
+ %doc README COPYING CHANGES TODO BUGS icewm.lsm FAQ doc/*.html doc/icewm.sgml
+-%{prefix}/lib/X11/icewm/
++%{prefix}/share/icewm/
+ %{prefix}/bin/icewm
+ %{prefix}/bin/icewmhint
+ %{prefix}/bin/icewmbg
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 8fcc82340309..9e795ec32769 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -1,168 +1,178 @@
 bin/icewm
 bin/icewmbg
 bin/icewmhint
-lib/X11/icewm/icons/app_16x16.xpm
-lib/X11/icewm/icons/app_32x32.xpm
-lib/X11/icewm/icons/bomb_16x16.xpm
-lib/X11/icewm/icons/bomb_32x32.xpm
-lib/X11/icewm/icons/file_16x16.xpm
-lib/X11/icewm/icons/file_32x32.xpm
-lib/X11/icewm/icons/folder_16x16.xpm
-lib/X11/icewm/icons/folder_32x32.xpm
-lib/X11/icewm/icons/fte_16x16.xpm
-lib/X11/icewm/icons/fte_32x32.xpm
-lib/X11/icewm/icons/gimp_16x16.xpm
-lib/X11/icewm/icons/gimp_32x32.xpm
-lib/X11/icewm/icons/java_16x16.xpm
-lib/X11/icewm/icons/java_32x32.xpm
-lib/X11/icewm/icons/koules_16x16.xpm
-lib/X11/icewm/icons/koules_32x32.xpm
-lib/X11/icewm/icons/netscape_16x16.xpm
-lib/X11/icewm/icons/netscape_32x32.xpm
-lib/X11/icewm/icons/pdf_16x16.xpm
-lib/X11/icewm/icons/pdf_32x32.xpm
-lib/X11/icewm/icons/xisp_16x16.xpm
-lib/X11/icewm/icons/xisp_32x32.xpm
-lib/X11/icewm/icons/xload_16x16.xpm
-lib/X11/icewm/icons/xload_32x32.xpm
-lib/X11/icewm/icons/xterm_16x16.xpm
-lib/X11/icewm/icons/xterm_32x32.xpm
-lib/X11/icewm/icons/xv_16x16.xpm
-lib/X11/icewm/icons/xv_32x32.xpm
-lib/X11/icewm/ledclock/a.xpm
-lib/X11/icewm/ledclock/colon.xpm
-lib/X11/icewm/ledclock/dot.xpm
-lib/X11/icewm/ledclock/m.xpm
-lib/X11/icewm/ledclock/n0.xpm
-lib/X11/icewm/ledclock/n1.xpm
-lib/X11/icewm/ledclock/n2.xpm
-lib/X11/icewm/ledclock/n3.xpm
-lib/X11/icewm/ledclock/n4.xpm
-lib/X11/icewm/ledclock/n5.xpm
-lib/X11/icewm/ledclock/n6.xpm
-lib/X11/icewm/ledclock/n7.xpm
-lib/X11/icewm/ledclock/n8.xpm
-lib/X11/icewm/ledclock/n9.xpm
-lib/X11/icewm/ledclock/p.xpm
-lib/X11/icewm/ledclock/slash.xpm
-lib/X11/icewm/ledclock/space.xpm
-lib/X11/icewm/mailbox/mail.xpm
-lib/X11/icewm/mailbox/newmail.xpm
-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/linux20.xpm
-lib/X11/icewm/taskbar/start.xpm
-lib/X11/icewm/taskbar/windows.xpm
-lib/X11/icewm/taskbar/xfreeos2.xpm
-lib/X11/icewm/themes/gtk2/closeA.xpm
-lib/X11/icewm/themes/gtk2/closeI.xpm
-lib/X11/icewm/themes/gtk2/default.theme
-lib/X11/icewm/themes/gtk2/maximizeA.xpm
-lib/X11/icewm/themes/gtk2/maximizeI.xpm
-lib/X11/icewm/themes/gtk2/menuButtonA.xpm
-lib/X11/icewm/themes/gtk2/menuButtonI.xpm
-lib/X11/icewm/themes/gtk2/minimizeA.xpm
-lib/X11/icewm/themes/gtk2/minimizeI.xpm
-lib/X11/icewm/themes/gtk2/restoreA.xpm
-lib/X11/icewm/themes/gtk2/restoreI.xpm
-lib/X11/icewm/themes/metal2/closeA.xpm
-lib/X11/icewm/themes/metal2/closeI.xpm
-lib/X11/icewm/themes/metal2/default.theme
-lib/X11/icewm/themes/metal2/dframeAB.xpm
-lib/X11/icewm/themes/metal2/dframeABL.xpm
-lib/X11/icewm/themes/metal2/dframeABR.xpm
-lib/X11/icewm/themes/metal2/dframeAL.xpm
-lib/X11/icewm/themes/metal2/dframeAR.xpm
-lib/X11/icewm/themes/metal2/dframeAT.xpm
-lib/X11/icewm/themes/metal2/dframeATL.xpm
-lib/X11/icewm/themes/metal2/dframeATR.xpm
-lib/X11/icewm/themes/metal2/dframeIB.xpm
-lib/X11/icewm/themes/metal2/dframeIBL.xpm
-lib/X11/icewm/themes/metal2/dframeIBR.xpm
-lib/X11/icewm/themes/metal2/dframeIL.xpm
-lib/X11/icewm/themes/metal2/dframeIR.xpm
-lib/X11/icewm/themes/metal2/dframeIT.xpm
-lib/X11/icewm/themes/metal2/dframeITL.xpm
-lib/X11/icewm/themes/metal2/dframeITR.xpm
-lib/X11/icewm/themes/metal2/frameAB.xpm
-lib/X11/icewm/themes/metal2/frameABL.xpm
-lib/X11/icewm/themes/metal2/frameABR.xpm
-lib/X11/icewm/themes/metal2/frameAL.xpm
-lib/X11/icewm/themes/metal2/frameAR.xpm
-lib/X11/icewm/themes/metal2/frameAT.xpm
-lib/X11/icewm/themes/metal2/frameATL.xpm
-lib/X11/icewm/themes/metal2/frameATR.xpm
-lib/X11/icewm/themes/metal2/frameIB.xpm
-lib/X11/icewm/themes/metal2/frameIBL.xpm
-lib/X11/icewm/themes/metal2/frameIBR.xpm
-lib/X11/icewm/themes/metal2/frameIL.xpm
-lib/X11/icewm/themes/metal2/frameIR.xpm
-lib/X11/icewm/themes/metal2/frameIT.xpm
-lib/X11/icewm/themes/metal2/frameITL.xpm
-lib/X11/icewm/themes/metal2/frameITR.xpm
-lib/X11/icewm/themes/metal2/maximizeA.xpm
-lib/X11/icewm/themes/metal2/maximizeI.xpm
-lib/X11/icewm/themes/metal2/menuButtonA.xpm
-lib/X11/icewm/themes/metal2/menuButtonI.xpm
-lib/X11/icewm/themes/metal2/minimizeA.xpm
-lib/X11/icewm/themes/metal2/minimizeI.xpm
-lib/X11/icewm/themes/metal2/restoreA.xpm
-lib/X11/icewm/themes/metal2/restoreI.xpm
-lib/X11/icewm/themes/metal2/titleAB.xpm
-lib/X11/icewm/themes/metal2/titleAL.xpm
-lib/X11/icewm/themes/metal2/titleAM.xpm
-lib/X11/icewm/themes/metal2/titleAR.xpm
-lib/X11/icewm/themes/metal2/titleAT.xpm
-lib/X11/icewm/themes/metal2/titleIB.xpm
-lib/X11/icewm/themes/metal2/titleIL.xpm
-lib/X11/icewm/themes/metal2/titleIM.xpm
-lib/X11/icewm/themes/metal2/titleIR.xpm
-lib/X11/icewm/themes/metal2/titleIT.xpm
-lib/X11/icewm/themes/motif/close.xpm
-lib/X11/icewm/themes/motif/default.theme
-lib/X11/icewm/themes/motif/maximize.xpm
-lib/X11/icewm/themes/motif/menu.xpm
-lib/X11/icewm/themes/motif/minimize.xpm
-lib/X11/icewm/themes/motif/restore.xpm
-lib/X11/icewm/themes/nice/blue.theme
-lib/X11/icewm/themes/nice/close.xpm
-lib/X11/icewm/themes/nice/default.theme
-lib/X11/icewm/themes/nice/maximize.xpm
-lib/X11/icewm/themes/nice/minimize.xpm
-lib/X11/icewm/themes/nice/restore.xpm
-lib/X11/icewm/themes/warp3/close.xpm
-lib/X11/icewm/themes/warp3/default.theme
-lib/X11/icewm/themes/warp3/maximize.xpm
-lib/X11/icewm/themes/warp3/minimize.xpm
-lib/X11/icewm/themes/warp3/restore.xpm
-lib/X11/icewm/themes/warp4/close.xpm
-lib/X11/icewm/themes/warp4/default.theme
-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/win95/close.xpm
-lib/X11/icewm/themes/win95/default.theme
-lib/X11/icewm/themes/win95/maximize.xpm
-lib/X11/icewm/themes/win95/minimize.xpm
-lib/X11/icewm/themes/win95/restore.xpm
-lib/X11/icewm/toolbar
-lib/X11/icewm/winoptions
-@dirrm lib/X11/icewm/icons
-@dirrm lib/X11/icewm/ledclock
-@dirrm lib/X11/icewm/mailbox
-@dirrm lib/X11/icewm/taskbar
-@dirrm lib/X11/icewm/themes/gtk2
-@dirrm lib/X11/icewm/themes/metal2
-@dirrm lib/X11/icewm/themes/motif
-@dirrm lib/X11/icewm/themes/nice
-@dirrm lib/X11/icewm/themes/warp3
-@dirrm lib/X11/icewm/themes/warp4
-@dirrm lib/X11/icewm/themes/win95
-@dirrm lib/X11/icewm/themes
-@dirrm lib/X11/icewm
+share/icewm/icons/app_16x16.xpm
+share/icewm/icons/app_32x32.xpm
+share/icewm/icons/bomb_16x16.xpm
+share/icewm/icons/bomb_32x32.xpm
+share/icewm/icons/file_16x16.xpm
+share/icewm/icons/file_32x32.xpm
+share/icewm/icons/folder_16x16.xpm
+share/icewm/icons/folder_32x32.xpm
+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/java_16x16.xpm
+share/icewm/icons/java_32x32.xpm
+share/icewm/icons/koules_16x16.xpm
+share/icewm/icons/koules_32x32.xpm
+share/icewm/icons/netscape_16x16.xpm
+share/icewm/icons/netscape_32x32.xpm
+share/icewm/icons/pdf_16x16.xpm
+share/icewm/icons/pdf_32x32.xpm
+share/icewm/icons/xisp_16x16.xpm
+share/icewm/icons/xisp_32x32.xpm
+share/icewm/icons/xload_16x16.xpm
+share/icewm/icons/xload_32x32.xpm
+share/icewm/icons/xterm_16x16.xpm
+share/icewm/icons/xterm_32x32.xpm
+share/icewm/icons/xv_16x16.xpm
+share/icewm/icons/xv_32x32.xpm
+share/icewm/ledclock/a.xpm
+share/icewm/ledclock/colon.xpm
+share/icewm/ledclock/dot.xpm
+share/icewm/ledclock/m.xpm
+share/icewm/ledclock/n0.xpm
+share/icewm/ledclock/n1.xpm
+share/icewm/ledclock/n2.xpm
+share/icewm/ledclock/n3.xpm
+share/icewm/ledclock/n4.xpm
+share/icewm/ledclock/n5.xpm
+share/icewm/ledclock/n6.xpm
+share/icewm/ledclock/n7.xpm
+share/icewm/ledclock/n8.xpm
+share/icewm/ledclock/n9.xpm
+share/icewm/ledclock/p.xpm
+share/icewm/ledclock/slash.xpm
+share/icewm/ledclock/space.xpm
+share/icewm/mailbox/mail.xpm
+share/icewm/mailbox/newmail.xpm
+share/icewm/mailbox/nomail.xpm
+share/icewm/mailbox/unreadmail.xpm
+share/icewm/menu
+share/icewm/preferences
+share/icewm/taskbar/bsd-daemon.xpm
+share/icewm/taskbar/debian.xpm
+share/icewm/taskbar/linux.xpm
+share/icewm/taskbar/linux1.xpm
+share/icewm/taskbar/linux2.xpm
+share/icewm/taskbar/linux20.xpm
+share/icewm/taskbar/start.xpm
+share/icewm/taskbar/windows.xpm
+share/icewm/taskbar/xfreeos2.xpm
+share/icewm/themes/gtk2/closeA.xpm
+share/icewm/themes/gtk2/closeI.xpm
+share/icewm/themes/gtk2/default.theme
+share/icewm/themes/gtk2/maximizeA.xpm
+share/icewm/themes/gtk2/maximizeI.xpm
+share/icewm/themes/gtk2/menuButtonA.xpm
+share/icewm/themes/gtk2/menuButtonI.xpm
+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/metal2/closeA.xpm
+share/icewm/themes/metal2/closeI.xpm
+share/icewm/themes/metal2/default.theme
+share/icewm/themes/metal2/dframeAB.xpm
+share/icewm/themes/metal2/dframeABL.xpm
+share/icewm/themes/metal2/dframeABR.xpm
+share/icewm/themes/metal2/dframeAL.xpm
+share/icewm/themes/metal2/dframeAR.xpm
+share/icewm/themes/metal2/dframeAT.xpm
+share/icewm/themes/metal2/dframeATL.xpm
+share/icewm/themes/metal2/dframeATR.xpm
+share/icewm/themes/metal2/dframeIB.xpm
+share/icewm/themes/metal2/dframeIBL.xpm
+share/icewm/themes/metal2/dframeIBR.xpm
+share/icewm/themes/metal2/dframeIL.xpm
+share/icewm/themes/metal2/dframeIR.xpm
+share/icewm/themes/metal2/dframeIT.xpm
+share/icewm/themes/metal2/dframeITL.xpm
+share/icewm/themes/metal2/dframeITR.xpm
+share/icewm/themes/metal2/frameAB.xpm
+share/icewm/themes/metal2/frameABL.xpm
+share/icewm/themes/metal2/frameABR.xpm
+share/icewm/themes/metal2/frameAL.xpm
+share/icewm/themes/metal2/frameAR.xpm
+share/icewm/themes/metal2/frameAT.xpm
+share/icewm/themes/metal2/frameATL.xpm
+share/icewm/themes/metal2/frameATR.xpm
+share/icewm/themes/metal2/frameIB.xpm
+share/icewm/themes/metal2/frameIBL.xpm
+share/icewm/themes/metal2/frameIBR.xpm
+share/icewm/themes/metal2/frameIL.xpm
+share/icewm/themes/metal2/frameIR.xpm
+share/icewm/themes/metal2/frameIT.xpm
+share/icewm/themes/metal2/frameITL.xpm
+share/icewm/themes/metal2/frameITR.xpm
+share/icewm/themes/metal2/maximizeA.xpm
+share/icewm/themes/metal2/maximizeI.xpm
+share/icewm/themes/metal2/menuButtonA.xpm
+share/icewm/themes/metal2/menuButtonI.xpm
+share/icewm/themes/metal2/minimizeA.xpm
+share/icewm/themes/metal2/minimizeI.xpm
+share/icewm/themes/metal2/restoreA.xpm
+share/icewm/themes/metal2/restoreI.xpm
+share/icewm/themes/metal2/titleAB.xpm
+share/icewm/themes/metal2/titleAL.xpm
+share/icewm/themes/metal2/titleAM.xpm
+share/icewm/themes/metal2/titleAR.xpm
+share/icewm/themes/metal2/titleAT.xpm
+share/icewm/themes/metal2/titleIB.xpm
+share/icewm/themes/metal2/titleIL.xpm
+share/icewm/themes/metal2/titleIM.xpm
+share/icewm/themes/metal2/titleIR.xpm
+share/icewm/themes/metal2/titleIT.xpm
+share/icewm/themes/motif/close.xpm
+share/icewm/themes/motif/default.theme
+share/icewm/themes/motif/maximize.xpm
+share/icewm/themes/motif/menu.xpm
+share/icewm/themes/motif/minimize.xpm
+share/icewm/themes/motif/restore.xpm
+share/icewm/themes/nice/blue.theme
+share/icewm/themes/nice/close.xpm
+share/icewm/themes/nice/default.theme
+share/icewm/themes/nice/maximize.xpm
+share/icewm/themes/nice/minimize.xpm
+share/icewm/themes/nice/restore.xpm
+share/icewm/themes/nice/hide.xpm
+share/icewm/themes/nice/rolldown.xpm
+share/icewm/themes/nice/rollup.xpm
+share/icewm/themes/warp3/close.xpm
+share/icewm/themes/warp3/default.theme
+share/icewm/themes/warp3/maximize.xpm
+share/icewm/themes/warp3/minimize.xpm
+share/icewm/themes/warp3/restore.xpm
+share/icewm/themes/warp3/hide.xpm
+share/icewm/themes/warp3/rolldown.xpm
+share/icewm/themes/warp3/rollup.xpm
+share/icewm/themes/warp4/close.xpm
+share/icewm/themes/warp4/default.theme
+share/icewm/themes/warp4/hide.xpm
+share/icewm/themes/warp4/maximize.xpm
+share/icewm/themes/warp4/minimize.xpm
+share/icewm/themes/warp4/restore.xpm
+share/icewm/themes/win95/close.xpm
+share/icewm/themes/win95/default.theme
+share/icewm/themes/win95/maximize.xpm
+share/icewm/themes/win95/minimize.xpm
+share/icewm/themes/win95/restore.xpm
+share/icewm/toolbar
+share/icewm/winoptions
+@dirrm share/icewm/icons
+@dirrm share/icewm/ledclock
+@dirrm share/icewm/mailbox
+@dirrm share/icewm/taskbar
+@dirrm share/icewm/themes/gtk2
+@dirrm share/icewm/themes/metal2
+@dirrm share/icewm/themes/motif
+@dirrm share/icewm/themes/nice
+@dirrm share/icewm/themes/warp3
+@dirrm share/icewm/themes/warp4
+@dirrm share/icewm/themes/win95
+@dirrm share/icewm/themes
+@dirrm share/icewm