NetBSD Problem Report #44015

From www@NetBSD.org  Sat Oct 30 11:38:15 2010
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 89E9663B942
	for <gnats-bugs@gnats.NetBSD.org>; Sat, 30 Oct 2010 11:38:15 +0000 (UTC)
Message-Id: <20101030113815.1EB1A63B873@www.NetBSD.org>
Date: Sat, 30 Oct 2010 11:38:15 +0000 (UTC)
From: tuxillo@dragonflybsd.org
Reply-To: tuxillo@dragonflybsd.org
To: gnats-bugs@NetBSD.org
Subject: x11/modular-xorg-server fails to build
X-Send-Pr-Version: www-1.0

>Number:         44015
>Category:       pkg
>Synopsis:       x11/modular-xorg-server fails to build
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    dfly-pkg-people
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Oct 30 11:40:01 +0000 2010
>Closed-Date:    Sun Oct 31 23:50:33 +0000 2010
>Last-Modified:  Sun Oct 31 23:50:33 +0000 2010
>Originator:     Antonio Huete Jimenez
>Release:        N/A
>Organization:
DragonFlyBSD
>Environment:
DragonFly dfbsdx86 2.9-DEVELOPMENT DragonFly v2.9.0.87.g01741-DEVELOPMENT #5: Sat Oct 30 01:59:03 CEST 2010     antonioh@dfbsdx86:/usr/obj/home/source/dfbsd/sys/GENERIC_SMP  i386

>Description:
After changing the location of mouse.h from machine/mouse.h to sys/mouse.h, Xorg build don't find that header thus failing to build.
>How-To-Repeat:
Simply make the package under DFBSD 2.9
>Fix:
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index c9df377..29c6677 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -4,6 +4,7 @@ SHA1 (xorg-server-1.6.5.tar.bz2) = c57c80dd15d3ca492e58ae993b9015d085ec6ea6
 RMD160 (xorg-server-1.6.5.tar.bz2) = 702970358a5643dbc9205f42e39c5b8ed2ff845a
 Size (xorg-server-1.6.5.tar.bz2) = 4678406 bytes
 SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0
+SHA1 (patch-ac) = e9eb4c4729fd5832c3a3f25dac4cba7d445de680
 SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908
 SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007
 SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
diff --git a/x11/modular-xorg-server/patches/patch-ac b/x11/modular-xorg-server/patches/patch-ac
new file mode 100644
index 0000000..770d3ef
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-ac
@@ -0,0 +1,11 @@
+--- hw/xfree86/os-support/xf86_OSlib.h.orig    2010-10-30 02:24:29 +0200
++++ hw/xfree86/os-support/xf86_OSlib.h 2010-10-30 02:25:03 +0200
+@@ -346,7 +346,7 @@
+ #    include <dev/wscons/wsdisplay_usl_io.h>
+ #   endif /* WSCONS_SUPPORT */
+ #   if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+-#    if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)
++#    if (defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)) || (defined(__DragonFly_version) && (__DragonFl
+ #     include <sys/mouse.h>
+ #    else
+ #     undef MOUSE_GETINFO

>Release-Note:

>Audit-Trail:
From: =?ISO-8859-1?Q?Antonio_Huete_Jim=E9nez?= <ahuete.devel@gmail.com>
To: gnats-bugs@NetBSD.org
Cc: gnats-admin@NetBSD.org
Subject: Re: pkg/44015: x11/modular-xorg-server fails to build
Date: Sat, 30 Oct 2010 13:50:20 +0200

 Hi,

 The patch is mispasted due line wrapping foo. You can find it here:

 http://leaf.dragonflybsd.org/~tuxillo/archive/patches/0001-x11-modular-xorg-server-Fix-a-header-location-change.patch

 Cheers,
 Antonio Huete

 On 10/30/10 13:40, gnats-admin@NetBSD.org wrote:
 > Thank you very much for your problem report.
 > It has the internal identification `pkg/44015'.
 > The individual assigned to look at your
 > report is: pkg-manager.
 >
 >> Category:       pkg
 >> Responsible:    pkg-manager
 >> Synopsis:       x11/modular-xorg-server fails to build
 >> Arrival-Date:   Sat Oct 30 11:40:01 +0000 2010

Responsible-Changed-From-To: pkg-manager->dragonfly-pkg-people
Responsible-Changed-By: hauke@NetBSD.org
Responsible-Changed-When: Sat, 30 Oct 2010 16:38:34 +0000
Responsible-Changed-Why:
A Dragonfly issue.


Responsible-Changed-From-To: dragonfly-pkg-people->dfly-pkg-people
Responsible-Changed-By: hauke@NetBSD.org
Responsible-Changed-When: Sat, 30 Oct 2010 23:07:19 +0000
Responsible-Changed-Why:
Over to dragonfly people, this time.
Can we make dragonfly-pkg-people an alias to dfly-pkg-people, to protect the innocent?


State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Sun, 31 Oct 2010 23:50:33 +0000
State-Changed-Why:
Committed, thank you.
When adding patches, please have a $NetBSD$ line at the top
and a short comment describing the change.


>Unformatted:

Home	PR Database Search