[pkgsrc/trunk]: pkgsrc/security/mit-krb5 Redo rpath handling as the option is...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9ca26ca6c2f2
branches:  trunk
changeset: 648903:9ca26ca6c2f2
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Mar 22 20:09:09 2015 +0000

description:
Redo rpath handling as the option is leaked into the config binary.
Bump revision.

diffstat:

 security/mit-krb5/Makefile                          |   4 ++--
 security/mit-krb5/distinfo                          |   7 ++++---
 security/mit-krb5/patches/patch-ag                  |   6 +++---
 security/mit-krb5/patches/patch-ck                  |   8 +++++---
 security/mit-krb5/patches/patch-util_ss_Makefile.in |  12 ++++++++++++
 5 files changed, 26 insertions(+), 11 deletions(-)

diffs (102 lines):

diff -r b07c0109dac1 -r 9ca26ca6c2f2 security/mit-krb5/Makefile
--- a/security/mit-krb5/Makefile        Sun Mar 22 20:08:04 2015 +0000
+++ b/security/mit-krb5/Makefile        Sun Mar 22 20:09:09 2015 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2015/03/16 10:44:23 joerg Exp $
+# $NetBSD: Makefile,v 1.82 2015/03/22 20:09:09 joerg Exp $
 
 DISTNAME=      krb5-1.10.7
 PKGNAME=       mit-${DISTNAME}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    security
 MASTER_SITES=  http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=  .tar
diff -r b07c0109dac1 -r 9ca26ca6c2f2 security/mit-krb5/distinfo
--- a/security/mit-krb5/distinfo        Sun Mar 22 20:08:04 2015 +0000
+++ b/security/mit-krb5/distinfo        Sun Mar 22 20:09:09 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2015/03/15 23:07:20 joerg Exp $
+$NetBSD: distinfo,v 1.52 2015/03/22 20:09:09 joerg Exp $
 
 SHA1 (2014-001-patch.txt) = 919402bf3b7c289e847e9adc03a7c30f26966769
 RMD160 (2014-001-patch.txt) = a39c8e12e79ab273d562b04c1e7811c414dd70e8
@@ -17,7 +17,7 @@
 SHA1 (patch-ad) = b56a7218007560470179dd811c84b8c690c966ac
 SHA1 (patch-ae) = c7395b9de5baf6612b8787fad55dbc051a680bfd
 SHA1 (patch-af) = 1edab3a5f7eb6a7c5dc287e94ae4401c389dbabf
-SHA1 (patch-ag) = 793488d56725cc85f6f00de00a7beee76abd1b92
+SHA1 (patch-ag) = a63d8929b02c41423123ee722d02af00645eda2c
 SHA1 (patch-ah) = 4e40f36e8969974b3c2f68b2e3636921133c57ba
 SHA1 (patch-aj) = 8a00ca30db3c9c3c9a2f7506cdc4c5b20f7f42c6
 SHA1 (patch-ak) = 19d9b15048a5920ee15c82b33da50c40cf400e46
@@ -27,8 +27,9 @@
 SHA1 (patch-ch) = 0f7f45aeb52907b52a2b143c3a2e36a7656c68c5
 SHA1 (patch-ci) = 4e310f0a4dfe27cf94d0e63d623590691b6c5970
 SHA1 (patch-cj) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b
-SHA1 (patch-ck) = 08c2e41e5c12c5b33d732fa16d1449063addafee
+SHA1 (patch-ck) = 6a483684c68f045bf6f8e165a8935338af7422db
 SHA1 (patch-kadmin_dbutil_dump.c) = 4b49c116dbed9e6be4a0bf0a731c3ae82808d82e
 SHA1 (patch-lib_apputils_net-server.c) = 4f54924cca60e75b1b835d35c5eeb96d9f95a90e
 SHA1 (patch-lib_krb5_asn.1_asn1buf.h) = a1e46ca9256aea4facc1d41841b1707b044a69e7
 SHA1 (patch-util_k5ev_verto-k5ev.c) = 79a2be64fa4f9b0dc3a333271e8a3ff7944e5c18
+SHA1 (patch-util_ss_Makefile.in) = 4ec8cd8640e0631b3c6738693b5318aadc9ef278
diff -r b07c0109dac1 -r 9ca26ca6c2f2 security/mit-krb5/patches/patch-ag
--- a/security/mit-krb5/patches/patch-ag        Sun Mar 22 20:08:04 2015 +0000
+++ b/security/mit-krb5/patches/patch-ag        Sun Mar 22 20:09:09 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.9 2015/03/15 23:07:20 joerg Exp $
+$NetBSD: patch-ag,v 1.10 2015/03/22 20:09:09 joerg Exp $
 
 Add --enable-pkgsrc-libtool option
 
@@ -24,8 +24,8 @@
  default_static=no
  default_shared=yes
  
-+SHLIB_RPATH_FLAGS='${defined(SHLIB_RDIRS):? ${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS) :}'
-+PROG_RPATH_FLAGS='${defined(PROG_RPATH):? $(RPATH_FLAG)$(PROG_RPATH) :}'
++SHLIB_RPATH_FLAGS='${COMPILER_RPATH_FLAG}$(SHLIB_RDIRS)'
++PROG_RPATH_FLAGS='$(RPATH_FLAG)$(PROG_RPATH)'
 +
  # Set up architecture-specific variables.
  case $krb5_cv_host in
diff -r b07c0109dac1 -r 9ca26ca6c2f2 security/mit-krb5/patches/patch-ck
--- a/security/mit-krb5/patches/patch-ck        Sun Mar 22 20:08:04 2015 +0000
+++ b/security/mit-krb5/patches/patch-ck        Sun Mar 22 20:09:09 2015 +0000
@@ -1,14 +1,16 @@
-$NetBSD: patch-ck,v 1.3 2015/03/15 23:07:20 joerg Exp $
+$NetBSD: patch-ck,v 1.4 2015/03/22 20:09:09 joerg Exp $
 
 libapputils is an internal library, so make it a convenience libtool archive.
 
---- lib/apputils/Makefile.in.orig      2012-05-31 23:49:44.000000000 +0000
+--- lib/apputils/Makefile.in.orig      2013-11-06 20:52:23.000000000 +0000
 +++ lib/apputils/Makefile.in
-@@ -16,6 +16,7 @@ DEFS=
+@@ -16,6 +16,9 @@ DEFS=
  STLIBOBJS=net-server.o @LIBOBJS@
  STOBJLISTS=OBJS.ST
  LIBBASE=apputils
 +LIBTOOL_TAIL=
++PROG_RPATH=   ${KRB5_LIBDIR}
++SHLIB_RDIRS=  ${KRB5_LIBDIR}
  
  all-unix:: all-liblinks
  clean-unix:: clean-liblinks clean-libs clean-libobjs
diff -r b07c0109dac1 -r 9ca26ca6c2f2 security/mit-krb5/patches/patch-util_ss_Makefile.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/mit-krb5/patches/patch-util_ss_Makefile.in       Sun Mar 22 20:09:09 2015 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-util_ss_Makefile.in,v 1.1 2015/03/22 20:09:09 joerg Exp $
+
+--- util/ss/Makefile.in.orig   2015-03-22 17:50:02.000000000 +0000
++++ util/ss/Makefile.in
+@@ -14,6 +14,7 @@ LIBBASE=ss
+ LIBMAJOR=1
+ LIBMINOR=0
+ RELDIR=../util/ss
++SHLIB_RDIRS=${KRB5_LIBDIR}
+ 
+ STOBJLISTS=OBJS.ST
+