From 15a02ca9a4abdd9f632395d1eb7e1e15018a63bf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 5 Jul 2011 10:15:46 +0200
Subject: [PATCH] openssh: needs perl to build, use vmove, homepage, license.

---
 srcpkgs/openssh/openssh-client.template | 14 ++++----------
 srcpkgs/openssh/openssh-server.template | 23 ++++++++---------------
 srcpkgs/openssh/template                | 22 +++++++++++-----------
 3 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/srcpkgs/openssh/openssh-client.template b/srcpkgs/openssh/openssh-client.template
index 12118e92ad9..0de62a50b34 100644
--- a/srcpkgs/openssh/openssh-client.template
+++ b/srcpkgs/openssh/openssh-client.template
@@ -15,18 +15,12 @@ Add_dependency run openssh		">=${version}"
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/bin
-	mkdir -p ${DESTDIR}/etc/ssh
-	mkdir -p ${DESTDIR}/usr/share/man/man1
-	mkdir -p ${DESTDIR}/usr/share/man/man5
 	for f in scp sftp slogin ssh ssh-add ssh-agent \
 		 ssh-copy-id ssh-keyscan findssl; do
-		mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin
+		vmove usr/bin/${f} usr/bin
 		[ ! -f ${SRCPKGDESTDIR}/usr/share/man/man1/${f}.1 ] && continue
-		mv ${SRCPKGDESTDIR}/usr/share/man/man1/${f}.1 \
-			${DESTDIR}/usr/share/man/man1
+		vmove usr/share/man/man1/${f}.1 usr/share/man/man1
 	done
-	mv ${SRCPKGDESTDIR}/etc/ssh/ssh_config ${DESTDIR}/etc/ssh
-	mv ${SRCPKGDESTDIR}/usr/share/man/man5/ssh_config.5 \
-		${DESTDIR}/usr/share/man/man5
+	vmove etc/ssh/ssh_config etc/ssh
+	vmove usr/share/man/man5/ssh_config.5 usr/share/man/man5
 }
diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template
index 74ef93d11b9..60e48e145dc 100644
--- a/srcpkgs/openssh/openssh-server.template
+++ b/srcpkgs/openssh/openssh-server.template
@@ -20,21 +20,14 @@ Add_dependency run openssh		">=${version}"
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/etc/ssh
-	mkdir -p ${DESTDIR}/usr/libexec/openssh
-	mkdir -p ${DESTDIR}/usr/share/man/man5
-	mkdir -p ${DESTDIR}/usr/share/man/man8
-	mv ${SRCPKGDESTDIR}/usr/libexec/openssh/sftp-server \
-		${DESTDIR}/usr/libexec/openssh
-	mv ${SRCPKGDESTDIR}/etc/ssh/sshd_config ${DESTDIR}/etc/ssh
-	mv ${SRCPKGDESTDIR}/usr/sbin ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/share/man/man5/sshd_config.5 \
-		${DESTDIR}/usr/share/man/man5
+	vmove usr/libexec/openssh/sftp-server usr/libexec
+	vmove etc/ssh/sshd_config etc/ssh
+	vmove usr/sbin usr
+	vmove usr/share/man/man5/sshd_config.5 usr/share/man/man5
 	for f in sftp-server sshd; do
-		mv ${SRCPKGDESTDIR}/usr/share/man/man8/${f}.8 \
-			${DESTDIR}/usr/share/man/man8
+		vmove usr/share/man/man8/${f}.8 usr/share/man/man8
 	done
-	mv ${SRCPKGDESTDIR}/etc/pam.d ${DESTDIR}/etc
-	mv ${SRCPKGDESTDIR}/etc/init.d ${DESTDIR}/etc
-	mkdir -p ${DESTDIR}/var/chroot/ssh
+	vmove etc/pam.d etc
+	vmove etc/init.d etc
+	vmkdir var/chroot/ssh
 }
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index af777208e94..92596f927d7 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,6 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=5.8p2
+revision=1
 distfiles="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--libexecdir=/usr/libexec/openssh --with-tcp-wrappers
@@ -10,7 +11,9 @@ configure_args="--libexecdir=/usr/libexec/openssh --with-tcp-wrappers
 --with-privsep-path=/var/chroot/ssh --with-kerberos5=/usr --with-rand-helper"
 short_desc="The OpenSSH implementation of SSH protocol versions 1 and 2"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=e5a1c821dd8dc33a94c445290956d52e03b3c450f9cd448b96d92317fd4cce42
+homepage="http://www.openssh.org"
+license="BSD"
+checksum=5c35ec7c966ce05cc4497ac59c0b54a556e55ae7368165cc8c4129694654f314
 long_desc="
  SSH (Secure SHell) is a program for logging into and executing
  commands on a remote machine. SSH is intended to replace rlogin and
@@ -33,6 +36,7 @@ Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run libssl
 
+Add_dependency build perl ">=0"
 Add_dependency build tcp_wrappers-devel
 Add_dependency build zlib-devel
 Add_dependency build openssl-devel
@@ -43,16 +47,12 @@ Add_dependency full shadow
 
 post_install()
 {
-	install -D -m644 ${wrksrc}/contrib/sshd.pam.generic \
-		${DESTDIR}/etc/pam.d/sshd
-	install -D -m755 ${wrksrc}/contrib/findssl.sh \
-		${DESTDIR}/usr/bin/findssl
-	install -D -m755 ${wrksrc}/contrib/ssh-copy-id \
-		${DESTDIR}/usr/bin/ssh-copy-id
-	install -D -m644 ${wrksrc}/contrib/ssh-copy-id.1 \
-		${DESTDIR}/usr/share/man/man1/ssh-copy-id.1
-	# Install the OpenRC service
-	install -D -m755 ${FILESDIR}/sshd.rc ${DESTDIR}/etc/init.d/sshd
+	vinstall contrib/sshd.pam.generic 644 etc/pam.d sshd
+	vinstall contrib/findssl.sh 755 usr/bin findssl
+	vinstall contrib/ssh-copy-id 755 usr/bin
+	vinstall contrib/ssh-copy-id.1 644 usr/share/man/man1
+	vinstall ${FILESDIR}/sshd.rc 755 etc/init.d sshd
+	vinstall LICENCE 644 usr/share/licenses/${pkgname}
 
 	sed -i \
 		-e 's|^#ListenAddress 0.0.0.0|ListenAddress 0.0.0.0|g' \