Date: Sat, 21 Dec 2002 16:01:46 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46433: Update port: sysutils/and to 1.0.8 Message-ID: <20021221160146.5086fd51.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 46433
>Category: ports
>Synopsis: Update port: sysutils/and to 1.0.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Dec 20 23:10:11 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.8
New file:
files/patch-and-OpenBSD.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/sysutils/and/Makefile sysutils/and/Makefile
--- /usr/ports/sysutils/and/Makefile Mon Nov 11 19:01:03 2002
+++ sysutils/and/Makefile Sat Dec 21 02:10:12 2002
@@ -7,7 +7,7 @@
#
PORTNAME= and
-PORTVERSION= 1.0.7
+PORTVERSION= 1.0.8
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,7 +15,7 @@
MAINTAINER= ports@FreeBSD.org
USE_GMAKE= yes
-ALL_TARGET= # empty
+ALL_TARGET= default
MAN5= and.conf.5 and.priorities.5
MAN8= and.8
diff -urN /usr/ports/sysutils/and/distinfo sysutils/and/distinfo
--- /usr/ports/sysutils/and/distinfo Sat Jun 22 04:41:34 2002
+++ sysutils/and/distinfo Sat Dec 21 01:31:52 2002
@@ -1 +1 @@
-MD5 (and-1.0.7.tar.gz) = c66f2945ec3f4e06e639ee8f290b2e74
+MD5 (and-1.0.8.tar.gz) = 4bef92c5375d8c8bddb98aa7ec6d1b1d
diff -urN /usr/ports/sysutils/and/files/patch-Makefile sysutils/and/files/patch-Makefile
--- /usr/ports/sysutils/and/files/patch-Makefile Sat Jun 22 04:41:34 2002
+++ sysutils/and/files/patch-Makefile Sat Dec 21 01:31:52 2002
@@ -1,5 +1,5 @@
---- Makefile.orig Sat Jun 22 03:39:00 2002
-+++ Makefile Sat Jun 22 03:39:19 2002
+--- Makefile.orig Mon Jan 28 01:02:51 2002
++++ Makefile Tue Dec 17 21:15:05 2002
@@ -16,7 +16,7 @@
# (and.init.debian for Debian GNU/Linux or and.init for others;
# leave empty for BSD!)
@@ -24,3 +24,14 @@
# typical Debian or SuSE 7.x configuration
#PREFIX=/usr
+@@ -110,8 +110,8 @@
+ LIBS = -lkvm
+ else
+ ifeq (${ARCH},FreeBSD)
+- CC = gcc -Wall
+- LD = gcc
++ CC ?= gcc -Wall
++ LD = $(CC)
+ LIBS = -lkvm
+ else
+ ifeq (${ARCH},SunOS)
diff -urN /usr/ports/sysutils/and/files/patch-and-OpenBSD.c sysutils/and/files/patch-and-OpenBSD.c
--- /usr/ports/sysutils/and/files/patch-and-OpenBSD.c Thu Jan 1 09:00:00 1970
+++ sysutils/and/files/patch-and-OpenBSD.c Sat Dec 21 02:05:09 2002
@@ -0,0 +1,41 @@
+--- and-OpenBSD.c.orig Mon Jan 28 01:02:51 2002
++++ and-OpenBSD.c Sat Dec 21 02:04:58 2002
+@@ -91,17 +91,38 @@
+ abort();
+ }
+ if (openbsd_next >= openbsd_nproc) return NULL;
++#if defined(__FreeBSD__) && __FreeBSD_version >= 50014
++ strncpy(openbsd_proc.command,openbsd_pt[openbsd_next].ki_comm,1023);
++#else
+ strncpy(openbsd_proc.command,openbsd_pt[openbsd_next].kp_proc.p_comm,1023);
++#endif
+ openbsd_proc.command[1023] = 0;
++#if defined(__FreeBSD__) && __FreeBSD_version >= 50014
++ openbsd_proc.pid = openbsd_pt[openbsd_next].ki_pid;
++ openbsd_proc.nice = openbsd_pt[openbsd_next].ki_nice-20;
++ openbsd_proc.uid = openbsd_pt[openbsd_next].ki_ruid;
++ openbsd_proc.gid = openbsd_pt[openbsd_next].ki_rgid;
++#else
+ openbsd_proc.pid = openbsd_pt[openbsd_next].kp_proc.p_pid;
+ openbsd_proc.nice = openbsd_pt[openbsd_next].kp_proc.p_nice-20;
+ openbsd_proc.uid = openbsd_pt[openbsd_next].kp_eproc.e_pcred.p_ruid;
+ openbsd_proc.gid = openbsd_pt[openbsd_next].kp_eproc.e_pcred.p_rgid;
++#endif
+ /* Adapted from top(1) port, as found in the misc@openbsd.org archive */
++#if defined(__FreeBSD__) && __FreeBSD_version >= 50014
++ /* XXX: Accessing ki_paddr causes sig10 ...
++ openbsd_proc.utime = (openbsd_pt[openbsd_next].ki_paddr->p_uticks +
++ openbsd_pt[openbsd_next].ki_paddr->p_sticks +
++ openbsd_pt[openbsd_next].ki_paddr->p_iticks)
++ / openbsd_hz;
++ */
++ openbsd_proc.utime = 0;
++#else
+ openbsd_proc.utime = (openbsd_pt[openbsd_next].kp_proc.p_uticks +
+ openbsd_pt[openbsd_next].kp_proc.p_sticks +
+ openbsd_pt[openbsd_next].kp_proc.p_iticks)
+ / openbsd_hz;
++#endif
+ /*
+ printf("%-20s %5i %3i %i\n",openbsd_proc.command,openbsd_proc.pid,
+ openbsd_proc.nice,openbsd_proc.utime);
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021221160146.5086fd51.tkato>