diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2009-03-23 21:47:57 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2009-03-23 21:47:57 +0000 |
commit | 8006aae6f8b446ff22fcb40fbe587bc8b4ca99c9 (patch) | |
tree | b844d23c08265c6b2bc20dc1a803e92a7bfa7301 /sysutils | |
parent | - Update to 1.0.6 (diff) |
- Fix build after addition of adding getdelim(), getline()
PR: 132982
Submitted by: Florian Smeets <flo@kasimir.com>
Notes
Notes:
svn path=/head/; revision=230805
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/lookat/Makefile | 4 | ||||
-rw-r--r-- | sysutils/lookat/files/patch-getline.c | 33 | ||||
-rw-r--r-- | sysutils/lookat/files/patch-getline.h | 16 |
3 files changed, 49 insertions, 4 deletions
diff --git a/sysutils/lookat/Makefile b/sysutils/lookat/Makefile index e9a713c81d72..a84513ad752d 100644 --- a/sysutils/lookat/Makefile +++ b/sysutils/lookat/Makefile @@ -21,10 +21,6 @@ MAN1= lookat.1 .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 --git a/sysutils/lookat/files/patch-getline.c b/sysutils/lookat/files/patch-getline.c new file mode 100644 index 000000000000..90e40f6c30ca --- /dev/null +++ b/sysutils/lookat/files/patch-getline.c @@ -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 --git a/sysutils/lookat/files/patch-getline.h b/sysutils/lookat/files/patch-getline.h new file mode 100644 index 000000000000..6a2c894581fd --- /dev/null +++ b/sysutils/lookat/files/patch-getline.h @@ -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 + |