summaryrefslogtreecommitdiff
path: root/wm/windowmaker
diff options
context:
space:
mode:
authoradam <adam>2015-10-16 10:42:23 +0000
committeradam <adam>2015-10-16 10:42:23 +0000
commit8e3f50ae6593ab3458669043d6d5835006e023b2 (patch)
tree7631bd086e72711956685795eb56650dc23f2b6e /wm/windowmaker
parentca43d8195ad3491fb71d846269035c10c1c80647 (diff)
downloadpkgsrc-8e3f50ae6593ab3458669043d6d5835006e023b2.tar.gz
Changes 0.95.7:
* Window snapping * Dragging maximized windows * Mini-Previews instead of Apercus * Ignore Decoration Hints from GNOME applications * Cooperative Window Manager Replacement
Diffstat (limited to 'wm/windowmaker')
-rw-r--r--wm/windowmaker/Makefile17
-rw-r--r--wm/windowmaker/PLIST10
-rw-r--r--wm/windowmaker/distinfo28
-rw-r--r--wm/windowmaker/patches/patch-WINGs_dragsource.c (renamed from wm/windowmaker/patches/patch-ai)4
-rw-r--r--wm/windowmaker/patches/patch-WindowMaker_Defaults_Makefile.in (renamed from wm/windowmaker/patches/patch-af)6
-rw-r--r--wm/windowmaker/patches/patch-aa42
-rw-r--r--wm/windowmaker/patches/patch-ac13
-rw-r--r--wm/windowmaker/patches/patch-ae29
-rw-r--r--wm/windowmaker/patches/patch-configure (renamed from wm/windowmaker/patches/patch-ab)10
-rw-r--r--wm/windowmaker/patches/patch-doc_cs_Makefile.in29
-rw-r--r--wm/windowmaker/patches/patch-doc_ru_Makefile.in29
-rw-r--r--wm/windowmaker/patches/patch-src_main.c (renamed from wm/windowmaker/patches/patch-ad)6
-rw-r--r--wm/windowmaker/patches/patch-src_switchpanel.c (renamed from wm/windowmaker/patches/patch-aj)4
-rw-r--r--wm/windowmaker/patches/patch-util_Makefile.in (renamed from wm/windowmaker/patches/patch-ak)6
-rw-r--r--wm/windowmaker/patches/patch-wrlib_Makefile.in13
-rw-r--r--wm/windowmaker/patches/patch-wrlib_load__gif.c24
16 files changed, 52 insertions, 218 deletions
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index a10cd4a6fd6..0b231ac68c5 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.112 2015/06/12 10:51:47 wiz Exp $
+# $NetBSD: Makefile,v 1.113 2015/10/16 10:42:23 adam Exp $
-DISTNAME= WindowMaker-0.95.6
+DISTNAME= WindowMaker-0.95.7
PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
-PKGREVISION= 1
CATEGORIES= x11 wm windowmaker
MASTER_SITES= http://windowmaker.info/pub/source/release/
@@ -13,15 +12,15 @@ LICENSE= gnu-gpl-v2
BROKEN_GETTEXT_DETECTION= yes
-USE_TOOLS+= msgfmt pkg-config xgettext
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
+USE_TOOLS+= msgfmt pkg-config xgettext
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-usermenu
CONFIGURE_ARGS+= --enable-xinerama
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep
-CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
+#CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
CONFIGURE_ENV+= LINGUAS="bg ca cs cz da de el es et fi fr gl he hr hu it ja ko nl ms no pl pt ro ru se sk sl sv tr zh_CN zh_TW"
CONFIGURE_ENV+= CPP_PATH=${CPP:Q}
USE_TOOLS+= perl:run
@@ -83,18 +82,10 @@ pre-configure:
${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
${WRKSRC}/WindowMaker/Defaults/WindowMaker \
${WRKSRC}/po/zh_TW.Big5.po
- set -e; \
- for manfile in ${WRKSRC}/doc/*.1x ${WRKSRC}/doc/*/*.1x; \
- do \
- ${MV} "$$manfile" `${ECHO} "$$manfile" | ${SED} "s/1x$$/1/"`; \
- done;
post-install:
${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/SoundSets/.directory
${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/Sounds/.directory
- cd ${WRKSRC} && \
- ${INSTALL_DATA} README README.definable-cursor FAQ FAQ.I18N \
- ${DESTDIR}${PREFIX}/share/doc/WindowMaker
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/wm/windowmaker/PLIST b/wm/windowmaker/PLIST
index cdaa72af37b..70143437325 100644
--- a/wm/windowmaker/PLIST
+++ b/wm/windowmaker/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2014/10/07 16:11:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.21 2015/10/16 10:42:23 adam Exp $
bin/convertfonts
bin/get-wings-flags
bin/get-wraster-flags
@@ -55,6 +55,7 @@ man/man1/wdwrite.1
man/man1/wmagnify.1
man/man1/wmaker.1
man/man1/wmgenmenu.1
+man/man1/wmiv.1
man/man1/wmmenugen.1
man/man1/wmsetbg.1
man/man1/wxcopy.1
@@ -117,6 +118,7 @@ share/GNUstep/Applications/WPrefs.app/tiff/oldstyle.tiff
share/GNUstep/Applications/WPrefs.app/tiff/opaque.tiff
share/GNUstep/Applications/WPrefs.app/tiff/opaqueresize.tiff
share/GNUstep/Applications/WPrefs.app/tiff/paths.tiff
+share/GNUstep/Applications/WPrefs.app/tiff/smallwindow.tiff
share/GNUstep/Applications/WPrefs.app/tiff/smooth.tiff
share/GNUstep/Applications/WPrefs.app/tiff/sound.tiff
share/GNUstep/Applications/WPrefs.app/tiff/speed0.tiff
@@ -290,6 +292,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
@@ -316,6 +319,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
@@ -327,10 +331,6 @@ share/WindowMaker/plmenu.sk
share/WindowMaker/plmenu.zh_CN
share/WindowMaker/plmenu.zh_TW
share/WindowMaker/wmmacros
-share/doc/WindowMaker/FAQ
-share/doc/WindowMaker/FAQ.I18N
-share/doc/WindowMaker/README
-share/doc/WindowMaker/README.definable-cursor
share/examples/WindowMaker/WMGLOBAL
share/examples/WindowMaker/WMRootMenu
share/examples/WindowMaker/WMState
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index 6a22b2796ef..953b29920a8 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,18 +1,14 @@
-$NetBSD: distinfo,v 1.39 2015/02/02 11:30:37 jperkin Exp $
+$NetBSD: distinfo,v 1.40 2015/10/16 10:42:23 adam Exp $
-SHA1 (WindowMaker-0.95.6.tar.gz) = e39c9d1bb012a087de5791c9474ff8776b2d230b
-RMD160 (WindowMaker-0.95.6.tar.gz) = 6faba86fb79190fe1e9de0192e1003603dbcf4ac
-Size (WindowMaker-0.95.6.tar.gz) = 3004856 bytes
-SHA1 (patch-aa) = e926a78bc5b800a1e5fbc8792099fc4a97ae916f
-SHA1 (patch-ab) = f954dadf7863a0ffc5eb4fb31bfadc218570324d
-SHA1 (patch-ac) = 0a2843e3f8e8456080082d1f3e57f58a5d440d18
-SHA1 (patch-ad) = ec668c0e40289e87e92ec85d26810ef358d2407a
-SHA1 (patch-ae) = af4cf08ef774080efeaa5baa2662748418b442a3
-SHA1 (patch-af) = 87c1ddd22f4afae10ae60f012d12a41de44b0f12
-SHA1 (patch-ai) = e13349dcdf08a332d8979a21b45c2a8be4951ce2
-SHA1 (patch-aj) = 14636a50f9cb1a2353f813cd7873de0e6c31ddb4
-SHA1 (patch-ak) = 40221313ce3456f4357082caec17991390607159
-SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103
-SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031
+SHA1 (WindowMaker-0.95.7.tar.gz) = ceae84f67e056dd291199b76afd0235edda214a0
+RMD160 (WindowMaker-0.95.7.tar.gz) = 2ae5003eb4e59b89c2b81c3b7b751b2f2dc98b14
+SHA512 (WindowMaker-0.95.7.tar.gz) = 9c1190503efdc58c11a90d5ba80796979cdc9f2beb69a6d233ffc8d531a54c877c5270841bf6318738069098cd488e5ab77ac19f661ac888e892bf05ac22d93f
+Size (WindowMaker-0.95.7.tar.gz) = 3238325 bytes
+SHA1 (patch-WINGs_dragsource.c) = a9b8dfb0ac453e5835b683a2119428d0b1182ced
+SHA1 (patch-WindowMaker_Defaults_Makefile.in) = 3f0fbb4f1adef603cc7e3c371c3e72dd1d8f594c
+SHA1 (patch-configure) = dde661da4d1b3632b4710285f9f7a9485356e8b8
SHA1 (patch-src_event.c) = 9f72b77f7f7890c9b4283eecca3e2bb25ad8d5b3
-SHA1 (patch-wrlib_load__gif.c) = 039c342b99d8cc4edf4ce6ee93c9d1a1a2ac1f5d
+SHA1 (patch-src_main.c) = e1693470d803b96f8ff93906dfeea43d5c3509c9
+SHA1 (patch-src_switchpanel.c) = 4c494eff64b17bf4b08ddaafc95ffa37f43452f9
+SHA1 (patch-util_Makefile.in) = 066a9e54b4b4f7be6415259b737c85171f9aa548
+SHA1 (patch-wrlib_Makefile.in) = a7a5f601219c1fe8f7f0273a2a1518ab0d8e99b2
diff --git a/wm/windowmaker/patches/patch-ai b/wm/windowmaker/patches/patch-WINGs_dragsource.c
index b160c3d74f1..4756ce1d08a 100644
--- a/wm/windowmaker/patches/patch-ai
+++ b/wm/windowmaker/patches/patch-WINGs_dragsource.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.3 2014/10/07 16:11:11 adam Exp $
+$NetBSD: patch-WINGs_dragsource.c,v 1.1 2015/10/16 10:42:23 adam Exp $
---- WINGs/dragsource.c.orig 2014-08-30 12:29:09.000000000 +0000
+--- WINGs/dragsource.c.orig 2015-08-11 18:41:14.000000000 +0000
+++ WINGs/dragsource.c
@@ -2,6 +2,8 @@
#include "wconfig.h"
diff --git a/wm/windowmaker/patches/patch-af b/wm/windowmaker/patches/patch-WindowMaker_Defaults_Makefile.in
index be1b14156e5..ac631771e6e 100644
--- a/wm/windowmaker/patches/patch-af
+++ b/wm/windowmaker/patches/patch-WindowMaker_Defaults_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2013/05/21 14:38:40 hans Exp $
+$NetBSD: patch-WindowMaker_Defaults_Makefile.in,v 1.1 2015/10/16 10:42:23 adam Exp $
---- WindowMaker/Defaults/Makefile.in.orig 2013-01-09 21:43:07.000000000 +0000
+--- WindowMaker/Defaults/Makefile.in.orig 2015-08-11 18:52:19.000000000 +0000
+++ WindowMaker/Defaults/Makefile.in
-@@ -235,7 +235,7 @@ top_builddir = @top_builddir@
+@@ -314,7 +314,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
wprefs_bindir = @wprefs_bindir@
wprefs_datadir = @wprefs_datadir@
diff --git a/wm/windowmaker/patches/patch-aa b/wm/windowmaker/patches/patch-aa
deleted file mode 100644
index 2c0dbd7df43..00000000000
--- a/wm/windowmaker/patches/patch-aa
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2013/05/21 14:38:40 hans Exp $
-
---- doc/Makefile.in.orig 2013-01-09 21:43:07.000000000 +0000
-+++ doc/Makefile.in
-@@ -279,25 +279,25 @@ wprefs_bindir = @wprefs_bindir@
- wprefs_datadir = @wprefs_datadir@
- SUBDIRS = sk cs ru
- man_MANS = \
-- geticonset.1x \
-- getstyle.1x \
-+ geticonset.1 \
-+ getstyle.1 \
- get-wings-flags.1 \
- get-wraster-flags.1 \
- get-wutil-flags.1 \
-- seticons.1x \
-- setstyle.1x \
-+ seticons.1 \
-+ setstyle.1 \
- upgrade-windowmaker-defaults.8 \
- wdread.1 \
-- wdwrite.1x \
-- WindowMaker.1x \
-- wmagnify.1x \
-- wmaker.1x \
-+ wdwrite.1 \
-+ WindowMaker.1 \
-+ wmagnify.1 \
-+ wmaker.1 \
- wmgenmenu.1 \
- wmmenugen.1 \
-- wmsetbg.1x \
-- WPrefs.1x \
-- wxcopy.1x \
-- wxpaste.1x
-+ wmsetbg.1 \
-+ WPrefs.1 \
-+ wxcopy.1 \
-+ wxpaste.1
-
- EXTRA_DIST = $(man_MANS)
- all: all-recursive
diff --git a/wm/windowmaker/patches/patch-ac b/wm/windowmaker/patches/patch-ac
deleted file mode 100644
index df9b70e241b..00000000000
--- a/wm/windowmaker/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2013/05/21 14:38:40 hans Exp $
-
---- wrlib/Makefile.in 2013-05-14 22:11:11.000000000 +0000
-+++ wrlib/Makefile.in.orig
-@@ -321,7 +321,7 @@ SUBDIRS = .
- AUTOMAKE_OPTIONS =
- EXTRA_DIST = tests libwraster.map get-wraster-flags.in
- lib_LTLIBRARIES = libwraster.la
--libwraster_la_LDFLAGS = -version-info @WRASTER_VERSION@ \
-+libwraster_la_LDFLAGS = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info @WRASTER_VERSION@ \
- $(am__append_1)
- bin_SCRIPTS = get-wraster-flags
- include_HEADERS = wraster.h
diff --git a/wm/windowmaker/patches/patch-ae b/wm/windowmaker/patches/patch-ae
deleted file mode 100644
index 2c4f8cd5623..00000000000
--- a/wm/windowmaker/patches/patch-ae
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2013/05/21 14:38:40 hans Exp $
-
---- doc/sk/Makefile.in.orig 2013-01-09 21:43:07.000000000 +0000
-+++ doc/sk/Makefile.in
-@@ -237,15 +237,15 @@ top_srcdir = @top_srcdir@
- wprefs_bindir = @wprefs_bindir@
- wprefs_datadir = @wprefs_datadir@
- man_MANS = \
-- geticonset.1x \
-- setstyle.1x \
-- wxpaste.1x \
-- getstyle.1x \
-- wdwrite.1x \
-- wmsetbg.1x \
-- seticons.1x \
-- wmaker.1x \
-- wxcopy.1x
-+ geticonset.1 \
-+ setstyle.1 \
-+ wxpaste.1 \
-+ getstyle.1 \
-+ wdwrite.1 \
-+ wmsetbg.1 \
-+ seticons.1 \
-+ wmaker.1 \
-+ wxcopy.1
-
- EXTRA_DIST = $(man_MANS)
- all: all-am
diff --git a/wm/windowmaker/patches/patch-ab b/wm/windowmaker/patches/patch-configure
index 937677e563d..aee349c8486 100644
--- a/wm/windowmaker/patches/patch-ab
+++ b/wm/windowmaker/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.15 2014/01/17 08:48:06 adam Exp $
+$NetBSD: patch-configure,v 1.1 2015/10/16 10:42:23 adam Exp $
---- configure.orig 2013-01-09 21:43:05.000000000 +0000
+--- configure.orig 2015-08-11 18:52:18.000000000 +0000
+++ configure
-@@ -11948,9 +11948,9 @@ test "x$exec_prefix" = xNONE && exec_pre
- _bindir=`eval echo $bindir`
- _bindir=`eval echo $_bindir`
+@@ -13840,9 +13840,9 @@ _bindir=`eval echo $_bindir`
+ _libdir=`eval echo $libdir`
+ _libdir=`eval echo $_libdir`
-lib_search_path='-L${libdir}'
+lib_search_path="-L${BUILDLINK_DIR}/lib -L${BUILDLINK_X11_DIR}/lib"
diff --git a/wm/windowmaker/patches/patch-doc_cs_Makefile.in b/wm/windowmaker/patches/patch-doc_cs_Makefile.in
deleted file mode 100644
index 478dd9de057..00000000000
--- a/wm/windowmaker/patches/patch-doc_cs_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-doc_cs_Makefile.in,v 1.1 2013/05/21 14:38:40 hans Exp $
-
---- doc/cs/Makefile.in.orig 2013-05-14 22:33:35.000000000 +0000
-+++ doc/cs/Makefile.in
-@@ -237,15 +237,15 @@ top_srcdir = @top_srcdir@
- wprefs_bindir = @wprefs_bindir@
- wprefs_datadir = @wprefs_datadir@
- man_MANS = \
-- geticonset.1x \
-- setstyle.1x \
-- wxpaste.1x \
-- getstyle.1x \
-- wdwrite.1x \
-- wmsetbg.1x \
-- seticons.1x \
-- wmaker.1x \
-- wxcopy.1x
-+ geticonset.1 \
-+ setstyle.1 \
-+ wxpaste.1 \
-+ getstyle.1 \
-+ wdwrite.1 \
-+ wmsetbg.1 \
-+ seticons.1 \
-+ wmaker.1 \
-+ wxcopy.1
-
- EXTRA_DIST = $(man_MANS)
- all: all-am
diff --git a/wm/windowmaker/patches/patch-doc_ru_Makefile.in b/wm/windowmaker/patches/patch-doc_ru_Makefile.in
deleted file mode 100644
index fac417ae820..00000000000
--- a/wm/windowmaker/patches/patch-doc_ru_Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-doc_ru_Makefile.in,v 1.1 2013/05/21 14:38:40 hans Exp $
-
---- doc/ru/Makefile.in.orig 2013-05-14 22:33:35.000000000 +0000
-+++ doc/ru/Makefile.in
-@@ -237,15 +237,15 @@ top_srcdir = @top_srcdir@
- wprefs_bindir = @wprefs_bindir@
- wprefs_datadir = @wprefs_datadir@
- man_MANS = \
-- geticonset.1x \
-- setstyle.1x \
-- wxpaste.1x \
-- getstyle.1x \
-- wdwrite.1x \
-- wmsetbg.1x \
-- seticons.1x \
-- wmaker.1x \
-- wxcopy.1x
-+ geticonset.1 \
-+ setstyle.1 \
-+ wxpaste.1 \
-+ getstyle.1 \
-+ wdwrite.1 \
-+ wmsetbg.1 \
-+ seticons.1 \
-+ wmaker.1 \
-+ wxcopy.1
-
- EXTRA_DIST = $(man_MANS)
- all: all-am
diff --git a/wm/windowmaker/patches/patch-ad b/wm/windowmaker/patches/patch-src_main.c
index b23e0b737d0..5fd827b9dd6 100644
--- a/wm/windowmaker/patches/patch-ad
+++ b/wm/windowmaker/patches/patch-src_main.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.9 2013/05/21 14:38:40 hans Exp $
+$NetBSD: patch-src_main.c,v 1.1 2015/10/16 10:42:23 adam Exp $
---- src/main.c.orig 2013-01-09 21:42:49.000000000 +0000
+--- src/main.c.orig 2015-08-11 18:41:14.000000000 +0000
+++ src/main.c
@@ -31,6 +31,7 @@
#include <sys/stat.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.9 2013/05/21 14:38:40 hans Exp $
#include <X11/Xlib.h>
#include <X11/Xutil.h>
-@@ -315,6 +316,12 @@ void SetupEnvironment(WScreen * scr)
+@@ -241,6 +242,12 @@ void SetupEnvironment(WScreen * scr)
{
char *tmp, *ptr;
char buf[16];
diff --git a/wm/windowmaker/patches/patch-aj b/wm/windowmaker/patches/patch-src_switchpanel.c
index 783e0ec2cf1..90fd58e8649 100644
--- a/wm/windowmaker/patches/patch-aj
+++ b/wm/windowmaker/patches/patch-src_switchpanel.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.4 2014/10/07 16:11:11 adam Exp $
+$NetBSD: patch-src_switchpanel.c,v 1.1 2015/10/16 10:42:23 adam Exp $
---- src/switchpanel.c.orig 2014-08-30 12:29:09.000000000 +0000
+--- src/switchpanel.c.orig 2015-08-11 18:41:14.000000000 +0000
+++ src/switchpanel.c
@@ -37,6 +37,8 @@
diff --git a/wm/windowmaker/patches/patch-ak b/wm/windowmaker/patches/patch-util_Makefile.in
index aece7a70c9b..678d9f90c6e 100644
--- a/wm/windowmaker/patches/patch-ak
+++ b/wm/windowmaker/patches/patch-util_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.6 2014/01/17 08:48:06 adam Exp $
+$NetBSD: patch-util_Makefile.in,v 1.1 2015/10/16 10:42:23 adam Exp $
---- util/Makefile.in.orig 2013-09-12 22:00:17.000000000 +0000
+--- util/Makefile.in.orig 2015-08-11 18:52:20.000000000 +0000
+++ util/Makefile.in
-@@ -375,21 +375,21 @@ AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
+@@ -482,21 +482,21 @@ AM_CPPFLAGS = \
-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@
diff --git a/wm/windowmaker/patches/patch-wrlib_Makefile.in b/wm/windowmaker/patches/patch-wrlib_Makefile.in
new file mode 100644
index 00000000000..202514826f9
--- /dev/null
+++ b/wm/windowmaker/patches/patch-wrlib_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-wrlib_Makefile.in,v 1.1 2015/10/16 10:42:23 adam Exp $
+
+--- wrlib/Makefile.in.orig 2015-08-11 18:52:20.000000000 +0000
++++ wrlib/Makefile.in
+@@ -447,7 +447,7 @@ DIST_SUBDIRS = $(SUBDIRS) tests
+ AUTOMAKE_OPTIONS =
+ EXTRA_DIST = tests
+ lib_LTLIBRARIES = libwraster.la
+-libwraster_la_LDFLAGS = -version-info @WRASTER_VERSION@ \
++libwraster_la_LDFLAGS = @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm -version-info @WRASTER_VERSION@ \
+ $(am__append_1)
+ @HAVE_LD_VERSION_SCRIPT_TRUE@EXTRA_libwraster_la_DEPENDENCIES = libwraster.map
+ @HAVE_LD_VERSION_SCRIPT_TRUE@CLEANFILES = libwraster.map
diff --git a/wm/windowmaker/patches/patch-wrlib_load__gif.c b/wm/windowmaker/patches/patch-wrlib_load__gif.c
deleted file mode 100644
index 8e4ec736ae9..00000000000
--- a/wm/windowmaker/patches/patch-wrlib_load__gif.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-wrlib_load__gif.c,v 1.1 2014/10/07 16:11:11 adam Exp $
-
-Fix build with giflib 5.1 and newer.
-
---- wrlib/load_gif.c.orig 2014-10-07 12:55:29.000000000 +0000
-+++ wrlib/load_gif.c
-@@ -81,7 +81,7 @@ RImage *RLoadGIF(const char *file, int i
- }
-
- if (gif->SWidth < 1 || gif->SHeight < 1) {
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
- RErrorCode = RERR_BADIMAGEFILE;
- return NULL;
- }
-@@ -216,7 +216,7 @@ RImage *RLoadGIF(const char *file, int i
- free(buffer);
-
- if (gif)
-- DGifCloseFile(gif);
-+ DGifCloseFile(gif, NULL);
-
- return image;
- }