Date: Tue, 8 Oct 2002 16:03:29 +0400 (MSD) From: Maxim Maximov <mcsi@agava.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/43822: fix build of x11/props Message-ID: <200210081203.g98C3Tpr088055@ultra.domain>
next in thread | raw e-mail | index | archive | help
>Number: 43822
>Category: ports
>Synopsis: fix build of x11/props
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 08 05:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Maxim Maximov
>Release: FreeBSD 4.7-RC i386
>Organization:
>Environment:
System: FreeBSD ultra.domain 4.7-RC FreeBSD 4.7-RC #9: Fri Oct 4 12:38:44 MSD 2002 mcsi@ultra.domain:/usr/obj/usr/src/sys/ULTRA i386
>Description:
fix build of x11/props. in FreeBSD there's no point to define extern calloc/malloc with wrong return types.
>How-To-Repeat:
>Fix:
this patch is cumulative. the file has already been patched for other issues.
--- l10n_read.c.orig Sat Nov 8 04:21:25 1997
+++ l10n_read.c Tue Oct 8 15:59:40 2002
@@ -18,15 +18,16 @@
#include "l10n_props.h"
-#define MAX_LINE_LENGTH 256
+#define MAX_LINE_LENGTH 2560
#define NAME_SEPARATOR '='
#define FIELD_SEPARATOR '|'
#define ITEM_SEPARATOR ';'
-
+#ifndef __FreeBSD__
extern char *malloc();
extern char *calloc();
+#endif
/*
@@ -72,8 +73,9 @@
/*
* Find path for localization configuration files under
* $OPENWINHOME/share/locale/<locale>/props
+ * $OPENWINHOME/lib/X11/locale/<locale>/props
*/
- sprintf(fullpath, "%s/share/locale/%s/props/%s",
+ sprintf(fullpath, "%s/lib/X11/locale/%s/props/%s",
getenv("OPENWINHOME"), locale, file_name);
if ((config_file = fopen(fullpath, "r")) == NULL)
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210081203.g98C3Tpr088055>