- Fix build issue when devel/libinotify is installed[*].

- Fix build with clang.  Remove USE_GCC=any.
- Convert replacement commands in the post-patch target to patches.
- Separate x11-wm/windowmaker and x11-wm/libwraster from each other.

PR:		ports/176772 [*]
Reported by:	O. Hartmann [*]

58 files changed, 976 insertions, 68 deletions

diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile
index e92043b68089..959da5ab1ce6 100644
--- a/x11-wm/libwraster/Makefile
+++ b/x11-wm/libwraster/Makefile
@@ -1,30 +1,48 @@
 # $FreeBSD$
 
 PORTNAME=	libwraster
-PORTREVISION=	0
-
+PORTVERSION=	0.95.4
+PORTREVISION=	1
+CATEGORIES=	x11-wm windowmaker
+MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
+MASTER_SITE_SUBDIR=	source/release
+DISTNAME=	WindowMaker-${PORTVERSION}
+
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Window Maker raster graphics library
 
 LICENSE=	LGPL21
 
-MASTERDIR=	${.CURDIR}/../windowmaker
+LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
+		png15:${PORTSDIR}/graphics/png \
+		jbig:${PORTSDIR}/graphics/jbigkit \
+		tiff:${PORTSDIR}/graphics/tiff
 
+USES=		pathfix pkgconfig
+USE_AUTOTOOLS=	libtool
+USE_LDCONFIG=	yes
+USE_XORG=	xft xinerama xmu xpm
 BUILD_WRKSRC=	${WRKSRC}/wrlib
 INSTALL_WRKSRC=	${WRKSRC}/wrlib
-
-PATCHDIR=	# To void equivalent in master port
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
+CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
+		--with-nlsdir=${PREFIX}/share/locale \
+		--with-libs-from="-L${LOCALBASE}/lib" \
+		--with-incs-from="-I${LOCALBASE}/include" \
+		--with-gnustepdir="${PREFIX}/GNUstep" \
+		--enable-modelock \
+		--enable-xinerama --enable-usermenu \
+		--with-x
+MAKE_JOBS_SAFE=	yes
+CPPFLAGS+=	-DPREFIX=\\\"${PREFIX}\\\" -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		get-wraster-flags.1
 
-LWR_SLAVE=	yes
-
 pre-build:
 	cd ${WRKSRC} && ${MAKE} config-paths.h
 
 post-install:
-	(cd ${WRKSRC}/doc \
-		&& ${INSTALL_MAN} get-wraster-flags.1 ${MANPREFIX}/man/man1)
+	cd ${WRKSRC}/doc \
+		&& ${INSTALL_MAN} get-wraster-flags.1 ${MANPREFIX}/man/man1
 
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-wm/libwraster/distinfo b/x11-wm/libwraster/distinfo
new file mode 100644
index 000000000000..20c61534cd6b
--- /dev/null
+++ b/x11-wm/libwraster/distinfo
@@ -0,0 +1,2 @@
+SHA256 (WindowMaker-0.95.4.tar.gz) = 2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45
+SIZE (WindowMaker-0.95.4.tar.gz) = 2789390
diff --git a/x11-wm/libwraster/pkg-plist b/x11-wm/libwraster/pkg-plist
index 5c882105b3cc..7bbed37683c3 100644
--- a/x11-wm/libwraster/pkg-plist
+++ b/x11-wm/libwraster/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/get-wraster-flags
 include/wraster.h
 lib/libwraster.a
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 2dcd9d351484..c3c41b203a87 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -1,34 +1,31 @@
 # Created by: Brian Handy <handy@physics.montana.edu>
 # $FreeBSD$
 
-PORTNAME?=	windowmaker
+PORTNAME=	windowmaker
 PORTVERSION=	0.95.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	source/release
 DISTNAME=	WindowMaker-${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
-COMMENT?=	GNUstep-compliant NeXTstep window manager clone
+COMMENT=	GNUstep-compliant NeXTstep window manager clone
 
-LICENSE?=	GPLv2
+LICENSE=	GPLv2
 
 LIB_DEPENDS=	gif:${PORTSDIR}/graphics/giflib \
 		png15:${PORTSDIR}/graphics/png \
 		jbig:${PORTSDIR}/graphics/jbigkit \
-		tiff:${PORTSDIR}/graphics/tiff
+		tiff:${PORTSDIR}/graphics/tiff \
+		wraster:${PORTSDIR}/x11-wm/libwraster
+RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
 
-.if !defined(LWR_SLAVE)
-LIB_DEPENDS+=	wraster:${PORTSDIR}/x11-wm/libwraster
-RUN_DEPENDS+=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
+USES=		pathfix pkgconfig
+USE_AUTOTOOLS=	libtool
+USE_LDCONFIG=	yes
 USE_PERL5=	yes
-OPTIONS_DEFINE=	NLS XRANDR
-.endif
-
-USE_GCC=	any
 USE_XORG=	xft xinerama xmu xpm
-USES=	pathfix pkgconfig
-USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--with-nlsdir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
@@ -37,15 +34,15 @@ CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
 		--enable-modelock \
 		--enable-xinerama --enable-usermenu \
 		--with-x
-USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
-
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-DPREFIX=\\\"${PREFIX}\\\" -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \
+		INSTALL-WMAKER NEWS README README.definable-cursor TODO
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	DOCS NLS XRANDR
 
-.if !defined(LWR_SLAVE)
+.include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 && ${OSVERSION} < 800000
 CONFIGURE_ENV+=	ac_cv_c_inline_asm=no
@@ -56,18 +53,19 @@ CPPFLAGS+=	-DHAVE_SYS_SELECT_H
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_GETTEXT=   yes
-LINGUAS=	be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
+USE_GETTEXT=	yes
+LINGUAS=	be bg bs ca cs da de el es et fi fr gl hr hu hy it \
+		ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW
 CONFIGURE_ENV+=	LINGUAS="${LINGUAS}"
-PLIST_SUB=     NLS=""
+PLIST_SUB=	NLS=""
 .else
-CONFIGURE_ARGS+=       --disable-locale
-PLIST_SUB=     NLS="@comment "
+CONFIGURE_ARGS+=--disable-locale
+PLIST_SUB=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MXRANDR}
 USE_XORG+=	xrandr
-CONFIGURE_ARGS+=	--enable-xrandr
+CONFIGURE_ARGS+=--enable-xrandr
 .endif
 
 MANLANG=	"" cs sk ru
@@ -75,49 +73,21 @@ MAN1_EN=	geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \
 		wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x get-wings-flags.1 \
 		get-wutil-flags.1 wdread.1 WindowMaker.1x wmagnify.1x \
 		wmgenmenu.1 wmmenugen.1 WPrefs.1x
-
 MAN8_EN=	upgrade-windowmaker-defaults.8
-
 MAN1_CS=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
 		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
-
 MAN1_SK=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
 		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
-
 MAN1_RU=	geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x \
 		wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x
 
-PORTDOCS=	AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \
-		INSTALL-WMAKER NEWS README README.definable-cursor TODO
-
-post-patch:
-.for f in WINGs/wapplication.c WPrefs.app/Menu.c WPrefs.app/Paths.c \
-    WindowMaker/*menu*
-	@${REINPLACE_CMD} -e "s#/usr/local#${PREFIX}#g" ${WRKSRC}/${f}
-.endfor
-	@${REINPLACE_CMD} -e '/\/usr\/X11R6\/include\/X11\/pixmaps/d' \
-	    -e '/\/usr\/share\/pixmaps/d' \
-	    -e "s#\"/usr/local/share/pixmaps\",#\"${PREFIX}/share/pixmaps\"#" \
-	    -e "s#/usr/share/icons#${PREFIX}/share/icons#" \
-	    ${WRKSRC}/WindowMaker/Defaults/WindowMaker.in
-	@${REINPLACE_CMD} -e "s#/usr/include/X11#${PREFIX}/share#" \
-	    ${WRKSRC}/WPrefs.app/Paths.c
-	@${REINPLACE_CMD} -e "s#WPrefs#${PREFIX}/GNUstep/Applications/WPrefs.app/WPrefs#" \
-	    ${WRKSRC}/util/wmgenmenu.c
-	@${REINPLACE_CMD} -e "764s#wPreferences.flags.restarting == 0#!wPreferences.flags.restarting#" \
-	    ${WRKSRC}/src/startup.c
-
 post-install:
-	@${MKDIR} ${PREFIX}/GNUstep/Applications/WPrefs.app/xpm
-	@${MKDIR} ${PREFIX}/share/WindowMaker/Sounds
+	@${MKDIR} \
+		${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \
+		${PREFIX}/share/WindowMaker/Sounds
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-update-LINGUAS: extract
-	cd ${WRKSRC}/po && \
-		${ECHO_CMD} *.po | ${SED} 's|\.po||g' > ${FILESDIR}/LINGUAS
-.endif	# .if !defined(LWR_SLAVE)
-
 .include <bsd.port.post.mk>
diff --git a/x11-wm/windowmaker/files/patch-WINGs__proplist.c b/x11-wm/windowmaker/files/patch-WINGs__proplist.c
new file mode 100644
index 000000000000..b79aa59b097e
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WINGs__proplist.c
@@ -0,0 +1,20 @@
+--- WINGs/proplist.c.orig	2013-05-03 02:48:24.000000000 +0900
++++ WINGs/proplist.c	2013-05-03 02:52:24.000000000 +0900
+@@ -1162,7 +1162,7 @@
+ 	WMPropList *key, *value, *dvalue;
+ 	WMHashEnumerator e;
+ 
+-	wassertr(source->type == WPLDictionary && dest->type == WPLDictionary);
++	wassertrv(source->type == WPLDictionary && dest->type == WPLDictionary, NULL);
+ 
+ 	if (source == dest)
+ 		return dest;
+@@ -1189,7 +1189,7 @@
+ 	WMPropList *key, *value, *dvalue;
+ 	WMHashEnumerator e;
+ 
+-	wassertr(source->type == WPLDictionary && dest->type == WPLDictionary);
++	wassertrv(source->type == WPLDictionary && dest->type == WPLDictionary, NULL);
+ 
+ 	if (source == dest) {
+ 		WMPropList *keys = WMGetPLDictionaryKeys(dest);
diff --git a/x11-wm/windowmaker/files/patch-WINGs__wapplication.c b/x11-wm/windowmaker/files/patch-WINGs__wapplication.c
new file mode 100644
index 000000000000..4c01a8b965ec
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WINGs__wapplication.c
@@ -0,0 +1,11 @@
+--- WINGs/wapplication.c.orig	2013-05-03 02:55:29.000000000 +0900
++++ WINGs/wapplication.c	2013-05-03 02:56:04.000000000 +0900
+@@ -159,7 +159,7 @@
+ 	if (path)
+ 		goto out;
+ 
+-	path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
++	path = checkFile(PREFIX "/GNUstep", appdir, ext, resource);
+ 	if (path)
+ 		goto out;
+ 
diff --git a/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c b/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c
new file mode 100644
index 000000000000..69f09e21a859
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c
@@ -0,0 +1,25 @@
+--- WPrefs.app/Menu.c.orig	2013-05-03 02:57:08.000000000 +0900
++++ WPrefs.app/Menu.c	2013-05-03 02:57:53.000000000 +0900
+@@ -512,19 +512,19 @@
+ 		data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
+ 		data->param.directory.command = "setstyle";
+ 		data->param.directory.directory =
+-		    "/usr/share/WindowMaker/Themes /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
++		    "/usr/share/WindowMaker/Themes " PREFIX "/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
+ 		data->param.directory.stripExt = 1;
+ 
+ 		data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (scale)"));
+ 		data->param.directory.command = "wmsetbg -u -s";
+ 		data->param.directory.directory =
+-		    "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
++		    "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
+ 		data->param.directory.stripExt = 1;
+ 
+ 		data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (tile)"));
+ 		data->param.directory.command = "wmsetbg -u -t";
+ 		data->param.directory.directory =
+-		    "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
++		    "/opt/kde2/share/wallpapers " PREFIX "/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
+ 		data->param.directory.stripExt = 1;
+ 
+ 		smenu = putNewSubmenu(pad, _("Assorted XTerms"));
diff --git a/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c b/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c
new file mode 100644
index 000000000000..f407bb1cf531
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c
@@ -0,0 +1,24 @@
+--- WPrefs.app/Paths.c.orig	2013-05-03 02:52:46.000000000 +0900
++++ WPrefs.app/Paths.c	2013-05-03 02:59:08.000000000 +0900
+@@ -78,9 +78,9 @@
+ 			wwarning(_("bad value in option IconPath. Using default path list"));
+ 		addPathToList(panel->icoL, -1, "~/pixmaps");
+ 		addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
+-		addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
+-		addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
+-		addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Pixmaps");
++		addPathToList(panel->icoL, -1, PREFIX "/share/pixmaps");
++		addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Icons");
++		addPathToList(panel->icoL, -1, PREFIX "/share/WindowMaker/Pixmaps");
+ 		addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
+ 	} else {
+ 		for (i = 0; i < WMGetPropListItemCount(array); i++) {
+@@ -95,7 +95,7 @@
+ 			wwarning(_("bad value in option PixmapPath. Using default path list"));
+ 		addPathToList(panel->pixL, -1, "~/pixmaps");
+ 		addPathToList(panel->pixL, -1, "~/GNUstep/Library/WindowMaker/Pixmaps");
+-		addPathToList(panel->pixL, -1, "/usr/local/share/WindowMaker/Pixmaps");
++		addPathToList(panel->pixL, -1, PREFIX "/share/WindowMaker/Pixmaps");
+ 	} else {
+ 		for (i = 0; i < WMGetPropListItemCount(array); i++) {
+ 			val = WMGetFromPLArray(array, i);
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in b/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in
new file mode 100644
index 000000000000..24bcf5704ed4
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in
@@ -0,0 +1,13 @@
+--- WindowMaker/Defaults/Makefile.in.orig	2013-01-10 06:43:07.000000000 +0900
++++ WindowMaker/Defaults/Makefile.in	2013-05-03 03:47:45.000000000 +0900
+@@ -458,7 +458,9 @@
+ 
+ WindowMaker: $(srcdir)/WindowMaker.in
+ 	-rm -f WindowMaker
+-	sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
++	sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
++	    -e "s:#prefix#:$(prefix):" \
++		$(srcdir)/WindowMaker.in \
+ 		> WindowMaker
+ 	chmod 644 WindowMaker
+ 
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in b/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in
new file mode 100644
index 000000000000..22764cebcfe4
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in
@@ -0,0 +1,28 @@
+--- WindowMaker/Defaults/WindowMaker.in.orig	2013-01-10 06:42:39.000000000 +0900
++++ WindowMaker/Defaults/WindowMaker.in	2013-05-03 03:50:44.000000000 +0900
+@@ -12,12 +12,10 @@
+     "~/GNUstep/Library/Icons",
+     "#pkgdatadir#/Icons",
+     "#pkgdatadir#/Pixmaps",
+-    "/usr/include/X11/pixmaps",
+     "~/GNUstep/Library/WindowMaker/Pixmaps",
+     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
+-    "/usr/share/icons",
+-    "/usr/local/share/pixmaps",
+-    "/usr/share/pixmaps"
++    "#prefix#/share/icons",
++    "#prefix#/share/pixmaps"
+   );
+   PixmapPath = (
+     "~/GNUstep/Library/WindowMaker/Pixmaps",
+@@ -25,9 +23,7 @@
+     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
+     "#pkgdatadir#/Pixmaps",
+     "#pkgdatadir#/Backgrounds",
+-    "/usr/include/X11/pixmaps",
+-    "/usr/local/share/pixmaps",
+-    "/usr/share/pixmaps"
++    "#prefix#/share/pixmaps"
+   );
+   WindowTitleBalloons = YES;
+   IconSize = 64;
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu b/x11-wm/windowmaker/files/patch-WindowMaker-menu
new file mode 100644
index 000000000000..1c87204a50fc
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..fd0fdde8810e
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.bg
@@ -0,0 +1,20 @@
+--- WindowMaker/menu.bg.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.bg	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..9a1b3136247f
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ca
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.ca.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.ca	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..a1b683ff92d2
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.cz
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.cz.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.cz	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..b94953d70fa6
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.da
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.da.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.da	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..b9dfd2589c18
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.de
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.de.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.de	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..75d1ac1616ee
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.el
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.el.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.el	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..b8e4eda2578a
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.es
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.es.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.es	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..e03ea98b0f27
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.fi
@@ -0,0 +1,20 @@
+--- WindowMaker/menu.fi.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.fi	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..4618e14ab854
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.fr
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.fr.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.fr	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..ff009bf0462a
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.gl
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.gl.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.gl	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..266933607f6d
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.he
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.he.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.he	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..6e03776c42b8
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.hr
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.hr.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.hr	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..b6465e8a10ea
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.hu
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.hu.orig	2013-05-03 03:12:26.000000000 +0900
++++ WindowMaker/menu.hu	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..a31f74c3a98f
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.it
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.it.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.it	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..041a738098eb
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ja
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.ja.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.ja	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..acb4c028b581
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ko
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.ko.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.ko	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..61b9d0a644a8
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.nl.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.nl	2013-05-03 03:12:17.000000000 +0900
+@@ -54,7 +54,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
+ 	"Applicaties" END
+ 	"Editors" MENU
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.no b/x11-wm/windowmaker/files/patch-WindowMaker-menu.no
new file mode 100644
index 000000000000..933db3f5a1df
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.no
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.no.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.no	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..b5b86afc58f2
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.pl
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.pl.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.pl	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..a39d80b10765
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.pt
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.pt.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.pt	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..616a1ac445ff
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ro
@@ -0,0 +1,20 @@
+--- WindowMaker/menu.ro.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.ro	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..6c3c0454d4e1
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ru
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.ru.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.ru	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..a01f69a43cd9
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.se
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.se.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.se	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..f33078e9befd
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.sk
@@ -0,0 +1,20 @@
+--- WindowMaker/menu.sk.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.sk	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..4e4e8eda153b
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.sl
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.sl.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.sl	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..597db83ba03b
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.tr
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.tr.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.tr	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..b76ed834d75d
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_CN
@@ -0,0 +1,11 @@
+--- WindowMaker/menu.zh_CN.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.zh_CN	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..104c1c278348
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_TW
@@ -0,0 +1,20 @@
+--- WindowMaker/menu.zh_TW.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/menu.zh_TW	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..dccb001f006e
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu
@@ -0,0 +1,11 @@
+--- WindowMaker/plmenu.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..1a9bea3dd8ae
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.bg
@@ -0,0 +1,20 @@
+--- WindowMaker/plmenu.bg.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.bg	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..62dfee7fe841
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.da
@@ -0,0 +1,41 @@
+--- WindowMaker/plmenu.da.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.da	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..e5645f444fef
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.de
@@ -0,0 +1,33 @@
+--- WindowMaker/plmenu.de.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.de	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..0434a7b5d92c
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.es
@@ -0,0 +1,38 @@
+--- WindowMaker/plmenu.es.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.es	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..a79205f150d0
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fi
@@ -0,0 +1,50 @@
+--- WindowMaker/plmenu.fi.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.fi	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..bf501972f392
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fr
@@ -0,0 +1,11 @@
+--- WindowMaker/plmenu.fr.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.fr	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..d2b82dd1cc61
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.hr
@@ -0,0 +1,41 @@
+--- WindowMaker/plmenu.hr.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.hr	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..8424394935cc
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.it
@@ -0,0 +1,11 @@
+--- WindowMaker/plmenu.it.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.it	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..5a2c0587eeb8
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ja
@@ -0,0 +1,20 @@
+--- WindowMaker/plmenu.ja.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.ja	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..ab982b8b8bf2
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ko
@@ -0,0 +1,11 @@
+--- WindowMaker/plmenu.ko.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.ko	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..5059d2bd33a8
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.pl
@@ -0,0 +1,11 @@
+--- WindowMaker/plmenu.pl.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.pl	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..bcf733983ee0
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ro
@@ -0,0 +1,20 @@
+--- WindowMaker/plmenu.ro.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.ro	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..19647c1a4af6
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.sk
@@ -0,0 +1,20 @@
+--- WindowMaker/plmenu.sk.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.sk	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..63386155c2f3
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_CN
@@ -0,0 +1,11 @@
+--- WindowMaker/plmenu.zh_CN.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.zh_CN	2013-05-03 03:12:17.000000000 +0900
+@@ -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
new file mode 100644
index 000000000000..1ded312d5242
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_TW
@@ -0,0 +1,11 @@
+--- WindowMaker/plmenu.zh_TW.orig	2013-05-03 03:12:25.000000000 +0900
++++ WindowMaker/plmenu.zh_TW	2013-05-03 03:12:17.000000000 +0900
+@@ -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/files/patch-configure b/x11-wm/windowmaker/files/patch-configure
new file mode 100644
index 000000000000..67467d341fa8
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-configure
@@ -0,0 +1,23 @@
+--- configure.orig	2013-05-02 15:16:38.000000000 +0900
++++ configure	2013-05-02 15:17:26.000000000 +0900
+@@ -12042,20 +12042,6 @@
+ fi
+ 
+ 
+-for ac_header in sys/inotify.h
+-do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_SYS_INOTIFY_H 1
+-_ACEOF
+-
+-$as_echo "#define HAVE_INOTIFY 1" >>confdefs.h
+-
+-fi
+-
+-done
+-
+ 
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
diff --git a/x11-wm/windowmaker/files/patch-src__startup.c b/x11-wm/windowmaker/files/patch-src__startup.c
new file mode 100644
index 000000000000..3b49f4cc2fcc
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-src__startup.c
@@ -0,0 +1,11 @@
+--- src/startup.c.orig	2013-01-10 06:42:39.000000000 +0900
++++ src/startup.c	2013-05-03 03:30:24.000000000 +0900
+@@ -758,7 +758,7 @@
+ 		wMenuRestoreState(wScreen[j]);
+ 
+ 		/* If we're not restarting, restore session */
+-		if (wPreferences.flags.restarting == 0 && !wPreferences.flags.norestore)
++		if (!wPreferences.flags.restarting && !wPreferences.flags.norestore)
+ 			wSessionRestoreState(wScreen[j]);
+ 
+ 		if (!wPreferences.flags.noautolaunch) {
diff --git a/x11-wm/windowmaker/files/patch-util__wmgenmenu.c b/x11-wm/windowmaker/files/patch-util__wmgenmenu.c
new file mode 100644
index 000000000000..09cf7547a758
--- /dev/null
+++ b/x11-wm/windowmaker/files/patch-util__wmgenmenu.c
@@ -0,0 +1,38 @@
+--- util/wmgenmenu.c.orig	2013-01-10 06:42:39.000000000 +0900
++++ util/wmgenmenu.c	2013-05-03 03:21:14.000000000 +0900
+@@ -146,7 +146,7 @@
+ 	L2Menu = WMCreatePLArray(
+ 		WMCreatePLString(_("Themes")),
+ 		WMCreatePLString("OPEN_MENU"),
+-		WMCreatePLString("-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
++		WMCreatePLString("-noext " PREFIX "/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+ 		NULL
+ 	);
+ 	WMAddToPLArray(L1Menu, L2Menu);
+@@ -155,7 +155,7 @@
+ 	L2Menu = WMCreatePLArray(
+ 		WMCreatePLString(_("Styles")),
+ 		WMCreatePLString("OPEN_MENU"),
+-		WMCreatePLString("-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
++		WMCreatePLString("-noext " PREFIX "/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+ 		NULL
+ 	);
+ 	WMAddToPLArray(L1Menu, L2Menu);
+@@ -164,7 +164,7 @@
+ 	L2Menu = WMCreatePLArray(
+ 		WMCreatePLString(_("Icon Sets")),
+ 		WMCreatePLString("OPEN_MENU"),
+-		WMCreatePLString("-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
++		WMCreatePLString("-noext " PREFIX "/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+ 		NULL
+ 	);
+ 	WMAddToPLArray(L1Menu, L2Menu);
+@@ -321,7 +321,7 @@
+ 	L1Menu = WMCreatePLArray(
+ 		WMCreatePLString(_("Configure Window Maker")),
+ 		WMCreatePLString("EXEC"),
+-		WMCreatePLString("WPrefs"),
++		WMCreatePLString(PREFIX "/GNUstep/Applications/WPrefs.app/WPrefs"),
+ 		NULL
+ 	);
+ 	WMAddToPLArray(RMenu, L1Menu);