Index: head/security/ssh2/Makefile
===================================================================
--- head/security/ssh2/Makefile	(revision 61533)
+++ head/security/ssh2/Makefile	(revision 61534)
@@ -1,107 +1,105 @@
 # New ports collection makefile for:	ssh2
 # Date created:		5 Oct 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ssh2
-PORTVERSION=	3.1.2
+PORTVERSION=	3.2.0
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.ssh.com/pub/ssh/ \
 		ftp://sunsite.unc.edu/pub/packages/security/ssh/ \
 		ftp://ftp.kyoto.wide.ad.jp/pub/security/ssh/ \
 		ftp://ftp.cis.fed.gov/pub/ssh/ \
 		ftp://ftp.keystealth.org/pub/ssh/ \
 		ftp://mirror.chpc.utah.edu/pub/ssh/ \
 		ftp://metalab.unc.edu/pub/packages/security/ssh/ \
 		ftp://herbie.ucs.indiana.edu/pub/security/ssh/
 DISTNAME=	ssh-${PORTVERSION}
 
 MAINTAINER=	larse@ISI.EDU
 
-#RESTRICTED=	"Crypto; export-controlled"
-
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS=	--with-etcdir=${SSH2_ETC} --disable-debug
 
 SSH2_ETC=	${PREFIX}/etc/ssh2
 SSH2_RCD=	${PREFIX}/etc/rc.d
 CONFIG_FILES=	ssh2_config sshd2_config
 
 # Uncomment if all your users are in their own group and their homedir
 # is writeable by that group.  Beware the security implications!
 #
 #CONFIGURE_ARGS+=	--enable-group-writeability
 
 # Kerberos support is untested.
 #
 #.if defined(KRB5_HOME) && exists(${KRB5_HOME})
 #CONFIGURE_ARGS+=--with-kerberos5=${KRB5_HOME} --disable-suid-ssh-signer
 #.endif
 
 # Auto-configure tcp_wrappers support.
 #
 .if exists(/usr/include/tcpd.h) && !defined(WITHOUT_TCPWRAP) && \
 	!defined(WITHOUT_TCPWRAP)
 CONFIGURE_ARGS+=	--with-libwrap
 .elif defined(WITH_TCPWRAP)
 CONFIGURE_ARGS+=	--with-libwrap="-L${LOCALBASE}/lib -lwrap"
 
 LIB_DEPENDS+=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_X11) || (exists(${X11BASE}/lib/libX11.a) \
 	&& !defined(WITHOUT_X11))
 USE_XLIB=	yes
 PLIST_SUB=	WITH_X11:=""
 .else
 CONFIGURE_ARGS+=	--without-x
 PLIST_SUB=	WITH_X11:="@comment "
 .endif
 
 MAN1=		ssh2.1 ssh-keygen2.1 ssh-add2.1 ssh-agent2.1 scp2.1 sftp2.1 \
 		sshregex.1 ssh-probe2.1 ssh-dummy-shell.1 ssh-pubkeymgr.1 \
 		ssh-chrootmgr.1
 MAN5=		ssh2_config.5 sshd-check-conf.5 sshd2_config.5
 MAN8=		sshd2.8
 MLINKS=		ssh2.1 ssh.1 ssh-add2.1 ssh-add.1 ssh-agent2.1 ssh-agent.1 \
 		ssh-keygen2.1 ssh-keygen.1 scp2.1 scp.1 sftp2.1 sftp.1 \
 		ssh-probe2.1 ssh-probe.1 sshd2.8 sshd.8
 MANCOMPRESSED=	no
 
-PORTDOCS=	BUG.REPORT CHANGES FAQ INSTALL LICENSE MANIFEST NEWS README \
+PORTDOCS=	CHANGES FAQ INSTALL LICENSE MANIFEST NEWS README \
 		REGEX-SYNTAX SSH2.QUICKSTART
 
 post-install: install-config-files
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
 	@if [ ! -f ${SSH2_ETC}/hostkey ]; then \
 	    ${ECHO} "Generating a secret host key..."; \
 	    ${PREFIX}/bin/ssh-keygen2 -P -b 1024 -t dsa ${SSH2_ETC}/hostkey; \
 	fi; \
 	if [ "`grep ssh /etc/inetd.conf|grep -v ^#ssh`" = "" ]; then \
 	    if [ ! -f ${SSH2_RCD}/sshd.sh ]; then \
 		${ECHO} "Installing ${SSH2_RCD}/sshd.sh startup file."; \
 		${SED} -e 's+!!PREFIX!!+${PREFIX}+' < ${FILESDIR}/sshd.sh \
 			> ${SSH2_RCD}/sshd.sh; \
 		${CHMOD} 751 ${SSH2_RCD}/sshd.sh; \
 	    fi; \
 	fi
 
 install-config-files:
 .for file in ${CONFIG_FILES}
 	${INSTALL_DATA} ${WRKSRC}/apps/ssh/${file} ${SSH2_ETC}/${file}.sample
 .if !exists(${SSH2_ETC}/${file})
 	${INSTALL_DATA} ${WRKSRC}/apps/ssh/${file} ${SSH2_ETC}
 .endif
 .endfor
 
 .include <bsd.port.post.mk>

Property changes on: head/security/ssh2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.108
\ No newline at end of property
+1.109
\ No newline at end of property
Index: head/security/ssh2/distinfo
===================================================================
--- head/security/ssh2/distinfo	(revision 61533)
+++ head/security/ssh2/distinfo	(revision 61534)
@@ -1 +1 @@
-MD5 (ssh-3.1.2.tar.gz) = 3da96ec4886063369eb29674b491b2c0
+MD5 (ssh-3.2.0.tar.gz) = bbc63ab4a7f56cd63a7fb68d44ad739c

Property changes on: head/security/ssh2/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.30
\ No newline at end of property
+1.31
\ No newline at end of property
Index: head/security/ssh2/pkg-plist
===================================================================
--- head/security/ssh2/pkg-plist	(revision 61533)
+++ head/security/ssh2/pkg-plist	(revision 61534)
@@ -1,43 +1,41 @@
 bin/ssh2
 bin/scp2
 bin/sftp2
 bin/ssh-agent2
 %%WITH_X11:%%bin/ssh-askpass2
 bin/ssh-keygen2
 bin/ssh-add2
 bin/ssh-signer2
 bin/ssh-probe2
-bin/ssh-pam-client
 bin/sftp-server2
 bin/ssh-dummy-shell
 bin/ssh-pubkeymgr
 bin/ssh-chrootmgr
 bin/ssh
 bin/ssh-agent
 bin/ssh-add
 bin/ssh-askpass
 bin/ssh-keygen
 bin/scp
 bin/sftp
 bin/sftp-server
 bin/ssh-signer
 bin/ssh-probe
 etc/rc.d/sshd.sh
 etc/ssh2/sshd2_config.sample
 etc/ssh2/ssh2_config.sample
 etc/ssh2/ssh_dummy_shell.out
 sbin/sshd2
 sbin/sshd-check-conf
 sbin/sshd
 @exec if [ ! -f %D/etc/ssh2/hostkey ]; then umask 022; echo "Generating 1024 bit host key."; %D/bin/ssh-keygen2 -P -b 1024 -t dsa %D/etc/ssh2/hostkey;  fi
-%%PORTDOCS%%share/doc/ssh2/BUG.REPORT
 %%PORTDOCS%%share/doc/ssh2/CHANGES
 %%PORTDOCS%%share/doc/ssh2/FAQ
 %%PORTDOCS%%share/doc/ssh2/INSTALL
 %%PORTDOCS%%share/doc/ssh2/LICENSE
 %%PORTDOCS%%share/doc/ssh2/MANIFEST
 %%PORTDOCS%%share/doc/ssh2/NEWS
 %%PORTDOCS%%share/doc/ssh2/README
 %%PORTDOCS%%share/doc/ssh2/REGEX-SYNTAX
 %%PORTDOCS%%share/doc/ssh2/SSH2.QUICKSTART
 %%PORTDOCS%%@dirrm share/doc/ssh2

Property changes on: head/security/ssh2/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.22
\ No newline at end of property
+1.23
\ No newline at end of property