Date: Tue, 18 Apr 2006 11:20:54 +0300 From: "Ion-Mihai "IOnut" Tetcu" <itetcu@people.tecnik93.com> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/95986: [PATCH] sysutils/multitail: update to 4.0.1 Message-ID: <1145348454.89016@it.buh.tecnik93.com> Resent-Message-ID: <200604180830.k3I8ULdP028077@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95986
>Category: ports
>Synopsis: [PATCH] sysutils/multitail: update to 4.0.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 18 08:30:20 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Ion-Mihai "IOnut" Tetcu
>Release: FreeBSD 6.1-PRERELEASE i386
>Organization:
Tecnik'93
>Environment:
System: FreeBSD 6.1-PRERELEASE #2: Fri Mar 31 13:08:13 EEST 2006
root@it.buh.tecnik93.com:/usr/obj/usr/src/sys/IT6_U_P
>Description:
Update to 4.0.1:
-added e-patch-config.c and e-patch-cv.c (which should be placed in ./files) to fix buildon 4.x
-change log at: http://www.vanheusden.com/multitail/changelog.html#stable
Drop USE_RENPLACE while here.
Tinderbox'ed: http://sce-tindy.tecnik93.com/tb-exp/index.php?action=describe_port&id=276
>How-To-Repeat:
>Fix:
--- multitail.diff begins here ---
? files
? multitail.diff
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/multitail/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile 27 Mar 2006 18:18:50 -0000 1.50
+++ Makefile 18 Apr 2006 08:17:02 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= multitail
-PORTVERSION= 3.8.10
+PORTVERSION= 4.0.1
CATEGORIES= sysutils
MASTER_SITES= http://www.vanheusden.com/multitail/
EXTRACT_SUFX= .tgz
@@ -14,11 +14,16 @@
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 @@
${INSTALL_DATA} ${WRKSRC}/license.txt ${DOCSDIR}
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/sysutils/multitail/distinfo,v
retrieving revision 1.49
diff -u -r1.49 distinfo
--- distinfo 27 Mar 2006 18:18:50 -0000 1.49
+++ distinfo 18 Apr 2006 08:17:02 -0000
@@ -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.1.tgz) = 297e3b0026499cf3091e9b7c654b9d19
+SHA256 (multitail-4.0.1.tgz) = d724a5f4696c2f220df9d9701eb46fee747f9e5cb846b3414e4f7affdacf80c3
+SIZE (multitail-4.0.1.tgz) = 123628
--- multitail.diff ends here ---
--- e-patch-config.c begins here ---
--- ./config.c.orig Tue Apr 18 11:10:04 2006
+++ ./config.c Tue Apr 18 11:11:01 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);
--- e-patch-config.c ends here ---
--- e-patch-cv.c begins here ---
--- ./cv.c.orig Tue Apr 18 11:09:59 2006
+++ ./cv.c Tue Apr 18 11:10: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];
--- e-patch-cv.c ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1145348454.89016>