1 files changed, 20 insertions, 68 deletions

diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index b4fcaa624b9d..b8adffd10151 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -1,15 +1,14 @@
-# Ports collection Makefile for:	MIT Kerberos V
-# Date created:				6/5/1998
-# Whom:					nectar@FreeBSD.org
+# Ports collection Makefile for:	MIT Kerberos V Application Suite
+# Date created:				4/19/2010
+# Whom:					cy@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-PORTNAME=		krb5
-PORTVERSION=		1.7
-PORTREVISION=	2
+PORTNAME=		krb5-appl
+PORTVERSION=		1.0
 CATEGORIES=		security
-MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
+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/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
 EXTRACT_SUFX=		.tar
@@ -17,14 +16,14 @@ EXTRACT_SUFX=		.tar
 MAINTAINER=		cy@FreeBSD.org
 COMMENT=		An authentication system developed at MIT, successor to Kerberos IV
 
-BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4 \
+			krb5-config:${PORTSDIR}/security/krb5
+LIB_DEPENDS=		krb5support.0:${PORTSDIR}/security/krb5
+RUN_DEPENDS=		kinit:${PORTSDIR}/security/krb5
 
-CONFLICTS=		krb[45]-[0-9]* heimdal-[0-9]* srp-[0-9]*
+CONFLICTS=		krb4-[0-9]* krb5-1.[0-7].* heimdal-[0-9]* srp-[0-9]*
 
-BROKEN=			does not compile
-FORBIDDEN=		MITKRB5-SA-2010-001, MITKRB5-SA-2010-002, and MITKRB5-SA-2010-003.
-
-LATEST_LINK=		${PORTNAME}-17
+LATEST_LINK=		${PORTNAME}-1
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_OPENSSL=		yes
 WITH_OPENSSL_PORT=	yes
@@ -32,7 +31,7 @@ USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
 USE_LDCONFIG=		yes
 USE_AUTOTOOLS=		libtool:22
-CONFIGURE_ARGS?=	--enable-shared
+CONFIGURE_ARGS?=	--enable-shared --with-krb5=${PREFIX}/bin/krb5-config
 CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
 			CFLAGS="${CFLAGS}"
 MAKE_ARGS=		INSTALL="${INSTALL}"
@@ -41,10 +40,7 @@ OPTIONS=		KRB5_RENAME_FTP "Rename ftp to kftp" off \
 			KRB5_RENAME_TELNET "Rename telnet to ktelnet" off \
 			KRB5_RENAME_RLOGIN "Rename rlogin to krlogin" off \
 			KRB5_RENAME_RSH "Rename rsh to krsh" off \
-			KRB5_RENAME_RCP "Rename rcp to krcp" off \
-			KRB5_KRB4_COMPAT "Build and install krb4 compatibility" off \
-			KRB5_DOC "Build and install krb5 documentation" on \
-			WANT_HTML "Want HTML documentation too" on
+			KRB5_RENAME_RCP "Rename rcp to krcp" off
 
 .include <bsd.port.pre.mk>
 
@@ -58,25 +54,15 @@ BUILD_DEPENDS+=		texi2dvi:${PORTSDIR}/print/texinfo \
 INFO=			krb5-admin krb5-install krb5-user
 .endif
 
-.if !defined(WITH_KRB5_KRB4_COMPAT)
-CONFIGURE_ARGS+=	--without-krb4
-PLIST_SUB+=		KRB4="@comment "
-.else
-PLIST_SUB+=		KRB4=""
-.endif
-
 .if defined(KRB5_HOME)
 PREFIX=			${KRB5_HOME}
 .endif
 
-MAN1=			k5srvutil.1 kadmin.1 krb5-send-pr.1 krb5-config.1 \
-			kpasswd.1 klist.1 kinit.1 kdestroy.1 ksu.1 ktutil.1 \
-			sclient.1 rsh.1 rcp.1 rlogin.1 ftp.1 telnet.1 \
-			kerberos.1 kvno.1 compile_et.1
-MAN5=			kdc.conf.5 krb5.conf.5 .k5login.5
-MAN8=			krb5kdc.8 kadmin.local.8 kdb5_util.8 kadmind.8 \
-			kprop.8 kpropd.8 kproplog.8 sserver.8 kshd.8 \
-			klogind.8 login.krb5.8 ftpd.8 telnetd.8
+CFLAGS+=		-I${PREFIX}/include
+LDFLAGS+=		-L${PREFIX}/lib
+
+MAN1=			rsh.1 rcp.1 rlogin.1 ftp.1 telnet.1
+MAN8=			kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8
 
 .if defined(WITH_KRB5_RENAME_FTP)
 MAN1:=			${MAN1:C/ftp/kftp/}
@@ -124,7 +110,7 @@ PLIST_SUB+=		RCP_PROG="rcp"
 CONFIGURE_ARGS+=	--program-transform-name="${PROGRAM_TRANSFORM_NAME}"
 .endif
 
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 HTML_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc
 HTML_DOCS=		ftp.html kdestroy.html kinit.html klist.html \
@@ -144,41 +130,7 @@ post-extract:
 	fi
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e '1s,^#!\/usr\/athena/bin/perl,#!${PERL5},' \
-		${WRKSRC}/../doc/man2html
-
-pre-build:
-.if !defined(KRB5_KRB4_COMPAT)
-	@${ECHO} "------------------------------------------------------"
-	@${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build   "
-	@${ECHO} "the KerberosIV compatibility libraries.               "
-	@${ECHO} "------------------------------------------------------"
-.endif
-
-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}; \
-	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
-.endif
-
 	@${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
 	@${ECHO} "------------------------------------------------------"