From b32c7058b88f93f026ab59ddf559e2162ece8c7b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 9 Jul 2012 22:50:09 +0200
Subject: [PATCH] openssh: switch to /usr.

---
 srcpkgs/openssh/files/sshd.service      | 2 +-
 srcpkgs/openssh/openssh-server.template | 4 ++--
 srcpkgs/openssh/template                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/openssh/files/sshd.service b/srcpkgs/openssh/files/sshd.service
index fa3d3f278b..db01ec029f 100644
--- a/srcpkgs/openssh/files/sshd.service
+++ b/srcpkgs/openssh/files/sshd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=SSH Secure Shell Service
-After=syslog.target
+After=syslog.target sshdgenkeys.service
 
 [Service]
 ExecStart=/usr/sbin/sshd -D
diff --git a/srcpkgs/openssh/openssh-server.template b/srcpkgs/openssh/openssh-server.template
index 10e952d052..35ee92da89 100644
--- a/srcpkgs/openssh/openssh-server.template
+++ b/srcpkgs/openssh/openssh-server.template
@@ -17,9 +17,9 @@ do_install() {
 		vmove usr/share/man/man8/${f}.8 usr/share/man/man8
 	done
 	vmove etc/pam.d etc
-	vmkdir lib/systemd/system
+	vmkdir usr/lib/systemd/system
 	install -m644 ${FILESDIR}/*.{socket,service} \
-		${DESTDIR}/lib/systemd/system
+		${DESTDIR}/usr/lib/systemd/system
 	vinstall ${FILESDIR}/sshd.tmpfiles.d 644 \
 		usr/lib/tmpfiles.d sshd.conf
 }
diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index 42858fcdd2..d6960d01af 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=6.0p1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--without-tcp-wrappers --datadir=/usr/share/openssh
 --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody --with-pam