3 files changed, 25 insertions, 58 deletions
diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-as-needed.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-as-needed.patch
deleted file mode 100644
index 5b370d10a374..000000000000
--- a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-as-needed.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-
-  Fix building with --as-needed (bug #199520), make sure libWINGs gets
-  installed, and add a missing #include <math.h>.
-
---- WindowMaker-0.92.0/configure.ac
-+++ WindowMaker-0.92.0/configure.ac
-@@ -78,7 +78,8 @@
- [  --with-incs-from        pass compiler flags to look for header files],
- 	[inc_search_path="$withval $inc_search_path"])
- 
--
-+AC_CHECK_LIBM
-+AC_SUBST([LIBM])
- 
- dnl Checks for library functions.
- dnl ============================
---- WindowMaker-0.92.0/src/placement.c
-+++ WindowMaker-0.92.0/src/placement.c
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <limits.h>
-+#include <math.h>
- 
- #include "WindowMaker.h"
- #include "wcore.h"
---- WindowMaker-0.92.0/WINGs/Extras/Makefile.am
-+++ WindowMaker-0.92.0/WINGs/Extras/Makefile.am
-@@ -31,5 +31,6 @@
- 	$(top_builddir)/WINGs/libWUtil.la \
- 	@XFTLIBS@ @INTLIBS@
- 
-+libExtraWINGs_la_LIBADD = $(LDADD)
- test_LDADD = wtableview.o wtabledelegates.o $(LDADD)
- 
---- WindowMaker-0.92.0/WINGs/Makefile.am
-+++ WindowMaker-0.92.0/WINGs/Makefile.am
-@@ -6,6 +6,10 @@
- 
- 
- 
-+libWINGs_la_DEPENDENCIES = libWUtil.la
-+libWINGs_la_LIBADD = libWUtil.la \
-+	$(top_builddir)/wrlib/libwraster.la \
-+	@LIBM@ @XLIBS@ @XFTLIBS@
- libWINGs_la_LDFLAGS = -version-info 2:1:0
- libWUtil_la_LDFLAGS = -version-info 1:2:0
- 
---- WindowMaker-0.92.0/wmlib/Makefile.am
-+++ WindowMaker-0.92.0/wmlib/Makefile.am
-@@ -8,6 +8,7 @@
- 
- INCLUDES = $(DFLAGS) @XCFLAGS@
- 
-+libWMaker_la_LIBADD = @XLIBS@
- libWMaker_la_SOURCES = 	\
- 	menu.c 		\
- 	app.c 		\
diff --git a/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch
new file mode 100644
index 000000000000..8c83d4da2c5c
--- /dev/null
+++ b/x11-wm/windowmaker/files/0.92.0/windowmaker-0.92.0-math_h.patch
@@ -0,0 +1,25 @@
+
+  Add a missing #include <math.h>.
+
+--- WindowMaker-0.92.0/configure.ac
++++ WindowMaker-0.92.0/configure.ac
+@@ -78,7 +78,8 @@
+ [  --with-incs-from        pass compiler flags to look for header files],
+ 	[inc_search_path="$withval $inc_search_path"])
+ 
+-
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
+ 
+ dnl Checks for library functions.
+ dnl ============================
+--- WindowMaker-0.92.0/src/placement.c
++++ WindowMaker-0.92.0/src/placement.c
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <limits.h>
++#include <math.h>
+ 
+ #include "WindowMaker.h"
+ #include "wcore.h"
diff --git a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5 b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r6
index b17f3551cfd5..b17f3551cfd5 100644
--- a/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r5
+++ b/x11-wm/windowmaker/files/digest-windowmaker-0.92.0-r6