Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/flex merge conflicts
details: https://anonhg.NetBSD.org/src/rev/85c0fd6e62bb
branches: trunk
changeset: 333336:85c0fd6e62bb
user: christos <christos%NetBSD.org@localhost>
date: Wed Oct 29 18:28:36 2014 +0000
description:
merge conflicts
diffstat:
external/bsd/flex/dist/FlexLexer.h | 2 +
external/bsd/flex/dist/README-alpha | 2 -
external/bsd/flex/dist/README.cvs | 46 ---
external/bsd/flex/dist/buf.c | 4 +-
external/bsd/flex/dist/ccl.c | 2 +
external/bsd/flex/dist/configure.in | 170 --------------
external/bsd/flex/dist/dfa.c | 2 +
external/bsd/flex/dist/ecs.c | 2 +
external/bsd/flex/dist/filter.c | 4 +-
external/bsd/flex/dist/flex.skl | 22 +-
external/bsd/flex/dist/flexdef.h | 18 +-
external/bsd/flex/dist/flexint.h | 2 +
external/bsd/flex/dist/gen.c | 6 +-
external/bsd/flex/dist/gettext.h | 2 +
external/bsd/flex/dist/initparse.c | 5 +
external/bsd/flex/dist/libmain.c | 4 +-
external/bsd/flex/dist/libyywrap.c | 4 +-
external/bsd/flex/dist/main.c | 11 +-
external/bsd/flex/dist/misc.c | 4 +-
external/bsd/flex/dist/mkinstalldirs | 111 ---------
external/bsd/flex/dist/nfa.c | 4 +
external/bsd/flex/dist/options.c | 4 +
external/bsd/flex/dist/options.h | 2 +
external/bsd/flex/dist/parse.y | 4 +-
external/bsd/flex/dist/regex.c | 4 +
external/bsd/flex/dist/scan.l | 4 +-
external/bsd/flex/dist/scanflags.c | 4 +
external/bsd/flex/dist/scanopt.c | 4 +-
external/bsd/flex/dist/scanopt.h | 2 +
external/bsd/flex/dist/sym.c | 4 +
external/bsd/flex/dist/tables.c | 4 +-
external/bsd/flex/dist/tables.h | 2 +
external/bsd/flex/dist/tblcmp.c | 4 +
external/bsd/flex/dist/tools/Makefile.am | 3 -
external/bsd/flex/dist/tools/Makefile.in | 358 -----------------------------
external/bsd/flex/dist/tools/git2cl | 372 -------------------------------
external/bsd/flex/dist/yylex.c | 4 +-
external/bsd/flex/flex2netbsd | 73 +-----
external/bsd/flex/include/config.h | 25 +-
39 files changed, 139 insertions(+), 1165 deletions(-)
diffs (truncated from 1838 to 300 lines):
diff -r 9b97dd74f114 -r 85c0fd6e62bb external/bsd/flex/dist/FlexLexer.h
--- a/external/bsd/flex/dist/FlexLexer.h Wed Oct 29 18:22:45 2014 +0000
+++ b/external/bsd/flex/dist/FlexLexer.h Wed Oct 29 18:28:36 2014 +0000
@@ -1,3 +1,5 @@
+/* $NetBSD: FlexLexer.h,v 1.2 2014/10/29 18:28:36 christos Exp $ */
+
// -*-C++-*-
// FlexLexer.h -- define interfaces for lexical analyzer classes generated
// by flex
diff -r 9b97dd74f114 -r 85c0fd6e62bb external/bsd/flex/dist/README-alpha
--- a/external/bsd/flex/dist/README-alpha Wed Oct 29 18:22:45 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Beta versions and cvs snapshots of flex can be had at
-ftp://ftp.uncg.edu/people/wlestes/.
diff -r 9b97dd74f114 -r 85c0fd6e62bb external/bsd/flex/dist/README.cvs
--- a/external/bsd/flex/dist/README.cvs Wed Oct 29 18:22:45 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-This file gives information regarding the cvs tree of flex. The cvs
-tree of flex contains the files which are under version control by
-the flex maintainers for the flex project.
-
-You can learn about the details of retrieving a copy of the cvs flex
-tree from flex's SourceForge project page at:
-
-http://sourceforge.net/projects/flex
-
-If you are not interested in flex development or you are not in need
-of the latest bleeding-edge features, then the cvs flex tree is
-not for you.
-
-When you get a distribution of flex, a large number of intermediate
-files needed to make building flex easy are included. You don't have
-that in the cvs tree.
-
-You will need various external tools in order to build the distribution. Here is
-a (hopefully complete and correct) list of the required tools. Always get the
-latest version of each tool; we list the versions used in development of
-flex, but the listed versions may not work for you.
-
-compiler suite; e.g., gcc
-bash or some other fairly robust sh-style shell
-GNU bison; to generate parse.c from parse.y
-GNU m4 1.4; required by GNU autoconf (yes, it *must* be GNU m4)
-GNU autoconf 2.60 and GNU automake 1.10; for generating Makefiles etc.
-GNU gettext 0.14.5; for i18n
-flex (latest beta release); for bootstrap of scan.l
-help2man 1.36; to generate the flex man page
-tar, gzip, etc.; for packaging of the source distribution
-GNU texinfo 4.8; to build and test the flex manual
-perl; GNU automake and GNU autoconf now depend on perl to run
-GNU indent 2.8; for indenting the flex source the way we want it done
-
-Once you have all the necessary tools installed, life becomes
-simple. To prepare the flex tree for building, run the script:
-
-$ ./autogen.sh
-
-in the top level of the flex source tree.
-This script calls the various tools needed to get flex ready for the
-GNU-style configure script to be able to work.
-
-From this point on, building flex follows the usual configure, make,
-make install routine.
diff -r 9b97dd74f114 -r 85c0fd6e62bb external/bsd/flex/dist/buf.c
--- a/external/bsd/flex/dist/buf.c Wed Oct 29 18:22:45 2014 +0000
+++ b/external/bsd/flex/dist/buf.c Wed Oct 29 18:28:36 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: buf.c,v 1.2 2013/04/06 14:27:52 christos Exp $ */
+/* $NetBSD: buf.c,v 1.3 2014/10/29 18:28:36 christos Exp $ */
/* flex - tool to generate fast lexical analyzers */
@@ -32,6 +32,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: buf.c,v 1.3 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
diff -r 9b97dd74f114 -r 85c0fd6e62bb external/bsd/flex/dist/ccl.c
--- a/external/bsd/flex/dist/ccl.c Wed Oct 29 18:22:45 2014 +0000
+++ b/external/bsd/flex/dist/ccl.c Wed Oct 29 18:28:36 2014 +0000
@@ -30,6 +30,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: ccl.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
diff -r 9b97dd74f114 -r 85c0fd6e62bb external/bsd/flex/dist/configure.in
--- a/external/bsd/flex/dist/configure.in Wed Oct 29 18:22:45 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
-# This file is part of flex.
-
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-
-# Neither the name of the University nor the names of its contributors
-# may be used to endorse or promote products derived from this software
-# without specific prior written permission.
-
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE.
-
-# autoconf requirements and initialization
-
-AC_INIT([the fast lexical analyser generator], [2.5.37],
-[flex-help%lists.sourceforge.net@localhost], [flex])
-AC_CONFIG_SRCDIR([scan.l])
-AM_INIT_AUTOMAKE([gnits dist-bzip2 1.10])
-AC_CONFIG_HEADER([config.h:conf.in])
-AC_CONFIG_LIBOBJ_DIR([lib])
-
-# checks for programs
-
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.12)
-AC_PROG_YACC
-AM_PROG_LEX
-AC_PROG_CC
-AC_PROG_CXX
-AM_PROG_CC_C_O
-AC_PROG_LN_S
-AC_PROG_RANLIB
-AC_PROG_AWK
-AC_PROG_INSTALL
-
-AC_PATH_PROG(BISON, bison,bison)
-AC_PATH_PROG(HELP2MAN, help2man, help2man)
-
-# Check for a m4 that supports -P
-
-AC_CACHE_CHECK([for m4 that supports -P], [ac_cv_path_M4],
-[AC_PATH_PROGS_FEATURE_CHECK([M4], [gm4 gnum4 m4],
- [[m4out=`echo 'm''4_divnum' | $ac_path_M4 -P`]
- [test "x$m4out" = x0 \
- && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
- [AC_MSG_ERROR([could not find m4 that supports -P])])])
-AC_SUBST([M4], [$ac_cv_path_M4])
-AC_DEFINE_UNQUOTED([M4], ["$M4"], [Define to the m4 executable name.])
-
-AC_PATH_PROG(INDENT, indent, indent)
-# if INDENT is set to 'indent' then we didn't find indent
-if test "$INDENT" != indent ; then
- AC_MSG_CHECKING(if $INDENT is GNU indent)
- if $INDENT --version 2>/dev/null | head -n 1|grep "GNU indent" > /dev/null ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- AC_MSG_WARN($INDENT does not appear to be GNU indent.)
- fi
-else
- AC_MSG_WARN(no indent program found: make indent target will not function)
-fi
-
-# checks for headers
-
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([inttypes.h libintl.h limits.h locale.h malloc.h netinet/in.h regex.h stddef.h stdlib.h string.h strings.h unistd.h])
-
-# checks for libraries
-
-# The test test-pthread uses libpthread, so we check for it here, but
-# all we need is the preprocessor symbol defined since we don't need
-# LIBS to include libpthread for building flex.
-
-AC_CHECK_LIB(pthread, pthread_mutex_lock,
-AC_DEFINE([HAVE_LIBPTHREAD], 1, [pthread library] ),
-AC_DEFINE([HAVE_LIBPTHREAD], 0, [pthread library] )
-)
-AC_CHECK_HEADERS([pthread.h])
-
-AC_CHECK_LIB(m, log10)
-
-# Checks for typedefs, structures, and compiler characteristics.
-
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-
-AC_FUNC_ALLOCA
-AC_FUNC_FORK
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_CHECK_FUNCS([dup2 isascii memset pow regcomp setlocale strchr strtol])
-
-AC_CONFIG_FILES(
-Makefile
-doc/Makefile
-examples/Makefile
-examples/fastwc/Makefile
-examples/manual/Makefile
-lib/Makefile
-po/Makefile.in
-tools/Makefile
-tests/Makefile
-tests/TEMPLATE/Makefile
-tests/test-array-nr/Makefile
-tests/test-array-r/Makefile
-tests/test-basic-nr/Makefile
-tests/test-basic-r/Makefile
-tests/test-bison-yylloc/Makefile
-tests/test-bison-yylval/Makefile
-tests/test-c-cpp-nr/Makefile
-tests/test-c-cpp-r/Makefile
-tests/test-header-nr/Makefile
-tests/test-header-r/Makefile
-tests/test-include-by-buffer/Makefile
-tests/test-include-by-push/Makefile
-tests/test-include-by-reentrant/Makefile
-tests/test-multiple-scanners-nr/Makefile
-tests/test-multiple-scanners-r/Makefile
-tests/test-noansi-nr/Makefile
-tests/test-noansi-r/Makefile
-tests/test-prefix-nr/Makefile
-tests/test-prefix-r/Makefile
-tests/test-pthread/Makefile
-tests/test-string-nr/Makefile
-tests/test-string-r/Makefile
-tests/test-yyextra/Makefile
-tests/test-alloc-extra/Makefile
-tests/test-lineno-nr/Makefile
-tests/test-lineno-r/Makefile
-tests/test-linedir-r/Makefile
-tests/test-debug-r/Makefile
-tests/test-debug-nr/Makefile
-tests/test-mem-nr/Makefile
-tests/test-mem-r/Makefile
-tests/test-posix/Makefile
-tests/test-posixly-correct/Makefile
-tests/test-table-opts/Makefile
-tests/test-c++-basic/Makefile
-tests/test-bison-nr/Makefile
-tests/test-reject/Makefile
-tests/test-c++-multiple-scanners/Makefile
-tests/test-top/Makefile
-tests/test-rescan-nr/Makefile
-tests/test-rescan-r/Makefile
-tests/test-quotes/Makefile
-tests/test-ccl/Makefile
-tests/test-extended/Makefile
-tests/test-c++-yywrap/Makefile
-tests/test-concatenated-options/Makefile
-dnl --new-test-here-- This line is processed by tests/create-test.
-)
-
-AC_OUTPUT
diff -r 9b97dd74f114 -r 85c0fd6e62bb external/bsd/flex/dist/dfa.c
--- a/external/bsd/flex/dist/dfa.c Wed Oct 29 18:22:45 2014 +0000
+++ b/external/bsd/flex/dist/dfa.c Wed Oct 29 18:28:36 2014 +0000
@@ -28,6 +28,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: dfa.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
#include "tables.h"
diff -r 9b97dd74f114 -r 85c0fd6e62bb external/bsd/flex/dist/ecs.c
--- a/external/bsd/flex/dist/ecs.c Wed Oct 29 18:22:45 2014 +0000
+++ b/external/bsd/flex/dist/ecs.c Wed Oct 29 18:28:36 2014 +0000
@@ -30,6 +30,8 @@
/* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED */
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
/* PURPOSE. */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: ecs.c,v 1.2 2014/10/29 18:28:36 christos Exp $");
#include "flexdef.h"
diff -r 9b97dd74f114 -r 85c0fd6e62bb external/bsd/flex/dist/filter.c
--- a/external/bsd/flex/dist/filter.c Wed Oct 29 18:22:45 2014 +0000
+++ b/external/bsd/flex/dist/filter.c Wed Oct 29 18:28:36 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: filter.c,v 1.3 2013/10/20 03:13:44 christos Exp $ */
+/* $NetBSD: filter.c,v 1.4 2014/10/29 18:28:36 christos Exp $ */
Home |
Main Index |
Thread Index |
Old Index