Fix build under GNU/kFreeBSD/amd64.

5 files changed, 122 insertions, 5 deletions

diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 557a9811ec3..72fce89278f 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,13 +1,16 @@
-$NetBSD: distinfo,v 1.36 2012/11/15 03:32:00 sbd Exp $
+$NetBSD: distinfo,v 1.37 2013/07/26 12:40:06 ryoon Exp $
 
 SHA1 (heimdal-1.5.2.tar.gz) = dd0920a181d18236432e4b3e5eab6e468cda4b89
 RMD160 (heimdal-1.5.2.tar.gz) = 1ab2f835309a916dfbba667d3d0d38a57c312fde
 Size (heimdal-1.5.2.tar.gz) = 6798615 bytes
-SHA1 (patch-ad) = 8f30b685cbfe37bf202f6cc501fc336a36b60c00
+SHA1 (patch-ad) = fc7820f21ae6f2aa62126ec360be6d913eef2eb7
 SHA1 (patch-al) = 022d5f3723bd1db7fe5e92eea5d0106851a5d424
 SHA1 (patch-cf_install-catman.sh) = 8eb8ea0c0c8b281c080c85eefc3abbc7dcbe6746
+SHA1 (patch-cf_libtool.m4) = cd229e0e934649cb04c3f39928d1fa12c2474f62
+SHA1 (patch-cf_pthreads.m4) = eff8f355887d2f9795446073efd67ccf739db2c9
 SHA1 (patch-kdc_version-script.map) = 42b0417a16b19a680f30ae34cfffd082f609d4a6
 SHA1 (patch-lib_hcrypto_libtommath_tommath.h) = 60f223bb23145854f2a144da9e0a9484728b618a
 SHA1 (patch-lib_hcrypto_libtommath_tommath_class.h) = 8c7b1e8d30cda79fd59a8ef83094a611b47a43df
 SHA1 (patch-lib_hcrypto_libtommath_tommath_superclass.h) = 141e75b5b310446694769b16a977fa5b25160fbd
+SHA1 (patch-lib_libedit_aclocal.m4) = c50025a3b9bcae9913adab251169462dbc0f3221
 SHA1 (patch-lib_otp_Makefile.in) = 0fe1426000824614f0e31d3ab2348948f3f414d3
diff --git a/security/heimdal/patches/patch-ad b/security/heimdal/patches/patch-ad
index adc275b6a54..cb5f2ac1c9f 100644
--- a/security/heimdal/patches/patch-ad
+++ b/security/heimdal/patches/patch-ad
@@ -1,10 +1,36 @@
-$NetBSD: patch-ad,v 1.11 2012/08/07 13:54:22 obache Exp $
+$NetBSD: patch-ad,v 1.12 2013/07/26 12:40:06 ryoon Exp $
 
-* Not using lib${ABI} in pkgsrc.
-* improve detection of __sync_add_and_fetch, avoid compiler optimization.
+* GNU/kFreeBSD parts: use host of Debian GNU/kFreeBSD 7.0.
 
 --- configure.orig	2012-01-11 13:04:10.000000000 +0000
 +++ configure
+@@ -6779,7 +6779,7 @@ ia64-*-hpux*)
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*-gnukfreebsd*|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+@@ -6791,7 +6791,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+     case `/usr/bin/file conftest.o` in
+       *32-bit*)
+ 	case $host in
+-	  x86_64-*kfreebsd*-gnu)
++	  x86_64-*kfreebsd*-gnu|x86_64-*-gnukfreebsd*)
+ 	    LD="${LD-ld} -m elf_i386_fbsd"
+ 	    ;;
+ 	  x86_64-*linux*)
+@@ -6810,7 +6810,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	;;
+       *64-bit*)
+ 	case $host in
+-	  x86_64-*kfreebsd*-gnu)
++	  x86_64-*kfreebsd*-gnu|x86_64-*-gnukfreebsd*)
+ 	    LD="${LD-ld} -m elf_x86_64_fbsd"
+ 	    ;;
+ 	  x86_64-*linux*)
 @@ -12702,7 +12702,11 @@ fi #if test -n "$GCC"; then
  esac
  
@@ -18,6 +44,15 @@ $NetBSD: patch-ad,v 1.11 2012/08/07 13:54:22 obache Exp $
  
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
+@@ -14245,7 +14249,7 @@ case "$host" in
+ 		;;
+ 	esac
+ 	;;
+-*-*-kfreebsd*-gnu*)
++*-*-kfreebsd*-gnu*|x86_64-*-gnukfreebsd*)
+ 	native_pthread_support=yes
+ 	PTHREAD_CFLAGS=-pthread
+ 	PTHREAD_LIBADD=-pthread
 @@ -26547,7 +26551,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
  int
  main ()
diff --git a/security/heimdal/patches/patch-cf_libtool.m4 b/security/heimdal/patches/patch-cf_libtool.m4
new file mode 100644
index 00000000000..a8149a70417
--- /dev/null
+++ b/security/heimdal/patches/patch-cf_libtool.m4
@@ -0,0 +1,33 @@
+$NetBSD: patch-cf_libtool.m4,v 1.1 2013/07/26 12:40:06 ryoon Exp $
+
+* GNU/kFreeBSD parts: use host of Debian GNU/kFreeBSD 7.0.
+
+--- cf/libtool.m4.orig	2012-01-11 13:03:55.000000000 +0000
++++ cf/libtool.m4
+@@ -1268,7 +1268,7 @@ ia64-*-hpux*)
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*-gnukfreebsd*|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+@@ -1276,7 +1276,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+     case `/usr/bin/file conftest.o` in
+       *32-bit*)
+ 	case $host in
+-	  x86_64-*kfreebsd*-gnu)
++	  x86_64-*kfreebsd*-gnu|x86_64-*-gnukfreebsd*)
+ 	    LD="${LD-ld} -m elf_i386_fbsd"
+ 	    ;;
+ 	  x86_64-*linux*)
+@@ -1295,7 +1295,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	;;
+       *64-bit*)
+ 	case $host in
+-	  x86_64-*kfreebsd*-gnu)
++	  x86_64-*kfreebsd*-gnu|x86_64-*-gnukfreebsd*)
+ 	    LD="${LD-ld} -m elf_x86_64_fbsd"
+ 	    ;;
+ 	  x86_64-*linux*)
diff --git a/security/heimdal/patches/patch-cf_pthreads.m4 b/security/heimdal/patches/patch-cf_pthreads.m4
new file mode 100644
index 00000000000..f531c1ab9a0
--- /dev/null
+++ b/security/heimdal/patches/patch-cf_pthreads.m4
@@ -0,0 +1,15 @@
+$NetBSD: patch-cf_pthreads.m4,v 1.1 2013/07/26 12:40:06 ryoon Exp $
+
+* GNU/kFreeBSD parts: use host of Debian GNU/kFreeBSD 7.0.
+
+--- cf/pthreads.m4.orig	2012-01-10 21:53:51.000000000 +0000
++++ cf/pthreads.m4
+@@ -48,7 +48,7 @@ case "$host" in 
+ 		;;
+ 	esac
+ 	;;
+-*-*-kfreebsd*-gnu*)
++*-*-kfreebsd*-gnu*|*-*-gnukfreebsd*)
+ 	native_pthread_support=yes
+ 	PTHREAD_CFLAGS=-pthread
+ 	PTHREAD_LIBADD=-pthread
diff --git a/security/heimdal/patches/patch-lib_libedit_aclocal.m4 b/security/heimdal/patches/patch-lib_libedit_aclocal.m4
new file mode 100644
index 00000000000..1d4794f7183
--- /dev/null
+++ b/security/heimdal/patches/patch-lib_libedit_aclocal.m4
@@ -0,0 +1,31 @@
+$NetBSD: patch-lib_libedit_aclocal.m4,v 1.1 2013/07/26 12:40:06 ryoon Exp $
+
+--- lib/libedit/aclocal.m4.orig	2012-01-11 13:03:51.000000000 +0000
++++ lib/libedit/aclocal.m4
+@@ -1283,7 +1283,7 @@ ia64-*-hpux*)
+   rm -rf conftest*
+   ;;
+ 
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*-kfreebsd*|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+@@ -1291,7 +1291,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+     case `/usr/bin/file conftest.o` in
+       *32-bit*)
+ 	case $host in
+-	  x86_64-*kfreebsd*-gnu)
++	  x86_64-*kfreebsd*-gnu|x86_64-*-kfreebsd*)
+ 	    LD="${LD-ld} -m elf_i386_fbsd"
+ 	    ;;
+ 	  x86_64-*linux*)
+@@ -1310,7 +1310,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
+ 	;;
+       *64-bit*)
+ 	case $host in
+-	  x86_64-*kfreebsd*-gnu)
++	  x86_64-*kfreebsd*-gnu|x86_64-*-kfreebsd*)
+ 	    LD="${LD-ld} -m elf_x86_64_fbsd"
+ 	    ;;
+ 	  x86_64-*linux*)