aboutsummaryrefslogtreecommitdiff
path: root/sysutils/multitail
diff options
context:
space:
mode:
authorOliver Braun <obraun@FreeBSD.org>2006-04-30 16:30:08 +0000
committerOliver Braun <obraun@FreeBSD.org>2006-04-30 16:30:08 +0000
commitef8c94bbd00e3cfe5961812a604906c53884259e (patch)
treefd939f94b5e602c38015f649713a907fa92b4b60 /sysutils/multitail
parentfd092d0ec061dcf1991745757cb0bff9c8b9b760 (diff)
downloadports-ef8c94bbd00e3cfe5961812a604906c53884259e.tar.gz
ports-ef8c94bbd00e3cfe5961812a604906c53884259e.zip
* Upgrade to 4.0.3.
* Remove USE_REINPLACE (1) * Fix Build on 4.x. (1) PR: ports/95986 (1) Submitted by: Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com> (1)
Notes
Notes: svn path=/head/; revision=160923
Diffstat (limited to 'sysutils/multitail')
-rw-r--r--sysutils/multitail/Makefile11
-rw-r--r--sysutils/multitail/distinfo6
-rw-r--r--sysutils/multitail/files/extra-patch-config.c10
-rw-r--r--sysutils/multitail/files/extra-patch-cv.c10
4 files changed, 31 insertions, 6 deletions
diff --git a/sysutils/multitail/Makefile b/sysutils/multitail/Makefile
index 4769db9e7fd1..02a6489e7a45 100644
--- a/sysutils/multitail/Makefile
+++ b/sysutils/multitail/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= multitail
-PORTVERSION= 3.8.10
+PORTVERSION= 4.0.3
CATEGORIES= sysutils
MASTER_SITES= http://www.vanheusden.com/multitail/
EXTRACT_SUFX= .tgz
@@ -14,11 +14,16 @@ EXTRACT_SUFX= .tgz
MAINTAINER= obraun@FreeBSD.org
COMMENT= Tail multiple files on console with ncurses
-USE_REINPLACE= yes
USE_GMAKE= yes
MAN1= multitail.1
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES= ${FILESDIR}/e-patch-config.c ${FILESDIR}/e-patch-cv.c
+.endif
+
post-patch:
@${REINPLACE_CMD} -e '/^CC/d ; s/^CFLAGS=/CFLAGS+=/' ${WRKSRC}/Makefile
@${REINPLACE_CMD} -e 's,/etc/multitail.conf,${PREFIX}/etc/multitail.conf,' \
@@ -34,4 +39,4 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/multitail/distinfo b/sysutils/multitail/distinfo
index 50d7ae4ff8f2..7e2beab93405 100644
--- a/sysutils/multitail/distinfo
+++ b/sysutils/multitail/distinfo
@@ -1,3 +1,3 @@
-MD5 (multitail-3.8.10.tgz) = 1b4cb6288298fe61c4c5147b50bfd48d
-SHA256 (multitail-3.8.10.tgz) = f99b77805a96bee639f1a9b39704156b9d1bf75feb9cc32c3218853dee817f67
-SIZE (multitail-3.8.10.tgz) = 82860
+MD5 (multitail-4.0.3.tgz) = b6017e19aa7cf7e2b4fddd75a596a1a7
+SHA256 (multitail-4.0.3.tgz) = 6d74ba52b96f68007fb9598ca9d13ca8e02ab4deec413213243ce2e30698d50c
+SIZE (multitail-4.0.3.tgz) = 123820
diff --git a/sysutils/multitail/files/extra-patch-config.c b/sysutils/multitail/files/extra-patch-config.c
new file mode 100644
index 000000000000..42d9ed845221
--- /dev/null
+++ b/sysutils/multitail/files/extra-patch-config.c
@@ -0,0 +1,10 @@
+--- config.c.orig Tue Apr 18 15:54:34 2006
++++ config.c Sun Apr 30 18:19:00 2006
+@@ -40,6 +40,7 @@
+ long long int kb_str_to_value(char *field, char *str)
+ {
+ char *mult;
++ #define atoll(a) strtoll((a), (char **)NULL, 10)
+ long long int bytes = atoll(str);
+ if (bytes < -1)
+ error_exit("%s: value cannot be < -1\n", field);
diff --git a/sysutils/multitail/files/extra-patch-cv.c b/sysutils/multitail/files/extra-patch-cv.c
new file mode 100644
index 000000000000..197903aab522
--- /dev/null
+++ b/sysutils/multitail/files/extra-patch-cv.c
@@ -0,0 +1,10 @@
+--- cv.c.orig Tue Apr 18 15:54:34 2006
++++ cv.c Sun Apr 30 18:20:44 2006
+@@ -81,6 +81,7 @@
+
+ case CONVTYPE_DECTOHEX:
+ {
++ #define atoll(a) strtoll((a), (char **)NULL, 10)
+ long long int result = atoll(what);
+ char result_str[128];
+