From owner-freebsd-ports@FreeBSD.ORG  Sat Jun 12 06:15:50 2004
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 27A1F16A4CE
	for <ports@freebsd.org>; Sat, 12 Jun 2004 06:15:50 +0000 (GMT)
Received: from mail.corrupt.co.nz (222-152-14-69.jetstream.xtra.co.nz
	[222.152.14.69])	by mx1.FreeBSD.org (Postfix) with SMTP id 9FF4143D49
	for <ports@freebsd.org>; Sat, 12 Jun 2004 06:15:48 +0000 (GMT)
	(envelope-from drew@corrupt.co.nz)
Received: (qmail 91240 invoked by uid 1011); 12 Jun 2004 06:15:49 -0000
Received: from drew@corrupt.co.nz by tweety.lan.corrupt.co.nz by uid 1009 with
	qmail-scanner-1.22 Clear:RC:0(202.36.205.29):SA:0(0.0/3.8):. 
	Processed in 8.05461 secs); 12 Jun 2004 06:15:49 -0000
X-Spam-Status: No, hits=0.0 required=3.8
Received: from 202.36.205.29.dts.net.nz (HELO ?10.10.69.142?)
	(drew@corrupt.co.nz@202.36.205.29)
	by mail.corrupt.co.nz with SMTP; 12 Jun 2004 06:15:40 -0000
Message-ID: <40CA9F5D.4080006@corrupt.co.nz>
Date: Sat, 12 Jun 2004 18:14:53 +1200
From: Drew Broadley <drew@corrupt.co.nz>
User-Agent: Mozilla Thunderbird 0.6 (X11/20040606)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Drew Broadley <drew@corrupt.co.nz>
References: <40CA9E89.9060706@corrupt.co.nz>
In-Reply-To: <40CA9E89.9060706@corrupt.co.nz>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
cc: ports@freebsd.org
Subject: Re: FreeBSD Port: ImageMagick
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Jun 2004 06:15:50 -0000

Drew Broadley wrote:

> Error building (after I fixed the error in fetching)
>
>
> if /bin/sh ../libtool --silent --mode=compile cc -DHAVE_CONFIG_H -I../ 
> -I. -I. -I. -I.. -I../ltdl -I.. -I.. -I../ltdl  
> -I/usr/local/include/freetype2 -I/usr/local/include 
> -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11 
> -I/usr/local/include/libxml2  -O -pipe -mcpu=pentiumpro -Wall -MT 
> xwindow.lo -MD -MP -MF ".deps/xwindow.Tpo" -c -o xwindow.lo xwindow.c; \
> then mv -f ".deps/xwindow.Tpo" ".deps/xwindow.Plo"; else rm -f 
> ".deps/xwindow.Tpo"; exit 1; fi
> xwindow.c:78: redefinition of `ushort'
> /usr/include/sys/types.h:56: `ushort' previously declared here
> gmake[2]: *** [xwindow.lo] Error 1
> gmake[2]: Leaving directory 
> `/usr/ports/graphics/ImageMagick/work/ImageMagick-6.0.2/magick'
> gmake[1]: *** [all] Error 2
> gmake[1]: Leaving directory 
> `/usr/ports/graphics/ImageMagick/work/ImageMagick-6.0.2/magick'
> gmake: *** [all-recursive] Error 1
> *** Error code 2
>
> Stop in /usr/ports/graphics/ImageMagick.


Fix:

 > diff -u magick/xwindow.c.old magick/xwindow.c
--- magick/xwindow.c.old        Sat Jun 12 18:14:26 2004
+++ magick/xwindow.c    Sat Jun 12 18:13:56 2004
@@ -74,9 +74,11 @@
 #if defined(HAVE_MACHINE_PARAM_H)
 # include <machine/param.h>
 #endif
+/*
 #if __FreeBSD__ >= 5
   typedef unsigned short ushort;
 #endif
+*/
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <X11/extensions/XShm.h>