From 59911381cc9631810e3759e3937bd66eb7f6ed82 Mon Sep 17 00:00:00 2001 From: Jan Lentfer Date: Thu, 3 Dec 2009 15:24:20 +0100 Subject: [PATCH] bind - Changed bind dependend Makefiles to fit to new contrib/bind without version tag. --- lib/libbind/Makefile | 2 +- lib/libbind9/Makefile | 2 +- lib/libc/resolv/Makefile.inc | 2 +- lib/libc_rtld/Makefile | 2 +- lib/libisc/Makefile | 2 +- usr.sbin/named/Makefile.inc | 6 ++---- 6 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/libbind/Makefile b/lib/libbind/Makefile index 630bc50444..d23acb9f95 100644 --- a/lib/libbind/Makefile +++ b/lib/libbind/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libbind/Makefile,v 1.5.2.2 2002/07/19 18:46:25 ru Exp $ # $DragonFly: src/lib/libbind/Makefile,v 1.10 2007/02/15 20:28:49 victor Exp $ -BIND_DIR=${.CURDIR}/../../contrib/bind-9.5.2 +BIND_DIR=${.CURDIR}/../../contrib/bind # note: lib/bind/include/isc/list.h must come before lib/isc/include/isc/list.h # diff --git a/lib/libbind9/Makefile b/lib/libbind9/Makefile index 427d0eb184..ccec89ed16 100644 --- a/lib/libbind9/Makefile +++ b/lib/libbind9/Makefile @@ -1,6 +1,6 @@ # $DragonFly: src/lib/libbind9/Makefile,v 1.1 2006/09/20 21:48:39 victor Exp $ -BIND_DIR=${.CURDIR}/../../contrib/bind-9.5.2 +BIND_DIR=${.CURDIR}/../../contrib/bind .include "${BIND_DIR}/lib/isc/api" CFLAGS+= -I${.CURDIR}/../../usr.sbin/named \ -I${.CURDIR}/../../usr.sbin/named/include \ diff --git a/lib/libc/resolv/Makefile.inc b/lib/libc/resolv/Makefile.inc index b1f3ff4a87..8dc53ea166 100644 --- a/lib/libc/resolv/Makefile.inc +++ b/lib/libc/resolv/Makefile.inc @@ -1,4 +1,4 @@ -BINDDIR= ${.CURDIR}/../../contrib/bind-9.5.2/lib/bind +BINDDIR= ${.CURDIR}/../../contrib/bind/lib/bind .PATH: ${BINDDIR}/inet SRCS+= inet_addr.c inet_cidr_ntop.c inet_cidr_pton.c inet_lnaof.c \ diff --git a/lib/libc_rtld/Makefile b/lib/libc_rtld/Makefile index 3d5200040e..a4bcd40990 100644 --- a/lib/libc_rtld/Makefile +++ b/lib/libc_rtld/Makefile @@ -5,7 +5,7 @@ INTERNALLIB= INSTALL_PIC_ARCHIVE= NOPROFILE= STATIC_LOCALES= -BINDDIR= ${.CURDIR}/../../contrib/bind-9.5.2/lib/bind +BINDDIR= ${.CURDIR}/../../contrib/bind/lib/bind CFLAGS+=-I${.CURDIR}/../libc/include CFLAGS+=-I${.CURDIR}/../libc/rpc CFLAGS+=-I${.CURDIR}/../../include -D__thread= diff --git a/lib/libisc/Makefile b/lib/libisc/Makefile index 5569a9a585..f75f626468 100644 --- a/lib/libisc/Makefile +++ b/lib/libisc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD: src/lib/libisc/Makefile,v 1.1.2.6 2002/07/22 14:21:49 ru Exp $ # $DragonFly: src/lib/libisc/Makefile,v 1.8 2006/09/20 21:48:39 victor Exp $ -BIND_DIR= ${.CURDIR}/../../contrib/bind-9.5.2 +BIND_DIR= ${.CURDIR}/../../contrib/bind .include "${.CURDIR}/../../usr.sbin/named/Makefile.inc" .include "${BIND_DIR}/lib/isc/api" diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc index c5751b452a..eb21c1ce9c 100644 --- a/usr.sbin/named/Makefile.inc +++ b/usr.sbin/named/Makefile.inc @@ -5,11 +5,9 @@ .ifndef (Mk.Inc) Mk.Inc?=defined -BIND_DIR?= ${.CURDIR}/../../contrib/bind-9.5.2 +BIND_DIR?= ${.CURDIR}/../../contrib/bind -# P2 doesn't officially exist from ISC -# this is the patch for 9.3.5-P1 backported to 9.3.4-P1 -VER= 9.5.2 +VER= 9.5.2-P1 PS= ps PIDDIR= /var/run -- 2.41.0