several fixes

6 files changed, 1 insertions, 88 deletions

diff --git a/x11-wm/icewm/files/digest-icewm-1.2.10 b/x11-wm/icewm/files/digest-icewm-1.2.10
deleted file mode 100644
index dc63984372e9..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3c6835d0e17ad158922ea1ddd0cb60de icewm-1.2.10.tar.gz 823363
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.11-r1 b/x11-wm/icewm/files/digest-icewm-1.2.11-r1
new file mode 100644
index 000000000000..36026c116cfd
--- /dev/null
+++ b/x11-wm/icewm/files/digest-icewm-1.2.11-r1
@@ -0,0 +1 @@
+MD5 4aeb61b5c28e86edbbb8a8d360785010 icewm-1.2.11.tar.gz 836627
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.7 b/x11-wm/icewm/files/digest-icewm-1.2.7
deleted file mode 100644
index 657d236d1634..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b2423bdcf841a552d8c60a03858a1116 icewm-1.2.7.tar.gz 782335
diff --git a/x11-wm/icewm/files/digest-icewm-1.2.8 b/x11-wm/icewm/files/digest-icewm-1.2.8
deleted file mode 100644
index 16eae7b014f0..000000000000
--- a/x11-wm/icewm/files/digest-icewm-1.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8f4e57c875cfe3d612e4ee068a1c2d83 icewm-1.2.8.tar.gz 806459
diff --git a/x11-wm/icewm/files/icewm b/x11-wm/icewm/files/icewm
deleted file mode 100755
index 369d958d5628..000000000000
--- a/x11-wm/icewm/files/icewm
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/icewm
diff --git a/x11-wm/icewm/files/icewm-1.2.7-gentoo.patch b/x11-wm/icewm/files/icewm-1.2.7-gentoo.patch
deleted file mode 100644
index 046333627de7..000000000000
--- a/x11-wm/icewm/files/icewm-1.2.7-gentoo.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -urN icewm-1.2.6/Makefile icewm-1.2.6-new/Makefile
---- icewm-1.2.6/Makefile	Thu Dec 26 12:05:47 2002
-+++ icewm-1.2.6-new/Makefile	Sat Dec 28 18:12:30 2002
-@@ -110,12 +110,12 @@
- 
- install-docs: docs
- 	@echo ------------------------------------------
--	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
--	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-+	@rm -fr "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
- 	@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)"
-+	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
- 	@echo ------------------------------------------
- 
- install-nls: nls
-diff -urN icewm-1.2.6/Makefile.in icewm-1.2.6-new/Makefile.in
---- icewm-1.2.6/Makefile.in	Thu Dec 26 12:05:29 2002
-+++ icewm-1.2.6-new/Makefile.in	Sat Dec 28 18:12:30 2002
-@@ -110,12 +110,12 @@
- 
- install-docs: docs
- 	@echo ------------------------------------------
--	@rm -fr "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
--	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/icewm-$(VERSION)"
-+	@rm -fr "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLDIR) "$(DESTDIR)$(DOCDIR)/"
- 	@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)"
-+	@$(INSTALLLIB) $(DOCFILES) "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.sgml "$(DESTDIR)$(DOCDIR)/"
-+	@$(INSTALLLIB) "$(top_srcdir)/doc/"*.html "$(DESTDIR)$(DOCDIR)/"
- 	@echo ------------------------------------------
- 
- install-nls: nls
-diff -urN icewm-1.2.6/src/Makefile icewm-1.2.6-new/src/Makefile
---- icewm-1.2.6/src/Makefile	Thu Dec 26 12:05:48 2002
-+++ icewm-1.2.6-new/src/Makefile	Sat Dec 28 18:12:30 2002
-@@ -28,7 +28,7 @@
-                 -DEXEEXT='"$(EXEEXT)"' \
-                 -DICEWMEXE='"icewm$(EXEEXT)"' \
-                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
--                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+                -DICEHELPIDX='"$(DOCDIR)//icewm.html"'
- 
- CXXFLAGS =      -fpermissive -Wall -Wpointer-arith -Wconversion -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Winline -Woverloaded-virtual -W -fno-exceptions -fno-rtti -g -O2 $(DEBUG) $(DEFS) \
- 	         -I/usr/X11R6/include -I/usr/include/Xft2 -I/usr/include/freetype2 -I/usr/X11R6/include -I/usr/X11R6/include  # `fc-config --cflags`
-diff -urN icewm-1.2.6/src/Makefile.in icewm-1.2.6-new/src/Makefile.in
---- icewm-1.2.6/src/Makefile.in	Thu Dec 26 12:05:30 2002
-+++ icewm-1.2.6-new/src/Makefile.in	Sat Dec 28 18:12:30 2002
-@@ -28,7 +28,7 @@
-                 -DEXEEXT='"$(EXEEXT)"' \
-                 -DICEWMEXE='"icewm$(EXEEXT)"' \
-                 -DICEHELPEXE='"icehelp$(EXEEXT)"' \
--                -DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/icewm.html"'
-+                -DICEHELPIDX='"$(DOCDIR)//icewm.html"'
- 
- CXXFLAGS =      @CXXFLAGS@ $(DEBUG) $(DEFS) \
- 	        @CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ # `fc-config --cflags`
-diff -urN icewm-1.2.6/src/wmclient.h icewm-1.2.6-new/src/wmclient.h
---- icewm-1.2.6/src/wmclient.h	Thu Dec 26 12:05:30 2002
-+++ icewm-1.2.6-new/src/wmclient.h	Sat Dec 28 18:12:38 2002
-@@ -13,9 +13,10 @@
- 
- #ifndef __YIMP_XUTIL__
- //!!! remove these if possible
--typedef struct XWMHints;
--typedef struct XSizeHints;
--typedef struct XClassHint;
-+//typedef struct XWMHints;
-+//typedef struct XSizeHints;
-+//typedef struct XClassHint;
-+#include <X11/Xutil.h>
- #endif
- 
- class ClientData {