From owner-freebsd-ports Tue Oct 8 5:10: 7 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9C42337B401 for ; Tue, 8 Oct 2002 05:10:03 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D081543E81 for ; Tue, 8 Oct 2002 05:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g98CA1Co057789 for ; Tue, 8 Oct 2002 05:10:01 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g98CA16u057788; Tue, 8 Oct 2002 05:10:01 -0700 (PDT) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 60AC137B401 for ; 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 ; 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 ; 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 ; 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 Reply-To: Maxim Maximov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/43822: fix build of x11/props Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >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//props + * $OPENWINHOME/lib/X11/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