Index: x11-wm/libwraster/Makefile
===================================================================
--- x11-wm/libwraster/Makefile	(revision 544513)
+++ x11-wm/libwraster/Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	libwraster
-PORTVERSION=	0.95.8
-PORTREVISION=	1
+PORTVERSION=	0.95.9
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
@@ -17,7 +16,7 @@
 		libjbig.so:graphics/jbigkit \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
-		libMagickWand-6.so:graphics/ImageMagick6
+		libMagickWand-7.so:graphics/ImageMagick7
 
 USES=		jpeg libtool localbase pathfix pkgconfig xorg
 USE_LDCONFIG=	yes
@@ -25,7 +24,7 @@
 BUILD_WRKSRC=	${WRKSRC}/wrlib
 INSTALL_WRKSRC=	${WRKSRC}/wrlib
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/include/X11/pixmaps \
+CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/share/pixmaps \
 		--with-localedir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
 		--with-incs-from="-I${LOCALBASE}/include" \
@@ -40,8 +39,4 @@
 pre-build:
 	cd ${WRKSRC} && ${MAKE_CMD} config-paths.h
 
-post-install:
-	cd ${WRKSRC}/doc && ${INSTALL_MAN} \
-	    get-wraster-flags.1 ${STAGEDIR}${MANPREFIX}/man/man1
-
 .include <bsd.port.mk>
Index: x11-wm/libwraster/distinfo
===================================================================
--- x11-wm/libwraster/distinfo	(revision 544513)
+++ x11-wm/libwraster/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519792748
-SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
-SIZE (WindowMaker-0.95.8.tar.gz) = 3253515
+TIMESTAMP = 1597080685
+SHA256 (WindowMaker-0.95.9.tar.gz) = f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
+SIZE (WindowMaker-0.95.9.tar.gz) = 3397167
Index: x11-wm/libwraster/files/patch-configure
===================================================================
--- x11-wm/libwraster/files/patch-configure	(revision 544513)
+++ x11-wm/libwraster/files/patch-configure	(working copy)
@@ -1,6 +1,6 @@
---- configure.orig	2015-08-11 18:52:18 UTC
+--- configure.orig	2020-04-05 13:42:01 UTC
 +++ configure
-@@ -13782,7 +13782,7 @@ case "$host" in #(
+@@ -14305,7 +14305,7 @@ case "$host" in #(
    *-*-linux*|*-*-cygwin*|*-gnu*) :
      WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(
    *-*-freebsd*|*-k*bsd-gnu*) :
Index: x11-wm/libwraster/files/patch-wrlib__wraster.h
===================================================================
--- x11-wm/libwraster/files/patch-wrlib__wraster.h	(revision 544513)
+++ x11-wm/libwraster/files/patch-wrlib__wraster.h	(nonexistent)
@@ -1,20 +0,0 @@
---- wrlib/wraster.h.orig	2015-08-11 18:41:14 UTC
-+++ wrlib/wraster.h
-@@ -61,10 +61,14 @@
-  * mechanism and define an internal macro appropriately. Please note that the macro are not considered being
-  * part of the public API.
-  */
--#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
-+#ifndef __has_feature
-+#define	__has_feature(x)	0
-+#endif
-+#ifndef __has_extension
-+#define	__has_extension	__has_feature
-+#endif
-+#if __has_extension(attribute_depreated_with_message)
- #define __wrlib_deprecated(msg)  __attribute__ ((deprecated(msg)))
--#elif __GNUC__ >= 3
--#define __wrlib_deprecated(msg)  __attribute__ ((deprecated))
- #else
- #define __wrlib_deprecated(msg)
- #endif

Property changes on: x11-wm/libwraster/files/patch-wrlib__wraster.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/libwraster/files/patch-wrlib_wraster.h
===================================================================
--- x11-wm/libwraster/files/patch-wrlib_wraster.h	(nonexistent)
+++ x11-wm/libwraster/files/patch-wrlib_wraster.h	(working copy)
@@ -0,0 +1,20 @@
+--- wrlib/wraster.h.orig	2015-08-11 18:41:14 UTC
++++ wrlib/wraster.h
+@@ -61,10 +61,14 @@
+  * mechanism and define an internal macro appropriately. Please note that the macro are not considered being
+  * part of the public API.
+  */
+-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
++#ifndef __has_feature
++#define	__has_feature(x)	0
++#endif
++#ifndef __has_extension
++#define	__has_extension	__has_feature
++#endif
++#if __has_extension(attribute_depreated_with_message)
+ #define __wrlib_deprecated(msg)  __attribute__ ((deprecated(msg)))
+-#elif __GNUC__ >= 3
+-#define __wrlib_deprecated(msg)  __attribute__ ((deprecated))
+ #else
+ #define __wrlib_deprecated(msg)
+ #endif

Property changes on: x11-wm/libwraster/files/patch-wrlib_wraster.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/libwraster/pkg-plist
===================================================================
--- x11-wm/libwraster/pkg-plist	(revision 544513)
+++ x11-wm/libwraster/pkg-plist	(working copy)
@@ -1,4 +1,3 @@
-bin/get-wraster-flags
 include/wraster.h
 lib/libwraster.a
 lib/libwraster.so
@@ -5,4 +4,3 @@
 lib/libwraster.so.6
 lib/libwraster.so.6.0.0
 libdata/pkgconfig/wrlib.pc
-man/man1/get-wraster-flags.1.gz
Index: x11-wm/windowmaker/Makefile
===================================================================
--- x11-wm/windowmaker/Makefile	(revision 544513)
+++ x11-wm/windowmaker/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	windowmaker
-PORTVERSION=	0.95.8
-PORTREVISION=	2
+PORTVERSION=	0.95.9
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://windowmaker.org/pub/source/release/
 DISTNAME=	WindowMaker-${PORTVERSION}
@@ -18,7 +17,7 @@
 		libjbig.so:graphics/jbigkit \
 		libtiff.so:graphics/tiff \
 		libwebp.so:graphics/webp \
-		libMagickWand-6.so:graphics/ImageMagick6 \
+		libMagickWand-7.so:graphics/ImageMagick7 \
 		libwraster.so.6:x11-wm/libwraster \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
@@ -32,7 +31,7 @@
 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 \
+CONFIGURE_ARGS=	--with-pixmapdir=${PREFIX}/share/pixmaps \
 		--localedir=${PREFIX}/share/locale \
 		--with-libs-from="-L${LOCALBASE}/lib" \
 		--with-incs-from="-I${LOCALBASE}/include" \
Index: x11-wm/windowmaker/distinfo
===================================================================
--- x11-wm/windowmaker/distinfo	(revision 544513)
+++ x11-wm/windowmaker/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519793700
-SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
-SIZE (WindowMaker-0.95.8.tar.gz) = 3253515
+TIMESTAMP = 1589707505
+SHA256 (WindowMaker-0.95.9.tar.gz) = f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
+SIZE (WindowMaker-0.95.9.tar.gz) = 3397167
Index: x11-wm/windowmaker/files/patch-Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-Makefile.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-Makefile.in	(working copy)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2015-10-06 04:12:09 UTC
+--- Makefile.in.orig	2020-08-10 19:15:59 UTC
 +++ Makefile.in
-@@ -374,7 +374,7 @@ ACLOCAL_AMFLAGS = -I m4
+@@ -389,7 +389,7 @@ ACLOCAL_AMFLAGS = -I m4
  
  # Improve coverage in 'make distcheck' by checking that translations work
  AM_DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules LINGUAS='*'
Index: x11-wm/windowmaker/files/patch-WINGs_Examples_Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs_Examples_Makefile.in	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WINGs_Examples_Makefile.in	(working copy)
@@ -0,0 +1,19 @@
+--- WINGs/Examples/Makefile.in.orig	2020-08-10 19:15:59 UTC
++++ WINGs/Examples/Makefile.in
+@@ -359,14 +359,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@ @XLIBS@
+ 
+ colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
++AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
+ 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
+ 
+ all: all-am

Property changes on: x11-wm/windowmaker/files/patch-WINGs_Examples_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs_Extras_Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs_Extras_Makefile.in	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WINGs_Extras_Makefile.in	(working copy)
@@ -0,0 +1,23 @@
+--- WINGs/Extras/Makefile.in.orig	2020-08-10 19:15:59 UTC
++++ WINGs/Extras/Makefile.in
+@@ -155,7 +155,6 @@ am__v_lt_1 = 
+ test_SOURCES = test.c
+ test_OBJECTS = test.$(OBJEXT)
+ am__DEPENDENCIES_1 = $(top_builddir)/WINGs/libWINGs.la \
+-	$(top_builddir)/wrlib/libwraster.la \
+ 	$(top_builddir)/WINGs/libWUtil.la
+ test_DEPENDENCIES = wtableview.o wtabledelegates.o \
+ 	$(am__DEPENDENCIES_1)
+@@ -404,10 +403,10 @@ libExtraWINGs_la_SOURCES = \
+ 	wtableview.h \
+ 	wtabledelegates.h 
+ 
+-AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
++AM_CPPFLAGS = -I$(top_srcdir)/WINGs \
+ 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
+ 
+-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@
+ 

Property changes on: x11-wm/windowmaker/files/patch-WINGs_Extras_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs_Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs_Makefile.in	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WINGs_Makefile.in	(working copy)
@@ -0,0 +1,33 @@
+--- WINGs/Makefile.in.orig	2020-08-10 19:15:59 UTC
++++ WINGs/Makefile.in
+@@ -141,8 +141,7 @@ am__uninstall_files_from_dir = { \
+   }
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+-libWINGs_la_DEPENDENCIES = libWUtil.la \
+-	$(top_builddir)/wrlib/libwraster.la
++libWINGs_la_DEPENDENCIES = libWUtil.la
+ 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 \
+@@ -478,8 +477,8 @@ DIST_SUBDIRS = $(SUBDIRS) Tests Examples Extras
+ libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@
+ libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
+ 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@ @PANGOLIBS@
++LDADD = libWUtil.la libWINGs.la -lwraster @INTLIBS@
++libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
+ libWUtil_la_LIBADD = @LIBBSD@
+ EXTRA_DIST = BUGS make-rgb Examples Extras Tests
+ 
+@@ -553,7 +552,8 @@ libWUtil_la_SOURCES = \
+ 
+ AM_CFLAGS = 
+ 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 \
+ 	@XFTFLAGS@ @HEADER_SEARCH_PATH@
+ 
+ pkgconfigdir = $(prefix)/libdata/pkgconfig

Property changes on: x11-wm/windowmaker/files/patch-WINGs_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs_Tests_Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs_Tests_Makefile.in	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WINGs_Tests_Makefile.in	(working copy)
@@ -0,0 +1,41 @@
+--- WINGs/Tests/Makefile.in.orig	2020-08-10 19:15:59 UTC
++++ WINGs/Tests/Makefile.in
+@@ -118,7 +118,6 @@ am_testmywidget_OBJECTS = testmywidget.$(OBJEXT) mywid
+ testmywidget_OBJECTS = $(am_testmywidget_OBJECTS)
+ testmywidget_LDADD = $(LDADD)
+ testmywidget_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
+-	$(top_builddir)/wrlib/libwraster.la \
+ 	$(top_builddir)/WINGs/libWUtil.la
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -128,13 +127,11 @@ wmfile_SOURCES = wmfile.c
+ wmfile_OBJECTS = wmfile.$(OBJEXT)
+ wmfile_LDADD = $(LDADD)
+ wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
+-	$(top_builddir)/wrlib/libwraster.la \
+ 	$(top_builddir)/WINGs/libWUtil.la
+ wmquery_SOURCES = wmquery.c
+ wmquery_OBJECTS = wmquery.$(OBJEXT)
+ wmquery_LDADD = $(LDADD)
+ wmquery_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
+-	$(top_builddir)/wrlib/libwraster.la \
+ 	$(top_builddir)/WINGs/libWUtil.la
+ wtest_SOURCES = wtest.c
+ wtest_OBJECTS = wtest.$(OBJEXT)
+@@ -373,14 +370,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@ @XLIBS@ 
+ 
+ testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
+ wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
+-AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
++AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
+ 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
+ 
+ all: all-am

Property changes on: x11-wm/windowmaker/files/patch-WINGs_Tests_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs_WINGs_WINGsP.h
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs_WINGs_WINGsP.h	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WINGs_WINGs_WINGsP.h	(working copy)
@@ -0,0 +1,16 @@
+--- WINGs/WINGs/WINGsP.h.orig	2019-02-15 23:34:25 UTC
++++ WINGs/WINGs/WINGsP.h
+@@ -17,7 +17,13 @@
+ 
+ #include <assert.h>
+ 
++#ifdef _XLOCALE_H_	/* workaround for libX11<1.4 */
++#undef _XLOCALE_H_
+ #include <stdlib.h>
++#define _XLOCALE_H_
++#else
++#include <stdlib.h>
++#endif
+ #include <string.h>
+ #include <strings.h>
+ #include <stdio.h>

Property changes on: x11-wm/windowmaker/files/patch-WINGs_WINGs_WINGsP.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in	(nonexistent)
@@ -1,19 +0,0 @@
---- 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@ @XLIBS@
- 
- colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
- fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
- puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
--AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
- 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
- 
- all: all-am

Property changes on: x11-wm/windowmaker/files/patch-WINGs__Examples__Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in	(nonexistent)
@@ -1,23 +0,0 @@
---- WINGs/Extras/Makefile.in.orig	2015-10-06 04:12:10 UTC
-+++ WINGs/Extras/Makefile.in
-@@ -145,7 +145,6 @@ PROGRAMS = $(noinst_PROGRAMS)
- test_SOURCES = test.c
- test_OBJECTS = test.$(OBJEXT)
- am__DEPENDENCIES_1 = $(top_builddir)/WINGs/libWINGs.la \
--	$(top_builddir)/wrlib/libwraster.la \
- 	$(top_builddir)/WINGs/libWUtil.la
- test_DEPENDENCIES = wtableview.o wtabledelegates.o \
- 	$(am__DEPENDENCIES_1)
-@@ -386,10 +385,10 @@ libExtraWINGs_la_SOURCES = \
- 	wtableview.h \
- 	wtabledelegates.h 
- 
--AM_CPPFLAGS = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \
-+AM_CPPFLAGS = -I$(top_srcdir)/WINGs \
- 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@
- 
--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@
- 

Property changes on: x11-wm/windowmaker/files/patch-WINGs__Extras__Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs__Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs__Makefile.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WINGs__Makefile.in	(nonexistent)
@@ -1,33 +0,0 @@
---- 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)
--libWINGs_la_DEPENDENCIES = libWUtil.la \
--	$(top_builddir)/wrlib/libwraster.la
-+libWINGs_la_DEPENDENCIES = libWUtil.la
- 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 \
-@@ -438,8 +437,8 @@ libWINGs_la_LDFLAGS = -version-info @WIN
- libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
- 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@ @PANGOLIBS@
-+LDADD = libWUtil.la libWINGs.la -lwraster @INTLIBS@
-+libWINGs_la_LIBADD = libWUtil.la -lwraster @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
- libWUtil_la_LIBADD = @LIBBSD@
- EXTRA_DIST = BUGS make-rgb Examples Extras Tests
- 
-@@ -513,7 +512,8 @@ libWUtil_la_SOURCES = \
- 
- AM_CFLAGS = 
- 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 \
- 	@XFTFLAGS@ @HEADER_SEARCH_PATH@
- 
- pkgconfigdir = $(prefix)/libdata/pkgconfig

Property changes on: x11-wm/windowmaker/files/patch-WINGs__Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in	(nonexistent)
@@ -1,41 +0,0 @@
---- 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 \
--	$(top_builddir)/wrlib/libwraster.la \
- 	$(top_builddir)/WINGs/libWUtil.la
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-@@ -119,13 +118,11 @@ wmfile_SOURCES = wmfile.c
- wmfile_OBJECTS = wmfile.$(OBJEXT)
- wmfile_LDADD = $(LDADD)
- wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
--	$(top_builddir)/wrlib/libwraster.la \
- 	$(top_builddir)/WINGs/libWUtil.la
- wmquery_SOURCES = wmquery.c
- wmquery_OBJECTS = wmquery.$(OBJEXT)
- wmquery_LDADD = $(LDADD)
- wmquery_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
--	$(top_builddir)/wrlib/libwraster.la \
- 	$(top_builddir)/WINGs/libWUtil.la
- wtest_SOURCES = wtest.c
- wtest_OBJECTS = wtest.$(OBJEXT)
-@@ -355,14 +352,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@ @XLIBS@ 
- 
- testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h 
- wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
- EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png
--AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
-+AM_CPPFLAGS = -I$(top_srcdir)/WINGs -I$(top_srcdir)/src \
- 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@
- 
- all: all-am

Property changes on: x11-wm/windowmaker/files/patch-WINGs__Tests__Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h	(nonexistent)
@@ -1,16 +0,0 @@
---- WINGs/WINGs/WINGsP.h.orig	2015-08-11 18:41:14 UTC
-+++ WINGs/WINGs/WINGsP.h
-@@ -17,7 +17,13 @@
- 
- #include <assert.h>
- 
-+#ifdef _XLOCALE_H_	/* workaround for libX11<1.4 */
-+#undef _XLOCALE_H_
-+#include <stdlib.h>
-+#define _XLOCALE_H_
-+#else
- #include <stdlib.h>
-+#endif
- #include <string.h>
- #include <strings.h>
- #include <stdio.h>

Property changes on: x11-wm/windowmaker/files/patch-WINGs__WINGs__WINGsP.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs__wapplication.c
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs__wapplication.c	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WINGs__wapplication.c	(nonexistent)
@@ -1,11 +0,0 @@
---- 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;
- 
--	path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
-+	path = checkFile(PREFIX "/GNUstep", appdir, ext, resource);
- 	if (path)
- 		goto out;
- 

Property changes on: x11-wm/windowmaker/files/patch-WINGs__wapplication.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WINGs_wapplication.c
===================================================================
--- x11-wm/windowmaker/files/patch-WINGs_wapplication.c	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WINGs_wapplication.c	(working copy)
@@ -0,0 +1,11 @@
+--- WINGs/wapplication.c.orig	2020-04-05 13:41:15 UTC
++++ WINGs/wapplication.c
+@@ -187,7 +187,7 @@ char *WMPathForResourceOfType(const char *resource, co
+ 	if (path)
+ 		goto out;
+ 
+-	path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
++	path = checkFile(PREFIX "/GNUstep", appdir, ext, resource);
+ 	if (path)
+ 		goto out;
+ 

Property changes on: x11-wm/windowmaker/files/patch-WINGs_wapplication.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WPrefs.app_Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WPrefs.app_Makefile.in	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WPrefs.app_Makefile.in	(working copy)
@@ -0,0 +1,19 @@
+--- WPrefs.app/Makefile.in.orig	2020-08-10 19:15:59 UTC
++++ WPrefs.app/Makefile.in
+@@ -481,13 +481,14 @@ WPrefs_SOURCES = \
+ #	Themes.c
+ AM_CFLAGS = 
+ 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@ 
+ 
+ WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
+ WPrefs_LDADD = \
+ 	$(top_builddir)/WINGs/libWINGs.la\
+ 	$(top_builddir)/WINGs/libWUtil.la\
+-	$(top_builddir)/wrlib/libwraster.la \
++	-lwraster \
+ 	@XLFLAGS@ @XLIBS@ \
+ 	@LIBM@ \
+ 	@FCLIBS@ \

Property changes on: x11-wm/windowmaker/files/patch-WPrefs.app_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WPrefs.app_Menu.c
===================================================================
--- x11-wm/windowmaker/files/patch-WPrefs.app_Menu.c	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WPrefs.app_Menu.c	(working copy)
@@ -0,0 +1,25 @@
+--- WPrefs.app/Menu.c.orig	2020-04-05 13:41:15 UTC
++++ WPrefs.app/Menu.c
+@@ -518,19 +518,19 @@ static void createPanel(_Panel * p)
+ 		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"));

Property changes on: x11-wm/windowmaker/files/patch-WPrefs.app_Menu.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WPrefs.app_Paths.c
===================================================================
--- x11-wm/windowmaker/files/patch-WPrefs.app_Paths.c	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WPrefs.app_Paths.c	(working copy)
@@ -0,0 +1,24 @@
+--- WPrefs.app/Paths.c.orig	2019-02-15 23:34:25 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");
+-		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 @@ 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");
+-		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);

Property changes on: x11-wm/windowmaker/files/patch-WPrefs.app_Paths.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in	(nonexistent)
@@ -1,19 +0,0 @@
---- 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 = -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@ 
- 
- WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la
- WPrefs_LDADD = \
- 	$(top_builddir)/WINGs/libWINGs.la\
- 	$(top_builddir)/WINGs/libWUtil.la\
--	$(top_builddir)/wrlib/libwraster.la \
-+	-lwraster \
- 	@XLFLAGS@ @XLIBS@ \
- 	@LIBM@ \
- 	@FCLIBS@ \

Property changes on: x11-wm/windowmaker/files/patch-WPrefs.app__Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c
===================================================================
--- x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c	(nonexistent)
@@ -1,25 +0,0 @@
---- 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 =
--		    "/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"));

Property changes on: x11-wm/windowmaker/files/patch-WPrefs.app__Menu.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c
===================================================================
--- x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c	(nonexistent)
@@ -1,24 +0,0 @@
---- 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");
--		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 @@ 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");
--		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);

Property changes on: x11-wm/windowmaker/files/patch-WPrefs.app__Paths.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in	(nonexistent)
@@ -1,13 +0,0 @@
---- 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
--	$(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 ; \
- 	chmod 644 WindowMaker
- 

Property changes on: x11-wm/windowmaker/files/patch-WindowMaker-Defaults-Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in
===================================================================
--- x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in	(nonexistent)
@@ -1,28 +0,0 @@
---- 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",
--    "/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",
-@@ -26,9 +24,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;

Property changes on: x11-wm/windowmaker/files/patch-WindowMaker-Defaults-WindowMaker.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WindowMaker_Defaults_Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-WindowMaker_Defaults_Makefile.in	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WindowMaker_Defaults_Makefile.in	(working copy)
@@ -0,0 +1,10 @@
+--- WindowMaker/Defaults/Makefile.in.orig	2020-08-10 19:15:59 UTC
++++ WindowMaker/Defaults/Makefile.in
+@@ -562,6 +562,7 @@ WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
+ 
+ WindowMaker: $(srcdir)/WindowMaker.in
+ 	$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
++		-e "s:#prefix#:$(prefix):" \
+ 		-e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \
+ 		> WindowMaker ; \
+ 	chmod 644 WindowMaker

Property changes on: x11-wm/windowmaker/files/patch-WindowMaker_Defaults_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-WindowMaker_Defaults_WindowMaker.in
===================================================================
--- x11-wm/windowmaker/files/patch-WindowMaker_Defaults_WindowMaker.in	(nonexistent)
+++ x11-wm/windowmaker/files/patch-WindowMaker_Defaults_WindowMaker.in	(working copy)
@@ -0,0 +1,10 @@
+--- WindowMaker/Defaults/WindowMaker.in.orig	2020-04-05 13:41:16 UTC
++++ WindowMaker/Defaults/WindowMaker.in
+@@ -37,6 +37,7 @@
+ 		"~/pixmaps",
+ 		"#pkgdatadir#/Icons",
+ 		"#pkgdatadir#/Pixmaps",
++		"#prefix#/share/icons",
+ 		"#pixmapdir#"
+ 	);
+ 	ColormapMode = auto;

Property changes on: x11-wm/windowmaker/files/patch-WindowMaker_Defaults_WindowMaker.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-configure
===================================================================
--- x11-wm/windowmaker/files/patch-configure	(revision 544513)
+++ x11-wm/windowmaker/files/patch-configure	(working copy)
@@ -1,6 +1,6 @@
---- configure.orig	2015-08-11 18:52:18 UTC
+--- configure.orig	2020-04-05 13:42:01 UTC
 +++ configure
-@@ -13782,7 +13782,7 @@ case "$host" in #(
+@@ -14305,7 +14305,7 @@ case "$host" in #(
    *-*-linux*|*-*-cygwin*|*-gnu*) :
      WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(
    *-*-freebsd*|*-k*bsd-gnu*) :
Index: x11-wm/windowmaker/files/patch-doc__Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-doc__Makefile.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-doc__Makefile.in	(nonexistent)
@@ -1,10 +0,0 @@
---- doc/Makefile.in.orig	2015-10-06 04:12:09 UTC
-+++ doc/Makefile.in
-@@ -382,7 +382,6 @@ dist_man_MANS = \
- 	geticonset.1 \
- 	getstyle.1 \
- 	get-wings-flags.1 \
--	get-wraster-flags.1 \
- 	get-wutil-flags.1 \
- 	seticons.1 \
- 	setstyle.1 \

Property changes on: x11-wm/windowmaker/files/patch-doc__Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-src_Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-src_Makefile.in	(nonexistent)
+++ x11-wm/windowmaker/files/patch-src_Makefile.in	(working copy)
@@ -0,0 +1,27 @@
+--- src/Makefile.in.orig	2020-08-10 19:15:59 UTC
++++ src/Makefile.in
+@@ -173,8 +173,7 @@ am_wmaker_OBJECTS = actions.$(OBJEXT) appicon.$(OBJEXT
+ @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
++	$(top_builddir)/WINGs/libWUtil.la
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -467,13 +466,12 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h actions.c act
+ @USE_NESTED_FUNC_FALSE@CLEANFILES = $(nodist_wmaker_SOURCES)
+ AM_CFLAGS = 
+ AM_CPPFLAGS = $(DFLAGS) \
+-	-I$(top_srcdir)/wrlib \
+ 	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
+ 
+ wmaker_LDADD = \
+ 	$(top_builddir)/WINGs/libWINGs.la\
+ 	$(top_builddir)/WINGs/libWUtil.la\
+-	$(top_builddir)/wrlib/libwraster.la\
++	-lwraster \
+ 	@XLFLAGS@ \
+ 	@LIBXRANDR@ \
+ 	@LIBXINERAMA@ \

Property changes on: x11-wm/windowmaker/files/patch-src_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-src__Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-src__Makefile.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-src__Makefile.in	(nonexistent)
@@ -1,27 +0,0 @@
---- 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
-+	$(top_builddir)/WINGs/libWUtil.la
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -424,13 +423,12 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h
- @USE_NESTED_FUNC_FALSE@CLEANFILES = $(nodist_wmaker_SOURCES)
- AM_CFLAGS = 
- AM_CPPFLAGS = $(DFLAGS) \
--	-I$(top_srcdir)/wrlib \
- 	-I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ 
- 
- wmaker_LDADD = \
- 	$(top_builddir)/WINGs/libWINGs.la\
- 	$(top_builddir)/WINGs/libWUtil.la\
--	$(top_builddir)/wrlib/libwraster.la\
-+	-lwraster \
- 	@XLFLAGS@ \
- 	@LIBXRANDR@ \
- 	@LIBXINERAMA@ \

Property changes on: x11-wm/windowmaker/files/patch-src__Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-src__startup.c
===================================================================
--- x11-wm/windowmaker/files/patch-src__startup.c	(revision 544513)
+++ x11-wm/windowmaker/files/patch-src__startup.c	(nonexistent)
@@ -1,11 +0,0 @@
---- 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 */
--		if (wPreferences.flags.restarting == 0 && !wPreferences.flags.norestore)
-+		if (!wPreferences.flags.restarting && !wPreferences.flags.norestore)
- 			wSessionRestoreState(wScreen[j]);
- 
- 		if (!wPreferences.flags.noautolaunch) {

Property changes on: x11-wm/windowmaker/files/patch-src__startup.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-src_startup.c
===================================================================
--- x11-wm/windowmaker/files/patch-src_startup.c	(nonexistent)
+++ x11-wm/windowmaker/files/patch-src_startup.c	(working copy)
@@ -0,0 +1,11 @@
+--- src/startup.c.orig	2019-02-15 23:34:26 UTC
++++ src/startup.c
+@@ -666,7 +666,7 @@ void StartUp(Bool defaultScreenOnly)
+ 		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) {

Property changes on: x11-wm/windowmaker/files/patch-src_startup.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-util_Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-util_Makefile.in	(nonexistent)
+++ x11-wm/windowmaker/files/patch-util_Makefile.in	(working copy)
@@ -0,0 +1,63 @@
+--- util/Makefile.in.orig	2020-08-10 19:15:59 UTC
++++ util/Makefile.in
+@@ -154,14 +154,13 @@ wdwrite_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.
+ wmagnify_SOURCES = wmagnify.c
+ wmagnify_OBJECTS = wmagnify.$(OBJEXT)
+ wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
+-	$(top_builddir)/WINGs/libWUtil.la \
+-	$(top_builddir)/wrlib/libwraster.la
++	$(top_builddir)/WINGs/libWUtil.la
+ am_wmgenmenu_OBJECTS = wmgenmenu.$(OBJEXT)
+ wmgenmenu_OBJECTS = $(am_wmgenmenu_OBJECTS)
+ wmgenmenu_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
+ am_wmiv_OBJECTS = wmiv.$(OBJEXT)
+ wmiv_OBJECTS = $(am_wmiv_OBJECTS)
+-wmiv_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \
++wmiv_DEPENDENCIES = \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ am_wmmenugen_OBJECTS = wmmenugen.$(OBJEXT) wmmenugen_misc.$(OBJEXT) \
+@@ -172,8 +171,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)/WINGs/libWUti
+ wmsetbg_SOURCES = wmsetbg.c
+ wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
+ wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
+-	$(top_builddir)/WINGs/libWUtil.la \
+-	$(top_builddir)/wrlib/libwraster.la
++	$(top_builddir)/WINGs/libWUtil.la
+ wxcopy_SOURCES = wxcopy.c
+ wxcopy_OBJECTS = wxcopy.$(OBJEXT)
+ wxcopy_DEPENDENCIES =
+@@ -502,7 +500,7 @@ AUTOMAKE_OPTIONS = 
+ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
+ EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl
+ AM_CPPFLAGS = \
+-	 $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
++	 $(DFLAGS) -I$(top_srcdir)/WINGs \
+ 	@HEADER_SEARCH_PATH@ \
+ 	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
+ 
+@@ -525,13 +523,13 @@ geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la $
+ wmagnify_LDADD = \
+ 	$(top_builddir)/WINGs/libWINGs.la \
+ 	$(top_builddir)/WINGs/libWUtil.la \
+-	$(top_builddir)/wrlib/libwraster.la \
++	-lwraster \
+ 	@XLFLAGS@ @XLIBS@ @INTLIBS@
+ 
+ wmsetbg_LDADD = \
+ 	$(top_builddir)/WINGs/libWINGs.la \
+ 	$(top_builddir)/WINGs/libWUtil.la \
+-	$(top_builddir)/wrlib/libwraster.la \
++	-lwraster \
+ 	@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
+ 
+ wmgenmenu_LDADD = \
+@@ -548,7 +546,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenugen.h wmmenugen_
+ 	wmmenugen_parse_xdg.c
+ 
+ wmiv_LDADD = \
+-	$(top_builddir)/wrlib/libwraster.la \
++	-lwraster \
+ 	@XLFLAGS@ @XLIBS@ \
+ 	@GFXLIBS@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBEXIF)
+ 

Property changes on: x11-wm/windowmaker/files/patch-util_Makefile.in
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-util__Makefile.in
===================================================================
--- x11-wm/windowmaker/files/patch-util__Makefile.in	(revision 544513)
+++ x11-wm/windowmaker/files/patch-util__Makefile.in	(nonexistent)
@@ -1,63 +0,0 @@
---- 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 \
--	$(top_builddir)/WINGs/libWUtil.la \
--	$(top_builddir)/wrlib/libwraster.la
-+	$(top_builddir)/WINGs/libWUtil.la
- am_wmgenmenu_OBJECTS = wmgenmenu.$(OBJEXT)
- wmgenmenu_OBJECTS = $(am_wmgenmenu_OBJECTS)
- wmgenmenu_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la
- am_wmiv_OBJECTS = wmiv.$(OBJEXT)
- wmiv_OBJECTS = $(am_wmiv_OBJECTS)
--wmiv_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la \
-+wmiv_DEPENDENCIES = \
- 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- 	$(am__DEPENDENCIES_1)
- am_wmmenugen_OBJECTS = wmmenugen.$(OBJEXT) wmmenugen_misc.$(OBJEXT) \
-@@ -163,8 +162,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)
- wmsetbg_SOURCES = wmsetbg.c
- wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
- wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
--	$(top_builddir)/WINGs/libWUtil.la \
--	$(top_builddir)/wrlib/libwraster.la
-+	$(top_builddir)/WINGs/libWUtil.la
- wxcopy_SOURCES = wxcopy.c
- wxcopy_OBJECTS = wxcopy.$(OBJEXT)
- wxcopy_DEPENDENCIES =
-@@ -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 = \
--	 $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
-+	 $(DFLAGS) -I$(top_srcdir)/WINGs \
- 	@HEADER_SEARCH_PATH@ \
- 	-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
- 
-@@ -500,13 +498,13 @@ geticonset_LDADD = $(top_builddir)/WINGs
- wmagnify_LDADD = \
- 	$(top_builddir)/WINGs/libWINGs.la \
- 	$(top_builddir)/WINGs/libWUtil.la \
--	$(top_builddir)/wrlib/libwraster.la \
-+	-lwraster \
- 	@XLFLAGS@ @XLIBS@ @INTLIBS@
- 
- wmsetbg_LDADD = \
- 	$(top_builddir)/WINGs/libWINGs.la \
- 	$(top_builddir)/WINGs/libWUtil.la \
--	$(top_builddir)/wrlib/libwraster.la \
-+	-lwraster \
- 	@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
- 
- wmgenmenu_LDADD = \
-@@ -523,7 +521,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenuge
- 	wmmenugen_parse_xdg.c
- 
- wmiv_LDADD = \
--	$(top_builddir)/wrlib/libwraster.la \
-+	-lwraster \
- 	@XLFLAGS@ @XLIBS@ \
- 	@GFXLIBS@ $(PTHREAD_CFLAGS) $(PTHREAD_LIBS) $(LIBEXIF)
- 

Property changes on: x11-wm/windowmaker/files/patch-util__Makefile.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-util__wmiv.c
===================================================================
--- x11-wm/windowmaker/files/patch-util__wmiv.c	(revision 544513)
+++ x11-wm/windowmaker/files/patch-util__wmiv.c	(nonexistent)
@@ -1,12 +0,0 @@
---- 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"
- #include <stdlib.h>
-+#define	__BSD_VISIBLE	1
- #include <stdio.h>
-+#undef __BSD_VISIBLE
- #include <string.h>
- #include <dirent.h>
- #include <limits.h>

Property changes on: x11-wm/windowmaker/files/patch-util__wmiv.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/files/patch-util_wmiv.c
===================================================================
--- x11-wm/windowmaker/files/patch-util_wmiv.c	(nonexistent)
+++ x11-wm/windowmaker/files/patch-util_wmiv.c	(working copy)
@@ -0,0 +1,12 @@
+--- util/wmiv.c.orig	2020-04-05 13:41:16 UTC
++++ util/wmiv.c
+@@ -28,7 +28,9 @@
+ #include <X11/Xlib.h>
+ #include "wraster.h"
+ #include <stdlib.h>
++#define	__BSD_VISIBLE	1
+ #include <stdio.h>
++#undef __BSD_VISIBLE
+ #include <string.h>
+ #include <dirent.h>
+ #include <limits.h>

Property changes on: x11-wm/windowmaker/files/patch-util_wmiv.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: x11-wm/windowmaker/pkg-plist
===================================================================
--- x11-wm/windowmaker/pkg-plist	(revision 544513)
+++ x11-wm/windowmaker/pkg-plist	(working copy)
@@ -74,8 +74,6 @@
 GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff
 GNUstep/Applications/WPrefs.app/tiff/xis.tiff
 bin/convertfonts
-bin/get-wings-flags
-bin/get-wutil-flags
 bin/geticonset
 bin/getstyle
 bin/seticons
@@ -199,6 +197,7 @@
 share/WindowMaker/Pixmaps/tile.xpm
 share/WindowMaker/README
 share/WindowMaker/README.themes
+share/WindowMaker/Styles/Adwaita.style
 share/WindowMaker/Styles/Autumn.style
 share/WindowMaker/Styles/Black.style
 share/WindowMaker/Styles/BlackTexture.style
@@ -240,6 +239,10 @@
 share/WindowMaker/Themes/Pastel.style
 share/WindowMaker/Themes/SteelBlueSilk.style
 share/WindowMaker/appearance.menu
+share/WindowMaker/appearance.menu.fy
+share/WindowMaker/appearance.menu.nl
+share/WindowMaker/background.menu.fy
+share/WindowMaker/background.menu.nl
 share/WindowMaker/autostart.sh
 share/WindowMaker/background.menu
 share/WindowMaker/exitscript.sh
@@ -372,8 +375,6 @@
 %%NLS%%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.1.gz
 man/man1/getstyle.1.gz
 man/man1/seticons.1.gz
@@ -388,7 +389,6 @@
 man/man1/wmsetbg.1.gz
 man/man1/wxcopy.1.gz
 man/man1/wxpaste.1.gz
-man/man8/upgrade-windowmaker-defaults.8.gz
 %%NLS%%man/ru/man1/geticonset.1.gz
 %%NLS%%man/ru/man1/getstyle.1.gz
 %%NLS%%man/ru/man1/seticons.1.gz