Date: Tue, 22 Jan 2013 04:03:18 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310802 - in head/security/krb5: . files Message-ID: <201301220403.r0M43Ilv088562@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Jan 22 04:03:17 2013 New Revision: 310802 URL: http://svnweb.freebsd.org/changeset/ports/310802 Log: Update 1.10.3 --> 1.11 Deleted: head/security/krb5/files/patch-ac head/security/krb5/files/patch-ad head/security/krb5/files/patch-ae head/security/krb5/files/patch-ax Modified: head/security/krb5/Makefile head/security/krb5/distinfo head/security/krb5/pkg-plist Modified: head/security/krb5/Makefile ============================================================================== --- head/security/krb5/Makefile Tue Jan 22 03:57:55 2013 (r310801) +++ head/security/krb5/Makefile Tue Jan 22 04:03:17 2013 (r310802) @@ -6,8 +6,7 @@ # PORTNAME= krb5 -PORTVERSION= 1.10.3 -PORTREVISION= 1 +PORTVERSION= 1.11 CATEGORIES= security MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/ PATCH_SITES= http://web.mit.edu/kerberos/advisories/ @@ -36,8 +35,8 @@ PATCH_DIST_STRIP= -p2 LICENSE= MIT -OPTIONS= KRB5_DOC "Build and install krb5 documentation" on \ - WANT_HTML "Want HTML documentation too" on \ +OPTIONS= KRB5_PDF "Install krb5 PDF documentation" on \ + KRB5_HTML "Install HTML documentation" on \ DNS_FOR_REALM "enable DNS lookups of Kerberos realm names" off .if defined(KRB5_HOME) @@ -55,32 +54,16 @@ CONFIGURE_ARGS+= --enable-dns-for-realm USE_OPENSSL= yes -.if defined(WITH_KRB5_DOC) -BUILD_DEPENDS+= texi2dvi:${PORTSDIR}/print/texinfo \ - dvips:${PORTSDIR}/print/dvipsk-tetex -INFO= krb5-admin krb5-install krb5-user - -# pointyhat kludge - tetex drags in port-OpenSSL on 7.X, but only as a build -# dependency. Yet this triggers autodetection code in bsd.openssl.mk and -# OpenSSL dependency is registered with the resulting package, creating a -# discord between INDEX and actual package. Work around by explicitly recording -# the dependency in a way that INDEX build will see. -.if ${OSVERSION} < 800000 -WITH_OPENSSL_PORT= yes -.endif - -.endif - .include "${PORTSDIR}/Mk/bsd.openssl.mk" -MAN1= k5srvutil.1 kadmin.1 krb5-send-pr.1 krb5-config.1 \ +MAN1= k5srvutil.1 kadmin.1 krb5-send-pr.1 \ kpasswd.1 klist.1 kinit.1 kdestroy.1 kswitch.1 ksu.1 \ ktutil.1 \ - sclient.1 kerberos.1 kvno.1 compile_et.1 -MAN5= kdc.conf.5 krb5.conf.5 .k5identity.5 .k5login.5 \ - k5identity.5 k5login.5 -MAN8= krb5kdc.8 kadmin.local.8 kdb5_util.8 kadmind.8 \ - kprop.8 kpropd.8 kproplog.8 sserver.8 + sclient.1 kvno.1 compile_et.1 +MAN5= kadm5.acl.5 kdc.conf.5 krb5.conf.5 .k5identity.5 \ + .k5login.5 k5identity.5 k5login.5 +MAN8= krb5kdc.8 kadmin.local.8 kdb5_ldap_util.8 kdb5_util.8 \ + kadmind.8 kprop.8 kpropd.8 kproplog.8 sserver.8 .if defined(PROGRAM_TRANSFORM_NAME) && ${PROGRAM_TRANSFORM_NAME} != "" CONFIGURE_ARGS+= --program-transform-name="${PROGRAM_TRANSFORM_NAME}" @@ -88,11 +71,8 @@ CONFIGURE_ARGS+= --program-transform-nam WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src -HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc -HTML_DOCS= ftp.html kdestroy.html kinit.html klist.html \ - kpasswd.html krb5-admin.html \ - krb5-install.html krb5-user.html ksu.html \ - rcp.html rlogin.html rsh.html telnet.html +HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html +PDF_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" @@ -106,33 +86,42 @@ post-extract: fi .endif -post-patch: - @${REINPLACE_CMD} -e '1s,^#!\/usr\/athena/bin/perl,#!${PERL5},' \ - ${WRKSRC}/../doc/man2html - -post-build: -.if defined(WITH_KRB5_DOC) - @cd ${WRKSRC}/../doc && \ - ${MAKE} all -.endif - post-install: @${MKDIR} ${PREFIX}/share/doc/krb5 # html documentation -.if defined(WITH_KRB5_DOC) && defined(WITH_WANT_HTML) - for html in ${HTML_DOC_DIR}/*.html; do \ - ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \ - ${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \ +.if defined(WITH_KRB5_PDF) + pdf_files=`${FIND} ${PDF_DOC_DIR} ! -type d` + pdf_dirs=`${FIND} ${PDF_DOC_DIR} -type d` + for i in $${pdf_dirs}; do \ + ${MKDIR} -p ${PREFIX}/share/doc/krb5/$${i}; \ + done; \ + for i in $${pdf_files}; do \ + ${INSTALL_MAN} $${pdf} ${PREFIX}/share/doc/krb5/$${i}; \ + ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \ done .endif - ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST} -# handle info files -.if defined(WITH_KRB5_DOC) -.for info in ${INFO} - ${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info -.endfor +.if defined(WITH_KRB5_HTML) + html_files=`${FIND} ${HTML_DOC_DIR} ! -type d | ${GREP} -v /_sources` + html_dirs=`${FIND} ${HTML_DOC_DIR} -type d | ${GREP} -v /_sources` + for i in $${html_dirs}; do \ + ${MKDIR} -p ${PREFIX}/share/doc/krb5/$${i}; \ + done; \ + for i in $${html_files}; do \ + ${INSTALL_MAN} $${i} ${PREFIX}/share/doc/krb5/$${i}; \ + ${ECHO_CMD} share/doc/krb5/$${i} >> ${TMPPLIST}; \ + done .endif - +.if defined(WITH_KRB5_PDF) + for i in $${pdf_dirs}; do \ + ${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \ + done | ${TAIL} -r >> ${TMPPLIST} +.endif +.if defined(WITH_KRB5_HTML) + for i in $${html_dirs}; do \ + ${ECHO_CMD} @dirrm share/doc/krb5/$${i} >> ${TMPPLIST}; \ + done | ${TAIL} -r >> ${TMPPLIST} +.endif + ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST} @${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD @${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD @${ECHO} "------------------------------------------------------" Modified: head/security/krb5/distinfo ============================================================================== --- head/security/krb5/distinfo Tue Jan 22 03:57:55 2013 (r310801) +++ head/security/krb5/distinfo Tue Jan 22 04:03:17 2013 (r310802) @@ -1,2 +1,2 @@ -SHA256 (krb5-1.10.3-signed.tar) = fc48f9f985bf04aa91c239dae0daaa0509c85b61b2d172d9d65ab0c52bcea3cf -SIZE (krb5-1.10.3-signed.tar) = 11530240 +SHA256 (krb5-1.11-signed.tar) = fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651 +SIZE (krb5-1.11-signed.tar) = 11653120 Modified: head/security/krb5/pkg-plist ============================================================================== --- head/security/krb5/pkg-plist Tue Jan 22 03:57:55 2013 (r310801) +++ head/security/krb5/pkg-plist Tue Jan 22 04:03:17 2013 (r310802) @@ -66,15 +66,13 @@ lib/libkadm5srv.so lib/libkadm5srv_mit.so lib/libkadm5srv_mit.so.8 lib/libkdb5.so -lib/libkdb5.so.6 +lib/libkdb5.so.7 lib/libkrb5.so lib/libkrb5.so.3 lib/libkrb5support.so lib/libkrb5support.so.0 lib/krb5/plugins/kdb/db2.so lib/krb5/plugins/preauth/pkinit.so -lib/libverto-k5ev.so.0 -lib/libverto-k5ev.so lib/libverto.so.0 lib/libverto.so sbin/gss-server
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301220403.r0M43Ilv088562>