From f6995cfc88ed9d9ba04458db99240e788e61ac79 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 29 Feb 2012 13:04:04 +0100 Subject: [PATCH] dhcpcd: install to /usr. --- srcpkgs/dhcpcd/files/dhcpcd.service | 2 +- srcpkgs/dhcpcd/files/dhcpcd@.service | 4 ++-- srcpkgs/dhcpcd/template | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/dhcpcd/files/dhcpcd.service b/srcpkgs/dhcpcd/files/dhcpcd.service index bf288ceffe1..886a446b907 100644 --- a/srcpkgs/dhcpcd/files/dhcpcd.service +++ b/srcpkgs/dhcpcd/files/dhcpcd.service @@ -4,7 +4,7 @@ Wants=network.target Before=network.target [Service] -ExecStart=/sbin/dhcpcd -q -B +ExecStart=/usr/sbin/dhcpcd -q -B [Install] WantedBy=multi-user.target diff --git a/srcpkgs/dhcpcd/files/dhcpcd@.service b/srcpkgs/dhcpcd/files/dhcpcd@.service index f024a399b62..c20f496b425 100644 --- a/srcpkgs/dhcpcd/files/dhcpcd@.service +++ b/srcpkgs/dhcpcd/files/dhcpcd@.service @@ -4,8 +4,8 @@ Wants=network.target Before=network.target [Service] -ExecStart=/sbin/dhcpcd -q -B %I -ExecStop=/sbin/dhcpcd -k %I +ExecStart=/usr/sbin/dhcpcd -q -B %I +ExecStop=/usr/sbin/dhcpcd -k %I [Install] Alias=multi-user.target.wants/dhcpcd@eth0.service diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index 03d48c2206f..e68336c1f70 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,10 +1,11 @@ # Template file for 'dhcpcd' pkgname=dhcpcd version=5.5.4 +revision=1 homepage="http://roy.marples.name/projects/dhcpcd" distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-$version.tar.bz2" build_style=configure -configure_args="--libexecdir=/lib/dhcpcd" +configure_args="--prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc --rundir=/run" short_desc="RFC2131 compliant DHCP client" maintainer="Juan RP " license="Simplified BSD" @@ -22,7 +23,7 @@ Add_dependency build ntp conf_files="/etc/dhcpcd.conf" post_install() { - chmod 755 ${DESTDIR}/sbin/dhcpcd + chmod 755 ${DESTDIR}/usr/sbin/dhcpcd vinstall ${FILESDIR}/dhcpcd.service 644 lib/systemd/system vinstall ${FILESDIR}/dhcpcd@.service 644 lib/systemd/system }