6 files changed, 88 insertions, 0 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index 9a95722b43a0..362347a04c5b 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -471,6 +471,7 @@
     SUBDIR += mguesser
     SUBDIR += mi-aspell
     SUBDIR += mifluz
+    SUBDIR += miller
     SUBDIR += minised
     SUBDIR += mk-aspell
     SUBDIR += mkcatalog
diff --git a/textproc/miller/Makefile b/textproc/miller/Makefile
new file mode 100644
index 000000000000..86ca3bd9486a
--- /dev/null
+++ b/textproc/miller/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+PORTNAME=	miller
+PORTVERSION=	3.3.2
+DISTVERSIONPREFIX=v
+CATEGORIES=	textproc
+
+MAINTAINER=	jungleboogie0+mlr@gmail.com
+COMMENT=	Sed/awk/cut/join/sort for name-indexed data such as CSV
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+USES=		autoreconf libtool
+USE_GITHUB=	yes
+GH_ACCOUNT=	johnkerl
+GNU_CONFIGURE=	yes
+
+PLIST_FILES=	bin/mlr man/man1/mlr.1.gz
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+.endif
+
+post-configure:
+	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-c_Makefile
+	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-libtool
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+	${REINPLACE_CMD} -e 's|flex|${LOCALBASE}/bin/flex|' \
+		${WRKSRC}/c/dsls/Makefile
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/textproc/miller/distinfo b/textproc/miller/distinfo
new file mode 100644
index 000000000000..b7ed50aef4a4
--- /dev/null
+++ b/textproc/miller/distinfo
@@ -0,0 +1,2 @@
+SHA256 (johnkerl-miller-v3.3.2_GH0.tar.gz) = 77cbec3f41b60361ce1c7b6dd7fa4d253c7ba169db270565862f523ca965eb96
+SIZE (johnkerl-miller-v3.3.2_GH0.tar.gz) = 3205282
diff --git a/textproc/miller/files/extra-patch-c_Makefile b/textproc/miller/files/extra-patch-c_Makefile
new file mode 100644
index 000000000000..68564d6a78c4
--- /dev/null
+++ b/textproc/miller/files/extra-patch-c_Makefile
@@ -0,0 +1,30 @@
+--- c/Makefile.orig	2016-01-31 11:19:35 UTC
++++ c/Makefile
+@@ -370,7 +370,7 @@ mlr_LDADD = \
+ 			lib/libmlr.la \
+ 			dsls/libfdsl.la \
+ 			dsls/libpdsl.la \
+-			-lm
++			-lm -lc
+ 
+ 
+ # Other executable variants
+@@ -483,15 +483,15 @@ clean-noinstPROGRAMS:
+ 
+ mlr$(EXEEXT): $(mlr_OBJECTS) $(mlr_DEPENDENCIES) $(EXTRA_mlr_DEPENDENCIES) 
+ 	@rm -f mlr$(EXEEXT)
+-	$(AM_V_CCLD)$(LINK) $(mlr_OBJECTS) $(mlr_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(LINK) $(mlr_OBJECTS) $(mlr_LDADD) $(LIBS) -lc
+ 
+ mlrg$(EXEEXT): $(mlrg_OBJECTS) $(mlrg_DEPENDENCIES) $(EXTRA_mlrg_DEPENDENCIES) 
+ 	@rm -f mlrg$(EXEEXT)
+-	$(AM_V_CCLD)$(mlrg_LINK) $(mlrg_OBJECTS) $(mlrg_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(mlrg_LINK) $(mlrg_OBJECTS) $(mlrg_LDADD) $(LIBS) -lc
+ 
+ mlrp$(EXEEXT): $(mlrp_OBJECTS) $(mlrp_DEPENDENCIES) $(EXTRA_mlrp_DEPENDENCIES) 
+ 	@rm -f mlrp$(EXEEXT)
+-	$(AM_V_CCLD)$(mlrp_LINK) $(mlrp_OBJECTS) $(mlrp_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(mlrp_LINK) $(mlrp_OBJECTS) $(mlrp_LDADD) $(LIBS) -lc
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
diff --git a/textproc/miller/files/extra-patch-libtool b/textproc/miller/files/extra-patch-libtool
new file mode 100644
index 000000000000..06f6cefcb473
--- /dev/null
+++ b/textproc/miller/files/extra-patch-libtool
@@ -0,0 +1,13 @@
+--- libtool.orig	2016-01-31 11:54:21 UTC
++++ libtool
+@@ -7514,10 +7514,6 @@ func_mode_link ()
+ 	    # These systems don't actually have a C library (as such)
+ 	    test X-lc = "X$arg" && continue
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
+-	    # Do not include libc due to us having libc/libc_r.
+-	    test X-lc = "X$arg" && continue
+-	    ;;
+ 	  *-*-rhapsody* | *-*-darwin1.[012])
+ 	    # Rhapsody C and math libraries are in the System framework
+ 	    func_append deplibs " System.ltframework"
diff --git a/textproc/miller/pkg-descr b/textproc/miller/pkg-descr
new file mode 100644
index 000000000000..9d47c7c5d90f
--- /dev/null
+++ b/textproc/miller/pkg-descr
@@ -0,0 +1,7 @@
+Miller is like sed, awk, cut, join, and sort for name-indexed data such
+as CSV.
+
+With Miller you get to use named fields without needing to count
+positional indices.
+
+WWW: http://johnkerl.org/miller/doc/