pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
xtrace: imported to pkgsrc
Module Name: pkgsrc-wip
Committed By: Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By: tnn
Date: Sun Sep 27 13:25:46 2015 +0200
Changeset: c7ffc0cbcfd9ecdbe9f123e262f8e931b64b92b1
Modified Files:
Makefile
Removed Files:
xtrace/DESCR
xtrace/Makefile
xtrace/PLIST
xtrace/distinfo
xtrace/files/tdestroy.c
xtrace/patches/patch-Makefile.in
Log Message:
xtrace: imported to pkgsrc
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c7ffc0cbcfd9ecdbe9f123e262f8e931b64b92b1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
xtrace/DESCR | 4 --
xtrace/Makefile | 19 --------
xtrace/PLIST | 29 ------------
xtrace/distinfo | 6 ---
xtrace/files/tdestroy.c | 99 ----------------------------------------
xtrace/patches/patch-Makefile.in | 24 ----------
7 files changed, 182 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 30f537a..3bbc328 100644
--- a/Makefile
+++ b/Makefile
@@ -4012,7 +4012,6 @@ SUBDIR+= xspd
SUBDIR+= xspdapp
SUBDIR+= xspread
SUBDIR+= xtags
-SUBDIR+= xtrace
SUBDIR+= xtraceroute
SUBDIR+= xtrackcad
SUBDIR+= xtreemfs-client
diff --git a/xtrace/DESCR b/xtrace/DESCR
deleted file mode 100644
index 2a201ca..0000000
--- a/xtrace/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-Xtrace fakes an X server and forwards all connections to a real X
-server, displaying the communication between clients. It prints
-the requests going from client to server and the replies, events
-and errors going the other way.
diff --git a/xtrace/Makefile b/xtrace/Makefile
deleted file mode 100644
index 524ce6f..0000000
--- a/xtrace/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2012/10/18 16:12:29 trontor Exp $
-
-DISTNAME= xtrace_1.3.1.orig
-PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
-CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/x/xtrace/}
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://packages.qa.debian.org/x/xtrace.html
-COMMENT= Trace communication between X11 client and server
-LICENSE= gnu-gpl-v2
-
-GNU_CONFIGURE= yes
-WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-
-post-extract:
- ${CP} ${FILESDIR}/tdestroy.c ${WRKSRC}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/xtrace/PLIST b/xtrace/PLIST
deleted file mode 100644
index 31d3b35..0000000
--- a/xtrace/PLIST
+++ /dev/null
@@ -1,29 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2012/10/18 11:22:58 thomasklausner Exp $
-bin/xtrace
-man/man1/xtrace.1
-share/xtrace/all.proto
-share/xtrace/bigfont.proto
-share/xtrace/bigrequest.proto
-share/xtrace/composite.proto
-share/xtrace/damage.proto
-share/xtrace/dga.proto
-share/xtrace/dpms.proto
-share/xtrace/dri2.proto
-share/xtrace/errors.proto
-share/xtrace/events.proto
-share/xtrace/fixes.proto
-share/xtrace/genericevents.proto
-share/xtrace/glx.proto
-share/xtrace/mitshm.proto
-share/xtrace/randr.proto
-share/xtrace/render.proto
-share/xtrace/requests.proto
-share/xtrace/saver.proto
-share/xtrace/setup.proto
-share/xtrace/shape.proto
-share/xtrace/sync.proto
-share/xtrace/vidmode.proto
-share/xtrace/xinerama.proto
-share/xtrace/xinput.proto
-share/xtrace/xkb.proto
-share/xtrace/xvideo.proto
diff --git a/xtrace/distinfo b/xtrace/distinfo
deleted file mode 100644
index ec55c5e..0000000
--- a/xtrace/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2012/10/18 11:22:58 thomasklausner Exp $
-
-SHA1 (xtrace_1.3.1.orig.tar.gz) = a28069a0cc7f364350cee5e972dac26c9be0cf6e
-RMD160 (xtrace_1.3.1.orig.tar.gz) = ee576ce4251ad28c298be19f753db004185af453
-Size (xtrace_1.3.1.orig.tar.gz) = 185308 bytes
-SHA1 (patch-Makefile.in) = 4a592285a74b19f9e8e747ca2c75d15c79a5e84e
diff --git a/xtrace/files/tdestroy.c b/xtrace/files/tdestroy.c
deleted file mode 100644
index 7568e7d..0000000
--- a/xtrace/files/tdestroy.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* modified version of the file below, from vlc */
-/**
- * @file tdestroy.c
- * @brief replacement for GNU tdestroy()
- */
-/*****************************************************************************
- * Copyright (C) 2009 Rémi Denis-Courmont
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <assert.h>
-
-#include <search.h>
-
-static struct
-{
- const void **tab;
- size_t count;
-} list = { NULL, 0 };
-
-static void list_nodes (const void *node, const VISIT which, const int depth)
-{
- (void) depth;
-
- if (which != postorder && which != leaf)
- return;
-
- const void **tab = realloc (list.tab, sizeof (*tab) * (list.count + 1));
- if (tab == NULL)
- abort ();
-
- tab[list.count] = *(const void **)node;
- list.tab = tab;
- list.count++;
-}
-
-static struct
-{
- const void *node;
-} smallest = { NULL };
-
-static int cmp_smallest (const void *a, const void *b)
-{
- if (a == b)
- return 0;
- if (a == smallest.node)
- return -1;
- if (b == smallest.node)
- return +1;
- abort ();
-}
-
-void tdestroy (void *root, void (*freenode) (void *))
-{
- const void **tab;
- size_t count;
-
- assert (freenode != NULL);
-
- /* Enumerate nodes in order */
- assert (list.count == 0);
- twalk (root, list_nodes);
- tab = list.tab;
- count = list.count;
- list.tab = NULL;
- list.count = 0;
-
- /* Destroy the tree */
- for (size_t i = 0; i < count; i++)
- {
- smallest.node = tab[i];
- if (tdelete (smallest.node, &root, cmp_smallest) == NULL)
- abort ();
- }
- assert (root == NULL);
-
- /* Destroy the nodes */
- for (size_t i = 0; i < count; i++)
- freenode ((void *)(tab[i]));
- free (tab);
-}
diff --git a/xtrace/patches/patch-Makefile.in b/xtrace/patches/patch-Makefile.in
deleted file mode 100644
index 44e4e93..0000000
--- a/xtrace/patches/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2012/10/18 11:22:58 thomasklausner Exp $
-
-Hook in tdestroy replacement.
-
---- Makefile.in.orig 2012-06-11 12:57:07.000000000 +0000
-+++ Makefile.in
-@@ -74,7 +74,7 @@ PROGRAMS = $(bin_PROGRAMS)
- am_xtrace_OBJECTS = main.$(OBJEXT) x11common.$(OBJEXT) \
- x11client.$(OBJEXT) x11server.$(OBJEXT) parse.$(OBJEXT) \
- copyauth.$(OBJEXT) atoms.$(OBJEXT) translate.$(OBJEXT) \
-- stringlist.$(OBJEXT)
-+ stringlist.$(OBJEXT) tdestroy.$(OBJEXT)
- xtrace_OBJECTS = $(am_xtrace_OBJECTS)
- xtrace_LDADD = $(LDADD)
- DEFAULT_INCLUDES = -I.@am__isrc@
-@@ -229,7 +229,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -DPKGDATADIR='"$(pkgdatadir)"'
--xtrace_SOURCES = main.c x11common.c x11client.c x11server.c parse.c copyauth.c atoms.c translate.c stringlist.c
-+xtrace_SOURCES = main.c x11common.c x11client.c x11server.c parse.c copyauth.c atoms.c translate.c stringlist.c tdestroy.c
- noinst_HEADERS = xtrace.h parse.h stringlist.h translate.h
- dist_man_MANS = xtrace.1
- MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/configure $(srcdir)/stamp-h.in $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
Home |
Main Index |
Thread Index |
Old Index