From 9b6b9bacb0a86acdbea59218361138e16b4c1557 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 24 Nov 2014 00:34:36 +0000
Subject: [PATCH] - Fix heimdal-gssapi.pc. - Add an UPDATING entry.

PR:	195319
---
 UPDATING                                            | 12 ++++++++++++
 security/heimdal/Makefile                           |  1 +
 .../heimdal/files/patch-tools-heimdal-gssapi.pc.in  | 13 +++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 security/heimdal/files/patch-tools-heimdal-gssapi.pc.in

diff --git a/UPDATING b/UPDATING
index 28f81d6560cf..68e04c28779c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20141123:
+  AFFECTS: users of security/heimdal
+  AUTHOR: hrs@FreeBSD.org
+
+  The header and library files have been moved from PREFIX/{include,lib} to
+  PREFIX/{include,lib}/heimdal at r373047 to fix a library dependency
+  confusion when software attempts to link a Heimdal library in base and
+  an external library in LOCALBASE/lib at the same time.
+
+  All of packages which depend on security/heimdal have to be recompiled
+  and reinstalled because of this library location change.
+
 20141119:
   AFFECTS: users of x11/gnome2, graphics/clutter and lang/vala
   AUTHOR: kwm@FreeBSD.org
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 159edd543aa3..6747be58d80f 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	heimdal
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://www.h5l.org/dist/src/ \
 		http://ftp.pdc.kth.se/pub/heimdal/src/ \
diff --git a/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in b/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in
new file mode 100644
index 000000000000..b289f92894cf
--- /dev/null
+++ b/security/heimdal/files/patch-tools-heimdal-gssapi.pc.in
@@ -0,0 +1,13 @@
+--- tools/heimdal-gssapi.pc.in.orig	2014-11-24 09:17:39.000000000 +0900
++++ tools/heimdal-gssapi.pc.in	2014-11-24 09:17:44.000000000 +0900
+@@ -1,8 +1,8 @@
+ # $Id$
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
+-includedir=${prefix}/include
++libdir=@libdir@
++includedir=@includedir@
+ 
+ Name: @PACKAGE@
+ Description: Heimdal is an implementation of Kerberos 5, freely available under a three clause BSD style license.