aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authoraz <az@FreeBSD.org>2005-10-06 20:59:01 +0800
committeraz <az@FreeBSD.org>2005-10-06 20:59:01 +0800
commit1368e609789119f06c459530fc26e3adb47c7391 (patch)
treed4257ce7c29536a7da1b6c9b5e28f2bdd9d090f2 /sysutils
parent0281d2300b9c6eb32ed9e901ab810d08a4a39eb8 (diff)
downloadfreebsd-ports-gnome-1368e609789119f06c459530fc26e3adb47c7391.tar.gz
freebsd-ports-gnome-1368e609789119f06c459530fc26e3adb47c7391.tar.zst
freebsd-ports-gnome-1368e609789119f06c459530fc26e3adb47c7391.zip
- Update to version 1.22
Approved by: sem (mentor)
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/and/Makefile3
-rw-r--r--sysutils/and/distinfo4
-rw-r--r--sysutils/and/files/patch-and-OpenBSD.c12
-rw-r--r--sysutils/and/files/patch-and.c51
4 files changed, 62 insertions, 8 deletions
diff --git a/sysutils/and/Makefile b/sysutils/and/Makefile
index 861a6fd586ae..cd844f2b5856 100644
--- a/sysutils/and/Makefile
+++ b/sysutils/and/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= and
-PORTVERSION= 1.0.9
-PORTREVISION= 2
+PORTVERSION= 1.2.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/sysutils/and/distinfo b/sysutils/and/distinfo
index 29bd4fa6a3e7..f7d2f1c060ac 100644
--- a/sysutils/and/distinfo
+++ b/sysutils/and/distinfo
@@ -1,2 +1,2 @@
-MD5 (and-1.0.9.tar.gz) = 0489b469eb94be6c977056b308d3f375
-SIZE (and-1.0.9.tar.gz) = 25959
+MD5 (and-1.2.2.tar.gz) = b939909039a8487eec93ff7eb56a4779
+SIZE (and-1.2.2.tar.gz) = 29989
diff --git a/sysutils/and/files/patch-and-OpenBSD.c b/sysutils/and/files/patch-and-OpenBSD.c
index 5bb60a5c69d2..e08c56a23b42 100644
--- a/sysutils/and/files/patch-and-OpenBSD.c
+++ b/sysutils/and/files/patch-and-OpenBSD.c
@@ -1,6 +1,6 @@
---- and-OpenBSD.c.orig Sun Jan 27 18:52:18 2002
-+++ and-OpenBSD.c Thu Oct 6 14:51:53 2005
-@@ -91,6 +91,21 @@
+--- and-OpenBSD.c.orig Sat Mar 6 16:34:02 2004
++++ and-OpenBSD.c Thu Oct 6 16:11:57 2005
+@@ -91,10 +91,24 @@
abort();
}
if (openbsd_next >= openbsd_nproc) return NULL;
@@ -22,7 +22,11 @@
strncpy(openbsd_proc.command,openbsd_pt[openbsd_next].kp_proc.p_comm,1023);
openbsd_proc.command[1023] = 0;
openbsd_proc.pid = openbsd_pt[openbsd_next].kp_proc.p_pid;
-@@ -102,6 +117,7 @@
+- openbsd_proc.ppid = openbsd_pt[openbsd_next].kp_proc.p_ppid; /* FIXME that correct? */
+ 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;
+@@ -103,6 +117,7 @@
openbsd_pt[openbsd_next].kp_proc.p_sticks +
openbsd_pt[openbsd_next].kp_proc.p_iticks)
/ openbsd_hz;
diff --git a/sysutils/and/files/patch-and.c b/sysutils/and/files/patch-and.c
new file mode 100644
index 000000000000..cc857092a9d9
--- /dev/null
+++ b/sysutils/and/files/patch-and.c
@@ -0,0 +1,51 @@
+--- and.c.orig Mon Apr 5 23:19:01 2004
++++ and.c Thu Oct 6 16:04:09 2005
+@@ -47,7 +47,11 @@
+ #include <sys/types.h>
+ #include <signal.h>
+ #include <regex.h>
+-#include <values.h>
++#if defined(__FreeBSD__) && __FreeBSD_version >= 500014
++#include <sys/limits.h>
++#else
++#include <limits.h>
++#endif
+
+ #define DEBUG 0
+
+@@ -714,7 +718,7 @@
+ } else if (and_db.entry[i].uid == -1) {
+ exactness[i] = 0;
+ } else {
+- exactness[i] = -MAXINT;
++ exactness[i] = -INT_MAX;
+ }
+ /* group id */
+ if (gid == and_db.entry[i].gid) {
+@@ -722,7 +726,7 @@
+ } else if (and_db.entry[i].gid == -1) {
+ exactness[i] += 0;
+ } else {
+- exactness[i] = -MAXINT;
++ exactness[i] = -INT_MAX;
+ }
+ /* command */
+ if (command!=NULL && regexec(and_db.entry[i].command,command,0,0,0) == 0) {
+@@ -730,7 +734,7 @@
+ } else if (strcmp(and_db.entry[i].command_str,"*") == 0) {
+ exactness[i] += 0;
+ } else {
+- exactness[i] = -MAXINT;
++ exactness[i] = -INT_MAX;
+ }
+ /* parent */
+ par = parent;
+@@ -745,7 +749,7 @@
+ exactness[i] += 0;
+ break;
+ } else if (last) {
+- exactness[i] = -MAXINT;
++ exactness[i] = -INT_MAX;
+ break;
+ }
+ par = par->parent;