Sun Nov 22 09:43:16 2015 UTC ()
Pullup ticket #4858 - requested by tez
security/mit-krb5: build fix

Revisions pulled up:
- security/mit-krb5/Makefile                                    1.85

---
   Module Name: pkgsrc
   Committed By: tez
   Date: Thu Nov  5 19:10:30 UTC 2015

   Modified Files:
   pkgsrc/security/mit-krb5: Makefile

   Log Message:
   Fix build in case there is a system version of verto found.
   No revbump because it failed to build before if there was one.
   Fixes pkg/50348


(bsiegert)
diff -r1.84 -r1.84.4.1 pkgsrc/security/mit-krb5/Makefile
cvs diff -r1.84 -r1.84.4.1 pkgsrc/security/mit-krb5/Makefile (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/Makefile 2015/06/12 10:51:03 1.84
+++ pkgsrc/security/mit-krb5/Makefile 2015/11/22 09:43:16 1.84.4.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.84 2015/06/12 10:51:03 wiz Exp $ 1# $NetBSD: Makefile,v 1.84.4.1 2015/11/22 09:43:16 bsiegert Exp $
2 2
3DISTNAME= krb5-1.10.7 3DISTNAME= krb5-1.10.7
4PKGNAME= mit-${DISTNAME} 4PKGNAME= mit-${DISTNAME}
5PKGREVISION= 7 5PKGREVISION= 7
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/ 7MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/
8EXTRACT_SUFX= .tar 8EXTRACT_SUFX= .tar
9DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}-signed${EXTRACT_SUFX}
10 10
11PATCH_SITES= http://web.mit.edu/kerberos/advisories/ 11PATCH_SITES= http://web.mit.edu/kerberos/advisories/
12PATCHFILES= 2014-001-patch.txt 12PATCHFILES= 2014-001-patch.txt
13 13
14MAINTAINER= tez@NetBSD.org 14MAINTAINER= tez@NetBSD.org
@@ -35,26 +35,27 @@ GNU_CONFIGURE= yes @@ -35,26 +35,27 @@ GNU_CONFIGURE= yes
35MIT_KRB5_STATEDIR?= ${VARBASE} 35MIT_KRB5_STATEDIR?= ${VARBASE}
36FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR} 36FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR}
37 37
38BUILD_DEFS+= VARBASE 38BUILD_DEFS+= VARBASE
39 39
40CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR} 40CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR}
41CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 41CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
42CONFIGURE_ARGS+= --enable-shared 42CONFIGURE_ARGS+= --enable-shared
43CONFIGURE_ARGS+= --enable-dns-for-realm 43CONFIGURE_ARGS+= --enable-dns-for-realm
44CONFIGURE_ARGS+= --enable-kdc-replay-cache 44CONFIGURE_ARGS+= --enable-kdc-replay-cache
45CONFIGURE_ARGS+= --disable-thread-support 45CONFIGURE_ARGS+= --disable-thread-support
46CONFIGURE_ARGS+= --without-tcl 46CONFIGURE_ARGS+= --without-tcl
47CONFIGURE_ARGS+= --enable-pkgsrc-libtool 47CONFIGURE_ARGS+= --enable-pkgsrc-libtool
 48CONFIGURE_ARGS+= --without-system-verto
48CONFIGURE_ENV+= BUILDLINK_PREFIX_OPENSSL=${BUILDLINK_PREFIX.openssl:Q} 49CONFIGURE_ENV+= BUILDLINK_PREFIX_OPENSSL=${BUILDLINK_PREFIX.openssl:Q}
49MAKE_ENV+= ROOT_USER=${ROOT_USER} 50MAKE_ENV+= ROOT_USER=${ROOT_USER}
50LIBS.SunOS= -lrt 51LIBS.SunOS= -lrt
51 52
52PATCH_DIST_ARGS= -d ${WRKSRC} -p2 53PATCH_DIST_ARGS= -d ${WRKSRC} -p2
53 54
54INFO_FILES= YES 55INFO_FILES= YES
55 56
56OWN_DIRS_PERMS= ${MIT_KRB5_STATEDIR}/krb5kdc \ 57OWN_DIRS_PERMS= ${MIT_KRB5_STATEDIR}/krb5kdc \
57 ${ROOT_USER} ${ROOT_GROUP} 0700 58 ${ROOT_USER} ${ROOT_GROUP} 0700
58RCD_SCRIPTS= kadmind kdc 59RCD_SCRIPTS= kadmind kdc
59 60
60INSTALLATION_DIRS= bin include/gssapi include/gssrpc ${PKGINFODIR} \ 61INSTALLATION_DIRS= bin include/gssapi include/gssrpc ${PKGINFODIR} \