Apply patch from FreeBSD ports to patch-configure. This will allow the

package to build and install lib/windc.la, which is the cause of the
installation failure. This is evident when PREFER_PKGSRC=yes. Defuzz
patches.

13 files changed, 125 insertions, 48 deletions

diff --git a/security/heimdal/distinfo b/security/heimdal/distinfo
index 896049277ac..5499f2d8685 100644
--- a/security/heimdal/distinfo
+++ b/security/heimdal/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.42 2014/09/22 11:55:37 joerg Exp $
+$NetBSD: distinfo,v 1.43 2015/07/11 04:26:57 rodent Exp $
 
 SHA1 (heimdal-1.5.3.tar.gz) = 23f39a099ae862dce1f5f4e5c3720861849a4bd0
 RMD160 (heimdal-1.5.3.tar.gz) = 834660b4c0fe81a3aac4ffd9d8d37d74add1fa70
 Size (heimdal-1.5.3.tar.gz) = 6798305 bytes
-SHA1 (patch-ad) = 4376ee49bea9e79fa75f589b65b7a4b9b0676966
-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-ad) = 1768f055dbdb6e7ed958dec34a0eb7e466712e38
+SHA1 (patch-al) = 0cea9e7d48f2796b6856d9ef4512cfddcb5bfd03
+SHA1 (patch-cf_install-catman.sh) = 72f3ffa374fb63dcaa89dec288936ecfff1b5228
+SHA1 (patch-cf_libtool.m4) = ffc6c28e13051976c8c25a0f1e486ba7d693facc
+SHA1 (patch-cf_pthreads.m4) = 2a9e065a5a602e1f437d1faaf82f864f45603b5d
 SHA1 (patch-cf_roken-frag.m4) = 599216f2650facaff0559f2a9cc27439e2f1f099
-SHA1 (patch-kdc_version-script.map) = 42b0417a16b19a680f30ae34cfffd082f609d4a6
+SHA1 (patch-kdc_version-script.map) = bef9c33f2e4f4faa61771e2c462e43f1a56d0fb0
 SHA1 (patch-lib_ipc_server.c) = fa806b549ed5cb3c4427e3865642e6d9555a59b0
-SHA1 (patch-lib_libedit_aclocal.m4) = c50025a3b9bcae9913adab251169462dbc0f3221
-SHA1 (patch-lib_libedit_configure) = c029c471d68d389e67e1cc636a352a004fd6124e
-SHA1 (patch-lib_libedit_configure.ac) = 588b184615a80ab85d7c3624c6c05860c8e6feb0
-SHA1 (patch-lib_libedit_src_unvis.c) = 117c91ead1ca94aaed38c2d0611588fec6746d61
-SHA1 (patch-lib_libedit_src_vis.c) = ade98e513187c3fa03194909409a9bb23f66509a
-SHA1 (patch-lib_otp_Makefile.in) = 0fe1426000824614f0e31d3ab2348948f3f414d3
+SHA1 (patch-lib_libedit_aclocal.m4) = a556a5e2afab645263d3413422fc2e0a9825956b
+SHA1 (patch-lib_libedit_configure) = 54f92775849874b748e88e8f8923cc187cec5bae
+SHA1 (patch-lib_libedit_configure.ac) = 3c6122731b47cb94a488874b3e8d35f3a0bee3b1
+SHA1 (patch-lib_libedit_src_unvis.c) = c54dbf201d2fc68f537d7cc735a13d75f6e32947
+SHA1 (patch-lib_libedit_src_vis.c) = 6eb41d9704f84aacedb7d7f80ab0cdc4accceeb4
+SHA1 (patch-lib_otp_Makefile.in) = 8815c33a4eb024018a6160db58356704ec43d30c
 SHA1 (patch-lib_roken_vis.c) = 8037c4b36d6cd4bc2557a9409df04232276b7a28
diff --git a/security/heimdal/patches/patch-ad b/security/heimdal/patches/patch-ad
index 22cc65e9304..32dac27bab6 100644
--- a/security/heimdal/patches/patch-ad
+++ b/security/heimdal/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
+$NetBSD: patch-ad,v 1.15 2015/07/11 04:26:57 rodent Exp $
 
 * GNU/kFreeBSD parts: use host of Debian GNU/kFreeBSD 7.0.
 * OpenBSD's vish requires stdlib.h.
@@ -32,7 +32,75 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  	    LD="${LD-ld} -m elf_x86_64_fbsd"
  	    ;;
  	  x86_64-*linux*)
-@@ -12702,7 +12702,11 @@ fi #if test -n "$GCC"; then
+@@ -9567,29 +9567,6 @@ fi
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
+-      ld_shlibs=no
+-      ;;
+-
+-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-    # support.  Future versions do this automatically, but an explicit c++rt0.o
+-    # does not break anything, and helps significantly (at the cost of a little
+-    # extra space).
+-    freebsd2.2*)
+-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-      hardcode_libdir_flag_spec='-R$libdir'
+-      hardcode_direct=yes
+-      hardcode_shlibpath_var=no
+-      ;;
+-
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
+-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=yes
+-      hardcode_minus_L=yes
+-      hardcode_shlibpath_var=no
+-      ;;
+-
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+     freebsd* | dragonfly*)
+       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+@@ -10561,10 +10538,6 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -10572,7 +10545,6 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
+@@ -10590,18 +10562,6 @@ freebsd* | dragonfly*)
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
+-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+   *) # from 4.6 on, and DragonFly
+     shlibpath_overrides_runpath=yes
+     hardcode_into_libs=yes
+@@ -12702,7 +12662,11 @@ fi #if test -n "$GCC"; then
  esac
  
  CC="$CC $abi"
@@ -45,7 +113,16 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__" >&5
-@@ -14245,7 +14249,7 @@ case "$host" in
+@@ -14227,7 +14191,7 @@ case "$host" in
+ 	native_pthread_support="netbsd 3 uses explict pthread"
+ 		PTHREAD_LIBADD="-lpthread"
+ 	;;
+-*-*-freebsd[56789]*)
++*-*-freebsd*)
+ 	native_pthread_support=yes
+ 	PTHREAD_LIBADD="-pthread"
+ 	;;
+@@ -14245,7 +14209,7 @@ case "$host" in
  		;;
  	esac
  	;;
@@ -54,7 +131,7 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  	native_pthread_support=yes
  	PTHREAD_CFLAGS=-pthread
  	PTHREAD_LIBADD=-pthread
-@@ -16057,6 +16061,7 @@ fi
+@@ -16057,6 +16021,7 @@ fi
  for ac_header in vis.h
  do :
    ac_fn_c_check_header_compile "$LINENO" "vis.h" "ac_cv_header_vis_h" "
@@ -62,7 +139,7 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  #include <vis.h>
  #ifndef VIS_SP
  #error invis
-@@ -20473,6 +20478,7 @@ else
+@@ -20473,6 +20438,7 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef HAVE_VIS_H
@@ -70,7 +147,7 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  #include <vis.h>
  #endif
  struct foo { int foo; } xx;
-@@ -20510,6 +20516,7 @@ else
+@@ -20510,6 +20476,7 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef HAVE_VIS_H
@@ -78,7 +155,7 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  #include <vis.h>
  #endif
  struct foo { int foo; } xx;
-@@ -20547,6 +20554,7 @@ else
+@@ -20547,6 +20514,7 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef HAVE_VIS_H
@@ -86,7 +163,7 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  #include <vis.h>
  #endif
  struct foo { int foo; } xx;
-@@ -20584,6 +20592,7 @@ else
+@@ -20584,6 +20552,7 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef HAVE_VIS_H
@@ -94,7 +171,7 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  #include <vis.h>
  #endif
  struct foo { int foo; } xx;
-@@ -20621,6 +20630,7 @@ else
+@@ -20621,6 +20590,7 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef HAVE_VIS_H
@@ -102,7 +179,7 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  #include <vis.h>
  #endif
  struct foo { int foo; } xx;
-@@ -20658,6 +20668,7 @@ else
+@@ -20658,6 +20628,7 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef HAVE_VIS_H
@@ -110,7 +187,7 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  #include <vis.h>
  #endif
  struct foo { int foo; } xx;
-@@ -20695,6 +20706,7 @@ else
+@@ -20695,6 +20666,7 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef HAVE_VIS_H
@@ -118,7 +195,7 @@ $NetBSD: patch-ad,v 1.14 2014/05/16 12:49:42 ryoon Exp $
  #include <vis.h>
  #endif
  struct foo { int foo; } xx;
-@@ -20732,6 +20744,7 @@ else
+@@ -20732,6 +20704,7 @@ else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  #ifdef HAVE_VIS_H
diff --git a/security/heimdal/patches/patch-al b/security/heimdal/patches/patch-al
index 90bbf0d5f23..1f5038645bf 100644
--- a/security/heimdal/patches/patch-al
+++ b/security/heimdal/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2011/07/08 09:49:22 adam Exp $
+$NetBSD: patch-al,v 1.4 2015/07/11 04:26:57 rodent Exp $
 
---- lib/roken/Makefile.in.orig	2010-09-13 07:24:23.000000000 +0000
+--- lib/roken/Makefile.in.orig	2012-12-09 22:09:39.000000000 +0000
 +++ lib/roken/Makefile.in
-@@ -1990,6 +1990,8 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok
+@@ -2046,6 +2046,8 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok
  @CROSS_COMPILE_TRUE@	-c $(top_builddir)/include/config.h  \
  @CROSS_COMPILE_TRUE@	-p $(srcdir)/roken.h.in -o roken.h
  
diff --git a/security/heimdal/patches/patch-cf_install-catman.sh b/security/heimdal/patches/patch-cf_install-catman.sh
index 65f892c75ff..54f0e5d848d 100644
--- a/security/heimdal/patches/patch-cf_install-catman.sh
+++ b/security/heimdal/patches/patch-cf_install-catman.sh
@@ -1,8 +1,8 @@
-$NetBSD: patch-cf_install-catman.sh,v 1.1 2012/11/15 03:32:01 sbd Exp $
+$NetBSD: patch-cf_install-catman.sh,v 1.2 2015/07/11 04:26:57 rodent Exp $
 
 When getting a file basename strip any leading directories.
 
---- cf/install-catman.sh.orig	2012-01-10 21:53:51.000000000 +0000
+--- cf/install-catman.sh.orig	2012-12-09 22:06:44.000000000 +0000
 +++ cf/install-catman.sh
 @@ -14,7 +14,7 @@ catinstall="${INSTALL_CATPAGES-yes}"
  
diff --git a/security/heimdal/patches/patch-cf_libtool.m4 b/security/heimdal/patches/patch-cf_libtool.m4
index a8149a70417..8bbd808b3d8 100644
--- a/security/heimdal/patches/patch-cf_libtool.m4
+++ b/security/heimdal/patches/patch-cf_libtool.m4
@@ -1,8 +1,8 @@
-$NetBSD: patch-cf_libtool.m4,v 1.1 2013/07/26 12:40:06 ryoon Exp $
+$NetBSD: patch-cf_libtool.m4,v 1.2 2015/07/11 04:26:57 rodent 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.orig	2012-12-09 22:09:27.000000000 +0000
 +++ cf/libtool.m4
 @@ -1268,7 +1268,7 @@ ia64-*-hpux*)
    rm -rf conftest*
diff --git a/security/heimdal/patches/patch-cf_pthreads.m4 b/security/heimdal/patches/patch-cf_pthreads.m4
index f531c1ab9a0..5608548eb10 100644
--- a/security/heimdal/patches/patch-cf_pthreads.m4
+++ b/security/heimdal/patches/patch-cf_pthreads.m4
@@ -1,8 +1,8 @@
-$NetBSD: patch-cf_pthreads.m4,v 1.1 2013/07/26 12:40:06 ryoon Exp $
+$NetBSD: patch-cf_pthreads.m4,v 1.2 2015/07/11 04:26:57 rodent 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.orig	2012-12-09 22:06:44.000000000 +0000
 +++ cf/pthreads.m4
 @@ -48,7 +48,7 @@ case "$host" in 
  		;;
diff --git a/security/heimdal/patches/patch-kdc_version-script.map b/security/heimdal/patches/patch-kdc_version-script.map
index cc1fec4423a..50f96f07167 100644
--- a/security/heimdal/patches/patch-kdc_version-script.map
+++ b/security/heimdal/patches/patch-kdc_version-script.map
@@ -1,10 +1,10 @@
-$NetBSD: patch-kdc_version-script.map,v 1.1 2011/07/31 21:21:01 gls Exp $
+$NetBSD: patch-kdc_version-script.map,v 1.2 2015/07/11 04:26:57 rodent Exp $
 
 Adds the symbols _kdc_db_fetch and _kdc_free_ent to global
 visibility, so that they can be referenced from kdc/digest-service.
 Fixes build on Dragonfly. From Alex Hornung in PR pkg/45195.
 
---- kdc/version-script.map.orig	2010-09-13 07:23:34.000000000 +0000
+--- kdc/version-script.map.orig	2012-12-09 22:06:44.000000000 +0000
 +++ kdc/version-script.map
 @@ -2,6 +2,8 @@
  
diff --git a/security/heimdal/patches/patch-lib_libedit_aclocal.m4 b/security/heimdal/patches/patch-lib_libedit_aclocal.m4
index 1d4794f7183..62113620c9e 100644
--- a/security/heimdal/patches/patch-lib_libedit_aclocal.m4
+++ b/security/heimdal/patches/patch-lib_libedit_aclocal.m4
@@ -1,6 +1,6 @@
-$NetBSD: patch-lib_libedit_aclocal.m4,v 1.1 2013/07/26 12:40:06 ryoon Exp $
+$NetBSD: patch-lib_libedit_aclocal.m4,v 1.2 2015/07/11 04:26:57 rodent Exp $
 
---- lib/libedit/aclocal.m4.orig	2012-01-11 13:03:51.000000000 +0000
+--- lib/libedit/aclocal.m4.orig	2012-12-09 22:09:25.000000000 +0000
 +++ lib/libedit/aclocal.m4
 @@ -1283,7 +1283,7 @@ ia64-*-hpux*)
    rm -rf conftest*
diff --git a/security/heimdal/patches/patch-lib_libedit_configure b/security/heimdal/patches/patch-lib_libedit_configure
index ac392056518..1c8e0816429 100644
--- a/security/heimdal/patches/patch-lib_libedit_configure
+++ b/security/heimdal/patches/patch-lib_libedit_configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_libedit_configure,v 1.1 2013/10/11 16:21:40 roy Exp $
+$NetBSD: patch-lib_libedit_configure,v 1.2 2015/07/11 04:26:57 rodent Exp $
 
 Include termcap in the termcap test
 
---- lib/libedit/configure.orig	2013-10-11 15:50:12.000000000 +0000
+--- lib/libedit/configure.orig	2012-12-09 22:09:25.000000000 +0000
 +++ lib/libedit/configure
 @@ -11603,7 +11603,50 @@ test -n "$NROFF" || NROFF="/bin/false"
  
diff --git a/security/heimdal/patches/patch-lib_libedit_configure.ac b/security/heimdal/patches/patch-lib_libedit_configure.ac
index 04fc587216e..8d234d87645 100644
--- a/security/heimdal/patches/patch-lib_libedit_configure.ac
+++ b/security/heimdal/patches/patch-lib_libedit_configure.ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_libedit_configure.ac,v 1.1 2013/10/11 16:21:40 roy Exp $
+$NetBSD: patch-lib_libedit_configure.ac,v 1.2 2015/07/11 04:26:57 rodent Exp $
 
 Include termcap in the termcap test
 
---- lib/libedit/configure.ac.orig	2013-10-11 15:50:21.000000000 +0000
+--- lib/libedit/configure.ac.orig	2012-12-09 22:06:44.000000000 +0000
 +++ lib/libedit/configure.ac
 @@ -33,9 +33,10 @@ AC_PROG_AWK
  EL_MANTYPE
diff --git a/security/heimdal/patches/patch-lib_libedit_src_unvis.c b/security/heimdal/patches/patch-lib_libedit_src_unvis.c
index 34c6aefb5ca..f9fcdd6f458 100644
--- a/security/heimdal/patches/patch-lib_libedit_src_unvis.c
+++ b/security/heimdal/patches/patch-lib_libedit_src_unvis.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_libedit_src_unvis.c,v 1.2 2014/09/22 11:55:37 joerg Exp $
+$NetBSD: patch-lib_libedit_src_unvis.c,v 1.3 2015/07/11 04:26:57 rodent Exp $
 
 * Fix OpenBSD 5.5 build
 
 --- lib/libedit/src/unvis.c.orig	2012-12-09 22:06:44.000000000 +0000
 +++ lib/libedit/src/unvis.c
-@@ -46,9 +46,11 @@
+@@ -46,9 +46,11 @@ __RCSID("$NetBSD: unvis.c,v 1.32 2010/11
  #include <stdio.h>
  #include <vis.h>
  
diff --git a/security/heimdal/patches/patch-lib_libedit_src_vis.c b/security/heimdal/patches/patch-lib_libedit_src_vis.c
index b82287a3be4..3b308a5e4d3 100644
--- a/security/heimdal/patches/patch-lib_libedit_src_vis.c
+++ b/security/heimdal/patches/patch-lib_libedit_src_vis.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_libedit_src_vis.c,v 1.2 2014/09/22 11:55:37 joerg Exp $
+$NetBSD: patch-lib_libedit_src_vis.c,v 1.3 2015/07/11 04:26:57 rodent Exp $
 
 * Fix OpenBSD 5.5 build
 
 --- lib/libedit/src/vis.c.orig	2012-12-09 22:06:44.000000000 +0000
 +++ lib/libedit/src/vis.c
-@@ -67,6 +67,7 @@
+@@ -67,6 +67,7 @@ __RCSID("$NetBSD: vis.c,v 1.41 2009/11/2
  #include <vis.h>
  #include <stdlib.h>
  
diff --git a/security/heimdal/patches/patch-lib_otp_Makefile.in b/security/heimdal/patches/patch-lib_otp_Makefile.in
index 26de0c7e7e3..76f3928d1d1 100644
--- a/security/heimdal/patches/patch-lib_otp_Makefile.in
+++ b/security/heimdal/patches/patch-lib_otp_Makefile.in
@@ -1,6 +1,6 @@
-$NetBSD: patch-lib_otp_Makefile.in,v 1.2 2012/02/27 12:39:12 asau Exp $
+$NetBSD: patch-lib_otp_Makefile.in,v 1.3 2015/07/11 04:26:57 rodent Exp $
 
---- lib/otp/Makefile.in.orig	2012-01-11 13:04:29.000000000 +0000
+--- lib/otp/Makefile.in.orig	2012-12-09 22:09:38.000000000 +0000
 +++ lib/otp/Makefile.in
 @@ -50,7 +50,6 @@ check_PROGRAMS = otptest$(EXEEXT)
  @HAVE_DB1_TRUE@am__append_1 = $(LIB_db_create)