[src/netbsd-7-0]: src/external/bsd/bind remove unintentionally committed file...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d9f3e18ab229
branches:  netbsd-7-0
changeset: 801290:d9f3e18ab229
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Feb 21 06:47:38 2017 +0000

description:
remove unintentionally committed files from ticket 1363

diffstat:

 external/bsd/bind/Makefile.inc.orig           |  131 --------
 external/bsd/bind/include/isc/platform.h.orig |  417 --------------------------
 2 files changed, 0 insertions(+), 548 deletions(-)

diffs (truncated from 556 to 300 lines):

diff -r 04ffe069c629 -r d9f3e18ab229 external/bsd/bind/Makefile.inc.orig
--- a/external/bsd/bind/Makefile.inc.orig       Mon Feb 20 16:28:37 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-#      $NetBSD: Makefile.inc.orig,v 1.1.2.1 2017/02/20 16:27:13 sborrill Exp $
-
-.if !defined(BIND9_MAKEFILE_INC)
-BIND9_MAKEFILE_INC=yes
-
-#NAMED_DEBUG=1
-
-USE_FORT?= yes # network client/server
-
-WARNS?=        1
-
-CWARNFLAGS.clang+=     -Wno-unused-value -Wno-parentheses
-
-.include <bsd.own.mk>
-
-.if ${MKCRYPTO} == "no"
-NAMED_USE_OPENSSL?=no
-.else
-NAMED_USE_OPENSSL?=yes
-.endif
-
-.if exists(${NETBSDSRCDIR}/sys/sys/atomic.h)
-NAMED_USE_PTHREADS?=yes
-.else
-NAMED_USE_PTHREADS?=no
-.endif
-
-IDIST=         ${NETBSDSRCDIR}/external/bsd/bind/dist
-BIND_SRCDIR=   ${NETBSDSRCDIR}/external/bsd/bind
-BIND_HTMLDIR=  /usr/share/doc/reference/ref8/bind9
-
-VERSIONFILE=${IDIST}/version
-.include "${VERSIONFILE}"
-
-VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
-SYSCONFDIR=/etc
-LOCALSTATEDIR=/var
-
-CPPFLAGS+=-I${BIND_SRCDIR}/include \
-       -I${IDIST} \
-       -I${IDIST}/lib/dns/include \
-       -I${IDIST}/lib/isc/include -I${IDIST}/lib/isc/unix/include \
-       -I${IDIST}/lib/bind9/include \
-       -I${IDIST}/lib/isccfg/include \
-       -I${IDIST}/lib/isccc/include \
-       -I${IDIST}/lib/lwres/include -I${IDIST}/lib/lwres/unix/include \
-       -DNS_LOCALSTATEDIR=\"${LOCALSTATEDIR}\" \
-       -DNS_SYSCONFDIR=\"${SYSCONFDIR}\" \
-       -DSESSION_KEYFILE=\"${LOCALSTATEDIR}/run/named/session.key\" \
-       -DVERSION=\"${VERSION}\" -DBIND9
-
-.if (${USE_INET6} != "no")
-CPPFLAGS+=     -DWANT_IPV6
-CPPFLAGS+=     -DALLOW_FILTER_AAAA
-.endif
-
-.if defined(HAVE_GCC)
-COPTS+=        -Wno-pointer-sign
-.endif
-
-.if defined(NAMED_DEBUG)
-DBG=-g3 -gstabs
-.endif
-
-.if !defined(LIB) || empty(LIB)
-# NOTE: the order of these libraries is important...
-.if defined(NAMED_DEBUG)
-LDADD+=                -lbind9_g -llwres_g -lisccfg_g -ldns_g -lisccc_g -lisc_g
-.else
-LDADD+=                -lbind9 -llwres -lisccfg -ldns -lisccc -lisc
-DPADD+=                ${LIBBIND9} ${LIBDNS} ${LIBLWRES}
-DPADD+=                ${LIBISCCFG} ${LIBISCCC} ${LIBISC}
-.endif
-.else
-CPPFLAGS+= -DLIBINTERFACE=${LIBINTERFACE} \
-          -DLIBREVISION=${LIBREVISION} -DLIBAGE=${LIBAGE}
-.endif
-#CPPFLAGS+= -DUSE_MEMIMPREGISTER -DUSE_APPIMPREGISTER -DUSE_SOCKETIMPREGISTER \
-#    -DUSE_TIMERIMPREGISTER
-
-.if ${NAMED_USE_PTHREADS} == "yes"
-# XXX: Not ready yet
-# CPPFLAGS+=   -DISC_PLATFORM_USE_NATIVE_RWLOCKS
-CPPFLAGS+=     -DISC_PLATFORM_USETHREADS
-.if !defined (LIB) || empty(LIB)
-LDADD+= -lpthread
-DPADD+= ${LIBPTHREAD}
-.else
-LIBDPLIBS+=      pthread  ${NETBSDSRCDIR}/lib/libpthread
-.endif
-.endif
-
-.if ${NAMED_USE_OPENSSL} == "yes"
-CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO -DHAVE_OPENSSL_GOST -DAES_SIT
-.if ${MKKERBEROS} != "no"
-CPPFLAGS+=-DGSSAPI
-.endif
-.if ${MKKERBEROS} != "no"
-.if !defined (LIB) || empty(LIB)
-LDADD+= -lgssapi -lheimntlm -lkrb5 -lhx509 -lheimbase \
-       -lcom_err  -lroken -lasn1 -lwind -lsqlite3
-DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBHEIMBASE} \
-       ${LIBCOM_ERR} ${LIBROKEN} ${LIBASN1} ${LIBWIND} ${LIBSQLITE3}
-.else
-.for L in gssapi krb5 hx509 heimntlm heimbase com_err roken asn1 wind
-LIBDPLIBS+=    $L ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/lib$L
-.endfor
-.endif
-.endif
-.if !defined (LIB) || empty(LIB)
-LDADD+= -lcrypto -lcrypt
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-.else
-.if exists(${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto)
-LIBDPLIBS+=    crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
-.else
-LIBDPLIBS+=    crypto ${NETBSDSRCDIR}/lib/libcrypto
-.endif
-.endif
-.endif
-
-.if ${NAMED_USE_PTHREADS} == "yes"
-CPPFLAGS+=-DISC_PLATFORM_USETHREADS -I${IDIST}/lib/isc/pthreads/include
-.else
-CPPFLAGS+=-I${IDIST}/lib/isc/nothreads/include
-.endif
-
-.if exists(${.PARSEDIR}/../Makefile.inc)
-.include "${.PARSEDIR}/../Makefile.inc"
-.endif
-.endif
diff -r 04ffe069c629 -r d9f3e18ab229 external/bsd/bind/include/isc/platform.h.orig
--- a/external/bsd/bind/include/isc/platform.h.orig     Mon Feb 20 16:28:37 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,417 +0,0 @@
-/*
- * Copyright (C) 2004-2010, 2013-2015  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2003  Internet Software Consortium.
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
- * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
- * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
- * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef ISC_PLATFORM_H
-#define ISC_PLATFORM_H 1
-
-#include <sys/atomic.h>
-
-/*! \file */
-
-/*****
- ***** Platform-dependent defines.
- *****/
-
-/***
- *** Network.
- ***/
-
-/*! \brief
- * Define if this system needs the <netinet/in6.h> header file included
- * for full IPv6 support (pretty much only UnixWare).
- */
-#undef ISC_PLATFORM_NEEDNETINETIN6H
-
-/*! \brief
- * Define if this system needs the <netinet6/in6.h> header file included
- * to support in6_pkinfo (pretty much only BSD/OS).
- */
-#undef ISC_PLATFORM_NEEDNETINET6IN6H
-
-/*! \brief
- * If sockaddrs on this system have an sa_len field, ISC_PLATFORM_HAVESALEN
- * will be defined.
- */
-#define ISC_PLATFORM_HAVESALEN 1
-
-/*! \brief
- * If this system has the IPv6 structure definitions, ISC_PLATFORM_HAVEIPV6
- * will be defined.
- */
-#define ISC_PLATFORM_HAVEIPV6 1
-
-/*! \brief
- * If this system is missing in6addr_any, ISC_PLATFORM_NEEDIN6ADDRANY will
- * be defined.
- */
-#undef ISC_PLATFORM_NEEDIN6ADDRANY
-
-/*! \brief
- * If this system is missing in6addr_loopback, ISC_PLATFORM_NEEDIN6ADDRLOOPBACK
- * will be defined.
- */
-#undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK
-
-/*! \brief
- * If this system has in6_pktinfo, ISC_PLATFORM_HAVEIN6PKTINFO will be
- * defined.
- */
-#define ISC_PLATFORM_HAVEIN6PKTINFO 1
-
-/*! \brief
- * If this system has in_addr6, rather than in6_addr, ISC_PLATFORM_HAVEINADDR6
- * will be defined.
- */
-#undef ISC_PLATFORM_HAVEINADDR6
-
-/*! \brief
- * If this system has sin6_scope_id, ISC_PLATFORM_HAVESCOPEID will be defined.
- */
-#define ISC_PLATFORM_HAVESCOPEID 1
-
-/*! \brief
- * If this system needs inet_ntop(), ISC_PLATFORM_NEEDNTOP will be defined.
- */
-#undef ISC_PLATFORM_NEEDNTOP
-
-/*! \brief
- * If this system needs inet_pton(), ISC_PLATFORM_NEEDPTON will be defined.
- */
-#undef ISC_PLATFORM_NEEDPTON
-
-/*! \brief
- * If this system needs in_port_t, ISC_PLATFORM_NEEDPORTT will be defined.
- */
-#undef ISC_PLATFORM_NEEDPORTT
-
-/*! \brief
- * Define if the system has struct lifconf which is a extended struct ifconf
- * for IPv6.
- */
-#undef ISC_PLATFORM_HAVELIFCONF
-
-/*! \brief
- * Define if the system has struct if_laddrconf which is a extended struct
- * ifconf for IPv6.
- */
-#undef ISC_PLATFORM_HAVEIF_LADDRCONF
-
-/*! \brief
- * Define if the system has struct if_laddrreq.
- */
-#undef ISC_PLATFORM_HAVEIF_LADDRREQ
-
-/*! \brief
- * Define either ISC_PLATFORM_BSD44MSGHDR or ISC_PLATFORM_BSD43MSGHDR.
- */
-#define ISC_NET_BSD44MSGHDR 1
-
-/*! \brief
- * Define if the system supports if_nametoindex.
- */
-#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1
-
-/*! \brief
- * Define on some UnixWare systems to fix erroneous definitions of various
- * IN6_IS_ADDR_* macros.
- */
-#undef ISC_PLATFORM_FIXIN6ISADDR
-
-/*! \brief
- * Define if the system has struct sockaddr_storage.
- */
-#define ISC_PLATFORM_HAVESOCKADDRSTORAGE 1
-
-/*! \brief
- * Define if the system supports kqueue multiplexing
- */
-#define ISC_PLATFORM_HAVEKQUEUE 1
-
-/*! \brief
- * Define if the system supports epoll multiplexing
- */
-#undef ISC_PLATFORM_HAVEEPOLL
-
-/*! \brief
- * Define if the system supports /dev/poll multiplexing
- */
-#undef ISC_PLATFORM_HAVEDEVPOLL
-
-/*! \brief
- * Define if we want to log backtrace
- */
-#define ISC_PLATFORM_USEBACKTRACE 1
-
-/*
- *** Printing.
- ***/