diff options
Diffstat (limited to 'usr.sbin/named')
| -rw-r--r-- | usr.sbin/named/Makefile | 69 | ||||
| -rw-r--r-- | usr.sbin/named/Makefile.inc | 59 | ||||
| -rw-r--r-- | usr.sbin/named/Makefile.maninc | 58 |
3 files changed, 29 insertions, 157 deletions
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index 4913c16f3fe7..9976151206d1 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -1,44 +1,33 @@ # $FreeBSD$ -USE_LIBBIND= true -.include "${.CURDIR}/Makefile.inc" - -.PATH: ${BIND_DIR}/bin/named ${BIND_DIR}/doc/man - -PROG= named -MAN= named.conf.5 named.8 named-bootconf.8 nsupdate.8 -SRCS= tmp_version.c pathnames.h \ - db_dump.c db_load.c db_lookup.c db_save.c db_update.c \ - db_glue.c db_ixfr.c db_sec.c db_tsig.c \ - ns_parser.y ns_lexer.c ns_parseutil.c ns_ctl.c \ - ns_forw.c ns_init.c ns_main.c ns_maint.c ns_req.c \ - ns_resp.c ns_stats.c ns_ncache.c ns_xfr.c ns_glue.c \ - ns_udp.c ns_config.c ns_update.c ns_ixfr.c ns_signal.c \ - ns_sort.c ns_notify.c - -.if exists(${.OBJDIR}/../../lib/libisc) -LIBISCDIR:= ${.OBJDIR}/../../lib/libisc -.else -LIBISCDIR!= cd ${.CURDIR}/../../lib/libisc; make -V .OBJDIR -.endif -LIBISC:= ${LIBISCDIR}/libisc.a - -DPADD+= ${LIBISC} -LDADD+= ${LIBISC} - -HTMLS= acl.html address_list.html comments.html config.html controls.html \ - docdef.html example.html include.html index.html key.html \ - logging.html master.html options.html server.html trusted-keys.html \ - zone.html -MISCS= DynamicUpdate FAQ.1of2 FAQ.2of2 rfc2317-notes.txt style.txt -FILES= ${HTMLS} ${MISCS} -.PATH: ${BIND_DIR}/doc/html ${BIND_DIR}/doc/misc - -.for file in ${HTMLS} -FILESDIR_${file}= ${DOCDIR}/bind/html -.endfor -.for file in ${MISCS} -FILESDIR_${file}= ${DOCDIR}/bind/misc -.endfor +BIND_DIR= ${.CURDIR}/../../contrib/bind9 +LIB_BIND_DIR= ${.CURDIR}/../../lib/bind +SRCDIR= ${BIND_DIR}/bin/named + +.include "${LIB_BIND_DIR}/config.mk" + +PROG= named + +.PATH: ${SRCDIR}/unix +SRCS+= os.c + +.PATH: ${SRCDIR} +SRCS+= aclconf.c builtin.c client.c config.c control.c \ + controlconf.c interfacemgr.c \ + listenlist.c log.c logconf.c main.c notify.c \ + query.c server.c sortlist.c \ + tkeyconf.c tsigconf.c update.c xfrout.c \ + zoneconf.c \ + lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \ + lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c + +CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/include -I${LIB_BIND_DIR} + +DPADD+= ${BIND_DPADD} +LDADD+= ${BIND_LDADD} + +MAN= named.8 lwresd.8 named.conf.5 + +LINKS= ${BINDIR}/named ${BINDIR}/lwresd .include <bsd.prog.mk> diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc deleted file mode 100644 index 30e1d2a11de1..000000000000 --- a/usr.sbin/named/Makefile.inc +++ /dev/null @@ -1,59 +0,0 @@ -# From: Id: Makefile.inc,v 8.4 1996/03/03 17:42:43 vixie Exp -# $FreeBSD$ - -.ifndef (Mk.Inc) -Mk.Inc?=defined - -BIND_DIR= ${.CURDIR}/../../contrib/bind - -VER!= cat ${BIND_DIR}/Version - -PS= ps -PIDDIR= /var/run -DESTETC= /etc/namedb -DESTEXEC= /usr/libexec -DESTRUN= /var/run -DESTSBIN= /usr/sbin -DESTHELP= /usr/share/misc - -CFLAGS+= -I${BIND_DIR}/port/freebsd/include \ - -I${.CURDIR}/../../contrib/bind/bin/named - -# This is mostly for named and named-xfer -.if defined(USE_LIBBIND) -# Sadly, mkdep doesn't know about -idirafter, which would be ideal here. -#CFLAGS+= -I${.CURDIR}/../../include -I${BIND_DIR}/include -CFLAGS+= -I${BIND_DIR}/include - -.if exists(${.OBJDIR}/../../lib/libbind) -LIBBINDDIR:= ${.OBJDIR}/../../lib/libbind -.else -LIBBINDDIR!= cd ${.CURDIR}/../../lib/libbind; make -V .OBJDIR -.endif -LIBBIND:= ${LIBBINDDIR}/libbind.a - -DPADD+= ${LIBBIND} -LDADD+= ${LIBBIND} - -CLEANFILES+= tmp_version.c pathnames.h -CFLAGS+= -I. - -tmp_version.c: version.c ${BIND_DIR}/Version - (u=$${USER-root} d=`pwd` h=`hostname` t=`LC_ALL=C date`; \ - sed -e "s|%WHEN%|$${t}|" -e "s|%VERSION%|"${VER}"|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - < ${BIND_DIR}/bin/named/version.c > tmp_version.c) - -pathnames.h: ${BIND_DIR}/bin/named/pathtemplate.h \ - ${.CURDIR}/../../usr.sbin/named/Makefile.inc - rm -f pathnames.h - sed -e "s|%DESTSBIN%|${DESTSBIN}|" \ - -e "s|%DESTEXEC%|${DESTEXEC}|" \ - -e "s|%DESTETC%|${DESTETC}|" \ - -e "s|%DESTRUN%|${DESTRUN}|" \ - < ${BIND_DIR}/bin/named/pathtemplate.h > pathnames.h - -.endif - -.include "Makefile.maninc" -.endif diff --git a/usr.sbin/named/Makefile.maninc b/usr.sbin/named/Makefile.maninc deleted file mode 100644 index ee91be38257d..000000000000 --- a/usr.sbin/named/Makefile.maninc +++ /dev/null @@ -1,58 +0,0 @@ -# From: Id: Makefile.maninc,v 8.1 1994/12/15 06:23:43 vixie Exp -# $FreeBSD$ - -# (the BIND kit's man page Makefile has gotten bad and crazy over the years. -# this file has to be included AFTER bsd.prog.mk (which includes bsd.man.mk)) -CMD_EXT= 1 -SYSCALL_EXT= 2 -BSD_SYSCALL_EXT=2 -LIB_C_EXT= 3 -LIB_NETWORK_EXT=3 -FORMAT_EXT= 5 -DESC_EXT= 7 -SYS_OPS_EXT= 8 - -EXT_SED_CMD = INDOT_U=`echo "${INDOT}"|LC_ALL=C tr "a-z" "A-Z"`; \ - export INDOT_U; \ - XFER_INDOT_U=`echo "${XFER_INDOT}"|LC_ALL=C tr "a-z" "A-Z"`; \ - export XFER_INDOT_U; \ - CMD_EXT_U=`echo "${CMD_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \ - export CMD_EXT_U; \ - SYS_OPS_EXT_U=`echo "${SYS_OPS_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \ - export SYS_OPS_EXT_U; \ - LIB_NETWORK_EXT_U=`echo "${LIB_NETWORK_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \ - export LIB_NETWORK_EXT_U; \ - FORMAT_EXT_U=`echo "${FORMAT_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \ - export FORMAT_EXT_U; \ - DESC_EXT_U=`echo "${DESC_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \ - export DESC_EXT_U; \ - SYSCALL_EXT_U=`echo "${SYSCALL_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \ - export SYSCALL_EXT_U; \ - BSD_SYSCALL_EXT_U=`echo "${BSD_SYSCALL_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \ - export BSD_SYSCALL_EXT_U; \ - LIB_C_EXT_U=`echo "${LIB_C_EXT}"|LC_ALL=C tr "a-z" "A-Z"`; \ - export LIB_C_EXT_U; \ - sed -e "s/@INDOT@/${INDOT}/g" \ - -e "s/@INDOT_U@/$${INDOT_U}/g" \ - -e "s/@XFER_INDOT@/${XFER_INDOT}/g" \ - -e "s/@XFER_INDOT_U@/$${XFER_INDOT_U}/g" \ - -e "s/@CMD_EXT@/${CMD_EXT}/g" \ - -e "s/@CMD_EXT_U@/$${CMD_EXT_U}/g" \ - -e "s/@LIB_NETWORK_EXT@/${LIB_NETWORK_EXT}/g" \ - -e "s/@LIB_NETWORK_EXT_U@/$${LIB_NETWORK_EXT_U}/g" \ - -e "s/@FORMAT_EXT@/${FORMAT_EXT}/g" \ - -e "s/@FORMAT_EXT_U@/$${FORMAT_EXT_U}/g" \ - -e "s/@DESC_EXT@/${DESC_EXT}/g" \ - -e "s/@DESC_EXT_U@/$${DESC_EXT_U}/g" \ - -e "s/@SYS_OPS_EXT@/${SYS_OPS_EXT}/g" \ - -e "s/@SYS_OPS_EXT_U@/$${SYS_OPS_EXT_U}/g" \ - -e "s/@SYSCALL_EXT@/${SYSCALL_EXT}/g" \ - -e "s/@SYSCALL_EXT_U@/$${SYSCALL_EXT_U}/g" \ - -e "s/@BSD_SYSCALL_EXT@/${BSD_SYSCALL_EXT}/g" \ - -e "s/@BSD_SYSCALL_EXT_U@/$${BSD_SYSCALL_EXT_U}/g" \ - -e "s/@LIB_C_EXT@/${LIB_C_EXT}/g" \ - -e "s/@LIB_C_EXT_U@/$${LIB_C_EXT_U}/g" \ - -e "s@/etc/named\.conf@/etc/namedb/named.conf@g" \ - -e "s/^ *$$/.Pp/" - -MANFILTER= ${EXT_SED_CMD} |