diff options
author | Rong-En Fan <rafan@FreeBSD.org> | 2009-03-21 17:26:35 +0000 |
---|---|---|
committer | Rong-En Fan <rafan@FreeBSD.org> | 2009-03-21 17:26:35 +0000 |
commit | 4f810983a2c308961f39b5e060795f92ffc997f7 (patch) | |
tree | 73ded01169a254c59a17fe0012951dd870889cf1 | |
parent | - Add support for Xft and UTF-8 (optional) (diff) |
- Fix build after strndup(3) MFC
PR: ports/132014
Submitted by: Florian Smeets <flo at kasimir.com>
Approved by: maintainer timeout (1 month)
Notes
Notes:
svn path=/head/; revision=230591
-rw-r--r-- | ftp/omi/Makefile | 8 | ||||
-rw-r--r-- | ftp/omi/files/patch-utils.c | 21 | ||||
-rw-r--r-- | ftp/omi/files/patch-utils.h | 21 |
3 files changed, 43 insertions, 7 deletions
diff --git a/ftp/omi/Makefile b/ftp/omi/Makefile index a2b74033450a..d3458e26c8d5 100644 --- a/ftp/omi/Makefile +++ b/ftp/omi/Makefile @@ -33,10 +33,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/BSD-COPYRIGHT ${DOCSDIR}/ .endif -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 800058 || (${OSVERSION} >= 701101 && ${OSVERSION} < 800000) -BROKEN= does not build -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/ftp/omi/files/patch-utils.c b/ftp/omi/files/patch-utils.c new file mode 100644 index 000000000000..15134cf604aa --- /dev/null +++ b/ftp/omi/files/patch-utils.c @@ -0,0 +1,21 @@ +--- utils/utils.c.orig 2009-02-23 16:51:16.000000000 +0100 ++++ utils/utils.c 2009-02-23 16:53:54.000000000 +0100 +@@ -31,6 +31,9 @@ + return (mem); + } + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100 + char *strndup (const char *src, int num) + { + char *dst; +@@ -40,6 +43,8 @@ + dst[num] = '\0'; + return (strncpy(dst, src, num)); + } ++#endif ++#endif + + char *justify (char *str) + { diff --git a/ftp/omi/files/patch-utils.h b/ftp/omi/files/patch-utils.h new file mode 100644 index 000000000000..d1cdbb0ce71a --- /dev/null +++ b/ftp/omi/files/patch-utils.h @@ -0,0 +1,21 @@ +--- utils/utils.h.orig 2009-02-23 16:51:20.000000000 +0100 ++++ utils/utils.h 2009-02-23 16:54:21.000000000 +0100 +@@ -42,6 +42,9 @@ + * allocated. + */ + ++#if defined(__FreeBSD__) ++#include <osreldate.h> ++#if __FreeBSD_version <= 800057 && __FreeBSD_version > 800000 || __FreeBSD_version <= 701100 + char *strndup (const char *src, int num); + /* + * Like strdup(), but limits the string length to at most +@@ -50,6 +53,8 @@ + * Always allocates <num>+1 bytes, even if less space would + * be sufficient to store <src>. + */ ++#endif ++#endif + + char *justify (char *str); + /* |