5 files changed, 36 insertions, 44 deletions

diff --git a/security/srp/Makefile b/security/srp/Makefile
index 749807d98239..ddd56b9b5e91 100644
--- a/security/srp/Makefile
+++ b/security/srp/Makefile
@@ -6,41 +6,29 @@
 #
 
 PORTNAME=	srp
-PORTVERSION=	1.7.5
+PORTVERSION=	2.0.0
 CATEGORIES=	security net
-MASTER_SITES=	http://www-cs-students.stanford.edu/~tjw/srp/source/ \
-		http://srp.stanford.edu/source/
+MASTER_SITES=	http://srp.stanford.edu/source/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Secure Remote Password protocol library, TELNET, and FTP
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CC="${CC}" CFLAGS="${CFLAGS}" INSTALL="/usr/bin/install -C"
+CONFIGURE_ENV=	INSTALL="/usr/bin/install -C"
 CONFIGURE_ARGS=	--with-openssl=/usr				\
 		--with-zlib					\
 		--enable-loginf
 
-MYPORTDOCS=	Acknowledgements Copyrights LICENSE copyright.c \
-		draft-altman-rfc2942bis-00.txt draft-altman-rfc2944bis-01.txt \
-		draft-altman-telnet-fwdx-02.txt \
-		draft-ietf-tn3270e-telnet-tls-05.txt rfc2941.txt rfc2942.txt \
-		rfc2944.txt rfc2945.txt rfc2946.txt rfc2947.txt rfc2948.txt \
-		rfc2949.txt rfc2950.txt rfc2952.txt rfc2953.txt srp.ps
+post-patch:
+	@${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
+		's|malloc\.h|stdlib.h|g'
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
-.if !defined(NOPORTDOCS)
 post-install:
-.for f in ${MYPORTDOCS}
-	${MKDIR} ${PREFIX}/share/doc/srp
-	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/srp/${f}
-	@${ECHO_CMD} share/doc/srp/${f} >> ${TMPPLIST}
-.endfor
-	@${ECHO_CMD} @dirrm share/doc/srp >> ${TMPPLIST}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/docs && ${FIND} . | \
+		cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/srp/distinfo b/security/srp/distinfo
index 2a5908f11795..c55d194d35b0 100644
--- a/security/srp/distinfo
+++ b/security/srp/distinfo
@@ -1 +1 @@
-MD5 (srp-1.7.5.tar.gz) = 32c3a06b9aaf2326afd18d6e64572368
+MD5 (srp-2.0.0.tar.gz) = d8f6d0bbb8e2214580d2ab25b53529fe
diff --git a/security/srp/files/patch-base::pam_eps::pam_eps_passwd.c b/security/srp/files/patch-base::pam_eps::pam_eps_passwd.c
deleted file mode 100644
index dade65c43594..000000000000
--- a/security/srp/files/patch-base::pam_eps::pam_eps_passwd.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- base/pam_eps/pam_eps_passwd.c.orig	Tue Jan 22 16:26:28 2002
-+++ base/pam_eps/pam_eps_passwd.c	Tue Jan 22 16:26:42 2002
-@@ -75,7 +75,6 @@
- #include <syslog.h>
- #include <string.h>
- #include <stdarg.h>
--#include <malloc.h>
- #include <t_pwd.h>
- 
- #ifndef LINUX    /* AGM added this as of 0.2 */
diff --git a/security/srp/files/patch-telnet::telnetd::sys_term.c b/security/srp/files/patch-telnet::telnetd::sys_term.c
index 60fc3b88348b..e971bbaf307c 100644
--- a/security/srp/files/patch-telnet::telnetd::sys_term.c
+++ b/security/srp/files/patch-telnet::telnetd::sys_term.c
@@ -10,12 +10,3 @@
  #  ifdef UTMP_FILE
  char	utmpf[] = UTMP_FILE;
  #  else
-@@ -1473,7 +1476,7 @@
- {
- 	register int i;
- 	int syncpipe[2];
--#if defined(OSF) || defined(ultrix) || defined(__hpux)
-+#if defined(OSF) || defined(ultrix) || defined(__hpux) || defined(__FreeBSD__)
- 	time_t time();
- #else
- 	long time();
diff --git a/security/srp/pkg-plist b/security/srp/pkg-plist
index bbe39ec1ae8a..9c1f866b26dc 100644
--- a/security/srp/pkg-plist
+++ b/security/srp/pkg-plist
@@ -7,6 +7,7 @@ bin/telnet
 include/cstr.h
 include/krypto.h
 include/srp.h
+include/srp_aux.h
 include/t_client.h
 include/t_pwd.h
 include/t_server.h
@@ -18,3 +19,25 @@ lib/pam_eps_passwd.so
 sbin/eps_chkpwd
 sbin/ftpd
 sbin/telnetd
+%%PORTDOCS%%%%DOCSDIR%%/Acknowledgements
+%%PORTDOCS%%%%DOCSDIR%%/Copyrights
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/copyright.c
+%%PORTDOCS%%%%DOCSDIR%%/draft-altman-rfc2942bis-00.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-altman-rfc2944bis-01.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-altman-telnet-fwdx-02.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-tls-srp-05.txt
+%%PORTDOCS%%%%DOCSDIR%%/draft-ietf-tn3270e-telnet-tls-05.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2941.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2942.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2944.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2945.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2946.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2947.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2948.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2949.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2950.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2952.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc2953.txt
+%%PORTDOCS%%%%DOCSDIR%%/srp.ps
+%%PORTDOCS%%@dirrm %%DOCSDIR%%