Attachment 170702 Details for Bug 209771 – patch to fix sysutils/and (svn diff)

[patch] patch to fix sysutils/and (svn diff)

2016-05-26.diff (text/plain), 1.23 KB, created by Chris Hutchinson on 2016-05-26 23:32:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Hutchinson

Created: 2016-05-26 23:32:43 UTC

Size: 1.23 KB

patch

obsolete

>Index: and/Makefile
>===================================================================
>--- and/Makefile	(revision 415820)
>+++ and/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	and
> PORTVERSION=	1.2.2
>+PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	SF
> 
>@@ -9,8 +10,19 @@
> MAINTAINER=	portmaster@BSDforge.com
> COMMENT=	Auto Nice Daemon
> 
>+LICENSE=	GPLv2
>+
> USES=		gmake
> ALL_TARGET=	default
> NOPRECIOUSMAKEVARS=	yes
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+
>+# r295435 | kib | 2016-02-09 16:30:16
>+# Renamed P_KTHREAD ==> P_KPROC
>+post-patch:
>+.if ${OSVERSION} >= 1100095
>+	@${REINPLACE_CMD} "s,P_KTHREAD,P_KPROC,g" ${WRKSRC}/Makefile
>+.endif
>+
>+.include <bsd.port.post.mk>
>Index: and/files/patch-and-OpenBSD.c
>===================================================================
>--- and/files/patch-and-OpenBSD.c	(revision 415820)
>+++ and/files/patch-and-OpenBSD.c	(working copy)
>@@ -5,7 +5,7 @@
>    }
>    if (openbsd_next >= openbsd_nproc) return NULL;
> +
>-+#if defined(__FreeBSD__) && __FreeBSD_version >= 500014
>++#if defined(__FreeBSD__) && __FreeBSD_version >= 500014 && __FreeBSD_version <= 1100094
> +  /* Skip kernel threads */
> +  while((openbsd_pt[openbsd_next].ki_flag & P_KTHREAD) 
> +	     && openbsd_next < openbsd_nproc)

Flags:

portmaster: maintainer-approval+

Actions: View | Diff

Attachments on bug 209771: 170692 | 170702 | 170763