Fix patches. Don't enable Cocoa on Darwin, it doesn't build.

10 files changed, 51 insertions, 70 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index eed95186d1f..ec33326e182 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.157 2016/01/24 15:30:46 nros Exp $
+# $NetBSD: Makefile,v 1.158 2016/02/12 23:42:15 jperkin Exp $
 
 .include 	"Makefile.common"
 DISTNAME=	abiword-${ABIVERSION}
@@ -24,14 +24,17 @@ CONFIGURE_ARGS+=	--enable-plugins=""
 # disable to make sure it's not found somewhere else
 CONFIGURE_ARGS+=        --with-evolution-data-server=no
 
-
 PKGCONFIG_OVERRIDE+=	libabiword.pc.in
 
 pre-configure:
 	cd ${WRKSRC}; \
 	autoreconf --force --install
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
 BUILDLINK_TRANSFORM+=	opt:-no-undefined:-Wl,--no-undefined
+.endif
 
 .include "options.mk"
 
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index 8d1eae0b3dd..4dd979b70fd 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,26 +1,26 @@
-$NetBSD: distinfo,v 1.68 2016/01/24 15:30:46 nros Exp $
+$NetBSD: distinfo,v 1.69 2016/02/12 23:42:15 jperkin Exp $
 
 SHA1 (abiword-3.0.1.tar.gz) = 7badf9663564a144e16764a456cadda18df70991
 RMD160 (abiword-3.0.1.tar.gz) = 05d92a7304e4e419776970d7b35065ceb59f7681
 SHA512 (abiword-3.0.1.tar.gz) = c655aabe0ba0a9880f30808e26c02ec3280c750625faa482a68d4d336742f85659a7af7d6413d8813b82d3de0a3f6b61b6f6898f030bb921d792ad866879dbcf
 Size (abiword-3.0.1.tar.gz) = 11144990 bytes
-SHA1 (patch-configure.ac) = bbffa133509affe43fdef7e420e3a96a14edf58f
+SHA1 (patch-configure.ac) = 239c0635c2c616c7e0a986a5fd92428393af38b7
 SHA1 (patch-plugin-configure.m4) = a8b8db3bdbd69339e32eefec1de7b1b59467db40
-SHA1 (patch-plugins_aiksaurus_Makefile.am) = df642d973dfa453670807d639da11bb112cbd0bd
-SHA1 (patch-plugins_command_Makefile.am) = c26cd671390aa2bfd6f306a62d39fc6d50c56939
+SHA1 (patch-plugins_aiksaurus_Makefile.am) = 1529d5098b7fb798c428fe02cc50879374cb3e9d
+SHA1 (patch-plugins_command_Makefile.am) = e003a6bf9a6e0566abc85f09868fdf1aa93234d7
 SHA1 (patch-plugins_gimp_xp_AbiGimp.cpp) = 15692cf15fd4099e7ad4ad854b6b57b103717269
-SHA1 (patch-plugins_goffice_Makefile.am) = 37afe59c96df7b0a3702a6df99abe42249e339d9
+SHA1 (patch-plugins_goffice_Makefile.am) = 1959eea3b4e19f085aeb56870f682ce44561d445
 SHA1 (patch-plugins_grammar_linkgrammarwrap_LinkGrammarWrap.cpp) = f3916dbc0b208bfe9dbb55eac850a3094683694c
 SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = 0c29c7ddf0dbd55d4bb6ab90311e40f2cff7130b
 SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = bf1ea7eb25fb384014523554f7ca55e6507bcbe6
-SHA1 (patch-plugins_psion_Makefile.am) = 0d883b06e7f0368826e0d729c84cf9711555ab54
+SHA1 (patch-plugins_psion_Makefile.am) = d18356c2a273d99918076d5aefafec595af3f898
 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_xp_ie__impGraphic__WPG.cpp) = 36d7ca7855ddc504701e392c28e3d8530f78b81e
-SHA1 (patch-src_af_util_xp_ut__endian.h) = e73aef0db6ddef0316cca3f7a77fd4c71c870637
+SHA1 (patch-src_af_util_xp_ut__endian.h) = e1dd4cc0df3b0eb66dbd673fb5c0d2e3b24b30a4
 SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 613f162d4db0ba9520e0481a98564e59ccd862d4
 SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
 SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = 01f6793651533e7e39f665e5c15e6c12e1c7b96d
diff --git a/editors/abiword/options.mk b/editors/abiword/options.mk
index 4fb29c4a079..1a7b9ddfa4c 100644
--- a/editors/abiword/options.mk
+++ b/editors/abiword/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2015/09/13 21:32:13 nros Exp $
+# $NetBSD: options.mk,v 1.2 2016/02/12 23:42:15 jperkin Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.abiword
 PKG_SUPPORTED_OPTIONS=		debug
@@ -15,4 +15,3 @@ CONFIGURE_ARGS+=        --enable-debug
 INSTALL_UNSTRIPPED=	yes
 CFLAGS+=		-O0
 .endif
-
diff --git a/editors/abiword/patches/patch-configure.ac b/editors/abiword/patches/patch-configure.ac
index 6cc08d81d53..4d8ba3d4931 100644
--- a/editors/abiword/patches/patch-configure.ac
+++ b/editors/abiword/patches/patch-configure.ac
@@ -1,8 +1,21 @@
-$NetBSD: patch-configure.ac,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-configure.ac,v 1.2 2016/02/12 23:42:15 jperkin Exp $
+
 Use the installed libabiword instead of the one in the build directory
 This is needed for the plugins so the can build as a separate package
---- configure.ac.orig	2015-06-06 23:11:58.000000000 +0000
+
+Disable Cocoa configuration on Darwin, it doesn't build.
+
+--- configure.ac.orig	2014-12-21 04:51:43.000000000 +0000
 +++ configure.ac
+@@ -146,7 +146,7 @@ fi
+ TOOLKIT_IS_GTK2="no"
+ AC_MSG_CHECKING([for platform and toolkit])
+ case ${host_os} in
+-  *darwin*)
++  *notdarwin*)
+     PLATFORM="unix"
+     TOOLKIT="cocoa"
+     ;;
 @@ -893,7 +893,7 @@ if test "$TOOLKIT" = "gtk"  && 
     test "$enable_shared" = "yes"; then
  	# link plugins to work around gcc visibility issue with 
diff --git a/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am b/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am
index 9d939612baa..4a845b393bd 100644
--- a/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am
+++ b/editors/abiword/patches/patch-plugins_aiksaurus_Makefile.am
@@ -1,15 +1,11 @@
-$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.
+$NetBSD: patch-plugins_aiksaurus_Makefile.am,v 1.3 2016/02/12 23:42:15 jperkin Exp $
+
 Use CXX for linking.
+
 --- plugins/aiksaurus/Makefile.am.orig	2014-03-21 23:51:31.000000000 +0000
 +++ plugins/aiksaurus/Makefile.am
-@@ -28,7 +28,8 @@ aiksaurus_la_LIBADD = \
- aiksaurus_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,--no-undefined
+@@ -31,4 +31,5 @@ aiksaurus_la_LDFLAGS = \
+ 	-no-undefined
  
  aiksaurus_la_SOURCES = 
 +nodist_EXTRA_aiksaurus_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-plugins_clarisworks_Makefile.am b/editors/abiword/patches/patch-plugins_clarisworks_Makefile.am
deleted file mode 100644
index 3fbf7a69f5d..00000000000
--- a/editors/abiword/patches/patch-plugins_clarisworks_Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_clarisworks_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/clarisworks/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
-+++ plugins/clarisworks/Makefile.am
-@@ -18,7 +18,7 @@ clarisworks_la_LIBADD = \
- clarisworks_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,-no-undefined
- 
- clarisworks_la_SOURCES = 
- 
diff --git a/editors/abiword/patches/patch-plugins_command_Makefile.am b/editors/abiword/patches/patch-plugins_command_Makefile.am
index dddc24fdb07..edf245904af 100644
--- a/editors/abiword/patches/patch-plugins_command_Makefile.am
+++ b/editors/abiword/patches/patch-plugins_command_Makefile.am
@@ -1,15 +1,11 @@
-$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.
+$NetBSD: patch-plugins_command_Makefile.am,v 1.3 2016/02/12 23:42:15 jperkin Exp $
+
 Use CXX for linking.
+
 --- plugins/command/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
 +++ plugins/command/Makefile.am
-@@ -13,8 +13,9 @@ command_la_LIBADD = \
- command_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,--no-undefined
+@@ -16,5 +16,6 @@ command_la_LDFLAGS = \
+ 	-no-undefined
  
  command_la_SOURCES = 
 +nodist_EXTRA_command_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 628b6f36aee..b4d7ad33944 100644
--- a/editors/abiword/patches/patch-plugins_goffice_Makefile.am
+++ b/editors/abiword/patches/patch-plugins_goffice_Makefile.am
@@ -1,21 +1,11 @@
-$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.
+$NetBSD: patch-plugins_goffice_Makefile.am,v 1.3 2016/02/12 23:42:15 jperkin Exp $
+
 Use CXX for linking.
+
 --- plugins/goffice/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
 +++ plugins/goffice/Makefile.am
-@@ -1,4 +1,5 @@
- 
-+
- SUBDIRS = unix
- 
- plugindir = $(ABIWORD_PLUGINSDIR)
-@@ -11,9 +12,10 @@ goffice_la_LIBADD = \
- goffice_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,--no-undefined
+@@ -14,6 +14,7 @@ goffice_la_LDFLAGS = \
+ 	-no-undefined
  
  goffice_la_SOURCES = 
 +nodist_EXTRA_goffice_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 352e5d96589..4c8789596c5 100644
--- a/editors/abiword/patches/patch-plugins_psion_Makefile.am
+++ b/editors/abiword/patches/patch-plugins_psion_Makefile.am
@@ -1,15 +1,11 @@
-$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.
+$NetBSD: patch-plugins_psion_Makefile.am,v 1.3 2016/02/12 23:42:15 jperkin Exp $
+
 Use CXX for linking.
+
 --- plugins/psion/Makefile.am.orig	2011-11-15 21:25:46.000000000 +0000
 +++ plugins/psion/Makefile.am
-@@ -11,9 +11,10 @@ psion_la_LIBADD = \
- psion_la_LDFLAGS = \
- 	-avoid-version \
- 	-module \
--	-no-undefined
-+	-Wl,--no-undefined
+@@ -14,6 +14,7 @@ psion_la_LDFLAGS = \
+ 	-no-undefined
  
  psion_la_SOURCES = 
 +nodist_EXTRA_psion_la_SOURCES = dummy.cpp
diff --git a/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h b/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h
index 954f30e8148..392f4b4dbb3 100644
--- a/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h
+++ b/editors/abiword/patches/patch-src_af_util_xp_ut__endian.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_af_util_xp_ut__endian.h,v 1.1 2015/09/13 21:32:13 nros Exp $
+$NetBSD: patch-src_af_util_xp_ut__endian.h,v 1.2 2016/02/12 23:42:15 jperkin Exp $
+
+Support DragonFly.
 
 --- src/af/util/xp/ut_endian.h.orig	2013-04-07 13:53:03.000000000 +0000
 +++ src/af/util/xp/ut_endian.h