Use -Wl,--no-undefined instead of -Wl,-no-undefined in abiword*.

Remove the many of the patches and use BUILDLINK_TRANSFORM instead.
Reported by Richard Palo in private mail.

54 files changed, 19 insertions, 736 deletions

diff --git a/editors/abiword-plugins/Makefile b/editors/abiword-plugins/Makefile
index 22336f4251f..618395a61ba 100644
--- a/editors/abiword-plugins/Makefile
+++ b/editors/abiword-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2015/10/10 01:58:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.63 2016/01/24 15:30:47 nros Exp $
 
 .include	"../../editors/abiword/Makefile.common"
 DISTNAME=	abiword-${ABIVERSION}
@@ -94,6 +94,8 @@ pre-configure:
 	cd ${WRKSRC}; \
 	autoreconf --force --install
 
+BUILDLINK_TRANSFORM+=	opt:-no-undefined:-Wl,--no-undefined
+
 .include "../../editors/abiword/options.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 1b03479846b..eed95186d1f 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2015/09/21 11:28:45 nros Exp $
+# $NetBSD: Makefile,v 1.157 2016/01/24 15:30:46 nros Exp $
 
 .include 	"Makefile.common"
 DISTNAME=	abiword-${ABIVERSION}
@@ -31,6 +31,8 @@ pre-configure:
 	cd ${WRKSRC}; \
 	autoreconf --force --install
 
+BUILDLINK_TRANSFORM+=	opt:-no-undefined:-Wl,--no-undefined
+
 .include "options.mk"
 
 .include "../../converters/fribidi/buildlink3.mk"
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index a264aab3b23..8d1eae0b3dd 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2015/11/03 03:32:14 agc Exp $
+$NetBSD: distinfo,v 1.68 2016/01/24 15:30:46 nros Exp $
 
 SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991
 RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681
@@ -6,68 +6,20 @@ SHA512 (abiword-3.0.1.tar.gz) = c655aabe0ba0a9880f30808e26c02ec3280c750625faa482
 Size (abiword-3.0.1.tar.gz) = 11144990 bytes
 SHA1 (patch-configure.ac) = bbffa133509affe43fdef7e420e3a96a14edf58f
 SHA1 (patch-plugin-configure.m4) = a8b8db3bdbd69339e32eefec1de7b1b59467db40
-SHA1 (patch-plugins_aiksaurus_Makefile.am) = e859a0af2b436616b1dae45f3be8593cf917c87d
-SHA1 (patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am) = 2790a45fa4590f8f5ac27ec6e1b0e9eacc5c7c6e
-SHA1 (patch-plugins_applix_Makefile.am) = d579e6620189bcdd5cb9286edb77936893d66727
-SHA1 (patch-plugins_babelfish_Makefile.am) = 9a14d52b882824a344e4189b210ea05f15cd5dc4
-SHA1 (patch-plugins_bmp_Makefile.am) = 9919326323259fdb717f1cc1b63be7b5fecb4d85
-SHA1 (patch-plugins_clarisworks_Makefile.am) = 20b149e4ccba72e54421e59f62cee8823737af5d
-SHA1 (patch-plugins_collab_Makefile.am) = 268b976c687e300326f1af9933cea7c060ecef90
-SHA1 (patch-plugins_command_Makefile.am) = 42bf4af0905f83faf21ceabfbf20756c39d9d268
-SHA1 (patch-plugins_docbook_Makefile.am) = 73ef7476c0eae93a79ffd1571081b545a7cf5f0b
-SHA1 (patch-plugins_eml_Makefile.am) = 23bccc8e3aa62275f441635675a2a34f53c5d118
-SHA1 (patch-plugins_epub_Makefile.am) = 0d4f2bca4e2a40d3f0c34f1c5b37284190979d48
-SHA1 (patch-plugins_freetranslation_Makefile.am) = f494b16bdd2d8cb484bec09a61c6e3e0d8f78b44
-SHA1 (patch-plugins_garble_Makefile.am) = b6c3f68a390c0b4a4e5e5d626a7532f4542b5e9f
-SHA1 (patch-plugins_gda_Makefile.am) = 73a112eb3118c6769bef00c5f4c3ad50a735b54a
-SHA1 (patch-plugins_gdict_Makefile.am) = 16e6fc9134bf96e8b924c8ef5f6f57988531684b
-SHA1 (patch-plugins_gimp_Makefile.am) = 0c284afb8e168dff87da0d4ae70936c8759b8cb5
+SHA1 (patch-plugins_aiksaurus_Makefile.am) = df642d973dfa453670807d639da11bb112cbd0bd
+SHA1 (patch-plugins_command_Makefile.am) = c26cd671390aa2bfd6f306a62d39fc6d50c56939
 SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269
-SHA1 (patch-plugins_goffice_Makefile.am) = 935af789858b3fbf3b928837acca024a1415bf86
-SHA1 (patch-plugins_google_Makefile.am) = ae883071f847b641ded349e5cb2ac3c126942d8d
-SHA1 (patch-plugins_grammar_Makefile.am) = 0c651d09ae690a22ce70f93fd091ceabb18a44d0
+SHA1 (patch-plugins_goffice_Makefile.am) = 37afe59c96df7b0a3702a6df99abe42249e339d9
 SHA1 (patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp) = f3916dbc0b208bfe9dbb55eac850a3094683694c
-SHA1 (patch-plugins_hancom_Makefile.am) = 93e6b69160438a254a6c68b81a6385456d328999
-SHA1 (patch-plugins_hrtext_Makefile.am) = 439ecd0ac09b147c5a789bfb498e5da866d0cb59
-SHA1 (patch-plugins_iscii_Makefile.am) = ff740a1d6e308658d18c0102a67fa8c3f32cf95b
-SHA1 (patch-plugins_kword_Makefile.am) = bac30878f5eb8a3d7d037f13bdef81308c5a3e17
-SHA1 (patch-plugins_latex_Makefile.am) = 196edb99bcbc3040ec665bf422472558684c5fe5
-SHA1 (patch-plugins_loadbindings_Makefile.am) = e689adf52c0786f648435e259da3410a98036887
-SHA1 (patch-plugins_mathview_Makefile.am) = 8a779c043b3b9b483ec072e2780240e1ec6f575a
-SHA1 (patch-plugins_mht_Makefile.am) = a302d8af3cbcaa246b1d61cf90adb2276a95d502
-SHA1 (patch-plugins_mif_Makefile.am) = 9dbd23cee5d1f5d56058eb95cf3f247766972110
-SHA1 (patch-plugins_mswrite_Makefile.am) = bd0d7546d07500ce74828e0414ee14278c49a396
-SHA1 (patch-plugins_opendocument_Makefile.am) = db01004db8480509f9c6060f82b7095bfe0b4715
-SHA1 (patch-plugins_openwriter_Makefile.am) = 40fc8135faa71918f02420ba5d527f74bc4e7999
-SHA1 (patch-plugins_openxml_Makefile.am) = 1eb9cf1df2fdd9e707e26412089b08f45ae59581
-SHA1 (patch-plugins_opml_Makefile.am) = 94fe9afb9d8145f36d50abec8c956cc295a6ff4d
-SHA1 (patch-plugins_ots_Makefile.am) = a674a0b2a222ba8d2acc8de002bf6d618c206573
-SHA1 (patch-plugins_paint_Makefile.am) = bbae6fdc2cfa162ccd2dd87178759997c6e7b71b
 SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b
 SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6
-SHA1 (patch-plugins_passepartout_Makefile.am) = c048ef9cdfab149394a6ecb02f7d5faf027c89ed
-SHA1 (patch-plugins_pdb_Makefile.am) = a01b5ed0ee10d3f72cf6fa2d20b96628844c8217
-SHA1 (patch-plugins_pdf_Makefile.am) = 68fd361019ab4f2a3bd9bc0ea9e5b2d697e13e45
-SHA1 (patch-plugins_presentation_Makefile.am) = 463c2bd628d4cdad9cee89ae1c10c56b0343366d
-SHA1 (patch-plugins_psion_Makefile.am) = 1f8836ea23aa38ad6716461fa4f0c6db1ec6eba0
-SHA1 (patch-plugins_rsvg_Makefile.am) = f844ee15921547e769da8dd5acfb64b57958b33f
-SHA1 (patch-plugins_s5_Makefile.am) = 4cf5ee72bd6878c5e3801141023c1e0ec5ec9002
-SHA1 (patch-plugins_sdw_Makefile.am) = b9a756c639225e7d57543f83d6db6e93be3d411e
-SHA1 (patch-plugins_t602_Makefile.am) = a4714fcefe149b874832683688a7537dcb04ae9f
-SHA1 (patch-plugins_urldict_Makefile.am) = 7cfb2775dd67cce045e31a01b79e4cb04887f7d5
-SHA1 (patch-plugins_wikipedia_Makefile.am) = 57e65f04b202f475c586d399a8c128f51d594630
-SHA1 (patch-plugins_wmf_Makefile.am) = 00bf982683d1d6c122b62a1df1bc241f6e276c4d
-SHA1 (patch-plugins_wml_Makefile.am) = 6c05337b5619864dde5a2100e1859684333fed47
-SHA1 (patch-plugins_wordperfect_Makefile.am) = d08d7d21ed8106bcbe77cc42ffca13d7ad18d3ac
+SHA1 (patch-plugins_psion_Makefile.am) = 0d883b06e7f0368826e0d729c84cf9711555ab54
 SHA1 (patch-plugins_wordperfect_xp_Makefile.am) = e5cba76cfdba5caca672b801fa222b277a7522c1
 SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = 10a6d88e21f98e743b4443a09cd73ab8b7812fc9
 SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 6e1e264506edabf0e1cb359f664ed455d16fa05e
 SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = c87bc227eebcfcc2ab11ee6b5237ef8fcc47c0bc
 SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = 0a75276dc0d1d99b97155f61d9f98de7126fb0a3
-SHA1 (patch-plugins_wpg_Makefile.am) = a96fafec05866fb7c3480c8d2a041b970ad8e988
 SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 36d7ca7855ddc504701e392c28e3d8530f78b81e
-SHA1 (patch-plugins_xslfo_Makefile.am) = cceef8d780dc63c1253544f21bd123dac19eba0b
-SHA1 (patch-src_Makefile.am) = b2b898470b842e5bfa45e2b3b653ca9b51714b73
 SHA1 (patch-src_af_util_xp_ut__endian.h) = e73aef0db6ddef0316cca3f7a77fd4c71c870637
 SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd862d4
 SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
diff --git a/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am b/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am
index 8994d60efdb..9d939612baa 100644
--- a/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am
+++ b/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD: patch-plugins_aiksaurus_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_aiksaurus_Makefile.am,v 1.2 2016/01/24 15:30:46 nros Exp $
 GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
 to the linker.  Prefix with "-Wl," to fix build.
 Use CXX for linking.
@@ -9,7 +9,7 @@ Use CXX for linking.
  	-avoid-version \
  	-module \
 -	-no-undefined
-+	-Wl,-no-undefined
++	-Wl,--no-undefined
  
  aiksaurus_la_SOURCES = 
 +nodist_EXTRA_aiksaurus_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am b/editors/abiword/patches/patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am
deleted file mode 100644
index 8f5a68dee38..00000000000
--- a/editors/abiword/patches/patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_aiksaurus_aiksaurusgtk3_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/aiksaurus/aiksaurusgtk3/Makefile.am.orig	2014-03-08 02:55:42.000000000 +0000
-+++ plugins/aiksaurus/aiksaurusgtk3/Makefile.am
-@@ -2,7 +2,7 @@ AM_CXXFLAGS = $(AIKSAURUS_CFLAGS) -Wall 
- 
- lib_LTLIBRARIES = libAiksaurusGtk3.la
- 
--libAiksaurusGtk3_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -export-dynamic
-+libAiksaurusGtk3_la_LDFLAGS = -Wl,-no-undefined -release $(LT_RELEASE) -export-dynamic
- 
- libAiksaurusGtk3_la_LIBADD = $(AIKSAURUS_LIBS)
- 
diff --git a/editors/abiword/patches/patch-plugins_applix_Makefile.am b/editors/abiword/patches/patch-plugins_applix_Makefile.am
deleted file mode 100644
index c6781a57717..00000000000
--- a/editors/abiword/patches/patch-plugins_applix_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_applix_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/applix/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/applix/Makefile.am
-@@ -18,7 +18,7 @@ applix_la_LIBADD = \
- applix_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- applix_la_SOURCES = 
- 
diff --git a/editors/abiword/patches/patch-plugins_babelfish_Makefile.am b/editors/abiword/patches/patch-plugins_babelfish_Makefile.am
deleted file mode 100644
index 77563659d4f..00000000000
--- a/editors/abiword/patches/patch-plugins_babelfish_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_babelfish_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/babelfish/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/babelfish/Makefile.am
-@@ -18,7 +18,7 @@ babelfish_la_LIBADD = \
- babelfish_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- babelfish_la_SOURCES =
- 
diff --git a/editors/abiword/patches/patch-plugins_bmp_Makefile.am b/editors/abiword/patches/patch-plugins_bmp_Makefile.am
deleted file mode 100644
index 4189c477422..00000000000
--- a/editors/abiword/patches/patch-plugins_bmp_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_bmp_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/bmp/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/bmp/Makefile.am
-@@ -18,7 +18,7 @@ bmp_la_LIBADD = \
- bmp_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- bmp_la_SOURCES = 
- nodist_EXTRA_bmp_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_collab_Makefile.am b/editors/abiword/patches/patch-plugins_collab_Makefile.am
deleted file mode 100644
index 7308e7ff4e1..00000000000
--- a/editors/abiword/patches/patch-plugins_collab_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_collab_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/collab/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/collab/Makefile.am
-@@ -22,7 +22,7 @@ collab_la_LIBADD = \
- collab_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- collab_la_SOURCES = 
- nodist_EXTRA_collab_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_command_Makefile.am b/editors/abiword/patches/patch-plugins_command_Makefile.am
index 8816eb74ba1..dddc24fdb07 100644
--- a/editors/abiword/patches/patch-plugins_command_Makefile.am
+++ b/editors/abiword/patches/patch-plugins_command_Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD: patch-plugins_command_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_command_Makefile.am,v 1.2 2016/01/24 15:30:46 nros Exp $
 GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
 to the linker.  Prefix with "-Wl," to fix build.
 Use CXX for linking.
@@ -9,7 +9,7 @@ Use CXX for linking.
  	-avoid-version \
  	-module \
 -	-no-undefined
-+	-Wl,-no-undefined
++	-Wl,--no-undefined
  
  command_la_SOURCES = 
 +nodist_EXTRA_command_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_docbook_Makefile.am b/editors/abiword/patches/patch-plugins_docbook_Makefile.am
deleted file mode 100644
index 0e94e7da1fa..00000000000
--- a/editors/abiword/patches/patch-plugins_docbook_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_docbook_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/docbook/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/docbook/Makefile.am
-@@ -18,7 +18,7 @@ docbook_la_LIBADD = \
- docbook_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- if TOOLKIT_COCOA
- docbook_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_eml_Makefile.am b/editors/abiword/patches/patch-plugins_eml_Makefile.am
deleted file mode 100644
index cb327e59477..00000000000
--- a/editors/abiword/patches/patch-plugins_eml_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_eml_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/eml/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/eml/Makefile.am
-@@ -18,7 +18,7 @@ eml_la_LIBADD = \
- eml_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- eml_la_SOURCES = 
- nodist_EXTRA_eml_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_epub_Makefile.am b/editors/abiword/patches/patch-plugins_epub_Makefile.am
deleted file mode 100644
index 412e02ec619..00000000000
--- a/editors/abiword/patches/patch-plugins_epub_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_epub_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/epub/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/epub/Makefile.am
-@@ -28,7 +28,7 @@ epub_la_LIBADD += $(EPUB_LIBS)
- epub_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- if TOOLKIT_COCOA
- epub_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_freetranslation_Makefile.am b/editors/abiword/patches/patch-plugins_freetranslation_Makefile.am
deleted file mode 100644
index dbdb2b27149..00000000000
--- a/editors/abiword/patches/patch-plugins_freetranslation_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_freetranslation_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/freetranslation/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/freetranslation/Makefile.am
-@@ -18,7 +18,7 @@ freetranslation_la_LIBADD = \
- freetranslation_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- freetranslation_la_SOURCES = 
- 
diff --git a/editors/abiword/patches/patch-plugins_garble_Makefile.am b/editors/abiword/patches/patch-plugins_garble_Makefile.am
deleted file mode 100644
index c58bf86f634..00000000000
--- a/editors/abiword/patches/patch-plugins_garble_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_garble_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/garble/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/garble/Makefile.am
-@@ -13,7 +13,7 @@ garble_la_LIBADD = \
- garble_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- garble_la_SOURCES = 
- nodist_EXTRA_garble_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_gda_Makefile.am b/editors/abiword/patches/patch-plugins_gda_Makefile.am
deleted file mode 100644
index 8d6b11011eb..00000000000
--- a/editors/abiword/patches/patch-plugins_gda_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_gda_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/gda/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/gda/Makefile.am
-@@ -11,7 +11,7 @@ gda_la_LIBADD = \
- gda_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- gda_la_SOURCES = 
- 
diff --git a/editors/abiword/patches/patch-plugins_gdict_Makefile.am b/editors/abiword/patches/patch-plugins_gdict_Makefile.am
deleted file mode 100644
index 31c83de24ad..00000000000
--- a/editors/abiword/patches/patch-plugins_gdict_Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-plugins_gdict_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
-Use CXX for linking.
---- plugins/gdict/Makefile.am.orig	2011-12-11 05:10:10.000000000 +0000
-+++ plugins/gdict/Makefile.am
-@@ -18,9 +18,10 @@ gdict_la_LIBADD = \
- gdict_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- gdict_la_SOURCES = 
-+nodist_EXTRA_gdict_la_SOURCES = dummy.cpp
- 
- EXTRA_DIST = \
- 	plugin.m4
diff --git a/editors/abiword/patches/patch-plugins_gimp_Makefile.am b/editors/abiword/patches/patch-plugins_gimp_Makefile.am
deleted file mode 100644
index 7828e99bcd7..00000000000
--- a/editors/abiword/patches/patch-plugins_gimp_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_gimp_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/gimp/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/gimp/Makefile.am
-@@ -18,7 +18,7 @@ gimp_la_LIBADD = \
- gimp_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- gimp_la_SOURCES = 
- nodist_EXTRA_gimp_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_goffice_Makefile.am b/editors/abiword/patches/patch-plugins_goffice_Makefile.am
index cee37edcb49..628b6f36aee 100644
--- a/editors/abiword/patches/patch-plugins_goffice_Makefile.am
+++ b/editors/abiword/patches/patch-plugins_goffice_Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD: patch-plugins_goffice_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_goffice_Makefile.am,v 1.2 2016/01/24 15:30:46 nros Exp $
 GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
 to the linker.  Prefix with "-Wl," to fix build.
 Use CXX for linking.
@@ -15,7 +15,7 @@ Use CXX for linking.
  	-avoid-version \
  	-module \
 -	-no-undefined
-+	-Wl,-no-undefined
++	-Wl,--no-undefined
  
  goffice_la_SOURCES = 
 +nodist_EXTRA_goffice_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_google_Makefile.am b/editors/abiword/patches/patch-plugins_google_Makefile.am
deleted file mode 100644
index aa0335fc92f..00000000000
--- a/editors/abiword/patches/patch-plugins_google_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_google_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/google/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/google/Makefile.am
-@@ -18,7 +18,7 @@ google_la_LIBADD = \
- google_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- google_la_SOURCES = 
- nodist_EXTRA_google_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_grammar_Makefile.am b/editors/abiword/patches/patch-plugins_grammar_Makefile.am
deleted file mode 100644
index 24d6564a463..00000000000
--- a/editors/abiword/patches/patch-plugins_grammar_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_grammar_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/grammar/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/grammar/Makefile.am
-@@ -12,7 +12,7 @@ grammar_la_LIBADD = \
- grammar_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- nodist_EXTRA_grammar_la_SOURCES = dummy.cpp
- grammar_la_SOURCES = 
diff --git a/editors/abiword/patches/patch-plugins_hancom_Makefile.am b/editors/abiword/patches/patch-plugins_hancom_Makefile.am
deleted file mode 100644
index 0a1a1243c39..00000000000
--- a/editors/abiword/patches/patch-plugins_hancom_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_hancom_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/hancom/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/hancom/Makefile.am
-@@ -18,7 +18,7 @@ hancom_la_LIBADD = \
- hancom_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- hancom_la_SOURCES = 
- nodist_EXTRA_hancom_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_hrtext_Makefile.am b/editors/abiword/patches/patch-plugins_hrtext_Makefile.am
deleted file mode 100644
index 71e03659492..00000000000
--- a/editors/abiword/patches/patch-plugins_hrtext_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_hrtext_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/hrtext/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/hrtext/Makefile.am
-@@ -18,7 +18,7 @@ hrtext_la_LIBADD = \
- hrtext_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- hrtext_la_SOURCES = 
- nodist_EXTRA_hrtext_la_SOURCES = dummy.cpp 
diff --git a/editors/abiword/patches/patch-plugins_iscii_Makefile.am b/editors/abiword/patches/patch-plugins_iscii_Makefile.am
deleted file mode 100644
index d9f2f736686..00000000000
--- a/editors/abiword/patches/patch-plugins_iscii_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_iscii_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/iscii/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/iscii/Makefile.am
-@@ -18,7 +18,7 @@ iscii_la_LIBADD = \
- iscii_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- iscii_la_SOURCES = 
- nodist_EXTRA_iscii_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_kword_Makefile.am b/editors/abiword/patches/patch-plugins_kword_Makefile.am
deleted file mode 100644
index 3bf8d1f2356..00000000000
--- a/editors/abiword/patches/patch-plugins_kword_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_kword_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/kword/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/kword/Makefile.am
-@@ -18,7 +18,7 @@ kword_la_LIBADD = \
- kword_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- kword_la_SOURCES = 
- nodist_EXTRA_kword_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_latex_Makefile.am b/editors/abiword/patches/patch-plugins_latex_Makefile.am
deleted file mode 100644
index 564c93e4055..00000000000
--- a/editors/abiword/patches/patch-plugins_latex_Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-plugins_latex_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/latex/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/latex/Makefile.am
-@@ -1,4 +1,5 @@
- 
-+
- if HAVE_LIBXSLT
- SUBDIRS = xp xsltml
- else
-@@ -22,7 +23,7 @@ latex_la_LIBADD = \
- latex_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- if TOOLKIT_COCOA
- latex_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_loadbindings_Makefile.am b/editors/abiword/patches/patch-plugins_loadbindings_Makefile.am
deleted file mode 100644
index ab35c279068..00000000000
--- a/editors/abiword/patches/patch-plugins_loadbindings_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_loadbindings_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/loadbindings/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/loadbindings/Makefile.am
-@@ -18,7 +18,7 @@ loadbindings_la_LIBADD = \
- loadbindings_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- loadbindings_la_SOURCES = 
- nodist_EXTRA_loadbindings_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_mathview_Makefile.am b/editors/abiword/patches/patch-plugins_mathview_Makefile.am
deleted file mode 100644
index 35b1dbcd0f4..00000000000
--- a/editors/abiword/patches/patch-plugins_mathview_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_mathview_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/mathview/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/mathview/Makefile.am
-@@ -12,7 +12,7 @@ mathview_la_LIBADD = \
- mathview_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- nodist_EXTRA_mathview_la_SOURCES = dummy.cpp
- mathview_la_SOURCES = 
diff --git a/editors/abiword/patches/patch-plugins_mht_Makefile.am b/editors/abiword/patches/patch-plugins_mht_Makefile.am
deleted file mode 100644
index b278aed2aec..00000000000
--- a/editors/abiword/patches/patch-plugins_mht_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_mht_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/mht/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/mht/Makefile.am
-@@ -11,7 +11,7 @@ mht_la_LIBADD = \
- mht_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- mht_la_SOURCES = 
- nodist_EXTRA_mht_la_SOURCES =  dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_mif_Makefile.am b/editors/abiword/patches/patch-plugins_mif_Makefile.am
deleted file mode 100644
index c3c75b34d77..00000000000
--- a/editors/abiword/patches/patch-plugins_mif_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_mif_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/mif/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/mif/Makefile.am
-@@ -18,7 +18,7 @@ mif_la_LIBADD = \
- mif_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- mif_la_SOURCES = 
- nodist_EXTRA_mif_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_mswrite_Makefile.am b/editors/abiword/patches/patch-plugins_mswrite_Makefile.am
deleted file mode 100644
index f8d232bd019..00000000000
--- a/editors/abiword/patches/patch-plugins_mswrite_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_mswrite_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/mswrite/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/mswrite/Makefile.am
-@@ -18,7 +18,7 @@ mswrite_la_LIBADD = \
- mswrite_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- mswrite_la_SOURCES = 
- nodist_EXTRA_mswrite_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_opendocument_Makefile.am b/editors/abiword/patches/patch-plugins_opendocument_Makefile.am
deleted file mode 100644
index ae452aa74c4..00000000000
--- a/editors/abiword/patches/patch-plugins_opendocument_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_opendocument_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/opendocument/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/opendocument/Makefile.am
-@@ -21,7 +21,7 @@ opendocument_la_LIBADD = \
- opendocument_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- if TOOLKIT_COCOA
- opendocument_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_openwriter_Makefile.am b/editors/abiword/patches/patch-plugins_openwriter_Makefile.am
deleted file mode 100644
index d9f5967357a..00000000000
--- a/editors/abiword/patches/patch-plugins_openwriter_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_openwriter_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/openwriter/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/openwriter/Makefile.am
-@@ -18,7 +18,7 @@ openwriter_la_LIBADD = \
- openwriter_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- if TOOLKIT_COCOA
- openwriter_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_openxml_Makefile.am b/editors/abiword/patches/patch-plugins_openxml_Makefile.am
deleted file mode 100644
index 56f94b67b22..00000000000
--- a/editors/abiword/patches/patch-plugins_openxml_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_openxml_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/openxml/Makefile.am.orig	2012-11-25 18:08:57.000000000 +0000
-+++ plugins/openxml/Makefile.am
-@@ -20,7 +20,7 @@ openxml_la_LIBADD = \
- openxml_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- if TOOLKIT_COCOA
- openxml_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_opml_Makefile.am b/editors/abiword/patches/patch-plugins_opml_Makefile.am
deleted file mode 100644
index 635c9fedc0e..00000000000
--- a/editors/abiword/patches/patch-plugins_opml_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_opml_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/opml/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/opml/Makefile.am
-@@ -18,7 +18,7 @@ opml_la_LIBADD = \
- opml_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- if TOOLKIT_COCOA
- opml_la_LDFLAGS += -headerpad_max_install_names
- endif # TOOLKIT_COCOA
diff --git a/editors/abiword/patches/patch-plugins_ots_Makefile.am b/editors/abiword/patches/patch-plugins_ots_Makefile.am
deleted file mode 100644
index 5f88c5055bf..00000000000
--- a/editors/abiword/patches/patch-plugins_ots_Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-plugins_ots_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/ots/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/ots/Makefile.am
-@@ -9,6 +9,7 @@ ots_la_LIBADD = \
- 	$(OTS_LIBS)
- 
- ots_la_LDFLAGS = \
-+	-Wl, \
- 	-avoid-version \
- 	-module \
- 	-no-undefined
diff --git a/editors/abiword/patches/patch-plugins_paint_Makefile.am b/editors/abiword/patches/patch-plugins_paint_Makefile.am
deleted file mode 100644
index 90e24facd47..00000000000
--- a/editors/abiword/patches/patch-plugins_paint_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_paint_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/paint/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/paint/Makefile.am
-@@ -20,7 +20,7 @@ paint_la_LIBADD = \
- paint_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- paint_la_SOURCES = 
- nodist_EXTRA_paint_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_passepartout_Makefile.am b/editors/abiword/patches/patch-plugins_passepartout_Makefile.am
deleted file mode 100644
index 27f865ac1bb..00000000000
--- a/editors/abiword/patches/patch-plugins_passepartout_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_passepartout_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/passepartout/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/passepartout/Makefile.am
-@@ -18,7 +18,7 @@ passepartout_la_LIBADD = \
- passepartout_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- passepartout_la_SOURCES = 
- nodist_EXTRA_passepartout_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_pdb_Makefile.am b/editors/abiword/patches/patch-plugins_pdb_Makefile.am
deleted file mode 100644
index 94be9601292..00000000000
--- a/editors/abiword/patches/patch-plugins_pdb_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_pdb_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/pdb/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/pdb/Makefile.am
-@@ -18,7 +18,7 @@ pdb_la_LIBADD = \
- pdb_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- pdb_la_SOURCES = 
- nodist_EXTRA_pdb_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_pdf_Makefile.am b/editors/abiword/patches/patch-plugins_pdf_Makefile.am
deleted file mode 100644
index 96570f5be41..00000000000
--- a/editors/abiword/patches/patch-plugins_pdf_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_pdf_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/pdf/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/pdf/Makefile.am
-@@ -18,7 +18,7 @@ pdf_la_LIBADD = \
- pdf_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- pdf_la_SOURCES = 
- nodist_EXTRA_pdf_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_presentation_Makefile.am b/editors/abiword/patches/patch-plugins_presentation_Makefile.am
deleted file mode 100644
index 40c158717be..00000000000
--- a/editors/abiword/patches/patch-plugins_presentation_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_presentation_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/presentation/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/presentation/Makefile.am
-@@ -18,7 +18,7 @@ presentation_la_LIBADD = \
- presentation_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- presentation_la_SOURCES = 
- nodist_EXTRA_presentation_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_psion_Makefile.am b/editors/abiword/patches/patch-plugins_psion_Makefile.am
index 1cb03e62a9e..352e5d96589 100644
--- a/editors/abiword/patches/patch-plugins_psion_Makefile.am
+++ b/editors/abiword/patches/patch-plugins_psion_Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD: patch-plugins_psion_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-plugins_psion_Makefile.am,v 1.2 2016/01/24 15:30:47 nros Exp $
 GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
 to the linker.  Prefix with "-Wl," to fix build.
 Use CXX for linking.
@@ -9,7 +9,7 @@ Use CXX for linking.
  	-avoid-version \
  	-module \
 -	-no-undefined
-+	-Wl,-no-undefined
++	-Wl,--no-undefined
  
  psion_la_SOURCES = 
 +nodist_EXTRA_psion_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_rsvg_Makefile.am b/editors/abiword/patches/patch-plugins_rsvg_Makefile.am
deleted file mode 100644
index d5bff47d439..00000000000
--- a/editors/abiword/patches/patch-plugins_rsvg_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_rsvg_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/rsvg/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/rsvg/Makefile.am
-@@ -12,7 +12,7 @@ rsvg_la_LIBADD = \
- rsvg_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- rsvg_la_SOURCES = 
- nodist_EXTRA_rsvg_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_s5_Makefile.am b/editors/abiword/patches/patch-plugins_s5_Makefile.am
deleted file mode 100644
index eed86278335..00000000000
--- a/editors/abiword/patches/patch-plugins_s5_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_s5_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/s5/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/s5/Makefile.am
-@@ -18,7 +18,7 @@ s5_la_LIBADD = \
- s5_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- s5_la_SOURCES = 
- nodist_EXTRA_s5_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_sdw_Makefile.am b/editors/abiword/patches/patch-plugins_sdw_Makefile.am
deleted file mode 100644
index 3f1a5590c2d..00000000000
--- a/editors/abiword/patches/patch-plugins_sdw_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_sdw_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/sdw/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/sdw/Makefile.am
-@@ -18,7 +18,7 @@ sdw_la_LIBADD = \
- sdw_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- sdw_la_SOURCES = 
- nodist_EXTRA_sdw_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_t602_Makefile.am b/editors/abiword/patches/patch-plugins_t602_Makefile.am
deleted file mode 100644
index d1426652636..00000000000
--- a/editors/abiword/patches/patch-plugins_t602_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_t602_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/t602/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/t602/Makefile.am
-@@ -18,7 +18,7 @@ t602_la_LIBADD = \
- t602_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- t602_la_SOURCES = 
- nodist_EXTRA_t602_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_urldict_Makefile.am b/editors/abiword/patches/patch-plugins_urldict_Makefile.am
deleted file mode 100644
index 7e8d85d16c8..00000000000
--- a/editors/abiword/patches/patch-plugins_urldict_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_urldict_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/urldict/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/urldict/Makefile.am
-@@ -18,7 +18,7 @@ urldict_la_LIBADD = \
- urldict_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- urldict_la_SOURCES = 
- nodist_EXTRA_urldict_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wikipedia_Makefile.am b/editors/abiword/patches/patch-plugins_wikipedia_Makefile.am
deleted file mode 100644
index 3173602e3ed..00000000000
--- a/editors/abiword/patches/patch-plugins_wikipedia_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_wikipedia_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/wikipedia/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/wikipedia/Makefile.am
-@@ -18,7 +18,7 @@ wikipedia_la_LIBADD = \
- wikipedia_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- wikipedia_la_SOURCES = 
- nodist_EXTRA_wikipedia_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wmf_Makefile.am b/editors/abiword/patches/patch-plugins_wmf_Makefile.am
deleted file mode 100644
index 5d9f6d50113..00000000000
--- a/editors/abiword/patches/patch-plugins_wmf_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_wmf_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/wmf/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/wmf/Makefile.am
-@@ -11,7 +11,7 @@ wmf_la_LIBADD = \
- wmf_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- wmf_la_SOURCES = 
- nodist_EXTRA_wmf_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wml_Makefile.am b/editors/abiword/patches/patch-plugins_wml_Makefile.am
deleted file mode 100644
index d20dc757afd..00000000000
--- a/editors/abiword/patches/patch-plugins_wml_Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-plugins_wml_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/wml/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/wml/Makefile.am
-@@ -1,4 +1,5 @@
- 
-+
- SUBDIRS = xp
- 
- if WML_BUILTIN
-@@ -18,7 +19,7 @@ wml_la_LIBADD = \
- wml_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- wml_la_SOURCES = 
- nodist_EXTRA_wml_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wordperfect_Makefile.am b/editors/abiword/patches/patch-plugins_wordperfect_Makefile.am
deleted file mode 100644
index 967d70b37c9..00000000000
--- a/editors/abiword/patches/patch-plugins_wordperfect_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_wordperfect_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/wordperfect/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/wordperfect/Makefile.am
-@@ -11,7 +11,7 @@ wordperfect_la_LIBADD = \
- wordperfect_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- wordperfect_la_SOURCES = 
- nodist_EXTRA_wordperfect_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_wpg_Makefile.am b/editors/abiword/patches/patch-plugins_wpg_Makefile.am
deleted file mode 100644
index d623237390b..00000000000
--- a/editors/abiword/patches/patch-plugins_wpg_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_wpg_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/wpg/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/wpg/Makefile.am
-@@ -11,7 +11,7 @@ wpg_la_LIBADD = \
- wpg_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- wpg_la_SOURCES = 
- nodist_EXTRA_wpg_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_xslfo_Makefile.am b/editors/abiword/patches/patch-plugins_xslfo_Makefile.am
deleted file mode 100644
index ef093bfe289..00000000000
--- a/editors/abiword/patches/patch-plugins_xslfo_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_xslfo_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- plugins/xslfo/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/xslfo/Makefile.am
-@@ -18,7 +18,7 @@ xslfo_la_LIBADD = \
- xslfo_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- xslfo_la_SOURCES = 
- nodist_EXTRA_xslfo_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-src_Makefile.am b/editors/abiword/patches/patch-src_Makefile.am
deleted file mode 100644
index d74964d32b1..00000000000
--- a/editors/abiword/patches/patch-src_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_Makefile.am,v 1.1 2015/09/13 21:32:13 nros Exp $
-GCC 4.6+ chokes on "--no-undefined" which older versions of GCC let fall 
-to the linker.  Prefix with "-Wl," to fix build.
---- src/Makefile.am.orig	2013-02-20 00:39:42.000000000 +0000
-+++ src/Makefile.am
-@@ -58,7 +58,7 @@ libabiword_@ABIWORD_SERIES@_la_CPPFLAGS 
- libabiword_@ABIWORD_SERIES@_la_LDFLAGS = \
- 	$(DEPS_LIBS) \
- 	$(CHAMPLAIN_LIBS) \
--	-no-undefined \
-+	-Wl,-no-undefined \
- 	-avoid-version \
- 	-export-dynamic
-