FreeBSD Port: ImageMagick

[Drew Broadley]

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>