Re: pkg/33639: pkgsrc/icewm fixes

[ober <ober%linbsd.org@localhost>]

Anyone taking a look at this?
I would gladly take over as maintainer for this port if
no one is willing to take the time to test the included patch...

-Ober

Richard Chesler: [Reading a piece of paper] The first rule of Fight Club is you 
don't talk about Fight Club?
Narrator: [Voice-over] I'm half asleep again; I must've left the original in 
the copy machine.
Richard Chesler: The second rule of Fight Club - is this yours?
Narrator: Huh?
Richard Chesler: Pretend you're me, make a managerial decision: you find this, 
what would you do?

On Sat, 3 Jun 2006 ober%linbsd.org@localhost wrote:

> Date: Sat,  3 Jun 2006 05:45:00 +0000 (UTC)
> From: ober%linbsd.org@localhost
> Reply-To: gnats-bugs%NetBSD.org@localhost
> To: pkg-manager%NetBSD.org@localhost, gnats-admin%NetBSD.org@localhost, 
> pkgsrc-bugs%NetBSD.org@localhost
> Subject: pkg/33639: pkgsrc/icewm fixes
>
> > Number:         33639
> > Category:       pkg
> > Synopsis:       pkgsrc/wm/icewm fails to build
> > Confidential:   no
> > Severity:       non-critical
> > Priority:       low
> > Responsible:    pkg-manager
> > State:          open
> > Class:          sw-bug
> > Submitter-Id:   net
> > Arrival-Date:   Sat Jun 03 05:45:00 +0000 2006
> > Originator:     LinBSD
> > Release:        NetBSD 3.99.17
> > Organization:
>                 LinBSD
> > Environment:
>
>
> System: NetBSD colbert.linbsd.org 3.99.17 NetBSD 3.99.17 (GENERIC.MP) #0: Fri 
> Apr 7 17:18:31 UTC 2006 
> jmc%b2.netbsd.org@localhost:/home/builds/ab/HEAD/amd64/200604070000Z-obj/home/builds/ab/HEAD/src/sys/arch/amd64/compile/GENERIC.MP
>  amd64
> Architecture: x86_64
> Machine: amd64
> > Description:
>         the pkgsrc/wm/icewm files to compile properly. The attached patches fix 
> it.
> > How-To-Repeat:
>         just try to build icewm from pkgsrc.
> > Fix:
>         o
> apply the patch below.
>
> diff -ru icewm/Makefile icewm.mine/Makefile
> --- icewm/Makefile      2006-05-19 02:03:20.000000000 -0500
> +++ icewm.mine/Makefile 2006-06-02 22:32:02.000000000 -0500
> @@ -7,6 +7,7 @@
>
> CONFIGURE_ARGS+=       --with-gnome-menus=no
> CONFIGURE_ARGS+=       --with-imlib=no
> +CONFIGURE_ARGS+=       --disable-i18n
> CONFIGURE_ARGS+=       --with-xpm=${BUILDLINK_PREFIX.xpm}
>
> BROKEN_IN=             pkgsrc-2006Q1
> diff -ru icewm/distinfo icewm.mine/distinfo
> --- icewm/distinfo      2006-05-14 14:07:30.000000000 -0500
> +++ icewm.mine/distinfo 2006-06-02 23:03:56.000000000 -0500
> @@ -6,4 +6,4 @@
> SHA1 (patch-aa) = 01d6f2b212fefcce51075d339f1a633b6f9740ed
> SHA1 (patch-ac) = 2da6c567f809db9292e123f7233e4bd767ddb26c
> SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424
> -SHA1 (patch-aj) = 280a46700bdcfda4517bebac867c422c42ac2c5b
> +SHA1 (patch-aj) = 8be4e207b6297b3b7de391c70478e2c576a429a4
> diff -ru icewm/patches/patch-aj icewm.mine/patches/patch-aj
> --- icewm/patches/patch-aj      2006-05-13 12:01:11.000000000 -0500
> +++ icewm.mine/patches/patch-aj 2006-06-02 23:03:45.000000000 -0500
> @@ -1,17 +1,18 @@
> $NetBSD: patch-aj,v 1.1 2006/05/13 17:01:11 ghen Exp $
>
> ---- src/aapm.cc.orig   2006-02-03 07:24:27.000000000 +0100
> -+++ src/aapm.cc
> -@@ -38,8 +38,12 @@
> +--- src/aapm.cc.orig   2006-04-16 11:12:31.000000000 -0500
> ++++ src/aapm.cc        2006-06-02 23:01:54.000000000 -0500
> +@@ -38,7 +38,12 @@
>  #include <sys/file.h>
>  #include <sys/ioctl.h>
>  #include <sys/types.h>
> +-#include <machine/apmvar.h>
> +#ifdef __sparcv9
> +#include <sparc/apmvar.h>
> +#else
> - #include <machine/apmvar.h>
> ++#include <dev/apm/apmio.h>
> ++#include <dev/apm/apmbios.h>
> +#endif
>  #endif
>
>  YColor *YApm::apmBg = 0;
> - YColor *YApm::apmFg = 0;
>
> > Unformatted: