From monkey@vectors.cx  Thu Oct  3 17:39:40 2002
Return-Path: <monkey@vectors.cx>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C9EBE37B404
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  3 Oct 2002 17:39:40 -0700 (PDT)
Received: from vectors.cx (manifold.vectors.cx [64.163.147.229])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5DC6743E7B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  3 Oct 2002 17:39:40 -0700 (PDT)
	(envelope-from monkey@vectors.cx)
Received: from vectors.cx (c3efd3f8f8f7ea7efce13243117af60a@localhost [127.0.0.1])
	by vectors.cx (8.12.6/8.12.4) with ESMTP id g940eZho006527
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 3 Oct 2002 17:40:35 -0700 (PDT)
	(envelope-from monkey@vectors.cx)
Received: (from monkey@localhost)
	by vectors.cx (8.12.6/8.12.6/Submit) id g940eZBG006526;
	Thu, 3 Oct 2002 17:40:35 -0700 (PDT)
	(envelope-from monkey)
Message-Id: <200210040040.g940eZBG006526@vectors.cx>
Date: Thu, 3 Oct 2002 17:40:35 -0700 (PDT)
From: <adam@vectors.cx>
Reply-To: <adam@vectors.cx>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] fix x11/props - *alloc-related build breakage
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         43643
>Category:       ports
>Synopsis:       [patch] fix x11/props - *alloc-related build breakage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    adamw
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 03 17:40:02 PDT 2002
>Closed-Date:    Mon Oct 21 17:43:54 PDT 2002
>Last-Modified:  Mon Oct 21 17:43:54 PDT 2002
>Originator:     
>Release:        FreeBSD 4.7-RC i386
>Organization:
>Environment:
System: FreeBSD smacky.vectors.cx 4.7-RC FreeBSD 4.7-RC #27: Wed Oct 2 13:15:44 PDT 2002 root@smacky.vectors.cx:/usr/src/sys/compile/smacky i386


	
>Description:
	as per http://bento.freebsd.org/errorlogs/4-latest/props-1.0.log, the
	build of x11/props is busted, due to an *alloc clash.

	provided is a patch for one of the patches.
	
>How-To-Repeat:
	
>Fix:

	

	patch that patches the patch to patch the *alloc clash. full of patchy
	goodness.

--- props.patch.patch.patch begins here ---
--- x11/props/files/patch-ab.orig	Thu Oct  3 17:32:10 2002
+++ x11/props/files/patch-ab	Thu Oct  3 17:32:20 2002
@@ -1,6 +1,6 @@
---- l10n_read.c.orig	Sat Nov  8 01:21:25 1997
-+++ l10n_read.c	Sun Nov  9 01:44:10 1997
-@@ -18,7 +18,7 @@
+--- l10n_read.c.orig	Fri Nov  7 17:21:25 1997
++++ l10n_read.c	Thu Oct  3 17:30:45 2002
+@@ -18,15 +18,17 @@
  #include	"l10n_props.h"
  
  
@@ -9,7 +9,17 @@
  
  #define	NAME_SEPARATOR		'='
  #define	FIELD_SEPARATOR		'|'
-@@ -72,8 +72,9 @@
+ #define	ITEM_SEPARATOR		';'
+ 
+ 
++#ifndef __FreeBSD__
+ extern char	*malloc();
+ extern char	*calloc();
++#endif
+ 
+ 
+ /*
+@@ -72,8 +74,9 @@
  	/*  
  	 * Find path for localization configuration files under
  	 * $OPENWINHOME/share/locale/<locale>/props
--- props.patch.patch.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->adamw 
Responsible-Changed-By: adamw 
Responsible-Changed-When: Sat Oct 19 15:07:36 PDT 2002 
Responsible-Changed-Why:  
I'll take this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43643 
State-Changed-From-To: open->closed 
State-Changed-By: adamw 
State-Changed-When: Mon Oct 21 17:43:35 PDT 2002 
State-Changed-Why:  
Committed, thanks! 

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