apmvar.h on amd64?

[Thomas Klausner <wiz%NetBSD.org@localhost>]

sno filed a bug report instead of asking on the relevant mailing list,
so I try to do that now :)

What's the proper way to handle apmvar.h includes on amd64? For
details, see below, though I trimmed the patch to the relevant part.
 Thomas


----- Forwarded message from sno%NetBSD.org@localhost -----

Date: Sat,  7 Nov 2009 11:35:00 +0000 (UTC)
From: sno%NetBSD.org@localhost
To: pkg-manager%netbsd.org@localhost, gnats-admin%netbsd.org@localhost, 
pkgsrc-bugs%netbsd.org@localhost
Cc: 
Subject: pkg/42280: sysutils/xfce4-battery-plugin fails compile on NetBSD amd64

>Number:         42280
>Category:       pkg
>Synopsis:       sysutils/xfce4-battery-plugin fails compile on NetBSD amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Nov 07 11:35:00 +0000 2009
>Originator:     Jens Rehsack
>Release:        5.99.21
>Organization:
>Environment:
NetBSD bert 5.99.21 NetBSD 5.99.21 (BERT) #2: Fri Nov  6 22:47:30 CET 2009  
trevor@bert:/usr/obj/usr/src/sys/arch/amd64/compile/BERT amd64
>Description:
On my NetBSD-5.99.21 the required <machine/apmvar.h> doesn't exists. So I 
modified patches/patch-aa to use <i386/apmvar.h> from amd64.
Because I'm not sure if this is correct or I did anything else wrong, instead 
of blind committing I ask for someone with more experience there to take the 
issue and have a look.
>How-To-Repeat:
Compile sysutils/xfce4-battery-plugin on NetBSD-5.99.21/amd64
>Fix:
(shortened -- wiz 20091110)
Index: sysutils/xfce4-battery-plugin/patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xfce4-battery-plugin/patches/patch-aa,v
retrieving revision 1.7
diff -u -u -r1.7 patch-aa
--- sysutils/xfce4-battery-plugin/patches/patch-aa      17 Dec 2008 12:57:27 
-0000      1.7
+++ sysutils/xfce4-battery-plugin/patches/patch-aa      7 Nov 2009 11:30:16 
-0000
@@ -19,6 +19,8 @@
 +/* On NetBSD/sparc64, apmvar.h is not exist in /usr/include/machine. */
 +/* Reported in PR port-sparc64/36735. */
 +#include <sparc/apmvar.h>
++#elif defined(__amd64__)
++#include <i386/apmvar.h>
 +#else
  #include <machine/apmvar.h>
 +#endif

----- End forwarded message -----