Date: Mon, 23 Mar 2009 20:12:11 +0100 (CET) From: Florian Smeets <flo@kasimir.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/132982: [PATCH] sysutils/lookat: [SUMMARIZE CHANGES] Message-ID: <20090323191211.3A8203F4EA@mail.solomo.de> Resent-Message-ID: <200903231920.n2NJK2fq081862@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 132982
>Category: ports
>Synopsis: [PATCH] sysutils/lookat: [SUMMARIZE CHANGES]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 23 19:20:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Florian Smeets
>Release: FreeBSD 7.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD mail.solomo.de 7.1-STABLE FreeBSD 7.1-STABLE #6: Sun Mar 1 16:30:44 CET
>Description:
- fix after addition of adding getdelim(), getline()
Added file(s):
- files/patch-getline.c
- files/patch-getline.h
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- lookat-1.4.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/lookat.orig/Makefile /usr/ports/sysutils/lookat/Makefile
--- /usr/ports/sysutils/lookat.orig/Makefile 2009-03-19 19:44:29.000000000 +0100
+++ /usr/ports/sysutils/lookat/Makefile 2009-03-23 20:08:54.000000000 +0100
@@ -21,10 +21,6 @@
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 800067
-BROKEN= does not compile
-.endif
-
post-patch:
@${REINPLACE_CMD} -e \
's|/etc/lookat.conf|${PREFIX}/etc/lookat.conf|g' ${WRKSRC}/${PORTNAME}.1
diff -ruN --exclude=CVS /usr/ports/sysutils/lookat.orig/files/patch-getline.c /usr/ports/sysutils/lookat/files/patch-getline.c
--- /usr/ports/sysutils/lookat.orig/files/patch-getline.c 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/sysutils/lookat/files/patch-getline.c 2009-03-23 20:08:11.000000000 +0100
@@ -0,0 +1,33 @@
+--- ./getline.c.orig 2009-03-23 18:42:33.000000000 +0000
++++ ./getline.c 2009-03-23 19:03:49.000000000 +0000
+@@ -45,7 +45,15 @@
+ }
+
+ #else /* ! have getdelim */
++
++#if defined(__FreeBSD__)
++#include <osreldate.h>
++#if __FreeBSD_version <= 800066
+ int
++#else
++ssize_t
++#endif
++#endif
+ getdelim (lineptr, n, delimiter, stream);
+
+ # include <assert.h>
+@@ -150,7 +158,14 @@
+ return getstr (lineptr, n, stream, '\n', 0);
+ }
+
++#if defined(__FreeBSD__)
++#include <osreldate.h>
++#if __FreeBSD_version <= 800066
+ int
++#else
++ssize_t
++#endif
++#endif
+ getdelim (lineptr, n, delimiter, stream)
+ char **lineptr;
+ size_t *n;
diff -ruN --exclude=CVS /usr/ports/sysutils/lookat.orig/files/patch-getline.h /usr/ports/sysutils/lookat/files/patch-getline.h
--- /usr/ports/sysutils/lookat.orig/files/patch-getline.h 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/sysutils/lookat/files/patch-getline.h 2009-03-23 20:08:11.000000000 +0100
@@ -0,0 +1,16 @@
+--- ./getline.h.orig 2009-03-23 18:40:41.000000000 +0000
++++ ./getline.h 2009-03-23 18:40:20.000000000 +0000
+@@ -36,8 +36,13 @@
+ int
+ getline PARAMS ((char **_lineptr, size_t *_n, FILE *_stream));
+
++#if defined(__FreeBSD__)
++#include <osreldate.h>
++#if __FreeBSD_version <= 800066
+ int
+ getdelim PARAMS ((char **_lineptr, size_t *_n, int _delimiter, FILE *_stream));
++#endif
++#endif
+
+ # endif
+
--- lookat-1.4.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090323191211.3A8203F4EA>