[Midnightbsd-cvs] src: lib/bind: new world order

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Nov 11 11:49:50 EST 2008 

Log Message:
-----------
new world order

Modified Files:
--------------
    src/lib/bind:
        config.mk (r1.3 -> r1.4)
    src/lib/bind/bind9:
        Makefile (r1.4 -> r1.5)
    src/lib/bind/dns:
        Makefile (r1.4 -> r1.5)
    src/lib/bind/isc:
        Makefile (r1.3 -> r1.4)
    src/lib/bind/isccc:
        Makefile (r1.2 -> r1.3)
    src/lib/bind/isccfg:
        Makefile (r1.2 -> r1.3)
    src/lib/bind/lwres:
        Makefile (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/bind/bind9/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L lib/bind/bind9/Makefile -L lib/bind/bind9/Makefile -u -r1.4 -r1.5
--- lib/bind/bind9/Makefile
+++ lib/bind/bind9/Makefile
@@ -1,6 +1,8 @@
 # $MidnightBSD$
 # $FreeBSD: src/lib/bind/bind9/Makefile,v 1.4.4.1 2005/11/16 07:59:49 ru Exp $
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -19,7 +21,7 @@
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 INCS=		${SRCDIR}/include/bind9/check.h \
 		${SRCDIR}/include/bind9/getaddresses.h \
 		${SRCDIR}/include/bind9/version.h
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/bind/dns/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L lib/bind/dns/Makefile -L lib/bind/dns/Makefile -u -r1.4 -r1.5
--- lib/bind/dns/Makefile
+++ lib/bind/dns/Makefile
@@ -1,6 +1,8 @@
-# $MIdnightBSD$
+# $MidnightBSD$
 # $FreeBSD: src/lib/bind/dns/Makefile,v 1.5.2.1 2005/11/16 07:59:49 ru Exp $
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -42,7 +44,7 @@
 DPADD=		${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD=		${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 DNSINCS=	${SRCDIR}/include/dns/acache.h \
 		${SRCDIR}/include/dns/acl.h \
 		${SRCDIR}/include/dns/adb.h \
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/bind/isc/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lib/bind/isc/Makefile -L lib/bind/isc/Makefile -u -r1.3 -r1.4
--- lib/bind/isc/Makefile
+++ lib/bind/isc/Makefile
@@ -1,6 +1,8 @@
 # $MidnightBSD$
 # $FreeBSD: src/lib/bind/isc/Makefile,v 1.8 2007/06/02 23:19:56 dougb Exp $
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -43,7 +45,7 @@
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 INCS=		${SRCDIR}/include/isc/app.h \
 		${SRCDIR}/include/isc/assertions.h \
 		${SRCDIR}/include/isc/base64.h \
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/bind/isccc/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/bind/isccc/Makefile -L lib/bind/isccc/Makefile -u -r1.2 -r1.3
--- lib/bind/isccc/Makefile
+++ lib/bind/isccc/Makefile
@@ -1,6 +1,8 @@
 # $MidnightBSD$
 # $FreeBSD: src/lib/bind/isccc/Makefile,v 1.4.4.1 2005/11/16 07:59:50 ru Exp $
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -21,7 +23,7 @@
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 INCS=		${SRCDIR}/include/isccc/alist.h \
 		${SRCDIR}/include/isccc/base64.h \
 		${SRCDIR}/include/isccc/cc.h \
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/bind/isccfg/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/bind/isccfg/Makefile -L lib/bind/isccfg/Makefile -u -r1.2 -r1.3
--- lib/bind/isccfg/Makefile
+++ lib/bind/isccfg/Makefile
@@ -1,6 +1,8 @@
 # $MidnightBSD$
 # $FreeBSD: src/lib/bind/isccfg/Makefile,v 1.7 2007/06/02 23:19:56 dougb Exp $
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
@@ -19,7 +21,7 @@
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 INCS=		${SRCDIR}/include/isccfg/aclconf.h \
 		${SRCDIR}/include/isccfg/cfg.h \
 		${SRCDIR}/include/isccfg/grammar.h \
Index: config.mk
===================================================================
RCS file: /home/cvs/src/lib/bind/config.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lib/bind/config.mk -L lib/bind/config.mk -u -r1.3 -r1.4
--- lib/bind/config.mk
+++ lib/bind/config.mk
@@ -1,6 +1,8 @@
 # $MidnightBSD$
 # $FreeBSD: src/lib/bind/config.mk,v 1.14.2.1 2005/07/30 07:56:25 des Exp $
 
+.include <bsd.own.mk>
+
 # BIND version number
 .if defined(BIND_DIR) && exists(${BIND_DIR}/version)
 .include	"${BIND_DIR}/version"
@@ -17,7 +19,7 @@
 CFLAGS+=	-DLIBINTERFACE=${LIBINTERFACE}
 CFLAGS+=	-DLIBREVISION=${LIBREVISION}
 CFLAGS+=	-DLIBAGE=${LIBAGE}
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 SHLIB_MAJOR=	${LIBINTERFACE}
 SHLIB_MINOR=	${LIBINTERFACE}
 .else
@@ -26,17 +28,17 @@
 .endif
 
 # GSSAPI support is incomplete in 9.3.0
-#.if !defined(NO_KERBEROS)
+#.if ${MK_KERBEROS} != "no"
 #CFLAGS+=	-DGSSAPI
 #.endif
 
 # Enable IPv6 support if available
-.if !defined(NO_INET6)
+.if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+=	-DWANT_IPV6
 .endif
 
 # Enable crypto if available
-.if !defined(NO_CRYPT)
+.if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DOPENSSL
 .endif
 
@@ -44,7 +46,7 @@
 CFLAGS+=	-DUSE_MD5
 
 # Endianness
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_ARCH} == "sparc64"
 CFLAGS+=	-DWORDS_BIGENDIAN
 .endif
 
@@ -69,7 +71,7 @@
 .endif
 
 # Link against BIND libraries
-.if !defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 LIBBIND9=	${LIB_BIND_REL}/bind9/libbind9.a
 CFLAGS+=	-I${BIND_DIR}/lib/bind9/include
 LIBDNS=		${LIB_BIND_REL}/dns/libdns.a
@@ -92,14 +94,14 @@
 .endif
 BIND_DPADD=	${LIBBIND9} ${LIBDNS} ${LIBISCCC} ${LIBISCCFG} \
 		${LIBISC} ${LIBLWRES}
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 BIND_LDADD=	-lbind9 -ldns -lisccc -lisccfg -lisc -llwres
 .else
 BIND_LDADD=	${BIND_DPADD}
 .endif
 
 # Link against crypto library
-.if !defined(NO_CRYPT)
+.if ${MK_OPENSSL} != "no"
 CRYPTO_DPADD=	${LIBCRYPTO}
 CRYPTO_LDADD=	-lcrypto
 .endif
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/bind/lwres/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L lib/bind/lwres/Makefile -L lib/bind/lwres/Makefile -u -r1.4 -r1.5
--- lib/bind/lwres/Makefile
+++ lib/bind/lwres/Makefile
@@ -1,13 +1,15 @@
 # $MidnightBSD$
 # $FreeBSD: src/lib/bind/lwres/Makefile,v 1.7.2.1 2005/11/16 07:59:50 ru Exp $
 
+.include <bsd.own.mk>
+
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 LIB_BIND_REL=	..
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
 SRCDIR=		${BIND_DIR}/lib/lwres
 
 # Unlike other BIND libs, this should be installed unless the user says NO.
-.if !defined(NO_BIND_LIBS_LWRES)
+.if ${MK_BIND_LIBS_LWRES) != "no"
 WITH_BIND_LIBS=
 .endif
 
@@ -32,7 +34,7 @@
 DPADD=		${PTHREAD_DPADD}
 LDADD=		${PTHREAD_LDADD}
 
-.if defined(WITH_BIND_LIBS)
+.if ${MK_BIND_LIBS} != "no"
 MAN=		lwres.3 lwres_buffer.3 lwres_config.3 lwres_context.3 \
 		lwres_gabn.3 lwres_gai_strerror.3 lwres_getaddrinfo.3 \
 		lwres_gethostent.3 lwres_getipnode.3 lwres_getnameinfo.3 \

More information about the Midnightbsd-cvs mailing list