pkg/46358: make sysutils/asapm work on amd64

[diro%nixsyspaus.org@localhost]

>Number:         46358
>Category:       pkg
>Synopsis:       make sysutils/asapm work on amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Fri Apr 20 08:10:00 +0000 2012
>Originator:     diro%nixsyspaus.org@localhost
>Release:        NetBSD 6.0_BETA
>Organization:
>Environment:
System: NetBSD gift 6.0_BETA NetBSD 6.0_BETA (GIFT) #4: Sat Mar 24 19:39:43 UTC 
2012  root@gift:/usr/obj/sys/arch/amd64/compile/GIFT amd64
Architecture: amd64
Machine: amd64
>Description:
ERROR: This package has set PKG_FAIL_REASON:
ERROR: APM needs /usr/include/machine/apmvar.h to build.
*** Error code 1

Stop.
bmake: stopped in /usr/pkgsrc/sysutils/asapm

>How-To-Repeat:
cd pkgsrc/sysutils/asapm; bmake
>Fix:
# diff patches/patch-af patch-af.new
3c3
< --- apm_read.c.orig   2001-11-23 23:07:19.000000000 +0200
---
> --- apm_read.c.orig   2001-11-23 21:07:19.000000000 +0000
5c5,17
< @@ -31,6 +31,7 @@
---
> @@ -21,16 +21,17 @@
>  #if defined(__FreeBSD__)
>  #include <sys/file.h>
>  #include <sys/ioctl.h>
> -#include <machine/apm_bios.h>
> +#include <dev/apm/apmbios.h>
>  #endif
>
>  #if defined(__NetBSD__)||defined(__OpenBSD__)
>  #include <sys/ioctl.h>
> -#include <machine/apmvar.h>
> +#include <i386/apmvar.h>
>  #endif
13c25
< @@ -136,18 +137,185 @@
---
> @@ -136,18 +137,185 @@ void ReadAPMDevice( )          /* FreeBSD versio



I don't know how we're doing the proper switching for architecture testing, but
that would be good to add around these modified include statements.