Sun Feb 13 16:17:54 2011 UTC ()
Use net/libbind/buildlink3.mk instead of removed net/bind95/buildlink3.mk.


(taca)
diff -r1.4 -r1.5 pkgsrc/mk/resolv.buildlink3.mk
cvs diff -r1.4 -r1.5 pkgsrc/mk/resolv.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/resolv.buildlink3.mk 2010/02/10 17:28:57 1.4
+++ pkgsrc/mk/resolv.buildlink3.mk 2011/02/13 16:17:54 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: resolv.buildlink3.mk,v 1.4 2010/02/10 17:28:57 joerg Exp $ 1# $NetBSD: resolv.buildlink3.mk,v 1.5 2011/02/13 16:17:54 taca Exp $
2# 2#
3# This Makefile fragment is included by package Makefiles and 3# This Makefile fragment is included by package Makefiles and
4# buildlink3.mk files for the packages that need a thread-safe 4# buildlink3.mk files for the packages that need a thread-safe
5# DNS resolver. 5# DNS resolver.
6# 6#
7# It defines the variables RESOLV_LDFLAGS and RESOLV_LIBS, 7# It defines the variables RESOLV_LDFLAGS and RESOLV_LIBS,
8# which are also exported into the CONFIGURE_ENV and MAKE_ENV environments. 8# which are also exported into the CONFIGURE_ENV and MAKE_ENV environments.
9# 9#
10# Package-settable variables: 10# Package-settable variables:
11# 11#
12# RESOLV_AUTO_VARS 12# RESOLV_AUTO_VARS
13# When set to "yes", the necessary flags are added automatically 13# When set to "yes", the necessary flags are added automatically
14# to LDFLAGS and friends. 14# to LDFLAGS and friends.
@@ -33,27 +33,27 @@ BUILDLINK_LDFLAGS.resolv= # empty, in li @@ -33,27 +33,27 @@ BUILDLINK_LDFLAGS.resolv= # empty, in li
33 (${OPSYS} == "Darwin" && empty(OS_VERSION:M[0123467].*)) 33 (${OPSYS} == "Darwin" && empty(OS_VERSION:M[0123467].*))
34USE_BUILTIN.resolv?= yes 34USE_BUILTIN.resolv?= yes
35 35
36# BIND 9 resolver 36# BIND 9 resolver
37BUILDLINK_LDFLAGS.resolv= -lresolv 37BUILDLINK_LDFLAGS.resolv= -lresolv
38.else 38.else
39USE_BUILTIN.resolv?= no 39USE_BUILTIN.resolv?= no
40.endif 40.endif
41 41
42.if !empty(USE_BUILTIN.resolv:M[yY][eE][sS]) 42.if !empty(USE_BUILTIN.resolv:M[yY][eE][sS])
43BUILDLINK_TREE+= resolv -resolv 43BUILDLINK_TREE+= resolv -resolv
44BUILDLINK_AUTO_VARS.resolv= ${RESOLV_AUTO_VARS} 44BUILDLINK_AUTO_VARS.resolv= ${RESOLV_AUTO_VARS}
45.else 45.else
46. include "../../net/bind95/buildlink3.mk" 46. include "../../net/libbind/buildlink3.mk"
47 47
48BUILDLINK_AUTO_VARS.bind= ${RESOLV_AUTO_VARS} 48BUILDLINK_AUTO_VARS.bind= ${RESOLV_AUTO_VARS}
49BUILDLINK_LDFLAGS.resolv= ${BUILDLINK_LDFLAGS.bind} 49BUILDLINK_LDFLAGS.resolv= ${BUILDLINK_LDFLAGS.bind}
50BUILDLINK_LIBS.resolv= ${BUILDLINK_LIBS.bind} 50BUILDLINK_LIBS.resolv= ${BUILDLINK_LIBS.bind}
51.endif 51.endif
52 52
53.if !empty(RESOLV_BUILDLINK3_MK:M+) 53.if !empty(RESOLV_BUILDLINK3_MK:M+)
54# 54#
55# Define user-visible RESOLV_{LDFLAGS,LIBS} as compiler options used 55# Define user-visible RESOLV_{LDFLAGS,LIBS} as compiler options used
56# to link code that needs a thread-safe DNS resolver. 56# to link code that needs a thread-safe DNS resolver.
57# 57#
58RESOLV_LDFLAGS= ${BUILDLINK_LDFLAGS.resolv} 58RESOLV_LDFLAGS= ${BUILDLINK_LDFLAGS.resolv}
59RESOLV_LIBS= ${BUILDLINK_LIBS.resolv} 59RESOLV_LIBS= ${BUILDLINK_LIBS.resolv}