From owner-svn-ports-all@freebsd.org  Wed Nov  9 22:42:56 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2EA11C388A2;
 Wed,  9 Nov 2016 22:42:56 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D39E629;
 Wed,  9 Nov 2016 22:42:55 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA9Mgtpp012586;
 Wed, 9 Nov 2016 22:42:55 GMT (envelope-from jkim@FreeBSD.org)
Received: (from jkim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA9MgtWq012585;
 Wed, 9 Nov 2016 22:42:55 GMT (envelope-from jkim@FreeBSD.org)
Message-Id: <201611092242.uA9MgtWq012585@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jkim set sender to
 jkim@FreeBSD.org using -f
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 9 Nov 2016 22:42:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r425814 - head/security/heimdal/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Nov 2016 22:42:56 -0000

Author: jkim
Date: Wed Nov  9 22:42:54 2016
New Revision: 425814
URL: https://svnweb.freebsd.org/changeset/ports/425814

Log:
  Do not let the configure script pick up Berkeley DB from ports.
  
  Approved by:	hrs (maintainer)

Modified:
  head/security/heimdal/files/patch-configure

Modified: head/security/heimdal/files/patch-configure
==============================================================================
--- head/security/heimdal/files/patch-configure	Wed Nov  9 22:31:48 2016	(r425813)
+++ head/security/heimdal/files/patch-configure	Wed Nov  9 22:42:54 2016	(r425814)
@@ -1,6 +1,6 @@
---- configure.orig	2014-10-20 14:24:44.000000000 +0900
-+++ configure	2014-10-20 14:27:30.000000000 +0900
-@@ -9567,29 +9567,6 @@
+--- configure.orig	2012-12-09 22:09:32 UTC
++++ configure
+@@ -9567,29 +9567,6 @@ fi
        hardcode_shlibpath_var=no
        ;;
  
@@ -30,7 +30,7 @@
      # 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 @@
+@@ -10561,10 +10538,6 @@ dgux*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
@@ -41,7 +41,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -10572,7 +10545,6 @@
+@@ -10572,7 +10545,6 @@ freebsd* | dragonfly*)
      objformat=`/usr/bin/objformat`
    else
      case $host_os in
@@ -49,7 +49,7 @@
      *) objformat=elf ;;
      esac
    fi
-@@ -10590,18 +10562,6 @@
+@@ -10590,18 +10562,6 @@ freebsd* | dragonfly*)
    esac
    shlibpath_var=LD_LIBRARY_PATH
    case $host_os in
@@ -68,7 +68,7 @@
    *) # from 4.6 on, and DragonFly
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
-@@ -14227,7 +14187,7 @@
+@@ -14227,7 +14187,7 @@ case "$host" in
  	native_pthread_support="netbsd 3 uses explict pthread"
  		PTHREAD_LIBADD="-lpthread"
  	;;
@@ -77,7 +77,17 @@
  	native_pthread_support=yes
  	PTHREAD_LIBADD="-pthread"
  	;;
-@@ -28245,7 +28205,7 @@
+@@ -14393,9 +14353,6 @@ done
+ 
+ else
+   for ac_header in 					\
+-	           db5/db.h				\
+-	           db4/db.h				\
+-	           db3/db.h				\
+ 	           db.h					\
+ 
+ do :
+@@ -28245,7 +28202,7 @@ fi
  
  krb_cv_compile_et="no"
  krb_cv_com_err_need_r=""