* Fix build using clang compiler on Darwin (Mac OS X 10.8.4) by not using weak

  aliases if the compiler does not support them.
  From J. Lewis Muir on pkgsrc-users@.
* Remove empty patch.

5 files changed, 73 insertions, 4 deletions

diff --git a/x11/motif/distinfo b/x11/motif/distinfo
index d03dd5556c2..37a8de05fbd 100644
--- a/x11/motif/distinfo
+++ b/x11/motif/distinfo
@@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.3 2013/01/22 12:04:10 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2013/09/08 07:23:56 ryoon Exp $
 
 SHA1 (motif-2.3.4-src.tgz) = 49ecfe2a0939232ca78ce318d938044e7f751b6d
 RMD160 (motif-2.3.4-src.tgz) = 96e1ed3c5b99d420e3e2e4eae1b5590961191a33
 Size (motif-2.3.4-src.tgz) = 9527040 bytes
 SHA1 (patch-Makefile.am) = 3185b240e3d6a60d3c04fa90fafe1af020de6a15
+SHA1 (patch-acinclude.m4) = 71ee2d26411be9d195b22f74a328af8c1fcb5aab
 SHA1 (patch-clients_uil_UilDB.c) = 781b52e915e667eeb02359a51cfeefdb9556c4dd
 SHA1 (patch-clients_uil_UilDefI.h) = 6447a306809e65b4993d79e14a989a01aed2e0bc
 SHA1 (patch-clients_uil_UilDiags.c) = 39ac8307219b435baf3d1bf829809fcb6536b1a9
-SHA1 (patch-configure.ac) = 1cc767295198783a48482a5cc6bef3a5c9ee9bf5
+SHA1 (patch-configure.ac) = 7facbad196a515ecd77b8a15162eed05b16c421e
 SHA1 (patch-doc_man_man3_Makefile.am) = b396f5e1235834f507a415c62b0efaa939943f1d
 SHA1 (patch-doc_man_man4_Makefile.am) = 154071494cf54a65e2e266861c81771a14156cae
 SHA1 (patch-doc_man_man5_Makefile.am) = 2f6e0cc239faf53e3391aef9da3def934023928e
 SHA1 (patch-lib_Xm_Scale.c) = d78669a3332ab9d7dd140a1a1d9532e065573c7b
 SHA1 (patch-lib_Xm_TextF.c) = 1bd1801d708ff2c832c131c9954b3bbfd444ed42
-SHA1 (patch-lib_Xm_XmIm.c) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-lib_Xm_XmP.h) = 31bd398e48286b013e991889f0adeaafb817de58
 SHA1 (patch-lib_Xm_Xmfuncs.h) = fef6a642988a8024da0bff00cdc40dc485695e2b
 SHA1 (patch-lib_Xm_Xmos.c) = 88af3627fad7c9ec40db0e8aca47e9617fe8c53b
 SHA1 (patch-lib_Xm_XpmI.h) = b27e0156bc2dd990a4d9642186b1638276054314
diff --git a/x11/motif/patches/patch-acinclude.m4 b/x11/motif/patches/patch-acinclude.m4
new file mode 100644
index 00000000000..efe8698a5ba
--- /dev/null
+++ b/x11/motif/patches/patch-acinclude.m4
@@ -0,0 +1,38 @@
+$NetBSD: patch-acinclude.m4,v 1.1 2013/09/08 07:23:56 ryoon Exp $
+
+* Fix build under OS X 10.8.4 with clang.
+  http://bugs.motifzone.net/show_bug.cgi?id=1625
+
+--- acinclude.m4.orig	2012-10-22 14:50:39.000000000 +0000
++++ acinclude.m4
+@@ -3,6 +3,7 @@ dnl This file provides the following mac
+ dnl
+ dnl     LT_LIB_XTHREADS
+ dnl	AM_FUNC_VOID_SPRINTF
++dnl	WEAK_ALIAS_SUPPORT
+ dnl
+ 
+ dnl This should be the canonical approach to check for XTHREADS.
+@@ -57,6 +58,22 @@ if test $ac_cv_func_void_sprintf = no; t
+ fi
+ ])
+ 
++dnl This tests whether weak aliases are supported.
++AC_DEFUN([WEAK_ALIAS_SUPPORT],
++[AC_CACHE_CHECK(whether weak aliases are supported, ac_cv_weak_alias_support,
++[AC_TRY_COMPILE([
++int get_value(int *value) {
++  return *value;
++}
++int get_value_alias(int *high) __attribute__((__weak__,alias("get_value")));
++],
++[],
++ac_cv_weak_alias_support=yes,
++ac_cv_weak_alias_support=no)])
++if test $ac_cv_weak_alias_support = no; then
++  AC_DEFINE(NO_WEAK_ALIASES,1,[Define if weak aliases are not supported])
++fi
++])
+ 
+ dnl
+ dnl End of special macros.
diff --git a/x11/motif/patches/patch-configure.ac b/x11/motif/patches/patch-configure.ac
index 885789b85b9..24e2f1d40b3 100644
--- a/x11/motif/patches/patch-configure.ac
+++ b/x11/motif/patches/patch-configure.ac
@@ -1,4 +1,7 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/01/22 12:04:10 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.2 2013/09/08 07:23:56 ryoon Exp $
+
+* Second part: fix build under OS X 10.8.4 with clang.
+  http://bugs.motifzone.net/show_bug.cgi?id=1625
 
 --- configure.ac.orig	2012-10-22 14:50:39.000000000 +0000
 +++ configure.ac
@@ -16,3 +19,11 @@ $NetBSD: patch-configure.ac,v 1.1 2013/01/22 12:04:10 ryoon Exp $
  AM_PROG_LIBTOOL
  
  AC_EXEEXT
+@@ -110,6 +109,7 @@ AC_TYPE_SIZE_T
+ AC_HEADER_TIME
+ AC_STRUCT_TM
+ AC_TYPE_UID_T
++WEAK_ALIAS_SUPPORT
+ 
+ dnl Checks for library functions.
+ AC_FUNC_ALLOCA
diff --git a/x11/motif/patches/patch-lib_Xm_XmIm.c b/x11/motif/patches/patch-lib_Xm_XmIm.c
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/x11/motif/patches/patch-lib_Xm_XmIm.c
+++ /dev/null
diff --git a/x11/motif/patches/patch-lib_Xm_XmP.h b/x11/motif/patches/patch-lib_Xm_XmP.h
new file mode 100644
index 00000000000..e66d0c89f28
--- /dev/null
+++ b/x11/motif/patches/patch-lib_Xm_XmP.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-lib_Xm_XmP.h,v 1.1 2013/09/08 07:23:56 ryoon Exp $
+
+* Fix build under OS X 10.8.4 with clang.
+  http://bugs.motifzone.net/show_bug.cgi?id=1625
+
+--- lib/Xm/XmP.h.orig	2012-10-22 14:50:35.000000000 +0000
++++ lib/Xm/XmP.h
+@@ -1444,7 +1444,11 @@ extern void _XmDestroyParentCallback( 
+ 
+ #if __GNUC__
+ #  define XM_DEPRECATED  __attribute__((__deprecated__))
++#  ifdef NO_WEAK_ALIASES
++#    define XM_ALIAS(sym)
++#  else
+ #  define XM_ALIAS(sym)  __attribute__((__weak__,alias(#sym)))
++#  endif
+ #else
+ #  define XM_DEPRECATED
+ #  define XM_ALIAS(sym)