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 (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,88 +1,89 @@ @@ -1,88 +1,89 @@
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
15HOMEPAGE= http://web.mit.edu/kerberos/ 15HOMEPAGE= http://web.mit.edu/kerberos/
16COMMENT= MIT Kerberos 5 authentication system 16COMMENT= MIT Kerberos 5 authentication system
17 17
18MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
19 19
20WRKSRC= ${WRKDIR}/${DISTNAME}/src 20WRKSRC= ${WRKDIR}/${DISTNAME}/src
21 21
22BUILD_TARGET= generate-files-mac all 22BUILD_TARGET= generate-files-mac all
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25 25
26CONFLICTS+= heimdal-[0-9]* 26CONFLICTS+= heimdal-[0-9]*
27CONFLICTS+= kth-krb4-[0-9]* 27CONFLICTS+= kth-krb4-[0-9]*
28 28
29USE_LANGUAGES= c c++ 29USE_LANGUAGES= c c++
30USE_LIBTOOL= yes 30USE_LIBTOOL= yes
31USE_TOOLS+= autoconf gzip m4 perl yacc msgfmt 31USE_TOOLS+= autoconf gzip m4 perl yacc msgfmt
32GNU_CONFIGURE= yes 32GNU_CONFIGURE= yes
33 33
34# The actual KDC databases are stored in ${MIT_KRB5_STATEDIR}/krb5kdc. 34# The actual KDC databases are stored in ${MIT_KRB5_STATEDIR}/krb5kdc.
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} \
61 ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \ 62 ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
62 ${PKGMANDIR}/man8 sbin share/examples/krb5 \ 63 ${PKGMANDIR}/man8 sbin share/examples/krb5 \
63 share/et share/examples/rc.d share/gnats \ 64 share/et share/examples/rc.d share/gnats \
64 lib/krb5/plugins/kdb lib/krb5/plugins/preauth \ 65 lib/krb5/plugins/kdb lib/krb5/plugins/preauth \
65 include/krb5 include/kadm5 66 include/krb5 include/kadm5
66 67
67# The MIT krb5 distribution is actually a tar file that contains the 68# The MIT krb5 distribution is actually a tar file that contains the
68# real .tar.gz distfile and a PGP signature. 69# real .tar.gz distfile and a PGP signature.
69post-extract: 70post-extract:
70 @${ECHO} "=> Extracting internal tarball"; \ 71 @${ECHO} "=> Extracting internal tarball"; \
71 extract_file="${WRKDIR}/${DISTNAME}.tar.gz"; \ 72 extract_file="${WRKDIR}/${DISTNAME}.tar.gz"; \
72 cd ${WRKDIR} && ${EXTRACT_CMD} 73 cd ${WRKDIR} && ${EXTRACT_CMD}
73 74
74pre-configure: 75pre-configure:
75 @${ECHO} "=> Generating configure"; \ 76 @${ECHO} "=> Generating configure"; \
76 cd ${WRKSRC}; autoconf -I ${WRKSRC} -f; 77 cd ${WRKSRC}; autoconf -I ${WRKSRC} -f;
77 78
78post-install: 79post-install:
79 @${ECHO} "=> Installing info files"; \ 80 @${ECHO} "=> Installing info files"; \
80 cd ${WRKDIR}/${DISTNAME}/doc; \ 81 cd ${WRKDIR}/${DISTNAME}/doc; \
81 for f in *.info *.info-[0-9]*; do \ 82 for f in *.info *.info-[0-9]*; do \
82 ${TEST} ! -f "$$f" || \ 83 ${TEST} ! -f "$$f" || \
83 ${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR}; \ 84 ${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR}; \
84 done 85 done
85 86
86BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8 87BUILDLINK_API_DEPENDS.openssl+= openssl>=0.9.8
87.include "../../security/openssl/buildlink3.mk" 88.include "../../security/openssl/buildlink3.mk"
88.include "../../mk/bsd.pkg.mk" 89.include "../../mk/bsd.pkg.mk"