aboutsummaryrefslogtreecommitdiff
path: root/textproc/miller
diff options
context:
space:
mode:
authorJimmy Olgeni <olgeni@FreeBSD.org>2017-06-26 13:45:06 +0000
committerJimmy Olgeni <olgeni@FreeBSD.org>2017-06-26 13:45:06 +0000
commit58cd00f423cc61c57c250fb89fdba3270ddd3e65 (patch)
tree96ad594b3a66e45349d6235bc5731899bb495282 /textproc/miller
parent5cfa4ca99e546b5e6f8d6ea4e758a0b2333d175c (diff)
Notes
Diffstat (limited to 'textproc/miller')
-rw-r--r--textproc/miller/Makefile6
-rw-r--r--textproc/miller/distinfo5
-rw-r--r--textproc/miller/files/extra-patch-c_Makefile30
-rw-r--r--textproc/miller/files/extra-patch-libtool13
4 files changed, 4 insertions, 50 deletions
diff --git a/textproc/miller/Makefile b/textproc/miller/Makefile
index 1412541c0127..1369d63d521a 100644
--- a/textproc/miller/Makefile
+++ b/textproc/miller/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= miller
-PORTVERSION= 3.3.2
+PORTVERSION= 5.2.1
DISTVERSIONPREFIX=v
CATEGORIES= textproc
@@ -20,8 +20,4 @@ PLIST_FILES= bin/mlr man/man1/mlr.1.gz
BROKEN_aarch64= Fails to compile: undefined reference to .mcount
-post-configure:
- ${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-c_Makefile
- ${PATCH} -d ${PATCH_WRKSRC} ${PATCH_ARGS} < ${FILESDIR}/extra-patch-libtool
-
.include <bsd.port.mk>
diff --git a/textproc/miller/distinfo b/textproc/miller/distinfo
index b7ed50aef4a4..c63960a90ded 100644
--- a/textproc/miller/distinfo
+++ b/textproc/miller/distinfo
@@ -1,2 +1,3 @@
-SHA256 (johnkerl-miller-v3.3.2_GH0.tar.gz) = 77cbec3f41b60361ce1c7b6dd7fa4d253c7ba169db270565862f523ca965eb96
-SIZE (johnkerl-miller-v3.3.2_GH0.tar.gz) = 3205282
+TIMESTAMP = 1497938440
+SHA256 (johnkerl-miller-v5.2.1_GH0.tar.gz) = 0160e5fbbff7c3606037b616b5e30a714d16bb160a950d51fde112fca9d6a763
+SIZE (johnkerl-miller-v5.2.1_GH0.tar.gz) = 5020833
diff --git a/textproc/miller/files/extra-patch-c_Makefile b/textproc/miller/files/extra-patch-c_Makefile
deleted file mode 100644
index 68564d6a78c4..000000000000
--- a/textproc/miller/files/extra-patch-c_Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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
deleted file mode 100644
index 06f6cefcb473..000000000000
--- a/textproc/miller/files/extra-patch-libtool
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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"