x11-wm/windowmaker: update 0.95.7 -> 0.95.8

PR:		220058, 205040
Changes:	http://repo.or.cz/wmaker-crm.git/blob/HEAD:/NEWS
Submitted by:	Marco Beishuizen <mbeis@xs4all.nl>
Approved by:	hrs (maintainer timeout)

48 files changed, 10 insertions, 730 deletions

diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index d758e00b1cf9..22a7e4edda85 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	windowmaker
-PORTVERSION=	0.95.7
-PORTREVISION=	5
+PORTVERSION=	0.95.8
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
@@ -19,12 +18,15 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
 		libMagickWand-6.so:graphics/ImageMagick \
-		libwraster.so.5:x11-wm/libwraster
+		libwraster.so:x11-wm/libwraster \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libexif.so:graphics/libexif
 RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:graphics/wmicons
 
 USES=		jpeg libtool shebangfix pathfix perl5 pkgconfig
 USE_LDCONFIG=	yes
-USE_XORG=	xft xinerama xmu xpm
+USE_XORG=	xft xinerama xmu xpm x11 xext
 SHEBANG_FILES=	util/wkdemenu.pl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_header_sys_inotify_h=no \
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index 30084ce6fee7..193035fe80b3 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1,2 +1,3 @@
-SHA256 (WindowMaker-0.95.7.tar.gz) = 842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9
-SIZE (WindowMaker-0.95.7.tar.gz) = 3238325
+TIMESTAMP = 1497386665
+SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
+SIZE (WindowMaker-0.95.8.tar.gz) = 3253515
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu b/x11-wm/windowmaker/files/patch-WindowMaker-menu
deleted file mode 100644
index 5ac2e96abfde..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu
-@@ -208,7 +208,7 @@
- 		"Background" END
- 		"Save Theme" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
- 		"Save IconSet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
--		"Preferences Utility" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Preferences Utility" EXEC PREFIX/GNUstep/Applications/WPrefs.app/WPrefs
- 	"Appearance" END
- 
- 	"Session" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.bg b/x11-wm/windowmaker/files/patch-WindowMaker-menu.bg
deleted file mode 100644
index 630b0e63f33d..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.bg
+++ /dev/null
@@ -1,20 +0,0 @@
---- WindowMaker/menu.bg.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.bg
-@@ -136,7 +136,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape
- 		"Ghostview" EXEC ghostview %a(GhostView,Enter file to view)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view)
- 		"TkDesk" EXEC tkdesk
- 	"Приложения" END
- 	"Редактори" MENU
-@@ -209,7 +209,7 @@
- 		"Фон" END
- 		"Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
- 		"Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
--		"Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Пособие за настройки" EXEC PREFIX/GNUstep/Applications/WPrefs.app/WPrefs
- 	"Изглед" END
- 
- 	"Изход"	MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ca b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ca
deleted file mode 100644
index e0413a9355c6..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ca
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.ca.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.ca
-@@ -130,7 +130,7 @@
-                 "LyX" EXEC lyx
-                 "Netscape" EXEC netscape 
-                 "Ghostview" EXEC ghostview %a(Enter file to view)
--                "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
-+                "Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Enter PDF to view)
-                 "TkDesk" EXEC tkdesk
-         "Aplicacions" END
-         "Editors" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.cz b/x11-wm/windowmaker/files/patch-WindowMaker-menu.cz
deleted file mode 100644
index 271cd9a4cfd4..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.cz
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.cz.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.cz
-@@ -84,7 +84,7 @@
- //		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape
-   		"Ghostview" EXEC ghostview
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread
- 		"OpenDOS" EXEC runxdos
- //  		"TkDesk" EXEC tkdesk
- 	"Aplikace" END
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.da b/x11-wm/windowmaker/files/patch-WindowMaker-menu.da
deleted file mode 100644
index 822b10d0cd11..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.da
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.da.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.da
-@@ -124,7 +124,7 @@
-                 "LyX" EXEC lyx
-                 "Netscape" EXEC netscape 
-                 "Ghostview" EXEC ghostview %a(GhostView,Indtast filnavn)
--                "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)
-+                "Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)
-                 "TkDesk" EXEC tkdesk
-         "Applikationer" END
-         "Tekstbehandling" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.de b/x11-wm/windowmaker/files/patch-WindowMaker-menu.de
deleted file mode 100644
index 67c3e38ff4e9..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.de
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.de.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.de
-@@ -64,7 +64,7 @@
- 		"Netscape" EXEC netscape
-                	"Ghostview" EXEC ghostview %a(Ghostview)
-                 "XDvi" EXEC xdvi %a(XDvi)
--               	"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat)
-+               	"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobat)
-   		"TkDesk" EXEC tkdesk
- 	"Anwendungen" END
- 	"Editoren" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.el b/x11-wm/windowmaker/files/patch-WindowMaker-menu.el
deleted file mode 100644
index e029f218bda7..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.el
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.el.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.el
-@@ -139,7 +139,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(Αρχείο προς ανάγνωση)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Γράψε το PDF προς προβολή)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobar,Γράψε το PDF προς προβολή)
-   		"TkDesk" EXEC tkdesk
- 	"Προγράμματα" END
- 	"Κειμενογράφοι" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.es b/x11-wm/windowmaker/files/patch-WindowMaker-menu.es
deleted file mode 100644
index cb266eded39a..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.es
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.es.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.es
-@@ -90,7 +90,7 @@
- 		"OffiX Files" EXEC files
- 		"LyX" EXEC lyx
- 		"Ghostview" EXEC ghostview
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread
- 		"TkDesk" EXEC tkdesk
- 	"Aplicaciones ..." END
- 
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.fi b/x11-wm/windowmaker/files/patch-WindowMaker-menu.fi
deleted file mode 100644
index 0652b633cd71..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.fi
+++ /dev/null
@@ -1,20 +0,0 @@
---- WindowMaker/menu.fi.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.fi
-@@ -129,7 +129,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(GhostView,Kirjoita näytettävän tiedoston nimi:)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Kirjoita näytettävän PDF-tiedoston nimi)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobat,Kirjoita näytettävän PDF-tiedoston nimi)
-   		"TkDesk" EXEC tkdesk
- 	"Sovellukset" END
- 	"Editorit" MENU
-@@ -202,7 +202,7 @@
- 		"Taustat" END
- 		"Tallenna teema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Teeman nimi,Kirjoita teematiedoston nimi:)"
- 		"Tallenna kuvakkeet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Kuvakesetin nimi,Kirjoita tiedostonnimi:)"
--		"Asetukset" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Asetukset" EXEC PREFIX/GNUstep/Applications/WPrefs.app/WPrefs
- 	"Ulkonäkö" END
- 
- 	"Lopeta"	MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.fr b/x11-wm/windowmaker/files/patch-WindowMaker-menu.fr
deleted file mode 100644
index 3cef675b332a..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.fr
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.fr.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.fr
-@@ -175,7 +175,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape
- 		"Ghostview" EXEC ghostview %a(Entrez un fichier)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Entrez un fichier PDF)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobat,Entrez un fichier PDF)
- 		"TkDesk" EXEC tkdesk
- 	"Applications" END
- 	"Editeurs" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.gl b/x11-wm/windowmaker/files/patch-WindowMaker-menu.gl
deleted file mode 100644
index a7c61e050406..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.gl
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.gl.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.gl
-@@ -64,7 +64,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread
-   		"TkDesk" EXEC tkdesk
- 	"Aplicacións" END
- 	"Editores" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.he b/x11-wm/windowmaker/files/patch-WindowMaker-menu.he
deleted file mode 100644
index b10925c02080..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.he
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.he.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.he
-@@ -116,7 +116,7 @@
- 		"LyX" EXEC lyx
- 		"פייקסטנ" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(Enter file to view)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Enter PDF to view)
-   		"TkDesk" EXEC tkdesk
- 	"םימושי" END
- 	"םיכרוע" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.hr b/x11-wm/windowmaker/files/patch-WindowMaker-menu.hr
deleted file mode 100644
index 32ef53049513..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.hr
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.hr.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.hr
-@@ -118,7 +118,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(Enter file to view)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Enter PDF to view)
-   		"TkDesk" EXEC tkdesk
- 	"Programi" END
- 	"Editori" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.hu b/x11-wm/windowmaker/files/patch-WindowMaker-menu.hu
deleted file mode 100644
index 4a3e4844d3ea..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.hu
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.hu.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.hu
-@@ -133,7 +133,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(GhostView,Kérem a fájl nevét)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Kérem a PDF fájl nevét)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobat,Kérem a PDF fájl nevét)
-   		"TkDesk" EXEC tkdesk
- 	"Alkalmazások" END
- 	"Szerkesztők" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.it b/x11-wm/windowmaker/files/patch-WindowMaker-menu.it
deleted file mode 100644
index 2123ca8398f7..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.it
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.it.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.it
-@@ -65,7 +65,7 @@
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(Ghostview)
-                 "XDvi" EXEC xdvi %a(XDvi)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobat)
-   		"TkDesk" EXEC tkdesk
- 	"Applicazioni" END
- 	"Editori" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ja b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ja
deleted file mode 100644
index 1401b4956927..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ja
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.ja.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.ja
-@@ -122,7 +122,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(Enter file to view)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Enter PDF to view)
-   		"TkDesk" EXEC tkdesk
- 	"アプリケーション" END
- 	"エディタ" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ko b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ko
deleted file mode 100644
index 232cff568edd..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ko
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.ko.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.ko
-@@ -163,7 +163,7 @@
- 		"세션 지움" CLEAR_SESSION
- 	"창 관 리" END
- 	"작업환경" MENU
--		"설    정" SHEXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf
-+		"설    정" SHEXEC PREFIX/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf
- 		"테    마" OPEN_MENU -noext THEMES_DIR ~/GNUstep/Library/WindowMaker/Themes WITH setstyle
- 		"테마저장" EXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(테마 이름,파일 이름을 입력하세요:)"
- 		"아이콘셋" OPEN_MENU -noext ICON_SETS_DIR ~/GNUstep/Library/WindowMaker/IconSets WITH seticons
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl b/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl
deleted file mode 100644
index 688174c7a67d..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.nl.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.nl
-@@ -208,7 +208,7 @@
- 		"Achtergrond" END
- 		"Thema opslaan" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Themanaam,Voer bestandsnaam in:)"
- 		"Iconenset opslaan" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Iconensetnaam,Voer bestandsnaam in:)"
--		"Voorkeurenhulpmiddel" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Voorkeurenhulpmiddel" EXEC PREFIX/GNUstep/Applications/WPrefs.app/WPrefs
- 	"Uiterlijk" END
- 
- 	"Sessie" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.no b/x11-wm/windowmaker/files/patch-WindowMaker-menu.no
deleted file mode 100644
index 0b98a45b0d51..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.no
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.no.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.no
-@@ -119,7 +119,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(Navnet på fila du vil se)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Skriv inn PDF\'en du ønsker)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Skriv inn PDF\'en du ønsker)
-   		"TkDesk" EXEC tkdesk
- 	"Applikasjoner" END
- 	"Tekst Redigering" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.pl b/x11-wm/windowmaker/files/patch-WindowMaker-menu.pl
deleted file mode 100644
index a18247c52dba..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.pl.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.pl
-@@ -134,7 +134,7 @@
- 			"LyX"                 EXEC lyx
-   			"Ghostview"           EXEC gv %a(GhostView,Wprowadz nazwe pliku *.ps *.pdf *.no:)
-   			"XDvi"                EXEC xdvi %a(XDvi,Wprowadz nazwe pliku *.dvi:)
--			"Acrobat"             EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Wprowadz nazwe pliku *.pdf:)
-+			"Acrobat"             EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobat,Wprowadz nazwe pliku *.pdf:)
- 			"Xpdf"                EXEC xpdf %a(Xpdf,Wprowadz nazwe pliku *.pdf:)
- 			"Arkusz kalkulacyjny" EXEC xspread
- 		"Tekst" END
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.pt b/x11-wm/windowmaker/files/patch-WindowMaker-menu.pt
deleted file mode 100644
index 0b6f7fe876ae..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.pt
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.pt.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.pt
-@@ -126,7 +126,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(Enter file to view)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Enter PDF to view)
-   		"TkDesk" EXEC tkdesk
- 	"Aplicações" END
- 	"Editores" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ro b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ro
deleted file mode 100644
index 9118e9ea4ba7..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ro
+++ /dev/null
@@ -1,20 +0,0 @@
---- WindowMaker/menu.ro.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.ro
-@@ -129,7 +129,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(GhostView,Enter file to view)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view)
-   		"TkDesk" EXEC tkdesk
- 	"Aplicaţii" END
- 	"Editoare" MENU
-@@ -202,7 +202,7 @@
- 		"Fundal" END
- 		"Salvează Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
- 		"Salvează Setul de Iconiţe" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
--		"Utilitar de Configurare" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Utilitar de Configurare" EXEC PREFIX/GNUstep/Applications/WPrefs.app/WPrefs
- 	"Configurare" END
- 
- 	"Ieşire" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ru b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ru
deleted file mode 100644
index 5b771a5493bd..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ru
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.ru.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.ru
-@@ -77,7 +77,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(Enter file to view)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Enter PDF to view)
-   		"TkDesk" EXEC tkdesk
- 	"Приложения" END
- 	"Редакторы" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.se b/x11-wm/windowmaker/files/patch-WindowMaker-menu.se
deleted file mode 100644
index ec77ed8f1f0e..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.se
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.se.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.se
-@@ -126,7 +126,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(Enter file to view)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Skriv in PDF-fil som ska visas)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Skriv in PDF-fil som ska visas)
-   		"TkDesk" EXEC tkdesk
- 	"Program" END
- 	"Textredigerare" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.sk b/x11-wm/windowmaker/files/patch-WindowMaker-menu.sk
deleted file mode 100644
index 59797dbc9c8f..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.sk
+++ /dev/null
@@ -1,20 +0,0 @@
---- WindowMaker/menu.sk.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.sk
-@@ -143,7 +143,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(GhostView,Zadajte meno súboru)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Zadajte meno PDF súboru)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobar,Zadajte meno PDF súboru)
-   		"TkDesk" EXEC tkdesk
- 	"Aplikácie" END
- 	"Editory" MENU
-@@ -216,7 +216,7 @@
- 		"Pozadie" END
- 		"Uložiť tému" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Meno témy,Zadajte názov súboru:)"
- 		"Uložiť sadu ikon" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Meno sady ikon,Zadajte názov súboru:)"
--		"Konfiguračný nástroj" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"Konfiguračný nástroj" EXEC PREFIX/GNUstep/Applications/WPrefs.app/WPrefs
- 	"Vzhľad" END
- 
- 	"Koniec" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.sl b/x11-wm/windowmaker/files/patch-WindowMaker-menu.sl
deleted file mode 100644
index 8ca6200bbb96..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.sl
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.sl.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.sl
-@@ -125,7 +125,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(Enter file to view)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Enter PDF to view)
-   		"TkDesk" EXEC tkdesk
- 	"Aplikacije" END
- 	"Urejevalniki besedil" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.tr b/x11-wm/windowmaker/files/patch-WindowMaker-menu.tr
deleted file mode 100644
index b7cb66fe5d97..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.tr
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.tr.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.tr
-@@ -111,7 +111,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(PS dosyasını girin)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(PDF dosyasını girin)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(PDF dosyasını girin)
-   		"TkDesk" EXEC tkdesk
- 	"Uygulamalar" END
- 	"Düzenleyiciler" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_CN b/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_CN
deleted file mode 100644
index ab67d96504a8..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_CN
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/menu.zh_CN.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.zh_CN
-@@ -129,7 +129,7 @@
-                 "LyX" EXEC lyx
-                 "Netscape" EXEC netscape
-                 "Ghostview" EXEC ghostview %a(GhostView,输入要查看的文件名)
--                "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,输入要查看的PDF文件名)
-+                "Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(Acrobat,输入要查看的PDF文件名)
-                 "TkDesk" EXEC tkdesk
-         "应用程序" END
-         "编辑器" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_TW b/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_TW
deleted file mode 100644
index c40f9c32f282..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_TW
+++ /dev/null
@@ -1,20 +0,0 @@
---- WindowMaker/menu.zh_TW.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/menu.zh_TW
-@@ -126,7 +126,7 @@
- 		"LyX" EXEC lyx
- 		"Netscape" EXEC netscape 
-   		"Ghostview" EXEC ghostview %a(GhostView,輸入要檢視的檔案)
--		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(輸入要檢視的 PDF)
-+		"Acrobat" EXEC PREFIX/Acrobat3/bin/acroread %a(輸入要檢視的 PDF)
-   		"TkDesk" EXEC tkdesk
- 	"應用程式" END
- 	"編輯器" MENU
-@@ -199,7 +199,7 @@
- 		"背景" END
- 		"儲存主題" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(主題名稱)"
- 		"儲存圖示集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(圖示集名稱)"
--		"偏好設定公用程式" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-+		"偏好設定公用程式" EXEC PREFIX/GNUstep/Applications/WPrefs.app/WPrefs
- 	"外觀" END
- 
- 	"離開"	MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu
deleted file mode 100644
index 4ae4cfb7f01d..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/plmenu.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu
-@@ -93,7 +93,7 @@
-    ),
-    ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-    ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--   ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+   ("Preferences Utility", EXEC, PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs")
-    ),
-    ("Session",
-     ("Save Session", SAVE_SESSION),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.bg b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.bg
deleted file mode 100644
index 35166143b7f0..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.bg
+++ /dev/null
@@ -1,20 +0,0 @@
---- WindowMaker/plmenu.bg.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.bg
-@@ -23,7 +23,7 @@
-   ("LyX", EXEC, "lyx"),
-   ("Netscape", EXEC, "netscape"),
-   ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
--  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
-+  ("Acrobat", EXEC, PREFIX "/Acrobat3/bin/acroread %a(Enter PDF to view)"),
-   ("TkDesk", EXEC, "tkdesk")
-   ),
-  ("Редактори",
-@@ -94,7 +94,7 @@
-    ),
-   ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-   ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("Пособие за настройки", EXEC, PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs")
-   ),
-  ("Изход",
-   ("Рестартиране", RESTART),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.da b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.da
deleted file mode 100644
index 6fdbd44b73db..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.da
+++ /dev/null
@@ -1,41 +0,0 @@
---- WindowMaker/plmenu.da.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.da
-@@ -82,7 +82,7 @@
-                 (
-                 "Acrobat",
-                 EXEC,
--                "/usr/local/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)"
-+                PREFIX "/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)"
-                 ),
-                 (
-                 "TkDesk",
-@@ -211,17 +211,17 @@
-                 (
-                 "Temaer",
-                 OPEN_MENU,
--                "-noext /usr/local/share/WindowMaker/Themes  $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
-+                "-noext "PREFIX "/share/WindowMaker/Themes  $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
-                 ),
-                 (
-                 "Stil",
-                 OPEN_MENU,
--                "-noext /usr/local/share/WindowMaker/Styles  $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
-+                "-noext "PREFIX "/share/WindowMaker/Styles  $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
-                 ),
-                 (
-                 "Ikonsæt",
-                 OPEN_MENU,
--                "-noext /usr/local/share/WindowMaker/IconSets  $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
-+                "-noext "PREFIX "/share/WindowMaker/IconSets  $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
-                 ),
-                 (
-                 "Baggrund",
-@@ -319,7 +319,7 @@
-                         (
-                         "Billeder",
-                         OPEN_MENU,
--                        "-noext /usr/local/share/WindowMaker/Backgrounds  $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
-+                        "-noext "PREFIX "/share/WindowMaker/Backgrounds  $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
-                         )
-                 ),
-                 ("Gem Tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Tema navn,Indtast navn:)"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.de b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.de
deleted file mode 100644
index 895cf291b2d2..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.de
+++ /dev/null
@@ -1,33 +0,0 @@
---- WindowMaker/plmenu.de.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.de
-@@ -23,7 +23,7 @@
-   ("LyX", EXEC, "lyx"),
-   ("Netscape", EXEC, "netscape"),
-   ("Ghostview", EXEC, "ghostview %a(Zu betrachtende Datei:)"),
--  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(PDF-Datei angeben)"),
-+  ("Acrobat", EXEC, PREFIX "/Acrobat3/bin/acroread %a(PDF-Datei angeben)"),
-   ("TkDesk", EXEC, "tkdesk")
-   ),
-  ("Editoren",
-@@ -66,9 +66,9 @@
-   ("Gespeicherte Sitzung löschen", CLEAR_SESSION)
-   ),
-  ("Erscheinungsbild",
--  ("Themen", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes $(HOME)/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
--  ("Stile", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles $(HOME)/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
--  ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets $(HOME)/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-+  ("Themen", OPEN_MENU, "-noext "PREFIX "/share/WindowMaker/Themes $(HOME)/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-+  ("Stile", OPEN_MENU, "-noext "PREFIX "/share/WindowMaker/Styles $(HOME)/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-+  ("Iconsätze", OPEN_MENU, "-noext "PREFIX "/share/WindowMaker/IconSets $(HOME)/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-   ("Hintergrund",
-    ("Einfarbig",
-     ("Schwarz", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-@@ -90,7 +90,7 @@
-     ("Grau schattiert",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-     ("Weinfarben schattiert",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-     ),
--   ("Bilder", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds $(HOME)/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-+   ("Bilder", OPEN_MENU, "-noext "PREFIX "/share/WindowMaker/Backgrounds $(HOME)/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-    ),   
-   ("Thema speichern", SHEXEC, "getstyle -t $(HOME)/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
-   ("Iconsatz speichern", SHEXEC, "geticonset $(HOME)/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"")
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.es b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.es
deleted file mode 100644
index bebf0e7a2982..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.es
+++ /dev/null
@@ -1,38 +0,0 @@
---- WindowMaker/plmenu.es.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.es
-@@ -23,7 +23,7 @@
-   ("LyX", EXEC, "lyx"),
-   ("Netscape", EXEC, "netscape"),
-   ("Ghostview", EXEC, "ghostview %a(Escribe el archivo que desees ver:)"),
--  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Escribe el archivo PDF que desees ver:)"),
-+  ("Acrobat", EXEC, PREFIX "/Acrobat3/bin/acroread %a(Escribe el archivo PDF que desees ver:)"),
-   ("TkDesk", EXEC, "tkdesk")
-   ),
-  ("Editores",
-@@ -66,9 +66,9 @@
-   ("Borrar sesion", CLEAR_SESSION)
-   ),
-  ("Apariencia",
--  ("Temas", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
--  ("Estilos", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
--  ("Grupos de iconos", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-+  ("Temas", OPEN_MENU, "-noext "PREFIX "/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-+  ("Estilos", OPEN_MENU, "-noext "PREFIX "/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-+  ("Grupos de iconos", OPEN_MENU, "-noext "PREFIX "/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-   ("Papel Tapiz",
-    ("Solido",
-     ("Negro", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-@@ -90,11 +90,11 @@
-     ("Sombras grises",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-     ("Sombras vino",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-     ),
--   ("Imagenes", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-+   ("Imagenes", OPEN_MENU, "-noext "PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-    ),   
-   ("Guardar tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-   ("Guardar iconos", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Preferencias", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("Preferencias", EXEC, PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs")
-   ), 
-  ("Salir",
-   ("Reiniciar", RESTART),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fi b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fi
deleted file mode 100644
index 436d5adcdaef..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fi
+++ /dev/null
@@ -1,50 +0,0 @@
---- WindowMaker/plmenu.fi.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.fi
-@@ -94,7 +94,7 @@
- 		(
- 		"Acrobat",
- 		EXEC,
--		"/usr/local/Acrobat3/bin/acroread %a(Acrobat,Kirjoita näytettävän PDF-tiedoston nimi)"
-+		PREFIX "/Acrobat3/bin/acroread %a(Acrobat,Kirjoita näytettävän PDF-tiedoston nimi)"
- 		),
-   		(
-   		"TkDesk",
-@@ -238,17 +238,17 @@
- 		(
- 		"Teemat",
- 		OPEN_MENU,
--		"-noext /usr/local/share/WindowMaker/Themes  $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
-+		"-noext "PREFIX "/share/WindowMaker/Themes  $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
- 		),
- 		(
- 		"Tyylit",
- 		OPEN_MENU,
--		"-noext /usr/local/share/WindowMaker/Styles  $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
-+		"-noext "PREFIX "/share/WindowMaker/Styles  $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
- 		),
- 		(
- 		"Kuvakkeet",
- 		OPEN_MENU,
--		"-noext /usr/local/share/WindowMaker/IconSets  $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
-+		"-noext "PREFIX "/share/WindowMaker/IconSets  $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
- 		),
- 		(
- 		"Taustat",
-@@ -341,7 +341,7 @@
- 			(
- 			"Kuvat",
- 			OPEN_MENU,
--			"-noext /usr/local/share/WindowMaker/Backgrounds  $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
-+			"-noext "PREFIX "/share/WindowMaker/Backgrounds  $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
- 			)
- 		),
- 		(
-@@ -357,7 +357,7 @@
- 		(
- 		"Asetukset",
- 		EXEC,
--		"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs"
-+		PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs"
- 		)
- 	),
- 	(
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fr b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fr
deleted file mode 100644
index 4902b4feb1f8..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fr
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/plmenu.fr.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.fr
-@@ -23,7 +23,7 @@
-         ("LyX", EXEC , "lyx"),
-         ("Netscape", EXEC, "netscape"),
-         ("Ghostview", EXEC, "ghostview %a(Entrez un fichier)"),
--        ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Acrobat,Entrez un fichier PDF)"),
-+        ("Acrobat", EXEC, PREFIX "/Acrobat3/bin/acroread %a(Acrobat,Entrez un fichier PDF)"),
-         ("TkDesk", EXEC, "tkdesk")
-    ),
-   ("Editeurs",
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.hr b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.hr
deleted file mode 100644
index 2edf84c1da6e..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.hr
+++ /dev/null
@@ -1,41 +0,0 @@
---- WindowMaker/plmenu.hr.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.hr
-@@ -31,7 +31,7 @@
-     (
-       Acrobat,
-       EXEC,
--      "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"
-+      PREFIX "/Acrobat3/bin/acroread %a(Enter PDF to view)"
-     ),
-     (TkDesk, EXEC, tkdesk)
-   ),
-@@ -88,17 +88,17 @@
-     (
-       Teme,
-       OPEN_MENU,
--      "-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
-+      "-noext "PREFIX "/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
-     ),
-     (
-       Stilovi,
-       OPEN_MENU,
--      "-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
-+      "-noext "PREFIX "/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
-     ),
-     (
-       "Setovi ikona",
-       OPEN_MENU,
--      "-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
-+      "-noext "PREFIX "/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
-     ),
-     (
-       Pozadina,
-@@ -191,7 +191,7 @@
-       (
-         Slike,
-         OPEN_MENU,
--        "-noext /usr/local/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
-+        "-noext "PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
-       )
-     ),
-     (
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.it b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.it
deleted file mode 100644
index af41eab42b5c..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.it
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/plmenu.it.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.it
-@@ -23,7 +23,7 @@
-   ("LyX", EXEC, "lyx"),
-   ("Netscape", EXEC, "netscape"),
-   ("Ghostview", EXEC, "ghostview %a(Ghostview, Scrivi il file da visualizzare)"),
--  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Acroread, Scrivi il file da visualizzare)"),
-+  ("Acrobat", EXEC, PREFIX "/Acrobat3/bin/acroread %a(Acroread, Scrivi il file da visualizzare)"),
-   ("TkDesk", EXEC, "tkdesk")
-   ),
-  ("Editor",
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ja b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ja
deleted file mode 100644
index 907f36292394..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ja
+++ /dev/null
@@ -1,20 +0,0 @@
---- WindowMaker/plmenu.ja.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.ja
-@@ -23,7 +23,7 @@
-   ("LyX", EXEC, "lyx"),
-   ("Netscape", EXEC, "netscape"),
-   ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
--  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
-+  ("Acrobat", EXEC, PREFIX "/Acrobat3/bin/acroread %a(Enter PDF to view)"),
-   ("TkDesk", EXEC, "tkdesk")
-   ),
-  ("エディタ",
-@@ -94,7 +94,7 @@
-    ),   
-   ("設定をテーマとしてセーブ", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-   ("現在のアイコンセットをセーブ", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("設定ユーティリティ", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("設定ユーティリティ", EXEC, PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs")
-   ), 
-  ("終了",
-   ("再起動", RESTART),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ko b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ko
deleted file mode 100644
index 2766f18acd37..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ko
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/plmenu.ko.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.ko
-@@ -63,7 +63,7 @@
-   ),
-  ("작업공간", WORKSPACE_MENU),
-  ("작업환경",
--  ("설    정", SHEXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf"),
-+  ("설    정", SHEXEC, PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf"),
-   ("테    마", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-   ("테마저장", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(테마 이름,파일 이름을 입력하세요:)\""),
-   ("스 타 일", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.pl b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.pl
deleted file mode 100644
index dd897e864789..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/plmenu.pl.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.pl
-@@ -32,7 +32,7 @@
- 			("LyX",                 EXEC, "lyx"),
-   			("Ghostview",           EXEC, "gv %a(Gv,Wprowadz nazwe pliku *.ps *.pdf *.no:)"),
-   			("XDvi",                EXEC, "xdvi %a(Xdvi,Wprowadz nazwe pliku *.dvi:)"),
--			("Acrobat",             EXEC, "/usr/local/Acrobat3/bin/acroread %a(Acrobat,Wprowadz nazwe pliku *.pdf:)"),
-+			("Acrobat",             EXEC, PREFIX "/Acrobat3/bin/acroread %a(Acrobat,Wprowadz nazwe pliku *.pdf:)"),
- 			("Xpdf",                EXEC, "xpdf %a(Xpdf,Wprowadz nazwe pliku *.pdf:)"),
- 			("Arkusz kalkulacyjny", EXEC, "xspread")
- 		),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ro b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ro
deleted file mode 100644
index 1c2494c2901b..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ro
+++ /dev/null
@@ -1,20 +0,0 @@
---- WindowMaker/plmenu.ro.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.ro
-@@ -23,7 +23,7 @@
-   ("LyX", EXEC, "lyx"),
-   ("Netscape", EXEC, "netscape"),
-   ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
--  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
-+  ("Acrobat", EXEC, PREFIX "/Acrobat3/bin/acroread %a(Enter PDF to view)"),
-   ("TkDesk", EXEC, "tkdesk")
-   ),
-  ("Editoare",
-@@ -94,7 +94,7 @@
-    ),   
-   ("Salvează Tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-   ("Salvează Setul de Iconiţe", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Utilitar de Configurare", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("Utilitar de Configurare", EXEC, PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs")
-   ), 
-  ("Ieşire",
-   ("Repornire", RESTART),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.sk b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.sk
deleted file mode 100644
index c2aa3506edea..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.sk
+++ /dev/null
@@ -1,20 +0,0 @@
---- WindowMaker/plmenu.sk.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.sk
-@@ -23,7 +23,7 @@
-   ("LyX", EXEC, "lyx"),
-   ("Netscape", EXEC, "netscape"),
-   ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
--  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
-+  ("Acrobat", EXEC, PREFIX "/Acrobat3/bin/acroread %a(Enter PDF to view)"),
-   ("TkDesk", EXEC, "tkdesk")
-   ),
-  ("Editory",
-@@ -94,7 +94,7 @@
-    ),   
-   ("Uložiť tému", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-   ("Uložiť sadu ikon", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Konfiguračný nástroj", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("Konfiguračný nástroj", EXEC, PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs")
-   ), 
-  ("Koniec",
-   ("Reštartovať", RESTART),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_CN b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_CN
deleted file mode 100644
index f7db91bc8a7b..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_CN
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/plmenu.zh_CN.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.zh_CN
-@@ -23,7 +23,7 @@
-   ("LyX", EXEC, "lyx"),
-   ("Netscape", EXEC, "netscape"),
-   ("Ghostview", EXEC, "ghostview %a(输入要查看的文件名)"),
--  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(要查看的PDF文件名)"),
-+  ("Acrobat", EXEC, PREFIX "/Acrobat3/bin/acroread %a(要查看的PDF文件名)"),
-   ("TkDesk", EXEC, "tkdesk")
-   ),
-  ("编辑器",
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_TW b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_TW
deleted file mode 100644
index 6c9f21678b3e..000000000000
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_TW
+++ /dev/null
@@ -1,11 +0,0 @@
---- WindowMaker/plmenu.zh_TW.orig	2015-08-11 18:41:14 UTC
-+++ WindowMaker/plmenu.zh_TW
-@@ -92,7 +92,7 @@
-    ),
-   ("儲存主題", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/%a(主題名稱)"),
-   ("儲存圖示集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/%a(圖示集名稱)"),
--  ("偏好設定公用程式", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("偏好設定公用程式", EXEC, PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs")
-   ),
-  ("離開",
-   ("重新啟動", RESTART),
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 99ee662530c5..37763851fec9 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -116,6 +116,7 @@ lib/libWUtil.so.5
 lib/libWUtil.so.5.0.0
 libdata/pkgconfig/WINGs.pc
 libdata/pkgconfig/WUtil.pc
+libdata/pkgconfig/wmlib.pc
 share/WINGs/Images.tiff
 share/WINGs/Images.xpm
 share/WINGs/defaultIcon.tiff