openresolv: add missing systemd builddep; fix patches.

This commit is contained in:
Juan RP 2013-06-03 09:17:18 +02:00
parent 0fd6425f11
commit ccc138edf9
3 changed files with 19 additions and 18 deletions

View file

@ -1,7 +1,7 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 7865a5f..0e4780f 100644 index 7865a5f..0e4780f 100644
--- a/Makefile --- Makefile
+++ b/Makefile +++ Makefile
@@ -17,7 +17,7 @@ TARGET= ${RESOLVCONF} ${SUBSCRIBERS} @@ -17,7 +17,7 @@ TARGET= ${RESOLVCONF} ${SUBSCRIBERS}
SRCS= ${TARGET:C,$,.in,} # pmake SRCS= ${TARGET:C,$,.in,} # pmake
SRCS:= ${TARGET:=.in} # gmake SRCS:= ${TARGET:=.in} # gmake
@ -22,8 +22,8 @@ index 7865a5f..0e4780f 100644
diff --git a/dnsmasq.in b/dnsmasq.in diff --git a/dnsmasq.in b/dnsmasq.in
index 96b5593..542acaa 100644 index 96b5593..542acaa 100644
--- a/dnsmasq.in --- dnsmasq.in
+++ b/dnsmasq.in +++ dnsmasq.in
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
[ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0 [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
. "@SYSCONFDIR@/resolvconf.conf" || exit 1 . "@SYSCONFDIR@/resolvconf.conf" || exit 1
@ -44,8 +44,8 @@ index 96b5593..542acaa 100644
changed=false changed=false
diff --git a/libc.in b/libc.in diff --git a/libc.in b/libc.in
index c4233d5..945efc8 100644 index c4233d5..945efc8 100644
--- a/libc.in --- libc.in
+++ b/libc.in +++ libc.in
@@ -97,7 +97,7 @@ fi @@ -97,7 +97,7 @@ fi
: ${resolv_conf:=/etc/resolv.conf} : ${resolv_conf:=/etc/resolv.conf}
: ${libc_service:=nscd} : ${libc_service:=nscd}
@ -66,8 +66,8 @@ index c4233d5..945efc8 100644
newns= newns=
diff --git a/named.in b/named.in diff --git a/named.in b/named.in
index 1ee3abc..43ceabb 100644 index 1ee3abc..43ceabb 100644
--- a/named.in --- named.in
+++ b/named.in +++ named.in
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
[ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0 [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
. "@SYSCONFDIR@/resolvconf.conf" || exit 1 . "@SYSCONFDIR@/resolvconf.conf" || exit 1
@ -88,8 +88,8 @@ index 1ee3abc..43ceabb 100644
# No point in changing files or reloading bind if the end result has not # No point in changing files or reloading bind if the end result has not
diff --git a/pdnsd.in b/pdnsd.in diff --git a/pdnsd.in b/pdnsd.in
index 0a0241a..4c14c3c 100644 index 0a0241a..4c14c3c 100644
--- a/pdnsd.in --- pdnsd.in
+++ b/pdnsd.in +++ pdnsd.in
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
[ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0 [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
. "@SYSCONFDIR@/resolvconf.conf" || exit 1 . "@SYSCONFDIR@/resolvconf.conf" || exit 1
@ -110,8 +110,8 @@ index 0a0241a..4c14c3c 100644
if [ -n "$pdnsd_resolv" ]; then if [ -n "$pdnsd_resolv" ]; then
diff --git a/unbound.in b/unbound.in diff --git a/unbound.in b/unbound.in
index 4ee0da7..633c7f0 100644 index 4ee0da7..633c7f0 100644
--- a/unbound.in --- unbound.in
+++ b/unbound.in +++ unbound.in
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
[ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0 [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
. "@SYSCONFDIR@/resolvconf.conf" || exit 1 . "@SYSCONFDIR@/resolvconf.conf" || exit 1

View file

@ -1,7 +1,7 @@
diff --git i/dnsmasq.in w/dnsmasq.in diff --git i/dnsmasq.in w/dnsmasq.in
index 96b5593..384d9df 100644 index 96b5593..384d9df 100644
--- i/dnsmasq.in --- dnsmasq.in
+++ w/dnsmasq.in +++ dnsmasq.in
@@ -33,10 +33,9 @@ @@ -33,10 +33,9 @@
NL=" NL="
" "
@ -25,8 +25,8 @@ index 96b5593..384d9df 100644
method=SetDomainServers method=SetDomainServers
diff --git i/resolvconf.conf.5.in w/resolvconf.conf.5.in diff --git i/resolvconf.conf.5.in w/resolvconf.conf.5.in
index 81fe154..9b4f1bd 100644 index 81fe154..9b4f1bd 100644
--- i/resolvconf.conf.5.in --- resolvconf.conf.5.in
+++ w/resolvconf.conf.5.in +++ resolvconf.conf.5.in
@@ -215,8 +215,8 @@ variables, documented below. @@ -215,8 +215,8 @@ variables, documented below.
Location of the dnsmasq service. Location of the dnsmasq service.
.It Sy dnsmasq_restart .It Sy dnsmasq_restart
@ -53,8 +53,8 @@ index 81fe154..9b4f1bd 100644
and and
diff --git i/unbound.in w/unbound.in diff --git i/unbound.in w/unbound.in
index 4ee0da7..5e4a326 100644 index 4ee0da7..5e4a326 100644
--- i/unbound.in --- unbound.in
+++ w/unbound.in +++ unbound.in
@@ -33,9 +33,8 @@ @@ -33,9 +33,8 @@
NL=" NL="
" "

View file

@ -11,6 +11,7 @@ license="BSD"
homepage="http://roy.marples.name/projects/openresolv/wiki" homepage="http://roy.marples.name/projects/openresolv/wiki"
distfiles="http://roy.marples.name/downloads/$pkgname/$pkgname-$version.tar.bz2" distfiles="http://roy.marples.name/downloads/$pkgname/$pkgname-$version.tar.bz2"
checksum=ab91fce9053ac653379155aaa6f1b912c0e117d8c55c91a908133ea26004c446 checksum=ab91fce9053ac653379155aaa6f1b912c0e117d8c55c91a908133ea26004c446
makedepends="systemd"
do_install() { do_install() {
make DESTDIR=$DESTDIR install make DESTDIR=$DESTDIR install