5 files changed, 52 insertions, 8 deletions

diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile
index d33c39dd6c2a..a91f772291c5 100644
--- a/lib/libxo/Makefile
+++ b/lib/libxo/Makefile
@@ -114,4 +114,6 @@ MLINKS=	xo_attr.3 xo_attr_h.3 \
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
+SUBDIR = encoder
+
 .include <bsd.lib.mk>
diff --git a/lib/libxo/add.man b/lib/libxo/add.man
index 42e0217c5f05..85b635ca1539 100644
--- a/lib/libxo/add.man
+++ b/lib/libxo/add.man
@@ -3,10 +3,10 @@
 .Fx
 uses
 .Nm libxo
-version 1.0.4.
+version 1.3.0.
 Complete documentation can be found on github:
 .Bd -literal -offset indent
-http://juniper.github.io/libxo/1.0.4/libxo\-manual.html
+https://juniper.github.io/libxo/1.3.0/html/index.html
 .Ed
 .Pp
 .Nm libxo
diff --git a/lib/libxo/encoder/Makefile b/lib/libxo/encoder/Makefile
new file mode 100644
index 000000000000..4707dd917c08
--- /dev/null
+++ b/lib/libxo/encoder/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+SHLIBDIR?=      /lib
+
+.include <src.opts.mk>
+
+PACKAGE=	runtime
+
+LIBXOSRC=	${SRCTOP}/contrib/libxo
+
+SUBDIR = csv
+
+.include <bsd.subdir.mk>
diff --git a/lib/libxo/encoder/csv/Makefile b/lib/libxo/encoder/csv/Makefile
new file mode 100644
index 000000000000..bd5ce912fa05
--- /dev/null
+++ b/lib/libxo/encoder/csv/Makefile
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+LIBXODIR=       ${STAGEDIR}${PREFIX}/usr/lib/libxo/encoder
+SHLIBDIR?=      ${LIBXODIR}
+LIBDIR?=      ${LIBXODIR}
+
+.include <src.opts.mk>
+
+PACKAGE=	runtime
+
+LIBXOSRC=	${SRCTOP}/contrib/libxo
+
+.PATH:	${LIBXOSRC}/encoder/csv
+
+LIB=	enc_csv
+SHLIB_MAJOR=0
+
+SRCS=	enc_csv.c
+
+CFLAGS+=-I${LIBXOSRC}/libxo -I${.CURDIR}
+CFLAGS+=-DXO_ENCODERDIR=\"/usr/lib/libxo/encoder\"
+
+LIBADD=	util xo
+
+WARNS?= 5
+
+SYMLINKS+=      ${SHLIB_NAME} ${LIBXODIR}/csv.enc
+
+.include <bsd.lib.mk>
diff --git a/lib/libxo/xo_config.h b/lib/libxo/xo_config.h
index 33b29a0f906c..ed4cd0496940 100644
--- a/lib/libxo/xo_config.h
+++ b/lib/libxo/xo_config.h
@@ -183,16 +183,16 @@
 /* #undef LIBXO_TEXT_ONLY */
 
 /* Version number as dotted value */
-#define LIBXO_VERSION "1.0.4"
+#define LIBXO_VERSION "1.3.0"
 
 /* Version number extra information */
 #define LIBXO_VERSION_EXTRA ""
 
 /* Version number as a number */
-#define LIBXO_VERSION_NUMBER 1000004
+#define LIBXO_VERSION_NUMBER 1003000
 
 /* Version number as string */
-#define LIBXO_VERSION_STRING "1000004"
+#define LIBXO_VERSION_STRING "1003000"
 
 /* Enable local wcwidth implementation */
 #define LIBXO_WCWIDTH 1
@@ -210,7 +210,7 @@
 #define PACKAGE_NAME "libxo"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxo 1.0.4"
+#define PACKAGE_STRING "libxo 1.3.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxo"
@@ -219,7 +219,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.4"
+#define PACKAGE_VERSION "1.3.0"
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
@@ -236,7 +236,7 @@
 /* #undef USE_INT_RETURN_CODES */
 
 /* Version number of package */
-#define VERSION "1.0.4"
+#define VERSION "1.3.0"
 
 /* Retain hash bucket size */
 /* #undef XO_RETAIN_SIZE */