From martin@kleinerdrache.org  Fri Oct 18 05:27:09 2002
Return-Path: <martin@kleinerdrache.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C2CC737B401
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Oct 2002 05:27:09 -0700 (PDT)
Received: from httpd.terions.de (static62-99-146-055.adsl.inode.at [62.99.146.55])
	by mx1.FreeBSD.org (Postfix) with SMTP id D532243E97
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 18 Oct 2002 05:27:05 -0700 (PDT)
	(envelope-from martin@kleinerdrache.org)
Received: (qmail 47755 invoked by uid 0); 18 Oct 2002 12:29:12 -0000
Message-Id: <20021018122912.47754.qmail@httpd.terions.de>
Date: 18 Oct 2002 12:29:12 -0000
From: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Reply-To: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: ImageMagick fails to build
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         44207
>Category:       ports
>Synopsis:       ImageMagick fails to build
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 18 05:30:04 PDT 2002
>Closed-Date:    Sat Oct 19 11:23:49 PDT 2002
>Last-Modified:  Tue Oct 22 04:20:03 PDT 2002
>Originator:     Martin Klaffenboeck
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD martin.kleinerdrache.org 4.7-STABLE FreeBSD 4.7-STABLE #20: Sat Oct 12 22:23:44 CEST 2002 martin@martin.kleinerdrache.org:/usr/obj/usr/src/sys/MYKERNEL i386


	
>Description:
When I try to build ImageMagick, it fails for me:

/bin/sh ../libtool --silent --mode=compile cc -DHAVE_CONFIG_H -I../ -I. -I. -I. -I.. -I../ltdl  -I/usr/local/include/freetype2 -I/usr/local/include -I/usr/X11R6/include -I/X11 -I/usr/local/include/libxml2  -O -pipe -march=pentiumpro -Wall -Wall -c -o xwindow.lo `test -f 'xwindow.c' || echo './'`xwindow.c
xwindow.c:62: redefinition of `ushort'
/usr/include/sys/types.h:56: `ushort' previously declared here
xwindow.c: In function `XInitializeWindows':
xwindow.c:4739: warning: int format, time_t arg (arg 3)
xwindow.c:4759: warning: int format, time_t arg (arg 3)
xwindow.c:4810: warning: int format, time_t arg (arg 3)
xwindow.c: In function `XMakeImage':
xwindow.c:5120: warning: int format, time_t arg (arg 3)
xwindow.c:5182: warning: int format, time_t arg (arg 3)
xwindow.c: In function `XMakePixmap':
xwindow.c:6864: warning: int format, time_t arg (arg 3)
xwindow.c: In function `XMakeStandardColormap':
xwindow.c:7044: warning: int format, time_t arg (arg 3)
xwindow.c:7482: warning: int format, time_t arg (arg 3)
gmake[2]: *** [xwindow.lo] Error 1
gmake[2]: Leaving directory `/usr/ports/graphics/ImageMagick/work/ImageMagick-5.5.1/magick'
gmake[1]: *** [all] Error 2
gmake[1]: Leaving directory `/usr/ports/graphics/ImageMagick/work/ImageMagick-5.5.1/magick'
gmake: *** [all-recursive] Error 1
*** Error code 2

Stop in /usr/ports/graphics/ImageMagick.

	
>How-To-Repeat:
cd ${PORTSDIR}/graphics/ImageMagick
make

	
>Fix:
The easyest way for me was to patch the patch file. ;-)
Here is my patch of the patch file patch-mi:

------begins after this line------
--- files/patch-mi.orig	Fri Oct 18 14:24:57 2002
+++ files/patch-mi	Fri Oct 18 14:17:27 2002
@@ -12,7 +12,7 @@
  #if defined(HasX11)
 +#if defined(HasSharedMemory)
 +#include <machine/param.h>
-+typedef unsigned short ushort;	/* needed for sys/ipc.h at the moment */
++// typedef unsigned short ushort;	/* needed for sys/ipc.h at the moment */
 +#include <sys/types.h>
 +#include <sys/ipc.h>
 +#include <sys/shm.h>
------ends before this line------



>Release-Note:
>Audit-Trail:

From: John Merryweather Cooper <john_m_cooper@yahoo.com>
To: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Cc: "FreeBSD-gnats-submit@freebsd.org" <FreeBSD-gnats-submit@freebsd.org>
Subject: Re: ports/44207: ImageMagick fails to build
Date: 18 Oct 2002 06:18:21 -0700

 On Fri, 2002-10-18 at 05:29, Martin Klaffenboeck wrote:
 > 
 > >Number:         44207
 > >Category:       ports
 
 <SNIP>
 
 I also have an identical fail to compile on 4.7-STABLE.
 
 jmc
 -- 
          _
   | |V| / '                       ||  MacroHard --                   \
 \_| | | \_,                       ||     the perfection of form over |
 ----------------------------------||     substance, marketing over   |
 Web:  http://www.borgsdemons.com  ||     performance, and greed over |
 AIM:  johnmcooper                 ||     design . . .                |
 Yahoo:  john_m_cooper             ||                                 |
 =====================================================================/
 Public Key:  http://www.borgsdemons.com/Personal/pgpkey.asc          |
 =====================================================================\
 

From: Adam Weinberger <adamw@FreeBSD.ORG>
To: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/44207: ImageMagick fails to build
Date: Fri, 18 Oct 2002 10:20:55 -0700

 This patch tests fine for me on -stable.
 
 -Adam
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Sat Oct 19 11:23:41 PDT 2002 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=44207 

From: Mikhail Teterin <mi+celsius@aldan.algebra.com>
To: <adam@vectors.cx>, FreeBSD-gnats-submit@freebsd.org
Cc: ijliao@freebsd.org, bde@freebsd.org, stephen@math.missouri.edu,
	martin.klaffenboeck@gmx.at
Subject: Re: ports/44207: ImageMagick broken on last commit
Date: Tue, 22 Oct 2002 13:13:26 +0200

 On Friday 18 October 2002 10:24 am, adam@vectors.cx wrote:
 = >Fix:
 =
 = 	Remove the typedef from the patch.
 =
 
 This will break -current, where sys/types does NOT typedef ushort :-( The 
 committed fix also introduced a style bug, by using a C++ comment... We need 
 to stop pulling the blanket between -current and -stable and come up with 
 something, that works in both until <sys/ipc.h> is fixed to not require 
 ushort.
 
 Bruce, we need guidance...
 
 	-mi
 
>Unformatted:
