main/dhcpcd: use /usr/lib as libexec directory v1 PROPOSED

Sören Tempel: 2
 main/dhcpcd: use /usr/lib as libexec directory
 main/dhcpcd-dbus: use depends_dev

 2 files changed, 17 insertions(+), 13 deletions(-)

[alpine-aports] [PATCH 1/2] main/dhcpcd: use /usr/lib as libexec directory Export this patch

dhcpcd-dbus uses this directory too.
---
 main/dhcpcd/APKBUILD | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/main/dhcpcd/APKBUILD b/main/dhcpcd/APKBUILD
index 53ef262..5336d88 100644
--- a/main/dhcpcd/APKBUILD
+++ b/main/dhcpcd/APKBUILD
@@ -1,15 +1,17 @@
-# Contributor: Michael Mason <ms13sp@gmail.com> 
+# Contributor: Michael Mason <ms13sp@gmail.com>
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dhcpcd
 pkgver=6.9.0
-pkgrel=0
+pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client"
 url="http://roy.marples.name/projects/dhcpcd/"
 arch="all"
 license="BSD-2"
-depends=
-makedepends="linux-headers"
-install=
+depends=""
+depends_dev="linux-headers dbus-dev"
+makedepends="$depends_dev"
+install=""
 subpackages="$pkgname-doc"
 source="http://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.bz2
 	busybox-logger.patch
@@ -30,16 +32,17 @@ build() {
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--libexecdir=/lib/dhcpcd \
-		--dbdir=/var/lib/dhcpcd \
+		--libexecdir=/usr/lib/$pkgname \
+		--dbdir=/var/lib/$pkgname \
 		|| return 1
-	make
+	make || return 1
 }
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-	install -Dm755 "$srcdir"/dhcpcd.initd "$pkgdir"/etc/init.d/dhcpcd
+	make DESTDIR="$pkgdir" install || return 1
+	install -Dm755 "$srcdir"/dhcpcd.initd \
+		"$pkgdir"/etc/init.d/dhcpcd || return 1
 }
 
 md5sums="374fcac1877078a2fc0ef8cd1617a869  dhcpcd-6.9.0.tar.bz2
-- 
2.5.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

[alpine-aports] [PATCH 2/2] main/dhcpcd-dbus: use depends_dev Export this patch

---
 main/dhcpcd-dbus/APKBUILD | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/main/dhcpcd-dbus/APKBUILD b/main/dhcpcd-dbus/APKBUILD
index da90f90..5e235f3 100644
--- a/main/dhcpcd-dbus/APKBUILD
+++ b/main/dhcpcd-dbus/APKBUILD
@@ -7,7 +7,8 @@ url="http://roy.marples.name/projects/dhcpcd-dbus"
 arch="all"
 license="BSD"
 depends=""
-makedepends="dbus-dev"
+depends_dev="dbus-dev"
+makedepends="$makedepends"

Isaac Dunham <ibid.ag@gmail.com>

8 years ago

I had been under the impression that depends_dev was for packages that
should be dependencies of the -dev suppackage.

Eivind Uggedal <eivind@uggedal.com>

8 years ago

You are correct. Since there is no -dev package this does not make sense.
In addition there is a typo in the patch which should make the package
unbuildable.

Eivind

Thanks,
Isaac


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

Natanael Copa <ncopa@alpinelinux.org>

8 years ago

NACK.

as Dunham and Uggedal explained, the depends_dev will only set the
dependency for -dev subpackage. It makes no sense to use depends_dev if
there are no -dev subpackage.

-nc


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---

 install=
 subpackages=
 source="http://roy.marples.name/downloads/dhcpcd/dhcpcd-dbus-$pkgver.tar.bz2
@@ -33,12 +34,12 @@ build() {
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib/$pkgname \
 		|| return 1
-	make
+	make || return 1
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install || return 1
 }
 
 md5sums="4fd43b0f0ca7c0e65f95a0b2846b37b7  dhcpcd-dbus-0.6.0.tar.bz2
-- 
2.5.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---