Date: Thu, 27 Oct 2011 20:45:32 -0400 From: Eitan Adler <lists@eitanadler.com> To: Cy Schubert <Cy.Schubert@komquats.com> Cc: xfce@freebsd.org Subject: Re: Xfce4-taskmanager Patch for 9.0 Message-ID: <CAF6rxgmsYi0LLQY9Crdo4qtFz-GhVjt6nfRmRRCGV99NMWjYGA@mail.gmail.com> In-Reply-To: <201110271958.p9RJwwla004755@slippy.cwsent.com> References: <201110271958.p9RJwwla004755@slippy.cwsent.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Oct 27, 2011 at 3:58 PM, Cy Schubert <Cy.Schubert@komquats.com> wro=
te:
> Hi xfce@,
>
> Here's a fix for xfce4-taskmanager under FreeBSD 9.0.
The patch below works for me. Is there any chance of getting upstream
to commit it?
>
> Index: Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /home/pcvs/ports/x11/xfce4-taskmanager/Makefile,v
> retrieving revision 1.30
> diff -u -r1.30 Makefile
> --- Makefile =C2=A0 =C2=A026 Oct 2011 20:27:23 -0000 =C2=A0 =C2=A0 =C2=A0=
1.30
> +++ Makefile =C2=A0 =C2=A027 Oct 2011 19:56:03 -0000
> @@ -7,6 +7,7 @@
>
> =C2=A0PORTNAME=3D =C2=A0 =C2=A0 =C2=A0xfce4-taskmanager
> =C2=A0PORTVERSION=3D =C2=A0 1.0.0
> +PORTREVISION=3D =C2=A01
> =C2=A0CATEGORIES=3D =C2=A0 =C2=A0x11 xfce
> =C2=A0MASTER_SITES=3D =C2=A0${MASTER_SITE_XFCE}
> =C2=A0MASTER_SITE_SUBDIR=3D =C2=A0 =C2=A0src/apps/${PORTNAME}/${PORTVERSI=
ON:R}
> @@ -26,10 +27,6 @@
>
> =C2=A0.include <bsd.port.pre.mk>
>
> -.if ${OSVERSION} >=3D 900000
> -BROKEN=3D =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0does no=
t compile on FreeBSD 9.X
> -.endif
> -
> =C2=A0post-patch:
> =C2=A0 =C2=A0 =C2=A0 =C2=A0@${REINPLACE_CMD} -e 's|prefix)/$$(DATADIRNAME=
)|datadir)|' \
> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${WRKSRC}/po/Makef=
ile.in.in
> Index: files/patch-task-manager-freebsd.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: files/patch-task-manager-freebsd.c
> diff -N files/patch-task-manager-freebsd.c
> --- /dev/null =C2=A0 1 Jan 1970 00:00:00 -0000
> +++ files/patch-task-manager-freebsd.c =C2=A027 Oct 2011 19:56:03 -0000
> @@ -0,0 +1,12 @@
> +--- src/task-manager-freebsd.c.orig =C2=A0 =C2=A02010-05-21 06:29:33.000=
000000 -0700
> ++++ src/task-manager-freebsd.c 2011-10-27 12:42:24.425260800 -0700
> +@@ -18,6 +18,9 @@
> + #include <fcntl.h>
> + #include <paths.h>
> + #include <unistd.h>
> ++#if defined(__FreeBSD_version) && __FreeBSD_version >=3D 900044
> ++#include <sys/vmmeter.h>
> ++#endif
> +
> + #include <glib.h>
> +
>
> If you want, I can commit it for you.
--=20
Eitan Adler
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgmsYi0LLQY9Crdo4qtFz-GhVjt6nfRmRRCGV99NMWjYGA>