aboutsummaryrefslogtreecommitdiff
path: root/x11-wm/windowmaker
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2015-10-06 05:12:56 +0000
committerHiroki Sato <hrs@FreeBSD.org>2015-10-06 05:12:56 +0000
commit66732e092d235504aa4697303d87d4f1e368469b (patch)
tree8a78006d313fbe1787a14b733eddb0d0adaad07a /x11-wm/windowmaker
parenta7a96746387069a5a0a16ad7278256a3152845b6 (diff)
downloadports-66732e092d235504aa4697303d87d4f1e368469b.tar.gz
ports-66732e092d235504aa4697303d87d4f1e368469b.zip
Update to 0.95.7. Changes include:
- Window snapping (maximize a window to a side or corder of the screen) by dragging is now supported. - It is now possible to customize behavior when a maximized window is dragged. - A knob is added to globally ignore decoration hints from GNOME appications. - A ICCCM protocol for window manager replacement has been supported.
Notes
Notes: svn path=/head/; revision=398682
Diffstat (limited to 'x11-wm/windowmaker')
-rw-r--r--x11-wm/windowmaker/Makefile22
-rw-r--r--x11-wm/windowmaker/distinfo4
-rw-r--r--x11-wm/windowmaker/files/patch-Makefile.in20
-rw-r--r--x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in8
-rw-r--r--x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in6
-rw-r--r--x11-wm/windowmaker/files/patch-WINGs__Makefile.in20
-rw-r--r--x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in10
-rw-r--r--x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h6
-rw-r--r--x11-wm/windowmaker/files/patch-WINGs__wapplication.c6
-rw-r--r--x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in10
-rw-r--r--x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c6
-rw-r--r--x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c8
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in16
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in8
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.bg4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.ca4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.cz4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.da4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.de4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.el4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.es4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.fi4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.fr4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.gl4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.he4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.hr4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.hu4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.it4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.ja4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.ko4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.nl4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.no4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.pl4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.pt4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.ro4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.ru4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.se4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.sk4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.sl4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.tr4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_CN4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_TW4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.bg4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.da4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.de4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.es4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fi4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fr4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.hr4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.it4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ja4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ko4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.pl4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ro4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.sk4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_CN4
-rw-r--r--x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_TW4
-rw-r--r--x11-wm/windowmaker/files/patch-configure6
-rw-r--r--x11-wm/windowmaker/files/patch-doc__Makefile.in12
-rw-r--r--x11-wm/windowmaker/files/patch-src__Makefile.in16
-rw-r--r--x11-wm/windowmaker/files/patch-src__startup.c6
-rw-r--r--x11-wm/windowmaker/files/patch-util__Makefile.in16
-rw-r--r--x11-wm/windowmaker/files/patch-util__wmiv.c4
-rw-r--r--x11-wm/windowmaker/pkg-plist90
66 files changed, 246 insertions, 234 deletions
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 42c55596db3b..54e8ab8ec534 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= windowmaker
-PORTVERSION= 0.95.6
-PORTREVISION= 4
+PORTVERSION= 0.95.7
CATEGORIES= x11-wm windowmaker
MASTER_SITES= http://windowmaker.org/pub/source/release/
DISTNAME= WindowMaker-${PORTVERSION}
@@ -22,7 +21,7 @@ LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \
libwraster.so.5:${PORTSDIR}/x11-wm/libwraster
RUN_DEPENDS= ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
-USES= libtool shebangfix pathfix perl5 pkgconfig
+USES= jpeg libtool shebangfix pathfix perl5 pkgconfig
USE_LDCONFIG= yes
USE_XORG= xft xinerama xmu xpm
SHEBANG_FILES= util/wkdemenu.pl
@@ -30,31 +29,34 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_header_sys_inotify_h=no \
wm_cv_func_secure_getenv=no
CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
- --with-nlsdir=${PREFIX}/share/locale \
+ --localedir=${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 \
+ --enable-xinerama \
+ --enable-usermenu \
+ --enable-wmreplace \
--with-x
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-PORTDOCS= AUTHORS BUGFORM BUGS ChangeLog FAQ FAQ.I18N INSTALL \
- INSTALL-WMAKER NEWS README README.definable-cursor TODO
-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
+PORTDOCS= AUTHORS BUGFORM BUGS ChangeLog FAQ INSTALL \
+ INSTALL-WMAKER NEWS README README.definable-cursor \
+ README.i18n TODO The-perfect-Window-Maker-patch.txt
OPTIONS_DEFINE= DOCS NLS
OPTIONS_SUB= yes
NLS_USES= gettext
-NLS_CONFIGURE_ENV= LINGUAS="${LINGUAS}"
+NLS_CONFIGURE_ENV= LINGUAS="*"
NLS_CONFIGURE_ENABLE= locale
post-install:
@${MKDIR} \
${STAGEDIR}${PREFIX}/GNUstep/Applications/WPrefs.app/xpm \
${STAGEDIR}${PREFIX}/share/WindowMaker/Sounds
+
+post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo
index befc6d63369d..30084ce6fee7 100644
--- a/x11-wm/windowmaker/distinfo
+++ b/x11-wm/windowmaker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (WindowMaker-0.95.6.tar.gz) = 435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4
-SIZE (WindowMaker-0.95.6.tar.gz) = 3004856
+SHA256 (WindowMaker-0.95.7.tar.gz) = 842d486c4b212b19d10dbae2c315c6ff20c6e651471eaa45214b3b832d8097a9
+SIZE (WindowMaker-0.95.7.tar.gz) = 3238325
diff --git a/x11-wm/windowmaker/files/patch-Makefile.in b/x11-wm/windowmaker/files/patch-Makefile.in
index 479bd4d6e253..ef5f64aae90e 100644
--- a/x11-wm/windowmaker/files/patch-Makefile.in
+++ b/x11-wm/windowmaker/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig
+--- Makefile.in.orig 2015-10-06 04:12:09 UTC
+++ Makefile.in
-@@ -271,7 +271,7 @@
- BUILT_SOURCES = config-paths.h
- DISTCLEANFILES = config-paths.h
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = wrlib WINGs src util po WindowMaker wmlib WPrefs.app doc test
-+SUBDIRS = WINGs src util po WindowMaker wmlib WPrefs.app doc test
- EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N INSTALL \
- INSTALL-WMAKER README.definable-cursor \
- The-perfect-Window-Maker-patch.txt \
+@@ -374,7 +374,7 @@ ACLOCAL_AMFLAGS = -I m4
+
+ # Improve coverage in 'make distcheck' by checking that translations work
+ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules LINGUAS='*'
+-SUBDIRS = wrlib WINGs src util po WindowMaker wmlib WPrefs.app doc
++SUBDIRS = WINGs src util po WindowMaker wmlib WPrefs.app doc
+ DIST_SUBDIRS = $(SUBDIRS) test
+ EXTRA_DIST = TODO BUGS BUGFORM FAQ INSTALL \
+ INSTALL-WMAKER README.i18n README.definable-cursor \
diff --git a/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in b/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
index 1367bda2ca47..a28ab63161e0 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
@@ -1,13 +1,13 @@
---- WINGs/Examples/Makefile.in.orig 2014-09-05 03:57:46.000000000 +0900
-+++ WINGs/Examples/Makefile.in 2014-09-05 03:59:22.000000000 +0900
-@@ -286,14 +286,14 @@
+--- WINGs/Examples/Makefile.in.orig 2015-10-06 04:12:10 UTC
++++ WINGs/Examples/Makefile.in
+@@ -342,14 +342,14 @@ top_srcdir = @top_srcdir@
wprefs_bindir = @wprefs_bindir@
wprefs_datadir = @wprefs_datadir@
AUTOMAKE_OPTIONS =
-LDADD = $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \
+LDADD = $(top_builddir)/WINGs/libWINGs.la -lwraster \
$(top_builddir)/WINGs/libWUtil.la \
- @XFTLIBS@ @INTLIBS@
+ @XFTLIBS@ @INTLIBS@ @XLIBS@
colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
diff --git a/x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in b/x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in
index 58ca9f05b904..4a4dc43465d0 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in
@@ -1,6 +1,6 @@
---- WINGs/Extras/Makefile.in.orig
+--- WINGs/Extras/Makefile.in.orig 2015-10-06 04:12:10 UTC
+++ WINGs/Extras/Makefile.in
-@@ -86,7 +86,6 @@
+@@ -145,7 +145,6 @@ PROGRAMS = $(noinst_PROGRAMS)
test_SOURCES = test.c
test_OBJECTS = test.$(OBJEXT)
am__DEPENDENCIES_1 = $(top_builddir)/WINGs/libWINGs.la \
@@ -8,7 +8,7 @@
$(top_builddir)/WINGs/libWUtil.la
test_DEPENDENCIES = wtableview.o wtabledelegates.o \
$(am__DEPENDENCIES_1)
-@@ -288,10 +287,10 @@
+@@ -386,10 +385,10 @@ libExtraWINGs_la_SOURCES = \
wtableview.h \
wtabledelegates.h
diff --git a/x11-wm/windowmaker/files/patch-WINGs__Makefile.in b/x11-wm/windowmaker/files/patch-WINGs__Makefile.in
index c3104863dfd0..be40848abba0 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WINGs__Makefile.in
@@ -1,6 +1,6 @@
---- WINGs/Makefile.in.orig 2014-09-05 04:10:28.000000000 +0900
-+++ WINGs/Makefile.in 2014-09-05 04:12:50.000000000 +0900
-@@ -106,8 +106,7 @@
+--- WINGs/Makefile.in.orig 2015-10-06 04:12:10 UTC
++++ WINGs/Makefile.in
+@@ -135,8 +135,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(pkgconfigdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -10,21 +10,21 @@
am_libWINGs_la_OBJECTS = configuration.lo dragcommon.lo \
dragdestination.lo dragsource.lo selection.lo wappresource.lo \
wballoon.lo wbox.lo wbrowser.lo wbutton.lo wcolor.lo \
-@@ -378,8 +377,8 @@
+@@ -438,8 +437,8 @@ libWINGs_la_LDFLAGS = -version-info @WIN
libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
- bin_SCRIPTS = get-wings-flags get-wutil-flags
+ dist_bin_SCRIPTS = get-wings-flags get-wutil-flags
lib_LTLIBRARIES = libWUtil.la libWINGs.la
-LDADD = libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
--libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@
+-libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
+LDADD = libWUtil.la libWINGs.la -lwraster @INTLIBS@
-+libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@
++libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
libWUtil_la_LIBADD = @LIBBSD@
- EXTRA_DIST = BUGS make-rgb Examples Extras Tests get-wings-flags.in get-wutil-flags.in
+ EXTRA_DIST = BUGS make-rgb Examples Extras Tests
-@@ -453,7 +452,8 @@
+@@ -513,7 +512,8 @@ libWUtil_la_SOURCES = \
AM_CFLAGS =
- AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
+ AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \
- -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+ -DPREFIX=\"$(prefix)\" \
+ -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/src \
diff --git a/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in b/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
index e00b3feb0052..9b72d8c5f704 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
@@ -1,6 +1,6 @@
---- WINGs/Tests/Makefile.in.orig 2014-09-05 03:59:36.000000000 +0900
-+++ WINGs/Tests/Makefile.in 2014-09-05 04:00:47.000000000 +0900
-@@ -80,7 +80,6 @@
+--- WINGs/Tests/Makefile.in.orig 2015-10-06 04:12:10 UTC
++++ WINGs/Tests/Makefile.in
+@@ -109,7 +109,6 @@ am_testmywidget_OBJECTS = testmywidget.$
testmywidget_OBJECTS = $(am_testmywidget_OBJECTS)
testmywidget_LDADD = $(LDADD)
testmywidget_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@@ -8,7 +8,7 @@
$(top_builddir)/WINGs/libWUtil.la
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -89,13 +88,11 @@
+@@ -119,13 +118,11 @@ wmfile_SOURCES = wmfile.c
wmfile_OBJECTS = wmfile.$(OBJEXT)
wmfile_LDADD = $(LDADD)
wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@@ -22,7 +22,7 @@
$(top_builddir)/WINGs/libWUtil.la
wtest_SOURCES = wtest.c
wtest_OBJECTS = wtest.$(OBJEXT)
-@@ -299,14 +296,14 @@
+@@ -355,14 +352,14 @@ top_srcdir = @top_srcdir@
wprefs_bindir = @wprefs_bindir@
wprefs_datadir = @wprefs_datadir@
AUTOMAKE_OPTIONS =
diff --git a/x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h b/x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h
index e99845161cc6..9772bab42904 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h
+++ b/x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h
@@ -1,6 +1,6 @@
---- WINGs/WINGs/WINGsP.h.orig 2013-03-06 03:52:04.000000000 +0900
-+++ WINGs/WINGs/WINGsP.h 2013-03-06 03:51:32.000000000 +0900
-@@ -14,7 +14,13 @@
+--- WINGs/WINGs/WINGsP.h.orig 2015-08-11 18:41:14 UTC
++++ WINGs/WINGs/WINGsP.h
+@@ -17,7 +17,13 @@
#include <assert.h>
diff --git a/x11-wm/windowmaker/files/patch-WINGs__wapplication.c b/x11-wm/windowmaker/files/patch-WINGs__wapplication.c
index 4c01a8b965ec..6770c6427f5a 100644
--- a/x11-wm/windowmaker/files/patch-WINGs__wapplication.c
+++ b/x11-wm/windowmaker/files/patch-WINGs__wapplication.c
@@ -1,6 +1,6 @@
---- 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 @@
+--- WINGs/wapplication.c.orig 2015-08-11 18:41:14 UTC
++++ WINGs/wapplication.c
+@@ -187,7 +187,7 @@ char *WMPathForResourceOfType(const char
if (path)
goto out;
diff --git a/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in b/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
index 961f682fbe99..fe40ec5d9702 100644
--- a/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
@@ -1,9 +1,9 @@
---- WPrefs.app/Makefile.in.orig 2014-09-05 04:29:28.000000000 +0900
-+++ WPrefs.app/Makefile.in 2014-09-05 04:30:48.000000000 +0900
-@@ -395,13 +395,14 @@
+--- WPrefs.app/Makefile.in.orig 2015-10-06 04:12:10 UTC
++++ WPrefs.app/Makefile.in
+@@ -455,13 +455,14 @@ WPrefs_SOURCES = \
# Themes.c
AM_CFLAGS =
- AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
+ AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \
- -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
+ -DPREFIX=\"$(prefix)\" \
+ -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
@@ -15,5 +15,5 @@
- $(top_builddir)/wrlib/libwraster.la \
+ -lwraster \
@XLFLAGS@ @XLIBS@ \
+ @LIBM@ \
@FCLIBS@ \
- @INTLIBS@
diff --git a/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c b/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c
index 69f09e21a859..5146f618214d 100644
--- a/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c
+++ b/x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c
@@ -1,6 +1,6 @@
---- 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 @@
+--- WPrefs.app/Menu.c.orig 2015-08-11 18:41:14 UTC
++++ WPrefs.app/Menu.c
+@@ -517,19 +517,19 @@ static void createPanel(_Panel * p)
data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
data->param.directory.command = "setstyle";
data->param.directory.directory =
diff --git a/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c b/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c
index f407bb1cf531..c4f3976ad4f1 100644
--- a/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c
+++ b/x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c
@@ -1,6 +1,6 @@
---- 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 @@
+--- WPrefs.app/Paths.c.orig 2015-08-11 18:41:14 UTC
++++ WPrefs.app/Paths.c
+@@ -78,9 +78,9 @@ static void showData(_Panel * panel)
wwarning(_("bad value in option IconPath. Using default path list"));
addPathToList(panel->icoL, -1, "~/pixmaps");
addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
@@ -13,7 +13,7 @@
addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
} else {
for (i = 0; i < WMGetPropListItemCount(array); i++) {
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ static void showData(_Panel * panel)
wwarning(_("bad value in option PixmapPath. Using default path list"));
addPathToList(panel->pixL, -1, "~/pixmaps");
addPathToList(panel->pixL, -1, "~/GNUstep/Library/WindowMaker/Pixmaps");
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in b/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in
index 24bcf5704ed4..491db2a72132 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in
@@ -1,13 +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/Defaults/Makefile.in.orig 2015-10-06 04:12:10 UTC
++++ WindowMaker/Defaults/Makefile.in
+@@ -542,7 +542,9 @@ WMWindowAttributes: $(srcdir)/WMWindowAt
+ chmod 644 WMWindowAttributes
WindowMaker: $(srcdir)/WindowMaker.in
- -rm -f WindowMaker
-- sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
-+ sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
-+ -e "s:#prefix#:$(prefix):" \
+- $(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
++ $(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
++ -e "s:#prefix#:$(prefix):" \
+ $(srcdir)/WindowMaker.in \
- > WindowMaker
+ > 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
index 22764cebcfe4..cbbcaf24d2e6 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- WindowMaker/Defaults/WindowMaker.in.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/Defaults/WindowMaker.in
+@@ -13,12 +13,10 @@
"~/GNUstep/Library/Icons",
"#pkgdatadir#/Icons",
"#pkgdatadir#/Pixmaps",
@@ -15,7 +15,7 @@
);
PixmapPath = (
"~/GNUstep/Library/WindowMaker/Pixmaps",
-@@ -25,9 +23,7 @@
+@@ -26,9 +24,7 @@
"~/GNUstep/Library/WindowMaker/CachedPixmaps",
"#pkgdatadir#/Pixmaps",
"#pkgdatadir#/Backgrounds",
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu b/x11-wm/windowmaker/files/patch-WindowMaker-menu
index 1c87204a50fc..5ac2e96abfde 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu
@@ -1,5 +1,5 @@
---- WindowMaker/menu.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu 2013-05-03 03:12:17.000000000 +0900
+--- 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:)"
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.bg b/x11-wm/windowmaker/files/patch-WindowMaker-menu.bg
index fd0fdde8810e..630b0e63f33d 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.bg
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.bg
@@ -1,5 +1,5 @@
---- WindowMaker/menu.bg.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.bg 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.bg.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.bg
@@ -136,7 +136,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ca b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ca
index 9a1b3136247f..e0413a9355c6 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ca
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ca
@@ -1,5 +1,5 @@
---- WindowMaker/menu.ca.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.ca 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.ca.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.ca
@@ -130,7 +130,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.cz b/x11-wm/windowmaker/files/patch-WindowMaker-menu.cz
index a1b683ff92d2..271cd9a4cfd4 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.cz
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.cz
@@ -1,5 +1,5 @@
---- WindowMaker/menu.cz.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.cz 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.cz.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.cz
@@ -84,7 +84,7 @@
// "LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.da b/x11-wm/windowmaker/files/patch-WindowMaker-menu.da
index b94953d70fa6..822b10d0cd11 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.da
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.da
@@ -1,5 +1,5 @@
---- WindowMaker/menu.da.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.da 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.da.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.da
@@ -124,7 +124,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.de b/x11-wm/windowmaker/files/patch-WindowMaker-menu.de
index b9dfd2589c18..67c3e38ff4e9 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.de
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.de
@@ -1,5 +1,5 @@
---- WindowMaker/menu.de.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.de 2013-05-03 03:12:17.000000000 +0900
+--- 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)
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.el b/x11-wm/windowmaker/files/patch-WindowMaker-menu.el
index 75d1ac1616ee..e029f218bda7 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.el
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.el
@@ -1,5 +1,5 @@
---- WindowMaker/menu.el.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.el 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.el.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.el
@@ -139,7 +139,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.es b/x11-wm/windowmaker/files/patch-WindowMaker-menu.es
index b8e4eda2578a..cb266eded39a 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.es
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.es
@@ -1,5 +1,5 @@
---- WindowMaker/menu.es.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.es 2013-05-03 03:12:17.000000000 +0900
+--- 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
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.fi b/x11-wm/windowmaker/files/patch-WindowMaker-menu.fi
index e03ea98b0f27..0652b633cd71 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.fi
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.fi
@@ -1,5 +1,5 @@
---- WindowMaker/menu.fi.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.fi 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.fi.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.fi
@@ -129,7 +129,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.fr b/x11-wm/windowmaker/files/patch-WindowMaker-menu.fr
index 4618e14ab854..3cef675b332a 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.fr
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.fr
@@ -1,5 +1,5 @@
---- WindowMaker/menu.fr.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.fr 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.fr.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.fr
@@ -175,7 +175,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.gl b/x11-wm/windowmaker/files/patch-WindowMaker-menu.gl
index ff009bf0462a..a7c61e050406 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.gl
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.gl
@@ -1,5 +1,5 @@
---- WindowMaker/menu.gl.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.gl 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.gl.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.gl
@@ -64,7 +64,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.he b/x11-wm/windowmaker/files/patch-WindowMaker-menu.he
index 266933607f6d..b10925c02080 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.he
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.he
@@ -1,5 +1,5 @@
---- WindowMaker/menu.he.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.he 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.he.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.he
@@ -116,7 +116,7 @@
"LyX" EXEC lyx
"פייקסטנ" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.hr b/x11-wm/windowmaker/files/patch-WindowMaker-menu.hr
index 6e03776c42b8..32ef53049513 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.hr
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.hr
@@ -1,5 +1,5 @@
---- WindowMaker/menu.hr.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.hr 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.hr.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.hr
@@ -118,7 +118,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.hu b/x11-wm/windowmaker/files/patch-WindowMaker-menu.hu
index b6465e8a10ea..4a3e4844d3ea 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.hu
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.hu
@@ -1,5 +1,5 @@
---- WindowMaker/menu.hu.orig 2013-05-03 03:12:26.000000000 +0900
-+++ WindowMaker/menu.hu 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.hu.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.hu
@@ -133,7 +133,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.it b/x11-wm/windowmaker/files/patch-WindowMaker-menu.it
index a31f74c3a98f..2123ca8398f7 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.it
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.it
@@ -1,5 +1,5 @@
---- WindowMaker/menu.it.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.it 2013-05-03 03:12:17.000000000 +0900
+--- 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)
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ja b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ja
index 041a738098eb..1401b4956927 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ja
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ja
@@ -1,5 +1,5 @@
---- WindowMaker/menu.ja.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.ja 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.ja.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.ja
@@ -122,7 +122,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ko b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ko
index acb4c028b581..232cff568edd 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ko
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ko
@@ -1,5 +1,5 @@
---- WindowMaker/menu.ko.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.ko 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.ko.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.ko
@@ -163,7 +163,7 @@
"세션 지움" CLEAR_SESSION
"창 관 리" END
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl b/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl
index 77d75a219f68..688174c7a67d 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.nl
@@ -1,5 +1,5 @@
---- WindowMaker/menu.nl.orig 2014-08-30 21:29:09.000000000 +0900
-+++ WindowMaker/menu.nl 2014-09-05 04:03:19.000000000 +0900
+--- 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:)"
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.no b/x11-wm/windowmaker/files/patch-WindowMaker-menu.no
index 933db3f5a1df..0b98a45b0d51 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.no
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.no
@@ -1,5 +1,5 @@
---- WindowMaker/menu.no.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.no 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.no.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.no
@@ -119,7 +119,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.pl b/x11-wm/windowmaker/files/patch-WindowMaker-menu.pl
index b5b86afc58f2..a18247c52dba 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.pl
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.pl
@@ -1,5 +1,5 @@
---- WindowMaker/menu.pl.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.pl 2013-05-03 03:12:17.000000000 +0900
+--- 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:)
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.pt b/x11-wm/windowmaker/files/patch-WindowMaker-menu.pt
index a39d80b10765..0b6f7fe876ae 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.pt
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.pt
@@ -1,5 +1,5 @@
---- WindowMaker/menu.pt.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.pt 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.pt.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.pt
@@ -126,7 +126,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ro b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ro
index 616a1ac445ff..9118e9ea4ba7 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ro
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ro
@@ -1,5 +1,5 @@
---- WindowMaker/menu.ro.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.ro 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.ro.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.ro
@@ -129,7 +129,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ru b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ru
index 6c3c0454d4e1..5b771a5493bd 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.ru
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.ru
@@ -1,5 +1,5 @@
---- WindowMaker/menu.ru.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.ru 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.ru.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.ru
@@ -77,7 +77,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.se b/x11-wm/windowmaker/files/patch-WindowMaker-menu.se
index a01f69a43cd9..ec77ed8f1f0e 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.se
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.se
@@ -1,5 +1,5 @@
---- WindowMaker/menu.se.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.se 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.se.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.se
@@ -126,7 +126,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.sk b/x11-wm/windowmaker/files/patch-WindowMaker-menu.sk
index f33078e9befd..59797dbc9c8f 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.sk
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.sk
@@ -1,5 +1,5 @@
---- WindowMaker/menu.sk.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.sk 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.sk.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.sk
@@ -143,7 +143,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.sl b/x11-wm/windowmaker/files/patch-WindowMaker-menu.sl
index 4e4e8eda153b..8ca6200bbb96 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.sl
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.sl
@@ -1,5 +1,5 @@
---- WindowMaker/menu.sl.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.sl 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.sl.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.sl
@@ -125,7 +125,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.tr b/x11-wm/windowmaker/files/patch-WindowMaker-menu.tr
index 597db83ba03b..b7cb66fe5d97 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.tr
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.tr
@@ -1,5 +1,5 @@
---- WindowMaker/menu.tr.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/menu.tr 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/menu.tr.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/menu.tr
@@ -111,7 +111,7 @@
"LyX" EXEC lyx
"Netscape" EXEC netscape
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_CN b/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_CN
index b76ed834d75d..ab67d96504a8 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_CN
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_CN
@@ -1,5 +1,5 @@
---- 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
+--- 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
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_TW b/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_TW
index 104c1c278348..c40f9c32f282 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_TW
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-menu.zh_TW
@@ -1,5 +1,5 @@
---- 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
+--- 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
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu
index dccb001f006e..4ae4cfb7f01d 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu 2013-05-03 03:12:17.000000000 +0900
+--- 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)\""),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.bg b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.bg
index 1a9bea3dd8ae..35166143b7f0 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.bg
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.bg
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.bg.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.bg 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.bg.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.bg
@@ -23,7 +23,7 @@
("LyX", EXEC, "lyx"),
("Netscape", EXEC, "netscape"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.da b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.da
index 62dfee7fe841..6fdbd44b73db 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.da
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.da
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.da.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.da 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.da.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.da
@@ -82,7 +82,7 @@
(
"Acrobat",
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.de b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.de
index e5645f444fef..895cf291b2d2 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.de
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.de
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.de.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.de 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.de.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.de
@@ -23,7 +23,7 @@
("LyX", EXEC, "lyx"),
("Netscape", EXEC, "netscape"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.es b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.es
index 0434a7b5d92c..bebf0e7a2982 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.es
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.es
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.es.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.es 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.es.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.es
@@ -23,7 +23,7 @@
("LyX", EXEC, "lyx"),
("Netscape", EXEC, "netscape"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fi b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fi
index a79205f150d0..436d5adcdaef 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fi
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fi
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.fi.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.fi 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.fi.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.fi
@@ -94,7 +94,7 @@
(
"Acrobat",
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fr b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fr
index bf501972f392..4902b4feb1f8 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fr
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.fr
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.fr.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.fr 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.fr.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.fr
@@ -23,7 +23,7 @@
("LyX", EXEC , "lyx"),
("Netscape", EXEC, "netscape"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.hr b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.hr
index d2b82dd1cc61..2edf84c1da6e 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.hr
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.hr
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.hr.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.hr 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.hr.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.hr
@@ -31,7 +31,7 @@
(
Acrobat,
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.it b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.it
index 8424394935cc..af41eab42b5c 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.it
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.it
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.it.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.it 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.it.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.it
@@ -23,7 +23,7 @@
("LyX", EXEC, "lyx"),
("Netscape", EXEC, "netscape"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ja b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ja
index 5a2c0587eeb8..907f36292394 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ja
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ja
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.ja.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.ja 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.ja.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.ja
@@ -23,7 +23,7 @@
("LyX", EXEC, "lyx"),
("Netscape", EXEC, "netscape"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ko b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ko
index ab982b8b8bf2..2766f18acd37 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ko
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ko
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.ko.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.ko 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.ko.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.ko
@@ -63,7 +63,7 @@
),
("작업공간", WORKSPACE_MENU),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.pl b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.pl
index 5059d2bd33a8..dd897e864789 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.pl
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.pl
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.pl.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.pl 2013-05-03 03:12:17.000000000 +0900
+--- 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:)"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ro b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ro
index bcf733983ee0..1c2494c2901b 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ro
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.ro
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.ro.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.ro 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.ro.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.ro
@@ -23,7 +23,7 @@
("LyX", EXEC, "lyx"),
("Netscape", EXEC, "netscape"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.sk b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.sk
index 19647c1a4af6..c2aa3506edea 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.sk
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.sk
@@ -1,5 +1,5 @@
---- WindowMaker/plmenu.sk.orig 2013-05-03 03:12:25.000000000 +0900
-+++ WindowMaker/plmenu.sk 2013-05-03 03:12:17.000000000 +0900
+--- WindowMaker/plmenu.sk.orig 2015-08-11 18:41:14 UTC
++++ WindowMaker/plmenu.sk
@@ -23,7 +23,7 @@
("LyX", EXEC, "lyx"),
("Netscape", EXEC, "netscape"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_CN b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_CN
index 63386155c2f3..f7db91bc8a7b 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_CN
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_CN
@@ -1,5 +1,5 @@
---- 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
+--- 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"),
diff --git a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_TW b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_TW
index 1ded312d5242..6c9f21678b3e 100644
--- a/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_TW
+++ b/x11-wm/windowmaker/files/patch-WindowMaker-plmenu.zh_TW
@@ -1,5 +1,5 @@
---- 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
+--- 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(主題名稱)"),
diff --git a/x11-wm/windowmaker/files/patch-configure b/x11-wm/windowmaker/files/patch-configure
index 0c664965f351..b991f2a3bf22 100644
--- a/x11-wm/windowmaker/files/patch-configure
+++ b/x11-wm/windowmaker/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2014-09-05 04:28:09.000000000 +0900
-+++ configure 2014-09-05 04:29:09.000000000 +0900
-@@ -13046,7 +13046,7 @@
+--- configure.orig 2015-08-11 18:52:18 UTC
++++ configure
+@@ -13782,7 +13782,7 @@ case "$host" in #(
*-*-linux*|*-*-cygwin*|*-gnu*) :
WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(
*-*-freebsd*|*-k*bsd-gnu*) :
diff --git a/x11-wm/windowmaker/files/patch-doc__Makefile.in b/x11-wm/windowmaker/files/patch-doc__Makefile.in
index b33664598232..5f3ab9609302 100644
--- a/x11-wm/windowmaker/files/patch-doc__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-doc__Makefile.in
@@ -1,10 +1,10 @@
---- doc/Makefile.in.orig
+--- doc/Makefile.in.orig 2015-10-06 04:12:09 UTC
+++ doc/Makefile.in
-@@ -282,7 +282,6 @@
- geticonset.1x \
- getstyle.1x \
+@@ -382,7 +382,6 @@ dist_man_MANS = \
+ geticonset.1 \
+ getstyle.1 \
get-wings-flags.1 \
- get-wraster-flags.1 \
get-wutil-flags.1 \
- seticons.1x \
- setstyle.1x \
+ seticons.1 \
+ setstyle.1 \
diff --git a/x11-wm/windowmaker/files/patch-src__Makefile.in b/x11-wm/windowmaker/files/patch-src__Makefile.in
index 60602dfddf24..d85622ebf01a 100644
--- a/x11-wm/windowmaker/files/patch-src__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-src__Makefile.in
@@ -1,8 +1,8 @@
---- src/Makefile.in.orig 2014-09-05 04:06:51.000000000 +0900
-+++ src/Makefile.in 2014-09-05 04:07:46.000000000 +0900
-@@ -124,8 +124,7 @@
- $(am__objects_3) $(am__objects_4)
- wmaker_OBJECTS = $(am_wmaker_OBJECTS)
+--- src/Makefile.in.orig 2015-10-06 04:12:09 UTC
++++ src/Makefile.in
+@@ -164,8 +164,7 @@ am_wmaker_OBJECTS = actions.$(OBJEXT) ap
+ @USE_NESTED_FUNC_FALSE@ xmodifier.hack_nf.$(OBJEXT)
+ wmaker_OBJECTS = $(am_wmaker_OBJECTS) $(nodist_wmaker_OBJECTS)
wmaker_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
- $(top_builddir)/WINGs/libWUtil.la \
- $(top_builddir)/wrlib/libwraster.la
@@ -10,10 +10,10 @@
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
-@@ -353,13 +352,12 @@
+@@ -424,13 +423,12 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h
+ @USE_NESTED_FUNC_FALSE@CLEANFILES = $(nodist_wmaker_SOURCES)
AM_CFLAGS =
- AM_CPPFLAGS = \
- $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\" \
+ AM_CPPFLAGS = $(DFLAGS) \
- -I$(top_srcdir)/wrlib \
-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
diff --git a/x11-wm/windowmaker/files/patch-src__startup.c b/x11-wm/windowmaker/files/patch-src__startup.c
index 3b49f4cc2fcc..f18030e1acd0 100644
--- a/x11-wm/windowmaker/files/patch-src__startup.c
+++ b/x11-wm/windowmaker/files/patch-src__startup.c
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/startup.c.orig 2015-08-11 18:41:14 UTC
++++ src/startup.c
+@@ -666,7 +666,7 @@ void StartUp(Bool defaultScreenOnly)
wMenuRestoreState(wScreen[j]);
/* If we're not restarting, restore session */
diff --git a/x11-wm/windowmaker/files/patch-util__Makefile.in b/x11-wm/windowmaker/files/patch-util__Makefile.in
index 9dfc3d6e9f16..eedbecc9a79c 100644
--- a/x11-wm/windowmaker/files/patch-util__Makefile.in
+++ b/x11-wm/windowmaker/files/patch-util__Makefile.in
@@ -1,6 +1,6 @@
---- util/Makefile.in.orig 2014-09-05 04:13:22.000000000 +0900
-+++ util/Makefile.in 2014-09-05 04:14:30.000000000 +0900
-@@ -115,14 +115,13 @@
+--- util/Makefile.in.orig 2015-10-06 04:12:09 UTC
++++ util/Makefile.in
+@@ -145,14 +145,13 @@ wdwrite_DEPENDENCIES = $(top_builddir)/W
wmagnify_SOURCES = wmagnify.c
wmagnify_OBJECTS = wmagnify.$(OBJEXT)
wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@@ -17,7 +17,7 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_wmmenugen_OBJECTS = wmmenugen.$(OBJEXT) wmmenugen_misc.$(OBJEXT) \
-@@ -133,8 +132,7 @@
+@@ -163,8 +162,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)
wmsetbg_SOURCES = wmsetbg.c
wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@@ -27,16 +27,16 @@
wxcopy_SOURCES = wxcopy.c
wxcopy_OBJECTS = wxcopy.$(OBJEXT)
wxcopy_DEPENDENCIES =
-@@ -417,7 +415,7 @@
+@@ -477,7 +475,7 @@ AUTOMAKE_OPTIONS =
bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl
- AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" \
+ AM_CPPFLAGS = \
- $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
+ $(DFLAGS) -I$(top_srcdir)/WINGs \
@HEADER_SEARCH_PATH@ \
-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
-@@ -440,13 +438,13 @@
+@@ -500,13 +498,13 @@ geticonset_LDADD = $(top_builddir)/WINGs
wmagnify_LDADD = \
$(top_builddir)/WINGs/libWINGs.la \
$(top_builddir)/WINGs/libWUtil.la \
@@ -52,7 +52,7 @@
@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
wmgenmenu_LDADD = \
-@@ -463,7 +461,7 @@
+@@ -523,7 +521,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenuge
wmmenugen_parse_xdg.c
wmiv_LDADD = \
diff --git a/x11-wm/windowmaker/files/patch-util__wmiv.c b/x11-wm/windowmaker/files/patch-util__wmiv.c
index e3677a937e5c..e7597e207236 100644
--- a/x11-wm/windowmaker/files/patch-util__wmiv.c
+++ b/x11-wm/windowmaker/files/patch-util__wmiv.c
@@ -1,5 +1,5 @@
---- util/wmiv.c.orig 2014-09-05 04:35:03.000000000 +0900
-+++ util/wmiv.c 2014-09-05 04:35:45.000000000 +0900
+--- util/wmiv.c.orig 2015-08-11 18:41:14 UTC
++++ util/wmiv.c
@@ -28,7 +28,9 @@
#include <X11/Xlib.h>
#include "wraster.h"
diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist
index 0083f15fc40a..068045385de1 100644
--- a/x11-wm/windowmaker/pkg-plist
+++ b/x11-wm/windowmaker/pkg-plist
@@ -37,6 +37,7 @@ GNUstep/Applications/WPrefs.app/tiff/oldstyle.tiff
GNUstep/Applications/WPrefs.app/tiff/opaque.tiff
GNUstep/Applications/WPrefs.app/tiff/opaqueresize.tiff
GNUstep/Applications/WPrefs.app/tiff/paths.tiff
+GNUstep/Applications/WPrefs.app/tiff/smallwindow.tiff
GNUstep/Applications/WPrefs.app/tiff/smooth.tiff
GNUstep/Applications/WPrefs.app/tiff/sound.tiff
GNUstep/Applications/WPrefs.app/tiff/speed0.tiff
@@ -104,7 +105,7 @@ include/WMaker.h
lib/libWINGs.a
lib/libWINGs.so
lib/libWINGs.so.3
-lib/libWINGs.so.3.0.0
+lib/libWINGs.so.3.1.0
lib/libWMaker.a
lib/libWMaker.so
lib/libWMaker.so.1
@@ -251,6 +252,7 @@ share/WindowMaker/menu.el
share/WindowMaker/menu.es
share/WindowMaker/menu.fi
share/WindowMaker/menu.fr
+share/WindowMaker/menu.fy
share/WindowMaker/menu.gl
share/WindowMaker/menu.he
share/WindowMaker/menu.hr
@@ -277,6 +279,7 @@ share/WindowMaker/plmenu.de
share/WindowMaker/plmenu.es
share/WindowMaker/plmenu.fi
share/WindowMaker/plmenu.fr
+share/WindowMaker/plmenu.fy
share/WindowMaker/plmenu.hr
share/WindowMaker/plmenu.it
share/WindowMaker/plmenu.ja
@@ -316,6 +319,10 @@ share/WindowMaker/wmmacros
%%NLS%%share/locale/fr/LC_MESSAGES/WPrefs.mo
%%NLS%%share/locale/fr/LC_MESSAGES/WindowMaker.mo
%%NLS%%share/locale/fr/LC_MESSAGES/wmgenmenu.mo
+%%NLS%%share/locale/fy/LC_MESSAGES/WINGs.mo
+%%NLS%%share/locale/fy/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/fy/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/fy/LC_MESSAGES/wmgenmenu.mo
%%NLS%%share/locale/gl/LC_MESSAGES/WindowMaker.mo
%%NLS%%share/locale/hr/LC_MESSAGES/WPrefs.mo
%%NLS%%share/locale/hr/LC_MESSAGES/WindowMaker.mo
@@ -347,54 +354,57 @@ share/WindowMaker/wmmacros
%%NLS%%share/locale/sk/LC_MESSAGES/WindowMaker.mo
%%NLS%%share/locale/sv/LC_MESSAGES/WindowMaker.mo
%%NLS%%share/locale/tr/LC_MESSAGES/WindowMaker.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/WPrefs.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/WindowMaker.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
-man/cs/man1/geticonset.1x.gz
-man/cs/man1/getstyle.1x.gz
-man/cs/man1/seticons.1x.gz
-man/cs/man1/setstyle.1x.gz
-man/cs/man1/wdwrite.1x.gz
-man/cs/man1/wmaker.1x.gz
-man/cs/man1/wmsetbg.1x.gz
-man/cs/man1/wxcopy.1x.gz
-man/cs/man1/wxpaste.1x.gz
-man/man1/WPrefs.1x.gz
-man/man1/WindowMaker.1x.gz
+man/cs/man1/geticonset.1.gz
+man/cs/man1/getstyle.1.gz
+man/cs/man1/seticons.1.gz
+man/cs/man1/setstyle.1.gz
+man/cs/man1/wdwrite.1.gz
+man/cs/man1/wmaker.1.gz
+man/cs/man1/wmsetbg.1.gz
+man/cs/man1/wxcopy.1.gz
+man/cs/man1/wxpaste.1.gz
+man/man1/WPrefs.1.gz
+man/man1/WindowMaker.1.gz
man/man1/get-wings-flags.1.gz
man/man1/get-wutil-flags.1.gz
-man/man1/geticonset.1x.gz
-man/man1/getstyle.1x.gz
-man/man1/seticons.1x.gz
-man/man1/setstyle.1x.gz
+man/man1/geticonset.1.gz
+man/man1/getstyle.1.gz
+man/man1/seticons.1.gz
+man/man1/setstyle.1.gz
man/man1/wdread.1.gz
-man/man1/wdwrite.1x.gz
-man/man1/wmagnify.1x.gz
-man/man1/wmaker.1x.gz
+man/man1/wdwrite.1.gz
+man/man1/wmagnify.1.gz
+man/man1/wmaker.1.gz
man/man1/wmgenmenu.1.gz
+man/man1/wmiv.1.gz
man/man1/wmmenugen.1.gz
-man/man1/wmsetbg.1x.gz
-man/man1/wxcopy.1x.gz
-man/man1/wxpaste.1x.gz
+man/man1/wmsetbg.1.gz
+man/man1/wxcopy.1.gz
+man/man1/wxpaste.1.gz
man/man8/upgrade-windowmaker-defaults.8.gz
-man/ru/man1/geticonset.1x.gz
-man/ru/man1/getstyle.1x.gz
-man/ru/man1/seticons.1x.gz
-man/ru/man1/setstyle.1x.gz
-man/ru/man1/wdwrite.1x.gz
-man/ru/man1/wmaker.1x.gz
-man/ru/man1/wmsetbg.1x.gz
-man/ru/man1/wxcopy.1x.gz
-man/ru/man1/wxpaste.1x.gz
-man/sk/man1/geticonset.1x.gz
-man/sk/man1/getstyle.1x.gz
-man/sk/man1/seticons.1x.gz
-man/sk/man1/setstyle.1x.gz
-man/sk/man1/wdwrite.1x.gz
-man/sk/man1/wmaker.1x.gz
-man/sk/man1/wmsetbg.1x.gz
-man/sk/man1/wxcopy.1x.gz
-man/sk/man1/wxpaste.1x.gz
+man/ru/man1/geticonset.1.gz
+man/ru/man1/getstyle.1.gz
+man/ru/man1/seticons.1.gz
+man/ru/man1/setstyle.1.gz
+man/ru/man1/wdwrite.1.gz
+man/ru/man1/wmaker.1.gz
+man/ru/man1/wmsetbg.1.gz
+man/ru/man1/wxcopy.1.gz
+man/ru/man1/wxpaste.1.gz
+man/sk/man1/geticonset.1.gz
+man/sk/man1/getstyle.1.gz
+man/sk/man1/seticons.1.gz
+man/sk/man1/setstyle.1.gz
+man/sk/man1/wdwrite.1.gz
+man/sk/man1/wmaker.1.gz
+man/sk/man1/wmsetbg.1.gz
+man/sk/man1/wxcopy.1.gz
+man/sk/man1/wxpaste.1.gz
@dir GNUstep/Applications/WPrefs.app/xpm
@dir share/WindowMaker/Sounds