Index: head/lib/libxo/xo_config.h =================================================================== --- head/lib/libxo/xo_config.h (revision 355825) +++ head/lib/libxo/xo_config.h (nonexistent) @@ -1,257 +0,0 @@ -/* $FreeBSD$ */ -/* libxo/xo_config.h. Generated from xo_config.h.in by configure. */ -/* libxo/xo_config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -/* #undef CRAY_STACKSEG_END */ - -/* Define to 1 if using `alloca.c'. */ -/* #undef C_ALLOCA */ - -/* Define to 1 if you have `alloca', as a function or macro. */ -#define HAVE_ALLOCA 1 - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -/* #undef HAVE_ALLOCA_H */ - -/* Define to 1 if you have the `asprintf' function. */ -#define HAVE_ASPRINTF 1 - -/* Define to 1 if you have the `bzero' function. */ -#define HAVE_BZERO 1 - -/* Define to 1 if you have the `ctime' function. */ -#define HAVE_CTIME 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_CTYPE_H 1 - -/* Define to 1 if you have the declaration of `__isthreaded', and to 0 if you - don't. */ -#define HAVE_DECL___ISTHREADED 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_DLFCN_H 1 - -/* Define to 1 if you have the `dlfunc' function. */ -#define HAVE_DLFUNC 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if you have the `fdopen' function. */ -#define HAVE_FDOPEN 1 - -/* Define to 1 if you have the `flock' function. */ -#define HAVE_FLOCK 1 - -/* Define to 1 if you have the `getpass' function. */ -#define HAVE_GETPASS 1 - -/* Define to 1 if you have the `getprogname' function. */ -#define HAVE_GETPROGNAME 1 - -/* Define to 1 if you have the `getrusage' function. */ -#define HAVE_GETRUSAGE 1 - -/* gettext(3) */ -/* #undef HAVE_GETTEXT */ - -/* Define to 1 if you have the `gettimeofday' function. */ -#define HAVE_GETTIMEOFDAY 1 - -/* humanize_number(3) */ -#define HAVE_HUMANIZE_NUMBER 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if you have the `crypto' library (-lcrypto). */ -#define HAVE_LIBCRYPTO 1 - -/* Define to 1 if you have the `m' library (-lm). */ -#define HAVE_LIBM 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_LIBUTIL_H 1 - -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#define HAVE_MALLOC 1 - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_MONITOR_H */ - -/* Support printflike */ -/* #undef HAVE_PRINTFLIKE */ - -/* Define to 1 if your system has a GNU libc compatible `realloc' function, - and to 0 otherwise. */ -#define HAVE_REALLOC 1 - -/* Define to 1 if you have the `srand' function. */ -#define HAVE_SRAND 1 - -/* Define to 1 if you have the `sranddev' function. */ -/* #undef HAVE_SRANDDEV */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STDIO_EXT_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_STDIO_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STDTIME_TZFILE_H */ - -/* Define to 1 if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strcspn' function. */ -#define HAVE_STRCSPN 1 - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strlcpy' function. */ -#define HAVE_STRLCPY 1 - -/* Define to 1 if you have the `strspn' function. */ -#define HAVE_STRSPN 1 - -/* Have struct sockaddr_un.sun_len */ -#define HAVE_SUN_LEN 1 - -/* Define to 1 if you have the `sysctlbyname' function. */ -#define HAVE_SYSCTLBYNAME 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_SYSCTL_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_THREADS_H 1 - -/* thread-local setting */ -#define HAVE_THREAD_LOCAL THREAD_LOCAL_before - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_TZFILE_H */ - -/* Define to 1 if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define to 1 if you have the `__flbf' function. */ -/* #undef HAVE___FLBF */ - -/* Enable debugging */ -/* #undef LIBXO_DEBUG */ - -/* Enable text-only rendering */ -/* #undef LIBXO_TEXT_ONLY */ - -/* Version number as dotted value */ -#define LIBXO_VERSION "1.3.1" - -/* Version number extra information */ -#define LIBXO_VERSION_EXTRA "" - -/* Version number as a number */ -#define LIBXO_VERSION_NUMBER 1003001 - -/* Version number as string */ -#define LIBXO_VERSION_STRING "1003001" - -/* Enable local wcwidth implementation */ -#define LIBXO_WCWIDTH 1 - -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "libxo" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "phil@juniper.net" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "libxo" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libxo 1.3.1" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "libxo" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "1.3.1" - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -/* #undef STACK_DIRECTION */ - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Use int return codes */ -/* #undef USE_INT_RETURN_CODES */ - -/* Version number of package */ -#define VERSION "1.3.1" - -/* Retain hash bucket size */ -/* #undef XO_RETAIN_SIZE */ - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -/* #undef inline */ -#endif - -/* Define to rpl_malloc if the replacement function should be used. */ -/* #undef malloc */ - -/* Define to rpl_realloc if the replacement function should be used. */ -/* #undef realloc */ - -/* Define to `unsigned int' if does not define. */ -/* #undef size_t */ Property changes on: head/lib/libxo/xo_config.h ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/lib/libxo/Makefile =================================================================== --- head/lib/libxo/Makefile (revision 355825) +++ head/lib/libxo/Makefile (revision 355826) @@ -1,119 +1,10 @@ # $FreeBSD$ -SHLIBDIR?= /lib - .include -PACKAGE= runtime - -LIBXOSRC= ${SRCTOP}/contrib/libxo - -.PATH: ${LIBXOSRC}/libxo - -LIB= xo -SHLIB_MAJOR=0 - -SRCS= libxo.c xo_encoder.c xo_syslog.c - -CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR} -CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" - -INCS= xo.h xo_encoder.h -INCSDIR=${INCLUDEDIR}/libxo - -LIBADD= util - -WARNS?= 5 - -MAN+= libxo.3 -MAN+= xo_attr.3 \ - xo_create.3 \ - xo_emit.3 \ - xo_emit_err.3 \ - xo_err.3 \ - xo_error.3 \ - xo_finish.3 \ - xo_flush.3 \ - xo_message.3 \ - xo_no_setlocale.3 \ - xo_open_container.3 \ - xo_open_list.3 \ - xo_open_marker.3 \ - xo_parse_args.3 \ - xo_set_allocator.3 \ - xo_set_flags.3 \ - xo_set_info.3 \ - xo_set_options.3 \ - xo_set_style.3 \ - xo_set_syslog_enterprise_id.3 \ - xo_set_version.3 \ - xo_set_writer.3 \ - xo_syslog.3 - -MAN+= xo_format.5 - -MAN+= xo_options.7 - -MLINKS= xo_attr.3 xo_attr_h.3 \ - xo_attr.3 xo_attr_hv.3 \ - xo_create.3 xo_create_to_file.3 \ - xo_create.3 xo_destroy.3 \ - xo_emit.3 xo_emit_h.3 \ - xo_emit.3 xo_emit_hv.3 \ - xo_emit_err.3 xo_emit_errc.3 \ - xo_emit_err.3 xo_emit_errx.3 \ - xo_emit_err.3 xo_emit_warn.3 \ - xo_emit_err.3 xo_emit_warnx.3 \ - xo_emit_err.3 xo_emit_warn_c.3 \ - xo_emit_err.3 xo_emit_warn_hc.3 \ - xo_err.3 xo_errc.3 \ - xo_err.3 xo_errx.3 \ - xo_err.3 xo_warn.3 \ - xo_err.3 xo_warnx.3 \ - xo_err.3 xo_warn_c.3 \ - xo_err.3 xo_warn_hc.3 \ - xo_finish.3 xo_finish_h.3 \ - xo_flush.3 xo_flush_h.3 \ - xo_message.3 xo_message_c.3 \ - xo_message.3 xo_message_hc.3 \ - xo_message.3 xo_message_hcv.3 \ - xo_open_container.3 xo_open_container_h.3 \ - xo_open_container.3 xo_open_container_hd.3 \ - xo_open_container.3 xo_open_container_d.3 \ - xo_open_container.3 xo_close_container.3 \ - xo_open_container.3 xo_close_container_h.3 \ - xo_open_container.3 xo_close_container_hd.3 \ - xo_open_container.3 xo_close_container_d.3 \ - xo_open_list.3 xo_open_list_h.3 \ - xo_open_list.3 xo_open_list_hd.3 \ - xo_open_list.3 xo_open_list_d.3 \ - xo_open_list.3 xo_open_instance.3 \ - xo_open_list.3 xo_open_instance_h.3 \ - xo_open_list.3 xo_open_instance_hd.3 \ - xo_open_list.3 xo_open_instance_d.3 \ - xo_open_list.3 xo_close_instance.3 \ - xo_open_list.3 xo_close_instance_h.3 \ - xo_open_list.3 xo_close_instance_hd.3 \ - xo_open_list.3 xo_close_instance_d.3 \ - xo_open_list.3 xo_close_list.3 \ - xo_open_list.3 xo_close_list_h.3 \ - xo_open_list.3 xo_close_list_hd.3 \ - xo_open_list.3 xo_close_list_d.3 \ - xo_open_marker.3 xo_open_marker_h.3 \ - xo_open_marker.3 xo_close_marker.3 \ - xo_open_marker.3 xo_close_marker_h.3 \ - xo_parse_args.3 xo_set_program.3 \ - xo_set_flags.3 xo_clear_flags.3 \ - xo_set_style.3 xo_set_style_name.3 \ - xo_set_version.3 xo_set_version_h.3 \ - xo_syslog.3 xo_close_log.3 \ - xo_syslog.3 xo_open_log.3 \ - xo_syslog.3 xo_set_logmask.3 \ - xo_syslog.3 xo_vsyslog.3 - HAS_TESTS= SUBDIR.${MK_TESTS}+= tests -#SUBDIR = encoder +SUBDIR = libxo .WAIT encoder -.include +.include Index: head/lib/libxo/encoder/csv/Makefile =================================================================== --- head/lib/libxo/encoder/csv/Makefile (revision 355825) +++ head/lib/libxo/encoder/csv/Makefile (revision 355826) @@ -1,30 +1,37 @@ # $FreeBSD$ -LIBXODIR= ${STAGEDIR}${PREFIX}/usr/lib/libxo/encoder -SHLIBDIR?= ${LIBXODIR} -LIBDIR?= ${LIBXODIR} - .include PACKAGE= runtime LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: ${LIBXOSRC}/encoder/csv +# We use FILES to install the encoder library under the proper/magic +# name, in the proper/magic directory. libxo looks for encoders from +# "--libxo encoder=name" as "${prefix}/lib/libxo/encoder/${name}.enc" +FILES = libenc_csv.so +FILESNAME_libenc_csv.so= csv.enc +FILESDIR = /usr/lib/libxo/encoder + LIB= enc_csv SHLIB_MAJOR=0 +SHLIB_NAME= lib${LIB}.so SRCS= enc_csv.c CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR} CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" LIBADD= util xo -LDFLAGS += -L${.OBJDIR}/../../wildebeast +LDFLAGS += -L${.OBJDIR:H:H}/libxo WARNS?= 5 -SYMLINKS+= ${SHLIB_NAME} ${LIBXODIR}/csv.enc +# Need to define a fake "install" target to block the one in bsd.lib.mk, +# since that one will install our lib in the wrong place (/usr/lib/). +install: realinstall .include +.include Index: head/lib/libxo/libxo/Makefile =================================================================== --- head/lib/libxo/libxo/Makefile (nonexistent) +++ head/lib/libxo/libxo/Makefile (revision 355826) @@ -0,0 +1,114 @@ +# $FreeBSD$ + +SHLIBDIR?= /lib + +.include + +PACKAGE= runtime + +LIBXOSRC= ${SRCTOP}/contrib/libxo + +.PATH: ${LIBXOSRC}/libxo + +LIB= xo +SHLIB_MAJOR=0 + +SRCS= libxo.c xo_encoder.c xo_syslog.c + +CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR} +CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\" + +INCS= xo.h xo_encoder.h +INCSDIR=${INCLUDEDIR}/libxo + +LIBADD= util + +WARNS?= 5 + +MAN+= libxo.3 +MAN+= xo_attr.3 \ + xo_create.3 \ + xo_emit.3 \ + xo_emit_err.3 \ + xo_err.3 \ + xo_error.3 \ + xo_finish.3 \ + xo_flush.3 \ + xo_message.3 \ + xo_no_setlocale.3 \ + xo_open_container.3 \ + xo_open_list.3 \ + xo_open_marker.3 \ + xo_parse_args.3 \ + xo_set_allocator.3 \ + xo_set_flags.3 \ + xo_set_info.3 \ + xo_set_options.3 \ + xo_set_style.3 \ + xo_set_syslog_enterprise_id.3 \ + xo_set_version.3 \ + xo_set_writer.3 \ + xo_syslog.3 + +MAN+= xo_format.5 + +MAN+= xo_options.7 + +MLINKS= xo_attr.3 xo_attr_h.3 \ + xo_attr.3 xo_attr_hv.3 \ + xo_create.3 xo_create_to_file.3 \ + xo_create.3 xo_destroy.3 \ + xo_emit.3 xo_emit_h.3 \ + xo_emit.3 xo_emit_hv.3 \ + xo_emit_err.3 xo_emit_errc.3 \ + xo_emit_err.3 xo_emit_errx.3 \ + xo_emit_err.3 xo_emit_warn.3 \ + xo_emit_err.3 xo_emit_warnx.3 \ + xo_emit_err.3 xo_emit_warn_c.3 \ + xo_emit_err.3 xo_emit_warn_hc.3 \ + xo_err.3 xo_errc.3 \ + xo_err.3 xo_errx.3 \ + xo_err.3 xo_warn.3 \ + xo_err.3 xo_warnx.3 \ + xo_err.3 xo_warn_c.3 \ + xo_err.3 xo_warn_hc.3 \ + xo_finish.3 xo_finish_h.3 \ + xo_flush.3 xo_flush_h.3 \ + xo_message.3 xo_message_c.3 \ + xo_message.3 xo_message_hc.3 \ + xo_message.3 xo_message_hcv.3 \ + xo_open_container.3 xo_open_container_h.3 \ + xo_open_container.3 xo_open_container_hd.3 \ + xo_open_container.3 xo_open_container_d.3 \ + xo_open_container.3 xo_close_container.3 \ + xo_open_container.3 xo_close_container_h.3 \ + xo_open_container.3 xo_close_container_hd.3 \ + xo_open_container.3 xo_close_container_d.3 \ + xo_open_list.3 xo_open_list_h.3 \ + xo_open_list.3 xo_open_list_hd.3 \ + xo_open_list.3 xo_open_list_d.3 \ + xo_open_list.3 xo_open_instance.3 \ + xo_open_list.3 xo_open_instance_h.3 \ + xo_open_list.3 xo_open_instance_hd.3 \ + xo_open_list.3 xo_open_instance_d.3 \ + xo_open_list.3 xo_close_instance.3 \ + xo_open_list.3 xo_close_instance_h.3 \ + xo_open_list.3 xo_close_instance_hd.3 \ + xo_open_list.3 xo_close_instance_d.3 \ + xo_open_list.3 xo_close_list.3 \ + xo_open_list.3 xo_close_list_h.3 \ + xo_open_list.3 xo_close_list_hd.3 \ + xo_open_list.3 xo_close_list_d.3 \ + xo_open_marker.3 xo_open_marker_h.3 \ + xo_open_marker.3 xo_close_marker.3 \ + xo_open_marker.3 xo_close_marker_h.3 \ + xo_parse_args.3 xo_set_program.3 \ + xo_set_flags.3 xo_clear_flags.3 \ + xo_set_style.3 xo_set_style_name.3 \ + xo_set_version.3 xo_set_version_h.3 \ + xo_syslog.3 xo_close_log.3 \ + xo_syslog.3 xo_open_log.3 \ + xo_syslog.3 xo_set_logmask.3 \ + xo_syslog.3 xo_vsyslog.3 + +.include Property changes on: head/lib/libxo/libxo/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lib/libxo/libxo/xo_config.h =================================================================== --- head/lib/libxo/libxo/xo_config.h (nonexistent) +++ head/lib/libxo/libxo/xo_config.h (revision 355826) @@ -0,0 +1,257 @@ +/* $FreeBSD$ */ +/* libxo/xo_config.h. Generated from xo_config.h.in by configure. */ +/* libxo/xo_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +/* #undef CRAY_STACKSEG_END */ + +/* Define to 1 if using `alloca.c'. */ +/* #undef C_ALLOCA */ + +/* Define to 1 if you have `alloca', as a function or macro. */ +#define HAVE_ALLOCA 1 + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +/* #undef HAVE_ALLOCA_H */ + +/* Define to 1 if you have the `asprintf' function. */ +#define HAVE_ASPRINTF 1 + +/* Define to 1 if you have the `bzero' function. */ +#define HAVE_BZERO 1 + +/* Define to 1 if you have the `ctime' function. */ +#define HAVE_CTIME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_CTYPE_H 1 + +/* Define to 1 if you have the declaration of `__isthreaded', and to 0 if you + don't. */ +#define HAVE_DECL___ISTHREADED 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `dlfunc' function. */ +#define HAVE_DLFUNC 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define to 1 if you have the `fdopen' function. */ +#define HAVE_FDOPEN 1 + +/* Define to 1 if you have the `flock' function. */ +#define HAVE_FLOCK 1 + +/* Define to 1 if you have the `getpass' function. */ +#define HAVE_GETPASS 1 + +/* Define to 1 if you have the `getprogname' function. */ +#define HAVE_GETPROGNAME 1 + +/* Define to 1 if you have the `getrusage' function. */ +#define HAVE_GETRUSAGE 1 + +/* gettext(3) */ +/* #undef HAVE_GETTEXT */ + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* humanize_number(3) */ +#define HAVE_HUMANIZE_NUMBER 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `crypto' library (-lcrypto). */ +#define HAVE_LIBCRYPTO 1 + +/* Define to 1 if you have the `m' library (-lm). */ +#define HAVE_LIBM 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIBUTIL_H 1 + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#define HAVE_MALLOC 1 + +/* Define to 1 if you have the `memmove' function. */ +#define HAVE_MEMMOVE 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MONITOR_H */ + +/* Support printflike */ +/* #undef HAVE_PRINTFLIKE */ + +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#define HAVE_REALLOC 1 + +/* Define to 1 if you have the `srand' function. */ +#define HAVE_SRAND 1 + +/* Define to 1 if you have the `sranddev' function. */ +#define HAVE_SRANDDEV 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STDIO_EXT_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_STDTIME_TZFILE_H */ + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strcspn' function. */ +#define HAVE_STRCSPN 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strspn' function. */ +#define HAVE_STRSPN 1 + +/* Have struct sockaddr_un.sun_len */ +#define HAVE_SUN_LEN 1 + +/* Define to 1 if you have the `sysctlbyname' function. */ +#define HAVE_SYSCTLBYNAME 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SYSCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_THREADS_H 1 + +/* thread-local setting */ +#define HAVE_THREAD_LOCAL THREAD_LOCAL_before + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_TZFILE_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `__flbf' function. */ +/* #undef HAVE___FLBF */ + +/* Enable debugging */ +/* #undef LIBXO_DEBUG */ + +/* Enable text-only rendering */ +/* #undef LIBXO_TEXT_ONLY */ + +/* Version number as dotted value */ +#define LIBXO_VERSION "1.3.1" + +/* Version number extra information */ +#define LIBXO_VERSION_EXTRA "" + +/* Version number as a number */ +#define LIBXO_VERSION_NUMBER 1003001 + +/* Version number as string */ +#define LIBXO_VERSION_STRING "1003001" + +/* Enable local wcwidth implementation */ +#define LIBXO_WCWIDTH 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "libxo" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "phil@juniper.net" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libxo" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "libxo 1.3.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libxo" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "1.3.1" + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +/* #undef STACK_DIRECTION */ + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Use int return codes */ +/* #undef USE_INT_RETURN_CODES */ + +/* Version number of package */ +#define VERSION "1.3.1" + +/* Retain hash bucket size */ +/* #undef XO_RETAIN_SIZE */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ + +/* Define to rpl_realloc if the replacement function should be used. */ +/* #undef realloc */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ Property changes on: head/lib/libxo/libxo/xo_config.h ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lib/libxo/tests/Makefile =================================================================== --- head/lib/libxo/tests/Makefile (revision 355825) +++ head/lib/libxo/tests/Makefile (revision 355826) @@ -1,249 +1,249 @@ # $FreeBSD$ .include PACKAGE= tests LIBXOSRC= ${SRCTOP}/contrib/libxo # Override the default suffix transformation rules for .c/.o -> .out .SUFFIXES: .SUFFIXES: .c .err .o .out .sh .PATH: .PATH.c: ${LIBXOSRC}/libxo ${LIBXOSRC}/tests/core .PATH.err: ${LIBXOSRC}/tests/core/saved .PATH.out: ${LIBXOSRC}/tests/core/saved .c.out .o.out: ATF_TESTS_SH+= functional_test BINDIR= ${TESTSDIR} ${PACKAGE}FILES+= test_01.E.err ${PACKAGE}FILES+= test_01.E.out ${PACKAGE}FILES+= test_01.H.err ${PACKAGE}FILES+= test_01.H.out ${PACKAGE}FILES+= test_01.HIPx.err ${PACKAGE}FILES+= test_01.HIPx.out ${PACKAGE}FILES+= test_01.HP.err ${PACKAGE}FILES+= test_01.HP.out ${PACKAGE}FILES+= test_01.J.err ${PACKAGE}FILES+= test_01.J.out ${PACKAGE}FILES+= test_01.JP.err ${PACKAGE}FILES+= test_01.JP.out ${PACKAGE}FILES+= test_01.T.err ${PACKAGE}FILES+= test_01.T.out ${PACKAGE}FILES+= test_01.X.err ${PACKAGE}FILES+= test_01.X.out ${PACKAGE}FILES+= test_01.XP.err ${PACKAGE}FILES+= test_01.XP.out ${PACKAGE}FILES+= test_01.err ${PACKAGE}FILES+= test_01.out ${PACKAGE}FILES+= test_02.E.err ${PACKAGE}FILES+= test_02.E.out ${PACKAGE}FILES+= test_02.H.err ${PACKAGE}FILES+= test_02.H.out ${PACKAGE}FILES+= test_02.HIPx.err ${PACKAGE}FILES+= test_02.HIPx.out ${PACKAGE}FILES+= test_02.HP.err ${PACKAGE}FILES+= test_02.HP.out ${PACKAGE}FILES+= test_02.J.err ${PACKAGE}FILES+= test_02.J.out ${PACKAGE}FILES+= test_02.JP.err ${PACKAGE}FILES+= test_02.JP.out ${PACKAGE}FILES+= test_02.T.err ${PACKAGE}FILES+= test_02.T.out ${PACKAGE}FILES+= test_02.X.err ${PACKAGE}FILES+= test_02.X.out ${PACKAGE}FILES+= test_02.XP.err ${PACKAGE}FILES+= test_02.XP.out ${PACKAGE}FILES+= test_02.err ${PACKAGE}FILES+= test_02.out ${PACKAGE}FILES+= test_03.E.err ${PACKAGE}FILES+= test_03.E.out ${PACKAGE}FILES+= test_03.H.err ${PACKAGE}FILES+= test_03.H.out ${PACKAGE}FILES+= test_03.HIPx.err ${PACKAGE}FILES+= test_03.HIPx.out ${PACKAGE}FILES+= test_03.HP.err ${PACKAGE}FILES+= test_03.HP.out ${PACKAGE}FILES+= test_03.J.err ${PACKAGE}FILES+= test_03.J.out ${PACKAGE}FILES+= test_03.JP.err ${PACKAGE}FILES+= test_03.JP.out ${PACKAGE}FILES+= test_03.T.err ${PACKAGE}FILES+= test_03.T.out ${PACKAGE}FILES+= test_03.X.err ${PACKAGE}FILES+= test_03.X.out ${PACKAGE}FILES+= test_03.XP.err ${PACKAGE}FILES+= test_03.XP.out ${PACKAGE}FILES+= test_03.err ${PACKAGE}FILES+= test_03.out ${PACKAGE}FILES+= test_04.E.err ${PACKAGE}FILES+= test_04.E.out ${PACKAGE}FILES+= test_04.H.err ${PACKAGE}FILES+= test_04.H.out ${PACKAGE}FILES+= test_04.HIPx.err ${PACKAGE}FILES+= test_04.HIPx.out ${PACKAGE}FILES+= test_04.HP.err ${PACKAGE}FILES+= test_04.HP.out ${PACKAGE}FILES+= test_04.J.err ${PACKAGE}FILES+= test_04.J.out ${PACKAGE}FILES+= test_04.JP.err ${PACKAGE}FILES+= test_04.JP.out ${PACKAGE}FILES+= test_04.T.err ${PACKAGE}FILES+= test_04.T.out ${PACKAGE}FILES+= test_04.X.err ${PACKAGE}FILES+= test_04.X.out ${PACKAGE}FILES+= test_04.XP.err ${PACKAGE}FILES+= test_04.XP.out ${PACKAGE}FILES+= test_05.E.err ${PACKAGE}FILES+= test_05.E.out ${PACKAGE}FILES+= test_05.H.err ${PACKAGE}FILES+= test_05.H.out ${PACKAGE}FILES+= test_05.HIPx.err ${PACKAGE}FILES+= test_05.HIPx.out ${PACKAGE}FILES+= test_05.HP.err ${PACKAGE}FILES+= test_05.HP.out ${PACKAGE}FILES+= test_05.J.err ${PACKAGE}FILES+= test_05.J.out ${PACKAGE}FILES+= test_05.JP.err ${PACKAGE}FILES+= test_05.JP.out ${PACKAGE}FILES+= test_05.T.err ${PACKAGE}FILES+= test_05.T.out ${PACKAGE}FILES+= test_05.X.err ${PACKAGE}FILES+= test_05.X.out ${PACKAGE}FILES+= test_05.XP.err ${PACKAGE}FILES+= test_05.XP.out ${PACKAGE}FILES+= test_06.E.err ${PACKAGE}FILES+= test_06.E.out ${PACKAGE}FILES+= test_06.H.err ${PACKAGE}FILES+= test_06.H.out ${PACKAGE}FILES+= test_06.HIPx.err ${PACKAGE}FILES+= test_06.HIPx.out ${PACKAGE}FILES+= test_06.HP.err ${PACKAGE}FILES+= test_06.HP.out ${PACKAGE}FILES+= test_06.J.err ${PACKAGE}FILES+= test_06.J.out ${PACKAGE}FILES+= test_06.JP.err ${PACKAGE}FILES+= test_06.JP.out ${PACKAGE}FILES+= test_06.T.err ${PACKAGE}FILES+= test_06.T.out ${PACKAGE}FILES+= test_06.X.err ${PACKAGE}FILES+= test_06.X.out ${PACKAGE}FILES+= test_06.XP.err ${PACKAGE}FILES+= test_06.XP.out ${PACKAGE}FILES+= test_07.E.err ${PACKAGE}FILES+= test_07.E.out ${PACKAGE}FILES+= test_07.H.err ${PACKAGE}FILES+= test_07.H.out ${PACKAGE}FILES+= test_07.HIPx.err ${PACKAGE}FILES+= test_07.HIPx.out ${PACKAGE}FILES+= test_07.HP.err ${PACKAGE}FILES+= test_07.HP.out ${PACKAGE}FILES+= test_07.J.err ${PACKAGE}FILES+= test_07.J.out ${PACKAGE}FILES+= test_07.JP.err ${PACKAGE}FILES+= test_07.JP.out ${PACKAGE}FILES+= test_07.T.err ${PACKAGE}FILES+= test_07.T.out ${PACKAGE}FILES+= test_07.X.err ${PACKAGE}FILES+= test_07.X.out ${PACKAGE}FILES+= test_07.XP.err ${PACKAGE}FILES+= test_07.XP.out ${PACKAGE}FILES+= test_08.E.err ${PACKAGE}FILES+= test_08.E.out ${PACKAGE}FILES+= test_08.H.err ${PACKAGE}FILES+= test_08.H.out ${PACKAGE}FILES+= test_08.HIPx.err ${PACKAGE}FILES+= test_08.HIPx.out ${PACKAGE}FILES+= test_08.HP.err ${PACKAGE}FILES+= test_08.HP.out ${PACKAGE}FILES+= test_08.J.err ${PACKAGE}FILES+= test_08.J.out ${PACKAGE}FILES+= test_08.JP.err ${PACKAGE}FILES+= test_08.JP.out ${PACKAGE}FILES+= test_08.T.err ${PACKAGE}FILES+= test_08.T.out ${PACKAGE}FILES+= test_08.X.err ${PACKAGE}FILES+= test_08.X.out ${PACKAGE}FILES+= test_08.XP.err ${PACKAGE}FILES+= test_08.XP.out ${PACKAGE}FILES+= test_09.E.err ${PACKAGE}FILES+= test_09.E.out ${PACKAGE}FILES+= test_09.H.err ${PACKAGE}FILES+= test_09.H.out ${PACKAGE}FILES+= test_09.HIPx.err ${PACKAGE}FILES+= test_09.HIPx.out ${PACKAGE}FILES+= test_09.HP.err ${PACKAGE}FILES+= test_09.HP.out ${PACKAGE}FILES+= test_09.J.err ${PACKAGE}FILES+= test_09.J.out ${PACKAGE}FILES+= test_09.JP.err ${PACKAGE}FILES+= test_09.JP.out ${PACKAGE}FILES+= test_09.T.err ${PACKAGE}FILES+= test_09.T.out ${PACKAGE}FILES+= test_09.X.err ${PACKAGE}FILES+= test_09.X.out ${PACKAGE}FILES+= test_09.XP.err ${PACKAGE}FILES+= test_09.XP.out ${PACKAGE}FILES+= test_10.E.err ${PACKAGE}FILES+= test_10.E.out ${PACKAGE}FILES+= test_10.H.err ${PACKAGE}FILES+= test_10.H.out ${PACKAGE}FILES+= test_10.HIPx.err ${PACKAGE}FILES+= test_10.HIPx.out ${PACKAGE}FILES+= test_10.HP.err ${PACKAGE}FILES+= test_10.HP.out ${PACKAGE}FILES+= test_10.J.err ${PACKAGE}FILES+= test_10.J.out ${PACKAGE}FILES+= test_10.JP.err ${PACKAGE}FILES+= test_10.JP.out ${PACKAGE}FILES+= test_10.T.err ${PACKAGE}FILES+= test_10.T.out ${PACKAGE}FILES+= test_10.X.err ${PACKAGE}FILES+= test_10.X.out ${PACKAGE}FILES+= test_10.XP.err ${PACKAGE}FILES+= test_10.XP.out ${PACKAGE}FILES+= test_10.err ${PACKAGE}FILES+= test_10.out ${PACKAGE}FILES+= test_11.E.err ${PACKAGE}FILES+= test_11.E.out ${PACKAGE}FILES+= test_11.H.err ${PACKAGE}FILES+= test_11.H.out ${PACKAGE}FILES+= test_11.HIPx.err ${PACKAGE}FILES+= test_11.HIPx.out ${PACKAGE}FILES+= test_11.HP.err ${PACKAGE}FILES+= test_11.HP.out ${PACKAGE}FILES+= test_11.J.err ${PACKAGE}FILES+= test_11.J.out ${PACKAGE}FILES+= test_11.JP.err ${PACKAGE}FILES+= test_11.JP.out ${PACKAGE}FILES+= test_11.T.err ${PACKAGE}FILES+= test_11.T.out ${PACKAGE}FILES+= test_11.X.err ${PACKAGE}FILES+= test_11.X.out ${PACKAGE}FILES+= test_11.XP.err ${PACKAGE}FILES+= test_11.XP.out PROGS+= test_01 PROGS+= test_02 PROGS+= test_03 PROGS+= test_04 PROGS+= test_05 PROGS+= test_06 PROGS+= test_07 PROGS+= test_08 PROGS+= test_09 PROGS+= test_10 PROGS+= test_11 -CFLAGS+= -I${LIBXOSRC}/libxo -I${.CURDIR:H} +CFLAGS+= -I${LIBXOSRC}/libxo -I${.CURDIR:H}/libxo LIBADD= xo util SUBDIR+= encoder .include Index: head/lib/libxo/tests/encoder/Makefile =================================================================== --- head/lib/libxo/tests/encoder/Makefile (revision 355825) +++ head/lib/libxo/tests/encoder/Makefile (revision 355826) @@ -1,19 +1,19 @@ # $FreeBSD$ LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: ${LIBXOSRC}/encoder/test SHLIB_NAME= libenc_test.so LIBDIR= ${TESTSBASE}/lib/libxo SYMLINKS+= ${LIBDIR}/${SHLIB_NAME} /usr/lib/libxo/encoder/test.enc SRCS= enc_test.c -CFLAGS+= -I${LIBXOSRC}/libxo +CFLAGS+= -I${LIBXOSRC}/libxo -I${.CURDIR:H:H}/libxo LIBADD= xo .include Index: head/usr.bin/xo/Makefile =================================================================== --- head/usr.bin/xo/Makefile (revision 355825) +++ head/usr.bin/xo/Makefile (revision 355826) @@ -1,24 +1,24 @@ # $FreeBSD$ .include LIBXOSRC= ${SRCTOP}/contrib/libxo .PATH: .PATH: ${LIBXOSRC}/xo PROG= xo MAN= xo.1 # XXX For xoversion.h CFLAGS+=-I${LIBXOSRC}/libxo # XXX For xo_config.h -CFLAGS+=-I${SRCTOP}/lib/libxo +CFLAGS+=-I${SRCTOP}/lib/libxo/libxo LIBADD= xo util HAS_TESTS= SUBDIR.${MK_TESTS}+= tests .include Index: vendor/Juniper/libxo/.svnignore =================================================================== --- vendor/Juniper/libxo/.svnignore (revision 355825) +++ vendor/Juniper/libxo/.svnignore (revision 355826) @@ -1,6 +1,6 @@ -libxo-0.4.6 -libxo-0.4.7 -libxo-0.6.0 -libxo-0.6.1 -libxo-0.6.2 +libxo-1.0.2 +libxo-1.0.4 +libxo-1.1.0 +libxo-1.3.0 +libxo-1.3.1 tag.sh Index: vendor/Juniper/libxo/import.sh =================================================================== --- vendor/Juniper/libxo/import.sh (revision 355825) +++ vendor/Juniper/libxo/import.sh (revision 355826) @@ -1,344 +1,344 @@ #!/bin/sh # $FreeBSD$ # # Import script for libxo. Typically invoked as: # # cd work/bsd/base # sh ./vendor/Juniper/libxo/import.sh -v 0.4.6 # # Add "-n" to avoid svn actions # Add "-d" to generate docs # # Phil Shafer (phil@), April 2016 # PROJECT=libxo BUILDWORLD="make -j8 buildworld -DWITH_META_MODE -DNO_CLEAN -DWITHOUT_TESTS" #"global" vars # Set SVN variables # select the local subversion site SVN=${SVN:-/usr/local/bin/svn} # "Real" SVN, even if "-n" RSVN=$SVN GMAKE=${GMAKE:-gmake} # For consistency... Error() { echo ERROR: ${1+"$@"} >&2 exit 1 } Cd() { [ $# -eq 1 ] || Error "Cd() takes a single parameter." cd $1 || Error "cannot \"cd $1\" from $PWD" info "Directory =" `pwd` if [ "$DOC" = doc ]; then echo " cd $1" echo " " fi } siginfo() { if [ ! -z "$CMD" ]; then info "CMD is $CMD" fi } trap 'siginfo' SIGINFO trap 'siginfo' SIGCONT run() { desc="$1" cmd="$2" CMD="$2" if [ "$DOC" = doc ]; then echo "## $desc" echo " $cmd" echo " " else echo "====" echo "Phase: $desc" echo " Run: $cmd" okay # We need to eval to handle "&&" in commands eval $cmd okay fi } info() { echo "## -- " "$@" } okay() { if [ -z "$OKAY" ]; then /bin/echo -n "proceed? " read okay case "$okay" in [QqNn]*) echo "exiting"; exit 1;; esac fi } spew_words () { for i in "$@"; do echo $i done } # Call this function and then follow it by any specific import script additions option_parsing() { local _shift=$# # Parse command line options while : do case "$1" in *=*) eval "$1"; shift;; --) shift; break;; -a) TARBALL=$2; shift 2;; -d) DOC=doc; shift;; -D) VENDOR_DIR=$2; shift 2;; -f) FETCH=yes; shift;; -n) SVN='echo svn'; shift;; -p) PROJECT=$2; shift 2;; -P) PR=$2; shift 2;; -r) REVIEWER=$2; shift 2;; -u) UPDATE=no; shift;; -v) VERS=$2; shift 2;; -y) OKAY=yes; shift;; -h) echo "Usage:"; echo " "$0 '[-ahnPr] [TARBALL=] [PR=] [REVIEWER=]' echo " -a -- name or tarball" echo " -d -- generate documentation" echo " -f -- force fetch of tarballs" echo " -h -- print usage" echo " -n -- do not import, check only" echo " -v -- version to import" echo " -y -- answer 'yes'" exit 1;; *) break;; esac done return $(($_shift - $#)) } ### option_parsing "$@" shift $? Cd `dirname $0` CWD=`pwd` TOP=`echo $CWD | sed 's:/vendor/.*::'` info "TOP = $TOP" Cd $TOP HEAD=$TOP/head info "HEAD = $HEAD" mkdir -p ../obj MAKEOBJDIRPREFIX=`cd ../obj; pwd` export MAKEOBJDIRPREFIX if [ -z "$VENDOR_DIR" ]; then VENDOR_DIR=`echo $CWD | sed 's:.*/vendor/::'` fi #-------------------------------------------------------------- info "CWD = $CWD" info "VENDOR_DIR = $VENDOR_DIR" info "VERS = $VERS" info "BUILDWORLD = $BUILDWORLD" DATESTAMP=`date "+%Y-%m-%d-%H-%M"` [ -z "$VERS" ] && Error "missing version argument (-v)" run "show any local changes" "diff -rbu $CWD/dist $HEAD/contrib/libxo" Cd $HEAD run "updating all" "svn update" if [ ! -z "$UPDATE" ]; then run "building the entire world" "script $MAKEOBJDIRPREFIX/out.$DATESTAMP.before $BUILDWORLD" fi Cd $CWD mkdir -p ~/tars # We use the source tarball from git since it has no frills # (and libxo has a lot of frills.....) URL=https://github.com/Juniper/libxo/archive/$VERS.tar.gz BASEURL=libxo-`basename $URL` TARBALL=~/tars/$BASEURL info "BASEURL = $BASEURL" if [ "$FETCH" = "yes" -o ! -f $TARBALL ]; then run "fetching tarball ($URL)" "fetch -o $TARBALL $URL" [ -s $TARBALL ] || Error "fetch failed to get file" fi # We need the release tar ball for the HTML docs, nothing more DOCURL=https://github.com/Juniper/libxo/releases/download/$VERS/libxo-$VERS.tar.gz # BASE should match what the TARBALL contains BASE=`basename $TARBALL .tar.gz` VERSION=`echo $BASE | sed 's/libxo-//'` TF=$BASE/info run "untarring source files TARBALL" "tar zxf $TARBALL" # List of top-level files we want to ignore TOPJUNKFILES="\ libxo-* \ tag.sh" # List of files in the tarball that we want to ignore DISTJUNKFILES="\ Makefile.in \ aclocal.m4 \ ar-lib \ autom4te.cache \ bin* \ build* \ compile \ configure \ config.guess \ config.sub \ depcomp \ doc/Makefile.in \ info* \ install-sh \ ltmain.sh \ m4 \ missing \ patches*" # List of directories that need a "Makefile.in" ignored IGNOREDIRS="\ doc \ encoder \ encoder/cbor \ encoder/test \ libxo \ tests \ tests/core \ tests/gettext \ tests/xo \ xo \ xohtml \ xolint \ xopo" SEDNUKE="sed -e '/^bin/d' -e '/^build/d' -e '/^info/d' -e '/^patches/d'" run "writing .svnignore" \ "(for i in $TOPJUNKFILES; do echo \$i ; done ) > .svnignore" run "setting svn:ignore for ." \ "$SVN propset svn:ignore -F .svnignore ." run "writing dist/.svnignore" \ "(for i in $DISTJUNKFILES; do echo \$i ; done ) > dist/.svnignore" run "setting svn:ignore for dist" \ "(cd dist && $SVN propset svn:ignore -F .svnignore .)" run "setting svn:ignore for Makefile.in dirs" \ "for dir in $IGNOREDIRS; do (cd dist/\$dir && $SVN propset svn:ignore Makefile.in .) ; done" # the rest should be common run "making list of files in existing tree" \ "(cd dist && $RSVN list -R) | grep -v '/$' | sort > $TF.old" run "making list of files in incoming tree" \ "(echo 'x .svnignore' ; cd $BASE && find . -type f ) | cut -c 3- | $SEDNUKE | sort > $TF.new" run "making list of deleted files" "comm -23 $TF.old $TF.new | tee $TF.rmlist" run "making list of new files" "comm -13 $TF.old $TF.new | tee $TF.addlist" run "copying contents over to dist/" "(cd $BASE && tar cf - . | tar xf - -C ../dist)" run "removing old files from svn" \ "(test -s $TF.rmlist && cd dist && xargs $SVN rm < ../$TF.rmlist)" run "adding new files to svn" \ "(test -s $TF.addlist && cd dist && xargs $SVN --parents add < ../$TF.addlist )" url=`$RSVN info | sed -n '/^URL:/s,URL: ,,p'` info "URL = $url" run "building tag script" "(echo set -x ; echo $SVN cp $url/dist $url/$VERSION ) > tag.sh" Cd $CWD/dist run "autoreconf" "autoreconf --install --force" Cd $CWD/dist/build run "configure for testing" "env MAKE=gmake ../configure --prefix $CWD/dist/build/root" run "build and test" \ "${GMAKE} clean && ${GMAKE} && ${GMAKE} install && ${GMAKE} test" # Freebsd lacks stock gettext, so don't build it run "configure for real" "env MAKE=gmake ../configure --disable-gettext --prefix /usr" run "build for real" \ "${GMAKE} clean && ${GMAKE}" # Move over and build the source tree Cd $HEAD -run "copying xo_config.h" "(echo '/* \$FreeBSD\$ */' ; cat $CWD/dist/build/libxo/xo_config.h ) > $HEAD/lib/libxo/xo_config.h" +run "copying xo_config.h" "(echo '/* \$FreeBSD\$ */' ; cat $CWD/dist/build/libxo/xo_config.h ) > $HEAD/lib/libxo/libxo/xo_config.h" run "copying add.man" "(echo '.\\\" \$FreeBSD\$' ; cat $CWD/dist/build/libxo/add.man ) > $HEAD/lib/libxo/add.man" run "copying xohtml.sh" "(echo '#!/bin/sh' ; echo '# \$FreeBSD\$' ; cat $CWD/dist/build/xohtml/xohtml.sh ) > $HEAD/usr.bin/xohtml/xohtml.sh" #BUILDDIRS="lib/libxo usr.bin/xo" #for dir in $BUILDDIRS ; do #Cd $HEAD/$dir #run "making build dir '$dir'" "make LIBXOSRC=$CWD/dist" #done run "building the entire world" "script $MAKEOBJDIRPREFIX/out.$DATESTAMP $BUILDWORLD LIBXOSRC=$CWD/dist" # Okay, so now it all builds!! Now we can start committing.... Cd $CWD run "show svn stat for 'dist'" "$SVN stat" run "show svn diff for 'dist'" "$SVN diff --no-diff-deleted" Cd $HEAD run "show svn stat for 'head'" "$SVN stat" run "show svn diff for 'head'" "$SVN diff --no-diff-deleted" # Start committing Cd $CWD run "commit changes to 'dist'" "$SVN -m 'Import $PROJECT $VERSION' commit dist" run "show svn stat for 'dist'" "$SVN stat dist" run "show svn diff for 'dist'" "$SVN diff dist --no-diff-deleted" run "tagging repo" "$SVN cp -m 'Tag $PROJECT $VERSION' $url/dist $url/$VERSION" run "refresh libxo" "$SVN update" Cd $HEAD/contrib/$PROJECT CONTRIB=`pwd` run "copy dist to contrib" "$SVN merge --accept=postpone svn+ssh://repo.freebsd.org/base/vendor/Juniper/libxo/dist ." run "show svn stat for 'head'" "$SVN stat" run "checking merge issues" "$SVN diff --no-diff-deleted --old=svn+ssh://repo.freebsd.org/base/vendor/Juniper/libxo/dist --new=." #run "committing to contrib" "$SVN commit -m 'Import $PROJECT $VERSION'" Cd $HEAD run "show svn stat for 'head'" "$SVN stat" run "show svn diff for 'head'" "$SVN diff --no-diff-deleted" run "commit changes to 'head'" "$SVN commit" run "show svn stat for 'head'" "$SVN stat" exit 0 Index: vendor/Juniper/libxo =================================================================== --- vendor/Juniper/libxo (revision 355825) +++ vendor/Juniper/libxo (revision 355826) Property changes on: vendor/Juniper/libxo ___________________________________________________________________ Modified: svn:ignore ## -1,2 +1,6 ## -libxo-0.4.6 +libxo-1.0.2 +libxo-1.0.4 +libxo-1.1.0 +libxo-1.3.0 +libxo-1.3.1 tag.sh