From mcsi@agava.com  Tue Oct  8 05:02:01 2002
Return-Path: <mcsi@agava.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 60AC137B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Oct 2002 05:02:01 -0700 (PDT)
Received: from relay2.agava.net.ru (ofc.agava.net [195.161.118.6])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4B2F443E77
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Oct 2002 05:01:59 -0700 (PDT)
	(envelope-from mcsi@agava.com)
Received: from ultra.domain (ultra.domain [192.168.1.58])
	by relay2.agava.net.ru (Postfix) with ESMTP id AB04947729D
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  8 Oct 2002 16:01:54 +0400 (MSD)
Received: from ultra.domain (localhost [127.0.0.1])
	by ultra.domain (8.12.6/8.12.5) with ESMTP id g98C3TJI088056
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 8 Oct 2002 16:03:29 +0400 (MSD)
	(envelope-from mcsi@ultra.domain)
Received: (from root@localhost)
	by ultra.domain (8.12.6/8.12.6/Submit) id g98C3Tpr088055;
	Tue, 8 Oct 2002 16:03:29 +0400 (MSD)
Message-Id: <200210081203.g98C3Tpr088055@ultra.domain>
Date: Tue, 8 Oct 2002 16:03:29 +0400 (MSD)
From: Maxim Maximov <mcsi@agava.com>
Reply-To: Maxim Maximov <mcsi@agava.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: fix build of x11/props
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         43822
>Category:       ports
>Synopsis:       fix build of x11/props
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 08 05:10:01 PDT 2002
>Closed-Date:    Tue Oct 22 14:54:01 PDT 2002
>Last-Modified:  Tue Oct 22 14:54:01 PDT 2002
>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:
State-Changed-From-To: open->closed 
State-Changed-By: adamw 
State-Changed-When: Tue Oct 22 14:53:07 PDT 2002 
State-Changed-Why:  
Didn't notice this PR when I made this commit pursuant to PR 43643. 

-Adam 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43822 
>Unformatted:
