From 967e8b1a9453cb60ca5d2a28ac497a932d73d858 Mon Sep 17 00:00:00 2001 From: mef Date: Sat, 9 May 2015 01:37:12 +0000 Subject: (pkgsrc) - Drop patch-a[acd], all are included now. (upstream) - Update 1.5.4 to 1.5.6 --------------------- 29 August 1999 Release of version 1.5.5 ============================================================================== 3 February 2000 Fixed bug in main.c where it called setsockopt without an option. (Mattias Engdegard) ============================================================================== 3 February 2000 Release of version 1.5.6 --- x11/xmon/Makefile | 7 +++---- x11/xmon/distinfo | 11 ++++------- x11/xmon/patches/patch-aa | 15 --------------- x11/xmon/patches/patch-ac | 24 ------------------------ x11/xmon/patches/patch-ad | 13 ------------- 5 files changed, 7 insertions(+), 63 deletions(-) delete mode 100644 x11/xmon/patches/patch-aa delete mode 100644 x11/xmon/patches/patch-ac delete mode 100644 x11/xmon/patches/patch-ad (limited to 'x11') diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile index 2cb4f0ffeab..815fbf7d6a3 100644 --- a/x11/xmon/Makefile +++ b/x11/xmon/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2012/10/29 05:07:16 asau Exp $ +# $NetBSD: Makefile,v 1.14 2015/05/09 01:37:12 mef Exp $ # -DISTNAME= xmon.1.5.4 -PKGNAME= xmon-1.5.4 -PKGREVISION= 3 +DISTNAME= xmon.1.5.6 +PKGNAME= xmon-1.5.6 CATEGORIES= x11 devel MASTER_SITES= ${MASTER_SITE_XCONTRIB:=devel_tools/} diff --git a/x11/xmon/distinfo b/x11/xmon/distinfo index 3b0aa58dd3e..38f5e5d9db9 100644 --- a/x11/xmon/distinfo +++ b/x11/xmon/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.5 2006/09/16 15:29:36 hira Exp $ +$NetBSD: distinfo,v 1.6 2015/05/09 01:37:12 mef Exp $ -SHA1 (xmon.1.5.4.tar.gz) = 646236e6abe38d8049112eea534423550431cd1a -RMD160 (xmon.1.5.4.tar.gz) = a0d304769348215756de085ab1e14bbd2541cb25 -Size (xmon.1.5.4.tar.gz) = 69490 bytes -SHA1 (patch-aa) = 6f927e32fc7097f5a16355e3312b470d979be985 +SHA1 (xmon.1.5.6.tar.gz) = bf354628f92a4cc92db1af7c1adb96335d2bacfa +RMD160 (xmon.1.5.6.tar.gz) = 15be4e458e57a88c1d73e9339bf9577d47169811 +Size (xmon.1.5.6.tar.gz) = 70564 bytes SHA1 (patch-ab) = 2b23ab7d8f9fcc2d627320a2aa23e425365a59ec -SHA1 (patch-ac) = f532bb53d4c08b507595116e09e2f7a2de5c6b9e -SHA1 (patch-ad) = 393f075a1104c4261db42adcd83f93122eee2ed8 diff --git a/x11/xmon/patches/patch-aa b/x11/xmon/patches/patch-aa deleted file mode 100644 index 614001e5d75..00000000000 --- a/x11/xmon/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/11/23 07:42:25 rh Exp $ - ---- Imakefile.orig Fri Feb 7 03:38:29 1997 -+++ Imakefile Mon Nov 22 10:48:01 1999 -@@ -14,8 +14,8 @@ - # If your standard C library does not contain the usleep function, you - # may need to add usleep.o to RECORDING_OBJ. - # --# DEFINES = -DRECORD_EVENTS --# RECORDING_OBJ = recording.o -+DEFINES = -DRECORD_EVENTS -+RECORDING_OBJ = recording.o - - OBJS1 = decode11.o linkl.o print11.o server.o fd.o main.o prtype.o table11.o \ - $(RECORDING_OBJ) diff --git a/x11/xmon/patches/patch-ac b/x11/xmon/patches/patch-ac deleted file mode 100644 index 82f6a91e93a..00000000000 --- a/x11/xmon/patches/patch-ac +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/11/23 07:42:25 rh Exp $ - ---- recording.c.orig Fri Feb 7 04:33:49 1997 -+++ recording.c Mon Nov 22 10:52:03 1999 -@@ -43,18 +43,13 @@ - #ifdef RECORD_EVENTS - - #include -+#include - - #include "common.h" - - #include "xmond.h" - #include "linkl.h" - #include "commands.h" -- --/* function prototypes: */ --/* recording.c: */ --extern void usleep P((unsigned int useconds )); -- --/* end function prototypes */ - - typedef struct - { diff --git a/x11/xmon/patches/patch-ad b/x11/xmon/patches/patch-ad deleted file mode 100644 index d5311ff18e3..00000000000 --- a/x11/xmon/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2006/09/16 15:29:36 hira Exp $ - ---- decode11.c.orig 1997-02-07 03:45:32.000000000 +0100 -+++ decode11.c 2006-06-20 11:32:55.000000000 +0200 -@@ -1080,7 +1080,7 @@ - Bool real_event; - { - short Event = IByte (&buf[0]) & 0x7f; -- int fd = server->fdd->fd; -+ int fd = server ? server->fdd->fd : -1; - Bool extended_event = False; - - if (real_event) -- cgit v1.2.3