Add link options to build on Darwin. Patches provided by Mark E. Perkins

in PR 36460.  This fixes the second half of the PR.

3 files changed, 62 insertions, 1 deletions

diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index 18bdc4231e3..8045cc2d2cc 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2005/07/08 09:47:02 adam Exp $
+$NetBSD: distinfo,v 1.27 2007/06/21 00:00:23 minskim Exp $
 
 SHA1 (WindowMaker-0.92.0.tar.bz2) = 4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c
 RMD160 (WindowMaker-0.92.0.tar.bz2) = c161eee64092fafb4868181fe2a0b6db96ed6de0
@@ -9,7 +9,9 @@ SHA1 (patch-ac) = 709866bb1db30a3d83fee6ad38f632bbbfd4fe71
 SHA1 (patch-ad) = 183b529289bbcb8dd7590296e546c166aef8da0a
 SHA1 (patch-ae) = 67c478b4fbee07ac832f59a7ad21bbbf137f5f86
 SHA1 (patch-af) = d754e2a195f1d58ea8a55f2e7bb375d18dd67e5e
+SHA1 (patch-ag) = 706d6261f58bae4cd810a77fd65dfb57d870bcab
 SHA1 (patch-ah) = b391a48f723c62335448007a89c6958a7d922d86
 SHA1 (patch-ai) = 44a6a63bad867e6bc614b58688d59aa610b8553b
 SHA1 (patch-aj) = 9d993770f77cd53d005b1f2c81baff49831fe96a
+SHA1 (patch-ak) = aca311941e7c2fa7860934cd029ff87fde96c8ff
 SHA1 (patch-al) = b900fcc52c3fb5b5184b28e22c29e111317ea7ad
diff --git a/wm/windowmaker/patches/patch-ag b/wm/windowmaker/patches/patch-ag
new file mode 100644
index 00000000000..25ae7f657bc
--- /dev/null
+++ b/wm/windowmaker/patches/patch-ag
@@ -0,0 +1,19 @@
+$NetBSD: patch-ag,v 1.6 2007/06/21 00:00:23 minskim Exp $
+
+--- WINGs/Examples/Makefile.in.orig	2007-06-20 16:28:40.000000000 -0700
++++ WINGs/Examples/Makefile.in
+@@ -127,12 +127,12 @@ puzzle_DEPENDENCIES = $(top_builddir)/WI
+ 
+ connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+ 
+-connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ 	@NETLIBS@ @INTLIBS@
++connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ 	@NETLIBS@ @INTLIBS@ @XLIBS@
+ 
+ 
+ server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a
+ 
+-server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ 	@NETLIBS@ @INTLIBS@
++server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ 	@NETLIBS@ @INTLIBS@ @XLIBS@
+ 
+ 
+ INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src 	-DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG
diff --git a/wm/windowmaker/patches/patch-ak b/wm/windowmaker/patches/patch-ak
new file mode 100644
index 00000000000..e0b5d5fd7a0
--- /dev/null
+++ b/wm/windowmaker/patches/patch-ak
@@ -0,0 +1,40 @@
+$NetBSD: patch-ak,v 1.3 2007/06/21 00:00:24 minskim Exp $
+
+--- util/Makefile.in.orig	2007-06-20 16:28:40.000000000 -0700
++++ util/Makefile.in
+@@ -126,15 +126,15 @@ INCLUDES = $(DFLAGS) -I$(top_srcdir)/WIN
+ 
+ liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@
+ 
+-wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
++wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
+ 
+-wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
++wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
+ 
+ wxcopy_LDADD = @XLFLAGS@ @XLIBS@ 
+ 
+ wxpaste_LDADD = @XLFLAGS@ @XLIBS@
+ 
+-getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
++getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
+ 
+ getstyle_SOURCES = getstyle.c fontconv.c
+ 
+@@ -143,13 +143,13 @@ setstyle_LDADD =  	$(top_builddir)/WINGs
+ 
+ setstyle_SOURCES = setstyle.c fontconv.c
+ 
+-convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
++convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
+ 
+ convertfonts_SOURCES = convertfonts.c fontconv.c
+ 
+-seticons_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
++seticons_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
+ 
+-geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist)
++geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist)
+ 
+ wmagnify_LDADD =  	$(top_builddir)/WINGs/libWINGs.a 	$(top_builddir)/wrlib/libwraster.la 	@XFTLIBS@ @INTLIBS@ @DLLIBS@
+