massive reduction of unneeded files

7 files changed, 0 insertions, 1120 deletions

diff --git a/nx-X11/extras/Xpm/sxpm/Imakefile b/nx-X11/extras/Xpm/sxpm/Imakefile
deleted file mode 100644
index 5474c777a..000000000
--- a/nx-X11/extras/Xpm/sxpm/Imakefile
+++ /dev/null
@@ -1,98 +0,0 @@
-XCOMM
-XCOMM
-XCOMM Copyright (C) 1989-95 GROUPE BULL
-XCOMM
-XCOMM Permission is hereby granted, free of charge, to any person obtaining a
-XCOMM copy of this software and associated documentation files
-XCOMM (the "Software"), to deal in the Software without restriction, including
-XCOMM without limitation the rights to use, copy, modify, merge, publish,
-XCOMM distribute, sublicense, and/or sell copies of the Software, and to permit
-XCOMM persons to whom the Software is furnished to do so, subject to the
-XCOMM following conditions:
-XCOMM The above copyright notice and this permission notice shall be included
-XCOMM in all copies or substantial portions of the Software.
-XCOMM
-XCOMM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-XCOMM OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-XCOMM MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-XCOMM IN NO EVENT SHALL GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-XCOMM LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-XCOMM FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-XCOMM DEALINGS IN THE SOFTWARE.
-XCOMM
-XCOMM Except as contained in this notice, the name of GROUPE BULL shall not be
-XCOMM used in advertising or otherwise to promote the sale, use or other
-XCOMM dealings in this Software without prior written authorization from
-XCOMM GROUPE BULL.
-XCOMM
-
-XCOMM
-XCOMM XPM Imakefile - Arnaud LE HORS
-XCOMM
-
-XCOMM default locations
-#ifndef XpmLibDir
-#define XpmLibDir $(USRLIBDIR)
-#endif
-#ifndef XpmBinDir
-#define XpmBinDir $(BINDIR)
-#endif
-#ifndef XpmManDir
-#define XpmManDir $(MANDIR)
-#endif
-#ifndef XpmIncDir
-#define XpmIncDir $(BUILDINCTOP)
-#endif
-
-      XPMLIBDIR = XpmLibDir
-      XPMBINDIR = XpmBinDir
-      XPMMANDIR = XpmManDir
-      XPMINCDIR = XpmIncDir
-
-         XPMLIB = -lXpm
-       INCLUDES = -I$(BUILDINCDIR) -I$(XPMINCDIR)
-        DEPLIBS = $(DEPXTOOLLIB) $(DEPXLIB)
-
-#ifdef Win32Architecture
-LOCAL_LIBRARIES = ../lib/Xpm.lib $(XTOOLLIB) $(XLIB)
-#else
-LOCAL_LIBRARIES = -L../lib -L$(XPMLIBDIR) $(XPMLIB) $(XTOOLLIB) $(XLIB)
-#endif
-
-XCOMM try hard to set things so we'll find the shared lib once installed
-LD_RUN_PATH = $(USRLIBDIR):$(XPMLIBDIR)
-USRLIBDIRPATH = $(USRLIBDIR):$(XPMLIBDIR)
-
-#if ProjectX < 603
-# ifdef HPArchitecture
-EXTRA_LOAD_FLAGS = -Wl,+s,+b,$(USRLIBDIRPATH)
-# endif
-# if defined(SunArchitecture) && defined(SVR4Architecture)
-EXTRA_LOAD_FLAGS = -R$(USRLIBDIRPATH)
-# endif
-# if defined(AlphaArchitecture) || defined (SGIArchitecture)
-EXTRA_LOAD_FLAGS = -Wl,-rpath,$(USRLIBDIRPATH)
-# endif
-#endif
-
-#ifdef OsNameDefines
-OS_NAME_DEFINES = OsNameDefines
-#endif
-
-          SRCS = sxpm.c
-          OBJS = sxpm.o
-
-#if (ProjectX < 6)
-AllTarget(sxpm)
-#else
-AllTarget(ProgramTargetName(sxpm))
-#endif
-NormalProgramTarget(sxpm,$(OBJS),$(DEPLIB),$(LOCAL_LIBRARIES),)
-InstallProgram(sxpm,$(XPMBINDIR))
-InstallManPage(sxpm,$(XPMMANDIR))
-DependTarget()
-LintTarget()
-
-clean::	
-	$(RM) sxpmout.xpm
-
diff --git a/nx-X11/extras/Xpm/sxpm/Makefile.noX b/nx-X11/extras/Xpm/sxpm/Makefile.noX
deleted file mode 100644
index 74847e666..000000000
--- a/nx-X11/extras/Xpm/sxpm/Makefile.noX
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-#  Copyright (C) 1989-95 GROUPE BULL
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to
-#  deal in the Software without restriction, including without limitation the
-#  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-#  sell copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-#  GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-#  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-#  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-#  Except as contained in this notice, the name of GROUPE BULL shall not be
-#  used in advertising or otherwise to promote the sale, use or other dealings
-#  in this Software without prior written authorization from GROUPE BULL.
-#
-
-#
-# XPM Makefile - Arnaud LE HORS
-#
-
-# where the program will be installed
-DESTBINDIR=/usr/local/bin/X11
-# where the man page will be installed
-MANDIR=/usr/local/man/manl
-
-# where the X11 libs are
-XLIBDIRS= -L/usr/X11/lib
-
-LIBDIRS= -L../lib
-LIBS= -lXpm -lXext -lXt -lX11
-
-CC = cc
-RM = rm -f
-# on sysV, define this as cp.
-INSTALL = install -c
-
-CDEBUGFLAGS= -O
-
-INCLUDES= -I..
-
-OBJS= sxpm.o
-
-CFLAGS= $(CDEBUGFLAGS) $(INCLUDES) $(DEFINES)
-
-all: sxpm
-
-clean: 
-	$(RM) *.o sxpm
-
-sxpm: sxpm.o
-	$(CC) $(CFLAGS) sxpm.o $(LIBDIRS) $(XLIBDIRS) $(LIBS) -o sxpm
-
-install:
-	$(INSTALL) -m 0755 sxpm $(DESTBINDIR)
-
-install.man:
-	$(INSTALL) -m 0644 sxpm.man $(MANDIR)/sxpm.l
-
-# Other dependencies.
-sxpm.o: ../lib/xpm.h
diff --git a/nx-X11/extras/Xpm/sxpm/plaid.xpm b/nx-X11/extras/Xpm/sxpm/plaid.xpm
deleted file mode 100644
index b0e9200fe..000000000
--- a/nx-X11/extras/Xpm/sxpm/plaid.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * plaid[] = {
-/* plaid pixmap 
- * width height ncolors chars_per_pixel */
-"22 22 4 2 ",
-/* colors */
-"   c red 	m white  s light_color ",
-"Y  c green	m black  s lines_in_mix ",
-"+  c yellow	m white  s lines_in_dark ",
-"x 		m black  s dark_color ",
-/* pixels */
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"  x   x   x   x   x   x x x x x x x x x x x ", 
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"  x   x   x   x   x   x x x x x x x x x x x ", 
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"Y Y Y Y Y x Y Y Y Y Y + x + x + x + x + x + ", 
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"  x   x   x   x   x   x x x x x x x x x x x ", 
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"  x   x   x   x   x   x x x x x x x x x x x ", 
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"          x           x   x   x Y x   x   x ", 
-"          x             x   x   Y   x   x   ",
-"          x           x   x   x Y x   x   x ", 
-"          x             x   x   Y   x   x   ", 
-"          x           x   x   x Y x   x   x ", 
-"x x x x x x x x x x x x x x x x x x x x x x ", 
-"          x           x   x   x Y x   x   x ", 
-"          x             x   x   Y   x   x   ", 
-"          x           x   x   x Y x   x   x ", 
-"          x             x   x   Y   x   x   ", 
-"          x           x   x   x Y x   x   x "
-} ;
diff --git a/nx-X11/extras/Xpm/sxpm/plaid_ext.xpm b/nx-X11/extras/Xpm/sxpm/plaid_ext.xpm
deleted file mode 100644
index 8538952ea..000000000
--- a/nx-X11/extras/Xpm/sxpm/plaid_ext.xpm
+++ /dev/null
@@ -1,43 +0,0 @@
-/* XPM */
-static char * plaid[] = {
-/* plaid pixmap 
- * width height ncolors chars_per_pixel */
-"22 22 4 2 XPMEXT",
-/* colors */
-"   c red 	m white  s light_color ",
-"Y  c green	m black  s lines_in_mix ",
-"+  c yellow	m white  s lines_in_dark ",
-"x 		m black  s dark_color ",
-/* pixels */
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"  x   x   x   x   x   x x x x x x x x x x x ", 
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"  x   x   x   x   x   x x x x x x x x x x x ", 
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"Y Y Y Y Y x Y Y Y Y Y + x + x + x + x + x + ", 
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"  x   x   x   x   x   x x x x x x x x x x x ", 
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"  x   x   x   x   x   x x x x x x x x x x x ", 
-"x   x   x x x   x   x x x x x x + x x x x x ", 
-"          x           x   x   x Y x   x   x ", 
-"          x             x   x   Y   x   x   ",
-"          x           x   x   x Y x   x   x ", 
-"          x             x   x   Y   x   x   ", 
-"          x           x   x   x Y x   x   x ", 
-"x x x x x x x x x x x x x x x x x x x x x x ", 
-"          x           x   x   x Y x   x   x ", 
-"          x             x   x   Y   x   x   ", 
-"          x           x   x   x Y x   x   x ", 
-"          x             x   x   Y   x   x   ", 
-"          x           x   x   x Y x   x   x ",
-"XPMEXT ext1 data1",
-"XPMEXT ext2",
-"data2_1",
-"data2_2",
-"XPMEXT ext3",
-"data3",
-"XPMEXT",
-"data4",
-"XPMENDEXT"
-} ;
diff --git a/nx-X11/extras/Xpm/sxpm/plaid_mask.xpm b/nx-X11/extras/Xpm/sxpm/plaid_mask.xpm
deleted file mode 100644
index 167d33857..000000000
--- a/nx-X11/extras/Xpm/sxpm/plaid_mask.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * plaid[] = {
-/* plaid pixmap 
- * width height ncolors chars_per_pixel */
-"22 22 5 2",
-/* colors */
-".  c red 	m white  s light_color ",
-"Y  c green	m black  s lines_in_mix ",
-"+  c yellow	m white  s lines_in_dark ",
-"x  		m black  s dark_color ",
-"   c none		 s mask ",
-/* pixels */
-"                      x x x x x + x x x x x ", 
-"                    . x x x x x x x x x x x ", 
-"                  . x x x x x x + x x x x x ", 
-"                . x . x x x x x x x x x x x ", 
-"              . x . x x x x x x + x x x x x ", 
-"            Y Y Y Y Y + x + x + x + x + x + ", 
-"          x x . x . x x x x x x + x x x x x ", 
-"        . x . x . x . x x x x x x x x x x x ", 
-"      . x x x . x . x x x x x x + x x x x x ", 
-"    . x . x . x . x . x x x x x x x x x x x ", 
-"  . x . x x x . x . x x x x x x + x x x x x ", 
-". . . . . x . . . . . x . x . x Y x . x . x ", 
-". . . . . x . . . . . . x . x . Y . x . x . ",
-". . . . . x . . . . . x . x . x Y x . x . x ", 
-". . . . . x . . . . . . x . x . Y . x . x . ", 
-". . . . . x . . . . . x . x . x Y x . x . x ", 
-"x x x x x x x x x x x x x x x x x x x x x x ", 
-". . . . . x . . . . . x . x . x Y x . x . x ", 
-". . . . . x . . . . . . x . x . Y . x . x . ", 
-". . . . . x . . . . . x . x . x Y x . x . x ", 
-". . . . . x . . . . . . x . x . Y . x . x . ", 
-". . . . . x . . . . . x . x . x Y x . x . x "
-} ;
diff --git a/nx-X11/extras/Xpm/sxpm/sxpm.c b/nx-X11/extras/Xpm/sxpm/sxpm.c
deleted file mode 100644
index 9d0b42e43..000000000
--- a/nx-X11/extras/Xpm/sxpm/sxpm.c
+++ /dev/null
@@ -1,709 +0,0 @@
-/*
- * Copyright (C) 1989-95 GROUPE BULL
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of GROUPE BULL shall not be
- * used in advertising or otherwise to promote the sale, use or other dealings
- * in this Software without prior written authorization from GROUPE BULL.
- */
-/* $XFree86: xc/extras/Xpm/sxpm/sxpm.c,v 1.2 2001/08/01 00:44:34 tsi Exp $ */
-
-/*****************************************************************************\
-* sxpm.c:                                                                     *
-*                                                                             *
-*  Show XPM File program                                                      *
-*                                                                             *
-*  Developed by Arnaud Le Hors                                                *
-\*****************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <X11/StringDefs.h>
-#include <X11/Intrinsic.h>
-#include <X11/IntrinsicP.h>
-#include <X11/Shell.h>
-
-#ifdef VMS
-#include <X11/shape.h>
-#else
-#include <X11/extensions/shape.h>
-#endif
-
-#include <X11/xpm.h>
-
-/* XPM */
-/* plaid pixmap */
-static char *plaid[] = {
-    /* width height ncolors chars_per_pixel */
-    "22 22 4 2 XPMEXT",
-    /* colors */
-    "   c red 	m white  s light_color",
-    "Y  c green	m black  s lines_in_mix",
-    "+  c yellow	m white  s lines_in_dark",
-    "x 		m black  s dark_color",
-    /* pixels */
-    "x   x   x x x   x   x x x x x x + x x x x x ",
-    "  x   x   x   x   x   x x x x x x x x x x x ",
-    "x   x   x x x   x   x x x x x x + x x x x x ",
-    "  x   x   x   x   x   x x x x x x x x x x x ",
-    "x   x   x x x   x   x x x x x x + x x x x x ",
-    "Y Y Y Y Y x Y Y Y Y Y + x + x + x + x + x + ",
-    "x   x   x x x   x   x x x x x x + x x x x x ",
-    "  x   x   x   x   x   x x x x x x x x x x x ",
-    "x   x   x x x   x   x x x x x x + x x x x x ",
-    "  x   x   x   x   x   x x x x x x x x x x x ",
-    "x   x   x x x   x   x x x x x x + x x x x x ",
-    "          x           x   x   x Y x   x   x ",
-    "          x             x   x   Y   x   x   ",
-    "          x           x   x   x Y x   x   x ",
-    "          x             x   x   Y   x   x   ",
-    "          x           x   x   x Y x   x   x ",
-    "x x x x x x x x x x x x x x x x x x x x x x ",
-    "          x           x   x   x Y x   x   x ",
-    "          x             x   x   Y   x   x   ",
-    "          x           x   x   x Y x   x   x ",
-    "          x             x   x   Y   x   x   ",
-    "          x           x   x   x Y x   x   x ",
-    "bullshit",
-    "XPMEXT ext1 data1",
-    "XPMEXT ext2",
-    "data2_1",
-    "data2_2",
-    "XPMEXT",
-    "foo",
-    "",
-    "XPMEXT ext3",
-    "data3",
-    "XPMENDEXT"
-};
-
-#define win XtWindow(topw)
-#define dpy XtDisplay(topw)
-#define root XRootWindowOfScreen(XtScreen(topw))
-#define xrdb XtDatabase(dpy)
-static Colormap colormap;
-
-void Usage();
-void ErrorMessage();
-void Punt();
-void VersionInfo();
-
-#ifdef __STDC__
-void kinput(Widget widget, char *tag, XEvent *xe, Boolean *b);
-#else
-void kinput();
-#endif
-
-#define IWIDTH      50
-#define IHEIGHT     50
-
-typedef struct _XpmIcon {
-    Pixmap pixmap;
-    Pixmap mask;
-    XpmAttributes attributes;
-}        XpmIcon;
-
-static char **command;
-static Widget topw;
-static XpmIcon view, icon;
-static XrmOptionDescRec options[] = {
-    {"-hints", ".hints", XrmoptionNoArg, (XtPointer) "True"},
-    {"-icon", ".icon", XrmoptionSepArg, (XtPointer) NULL},
-};
-
-int
-main(argc, argv)
-    int argc;
-    char **argv;
-{
-    int ErrorStatus;
-    unsigned int verbose = 0;		/* performs verbose output */
-    unsigned int stdinf = 1;		/* read from stdin */
-    unsigned int stdoutf = 0;		/* write to stdout */
-    unsigned int nod = 0;		/* no display */
-    unsigned int nom = 0;		/* no mask display */
-    unsigned int incResize = 0;
-    unsigned int resize = 0;
-    unsigned int w_rtn;
-    unsigned int h_rtn;
-    char *input = NULL;
-    char *output = NULL;
-    char *iconFile = NULL;
-    unsigned int numsymbols = 0;
-    XpmColorSymbol symbols[10];
-    char *stype;
-    XrmValue val;
-    unsigned long valuemask = 0;
-    int n;
-    Arg args[4];
-
-#ifdef Debug
-    char **data;
-    char *buffer;
-#endif
-
-    topw = XtInitialize(argv[0], "Sxpm",
-			options, XtNumber(options), &argc, argv);
-
-    if (!topw) {
-	fprintf(stderr, "Sxpm Error... [ Undefined DISPLAY ]\n");
-	exit(1);
-    }
-    colormap = XDefaultColormapOfScreen(XtScreen(topw));
-
-    /*
-     * geometry management
-     */
-
-    if (XrmGetResource(xrdb, NULL, "sxpm.geometry", &stype, &val)
-	|| XrmGetResource(xrdb, NULL, "Sxpm.geometry", &stype, &val)) {
-
-	int flags;
-	int x_rtn;
-	int y_rtn;
-	char *geo = NULL;
-
-	geo = (char *) val.addr;
-	flags = XParseGeometry(geo, &x_rtn, &y_rtn,
-			       (unsigned int *) &w_rtn,
-			       (unsigned int *) &h_rtn);
-
-	if (!((WidthValue & flags) && (HeightValue & flags)))
-	    resize = 1;
-
-    } else
-	resize = 1;
-
-    n = 0;
-    if (resize) {
-	w_rtn = 0;
-	h_rtn = 0;
-	XtSetArg(args[n], XtNwidth, 1);
-	n++;
-	XtSetArg(args[n], XtNheight, 1);
-	n++;
-    }
-    XtSetArg(args[n], XtNmappedWhenManaged, False);
-    n++;
-    XtSetArg(args[n], XtNinput, True);
-    n++;
-    XtSetValues(topw, args, n);
-
-    if ((XrmGetResource(xrdb, "sxpm.hints", "", &stype, &val)
-	 || XrmGetResource(xrdb, "Sxpm.hints", "", &stype, &val))
-	&& !strcmp((char *) val.addr, "True")) {
-	/* gotcha */
-	incResize = 1;
-	resize = 1;
-    }
-
-    /*
-     * icon management
-     */
-
-    if (XrmGetResource(xrdb, "sxpm.icon", "", &stype, &val)
-	|| XrmGetResource(xrdb, "Sxpm.icon", "", &stype, &val)) {
-	iconFile = (char *) val.addr;
-    }
-    if (iconFile) {
-
-	XColor color, junk;
-	Pixel bpix;
-	Window iconW;
-
-	if (XAllocNamedColor(dpy, colormap, "black", &color, &junk))
-	    bpix = color.pixel;
-	else
-	    bpix = XBlackPixelOfScreen(XtScreen(topw));
-
-	iconW = XCreateSimpleWindow(dpy, root, 0, 0,
-				    IWIDTH, IHEIGHT, 1, bpix, bpix);
-
-	icon.attributes.valuemask = XpmReturnAllocPixels;
-	ErrorStatus = XpmReadFileToPixmap(dpy, root, iconFile, &icon.pixmap,
-					  &icon.mask, &icon.attributes);
-	ErrorMessage(ErrorStatus, "Icon");
-
-	XSetWindowBackgroundPixmap(dpy, iconW, icon.pixmap);
-
-	n = 0;
-	XtSetArg(args[n], XtNbackground, bpix);
-	n++;
-	XtSetArg(args[n], XtNiconWindow, iconW);
-	n++;
-	XtSetValues(topw, args, n);
-    }
-
-    /*
-     * arguments parsing
-     */
-
-    command = argv;
-    for (n = 1; n < argc; n++) {
-	if (strcmp(argv[n], "-plaid") == 0) {
-	    stdinf = 0;
-	    continue;
-	}
-	if (argv[n][0] != '-') {
-	    stdinf = 0;
-	    input = argv[n];
-	    continue;
-	}
-	if ((strlen(argv[n]) == 1) && (argv[n][0] == '-'))
-	    /* stdin */
-	    continue;
-	if (strcmp(argv[n], "-o") == 0) {
-	    if (n < argc - 1) {
-		if ((strlen(argv[n + 1]) == 1) && (argv[n + 1][0] == '-'))
-		    stdoutf = 1;
-		else
-		    output = argv[n + 1];
-		n++;
-		continue;
-	    } else
-		Usage();
-	}
-	if (strcmp(argv[n], "-nod") == 0) {
-	    nod = 1;
-	    continue;
-	}
-	if (strcmp(argv[n], "-nom") == 0) {
-	    nom = 1;
-	    continue;
-	}
-	if (strcmp(argv[n], "-sc") == 0) {
-	    if (n < argc - 2) {
-		valuemask |= XpmColorSymbols;
-		symbols[numsymbols].name = argv[++n];
-		symbols[numsymbols++].value = argv[++n];
-		continue;
-	    } else
-		Usage();
-	}
-	if (strcmp(argv[n], "-sp") == 0) {
-	    if (n < argc - 2) {
-		valuemask |= XpmColorSymbols;
-		symbols[numsymbols].name = argv[++n];
-		symbols[numsymbols].value = NULL;
-		symbols[numsymbols++].pixel = atol(argv[++n]);
-		continue;
-	    }
-	}
-	if (strcmp(argv[n], "-cp") == 0) {
-	    if (n < argc - 2) {
-		valuemask |= XpmColorSymbols;
-		symbols[numsymbols].name = NULL;
-		symbols[numsymbols].value = argv[++n];
-		symbols[numsymbols++].pixel = atol(argv[++n]);
-		continue;
-	    }
-	}
-	if (strcmp(argv[n], "-mono") == 0) {
-	    valuemask |= XpmColorKey;
-	    view.attributes.color_key = XPM_MONO;
-	    continue;
-	}
-	if (strcmp(argv[n], "-gray4") == 0 || strcmp(argv[n], "-grey4") == 0) {
-	    valuemask |= XpmColorKey;
-	    view.attributes.color_key = XPM_GRAY4;
-	    continue;
-	}
-	if (strcmp(argv[n], "-gray") == 0 || strcmp(argv[n], "-grey") == 0) {
-	    valuemask |= XpmColorKey;
-	    view.attributes.color_key = XPM_GRAY;
-	    continue;
-	}
-	if (strcmp(argv[n], "-color") == 0) {
-	    valuemask |= XpmColorKey;
-	    view.attributes.color_key = XPM_COLOR;
-	    continue;
-	}
-	if (strncmp(argv[n], "-closecolors", 6) == 0) {
-	    valuemask |= XpmCloseness;
-	    view.attributes.closeness = 40000;
-	    continue;
-	}
-	if (strcmp(argv[n], "-rgb") == 0) {
-	    if (n < argc - 1) {
-		valuemask |= XpmRgbFilename;
-		view.attributes.rgb_fname = argv[++n];
-		continue;
-	    } else
-		Usage();
-
-	}
-	if (strncmp(argv[n], "-version", 4) == 0) {
-	    VersionInfo();
-	    exit(0);
-	}
-	if (strcmp(argv[n], "-v") == 0) {
-	    verbose = 1;
-	    continue;
-	}
-	if (strcmp(argv[n], "-pcmap") == 0) {
-	    valuemask |= XpmColormap;
-	    continue;
-	}
-	Usage();
-    }
-
-    XtRealizeWidget(topw);
-    if (valuemask & XpmColormap) {
-	colormap = XCreateColormap(dpy, win,
-				   DefaultVisual(dpy, DefaultScreen(dpy)),
-				   AllocNone);
-	view.attributes.colormap = colormap;
-	XSetWindowColormap(dpy, win, colormap);
-    }
-    view.attributes.colorsymbols = symbols;
-    view.attributes.numsymbols = numsymbols;
-    view.attributes.valuemask = valuemask;
-
-#ifdef Debug
-    /* this is just to test the XpmCreateDataFromPixmap function */
-
-    view.attributes.valuemask |= XpmReturnAllocPixels;
-    view.attributes.valuemask |= XpmReturnExtensions;
-    ErrorStatus = XpmCreatePixmapFromData(dpy, win, plaid,
-					  &view.pixmap, &view.mask,
-					  &view.attributes);
-    ErrorMessage(ErrorStatus, "Plaid");
-
-    ErrorStatus = XpmCreateDataFromPixmap(dpy, &data, view.pixmap, view.mask,
-					  &view.attributes);
-    ErrorMessage(ErrorStatus, "Data");
-    if (verbose && view.attributes.nextensions) {
-	unsigned int i, j;
-
-	for (i = 0; i < view.attributes.nextensions; i++) {
-	    fprintf(stderr, "Xpm extension : %s\n",
-		    view.attributes.extensions[i].name);
-	    for (j = 0; j < view.attributes.extensions[i].nlines; j++)
-		fprintf(stderr, "\t\t%s\n",
-			view.attributes.extensions[i].lines[j]);
-	}
-    }
-    XFreePixmap(dpy, view.pixmap);
-    if (view.mask)
-	XFreePixmap(dpy, view.mask);
-
-    XFreeColors(dpy, colormap,
-		view.attributes.alloc_pixels,
-		view.attributes.nalloc_pixels, 0);
-
-    XpmFreeAttributes(&view.attributes);
-    view.attributes.valuemask = valuemask;
-#endif
-
-    if (input || stdinf) {
-	view.attributes.valuemask |= XpmReturnInfos;
-	view.attributes.valuemask |= XpmReturnAllocPixels;
-	view.attributes.valuemask |= XpmReturnExtensions;
-
-#ifdef Debug
-	XpmFree(data);
-
-	/*
-	 * this is just to test the XpmCreatePixmapFromBuffer and
-	 * XpmCreateBufferFromPixmap functions
-	 */
-	ErrorStatus = XpmReadFileToBuffer(input, &buffer);
-	ErrorMessage(ErrorStatus, "CreateBufferFromFile");
-
-	ErrorStatus = XpmCreatePixmapFromBuffer(dpy, win, buffer,
-						&view.pixmap, &view.mask,
-						&view.attributes);
-	ErrorMessage(ErrorStatus, "CreatePixmapFromBuffer");
-	XpmFree(buffer);
-	ErrorStatus = XpmCreateBufferFromPixmap(dpy, &buffer,
-						view.pixmap, view.mask,
-						&view.attributes);
-	ErrorMessage(ErrorStatus, "CreateBufferFromPixmap");
-	ErrorStatus = XpmWriteFileFromBuffer("buffer_output", buffer);
-	ErrorMessage(ErrorStatus, "WriteFileFromBuffer");
-	XpmFree(buffer);
-	if (view.pixmap) {
-	    XFreePixmap(dpy, view.pixmap);
-	    if (view.mask)
-		XFreePixmap(dpy, view.mask);
-
-	    XFreeColors(dpy, colormap, view.attributes.alloc_pixels,
-			view.attributes.nalloc_pixels, 0);
-
-	    XpmFreeAttributes(&view.attributes);
-	}
-	ErrorStatus = XpmReadFileToData(input, &data);
-	ErrorMessage(ErrorStatus, "ReadFileToData");
-	ErrorStatus = XpmCreatePixmapFromData(dpy, win, data,
-					      &view.pixmap, &view.mask,
-					      &view.attributes);
-	ErrorMessage(ErrorStatus, "CreatePixmapFromData");
-	ErrorStatus = XpmWriteFileFromData("sxpmout.xpm", data);
-	ErrorMessage(ErrorStatus, "WriteFileFromData");
-	XpmFree(data);
-	XpmFreeAttributes(&view.attributes);
-#endif
-	ErrorStatus = XpmReadFileToPixmap(dpy, win, input,
-					  &view.pixmap, &view.mask,
-					  &view.attributes);
-	ErrorMessage(ErrorStatus, "Read");
-	if (verbose && view.attributes.nextensions) {
-	    unsigned int i, j;
-
-	    for (i = 0; i < view.attributes.nextensions; i++) {
-		fprintf(stderr, "Xpm extension : %s\n",
-			view.attributes.extensions[i].name);
-		for (j = 0; j < view.attributes.extensions[i].nlines; j++)
-		    fprintf(stderr, "\t\t%s\n",
-			    view.attributes.extensions[i].lines[j]);
-	    }
-	}
-    } else {
-#ifdef Debug
-	ErrorStatus = XpmCreatePixmapFromData(dpy, win, data,
-					      &view.pixmap, &view.mask,
-					      &view.attributes);
-	XpmFree(data);
-#else
-	ErrorStatus = XpmCreatePixmapFromData(dpy, win, plaid,
-					      &view.pixmap, &view.mask,
-					      &view.attributes);
-#endif
-	ErrorMessage(ErrorStatus, "Plaid");
-    }
-    if (output || stdoutf) {
-	ErrorStatus = XpmWriteFileFromPixmap(dpy, output, view.pixmap,
-					     view.mask, &view.attributes);
-	ErrorMessage(ErrorStatus, "Write");
-    }
-    if (!nod) {
-
-	/*
-	 * manage display if requested
-	 */
-
-	XSizeHints size_hints;
-	char *xString = NULL;
-
-	if (w_rtn && h_rtn
-	    && ((w_rtn < view.attributes.width)
-		|| h_rtn < view.attributes.height)) {
-	    resize = 1;
-	}
-	if (resize) {
-	    XtResizeWidget(topw,
-			   view.attributes.width, view.attributes.height, 1);
-	}
-	if (incResize) {
-	    size_hints.flags = USSize | PMinSize | PResizeInc;
-	    size_hints.height = view.attributes.height;
-	    size_hints.width = view.attributes.width;
-	    size_hints.height_inc = view.attributes.height;
-	    size_hints.width_inc = view.attributes.width;
-	} else
-	    size_hints.flags = PMinSize;
-
-	size_hints.min_height = view.attributes.height;
-	size_hints.min_width = view.attributes.width;
-	XSetWMNormalHints(dpy, win, &size_hints);
-
-	if (input) {
-	    xString = (char *) XtMalloc((sizeof(char) * strlen(input)) + 20);
-	    sprintf(xString, "Sxpm: %s", input);
-	    XStoreName(dpy, win, xString);
-	    XSetIconName(dpy, win, xString);
-	} else if (stdinf) {
-	    XStoreName(dpy, win, "Sxpm: stdin");
-	    XSetIconName(dpy, win, "Sxpm: stdin");
-	} else {
-	    XStoreName(dpy, win, "Sxpm");
-	    XSetIconName(dpy, win, "Sxpm");
-	}
-
-	XtAddEventHandler(topw, KeyPressMask, False,
-			  (XtEventHandler) kinput, NULL);
-	XSetWindowBackgroundPixmap(dpy, win, view.pixmap);
-
-	if (view.mask && !nom)
-	    XShapeCombineMask(dpy, win, ShapeBounding, 0, 0,
-			      view.mask, ShapeSet);
-
-	XClearWindow(dpy, win);
-	XtMapWidget(topw);
-	if (xString)
-	    XtFree(xString);
-	XtMainLoop();
-    }
-    Punt(0);
-
-    /* Muffle gcc */
-    return 0;
-}
-
-void
-Usage()
-{
-    fprintf(stderr, "\nUsage:  %s [options...]\n", command[0]);
-    fprintf(stderr, "Where options are:\n\
-\n\
-[-d host:display]            Display to connect to.\n\
-[-g geom]                    Geometry of window.\n\
-[-hints]                     Set ResizeInc for window.\n\
-[-icon filename]             Set pixmap for iconWindow.\n\
-[-plaid]                     Read the included plaid pixmap.\n\
-[filename]                   Read from file 'filename', and from standard\n\
-                             input if 'filename' is '-'.\n\
-[-o filename]                Write to file 'filename', and to standard\n\
-                             output if 'filename' is '-'.\n\
-[-pcmap]                     Use a private colormap.\n\
-[-closecolors]               Try to use `close' colors.\n\
-[-nod]                       Don't display in window.\n\
-[-nom]                       Don't use clip mask if any.\n\
-[-mono]                      Use the colors specified for a monochrome visual.\n\
-[-grey4]                     Use the colors specified for a 4 greyscale visual.\n\
-[-grey]                      Use the colors specified for a greyscale visual.\n\
-[-color]                     Use the colors specified for a color visual.\n\
-[-sc symbol color]           Override color defaults.\n\
-[-sp symbol pixel]           Override color defaults.\n\
-[-cp color pixel]            Override color defaults.\n\
-[-rgb filename]              Search color names in the rgb text file 'filename'.\n\
-[-v]                         Verbose - print out extensions.\n\
-[-version]                   Print out program's version number\n\
-                             and library's version number if different.\n\
-if no input is specified sxpm reads from standard input.\n\
-\n");
-    exit(0);
-}
-
-
-void
-ErrorMessage(ErrorStatus, tag)
-    int ErrorStatus;
-    char *tag;
-{
-    char *error = NULL;
-    char *warning = NULL;
-
-    switch (ErrorStatus) {
-    case XpmSuccess:
-	return;
-    case XpmColorError:
-	warning = "Could not parse or alloc requested color";
-	break;
-    case XpmOpenFailed:
-	error = "Cannot open file";
-	break;
-    case XpmFileInvalid:
-	error = "Invalid XPM file";
-	break;
-    case XpmNoMemory:
-	error = "Not enough memory";
-	break;
-    case XpmColorFailed:
-	error = "Failed to parse or alloc some color";
-	break;
-    }
-
-    if (warning)
-	fprintf(stderr, "%s Xpm Warning: %s.\n", tag, warning);
-
-    if (error) {
-	fprintf(stderr, "%s Xpm Error: %s.\n", tag, error);
-	Punt(1);
-    }
-}
-
-void
-Punt(i)
-    int i;
-{
-    if (icon.pixmap) {
-	XFreePixmap(dpy, icon.pixmap);
-	if (icon.mask)
-	    XFreePixmap(dpy, icon.mask);
-
-	XFreeColors(dpy, colormap,
-		    icon.attributes.alloc_pixels,
-		    icon.attributes.nalloc_pixels, 0);
-
-	XpmFreeAttributes(&icon.attributes);
-    }
-    if (view.pixmap) {
-	XFreePixmap(dpy, view.pixmap);
-	if (view.mask)
-	    XFreePixmap(dpy, view.mask);
-
-	XFreeColors(dpy, colormap,
-		    view.attributes.alloc_pixels,
-		    view.attributes.nalloc_pixels, 0);
-
-	XpmFreeAttributes(&view.attributes);
-    }
-    exit(i);
-}
-
-void
-kinput(widget, tag, xe, b)
-    Widget widget;
-    char *tag;
-    XEvent *xe;
-    Boolean *b;
-{
-    char c = '\0';
-
-    XLookupString(&(xe->xkey), &c, 1, NULL, NULL);
-    if (c == 'q' || c == 'Q')
-	Punt(0);
-}
-
-/*
- * small function to extract various version numbers from the given global
- * number (following the rule described in xpm.h).
- */
-void
-GetNumbers(num, format_return, libmajor_return, libminor_return)
-    int num;
-    int *format_return;
-    int *libmajor_return;
-    char *libminor_return;
-{
-    *format_return = num / 10000;
-    *libmajor_return = (num % 10000) / 100;
-    *libminor_return = 'a' + (num % 10000) % 100 - 1;
-}
-
-void
-VersionInfo()
-{
-    int format, libmajor;
-    char libminor;
-
-    GetNumbers(XpmIncludeVersion, &format, &libmajor, &libminor);
-    fprintf(stderr, "sxpm version: %d.%d%c\n",
-	    format, libmajor, libminor);
-    /*
-     * if we are linked to an XPM library different from the one we've been
-     * compiled with, print its own number too.
-     */
-    if (XpmIncludeVersion != XpmLibraryVersion()) {
-	GetNumbers(XpmLibraryVersion(), &format, &libmajor, &libminor);
-	fprintf(stderr, "using the XPM library version: %d.%d%c\n",
-		format, libmajor, libminor);
-    }
-}
diff --git a/nx-X11/extras/Xpm/sxpm/sxpm.man b/nx-X11/extras/Xpm/sxpm/sxpm.man
deleted file mode 100644
index 9d727fa32..000000000
--- a/nx-X11/extras/Xpm/sxpm/sxpm.man
+++ /dev/null
@@ -1,132 +0,0 @@
-.\"Copyright (C) 1989-95 GROUPE BULL
-.\"
-.\"Permission is hereby granted, free of charge, to any person obtaining a copy
-.\"of this software and associated documentation files (the "Software"), to
-.\"deal in the Software without restriction, including without limitation the
-.\"rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-.\"sell copies of the Software, and to permit persons to whom the Software is
-.\"furnished to do so, subject to the following conditions:
-.\"
-.\"The above copyright notice and this permission notice shall be included in
-.\"all copies or substantial portions of the Software.
-.\"
-.\"THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-.\"GROUPE BULL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-.\"AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-.\"CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-.\"
-.\"Except as contained in this notice, the name of GROUPE BULL shall not be
-.\"used in advertising or otherwise to promote the sale, use or other dealings
-.\"in this Software without prior written authorization from GROUPE BULL.
-.\"
-.\" $XFree86$
-.nr )S 12
-.TH SXPM 1
-.PD
-.ad b
-.SH NAME
-sxpm \- Show an XPM (X PixMap) file and/or convert XPM 1 or 2 files to XPM 3.
-.SH SYNOPSIS
-\fBsxpm\fR
-[\|\fB-d\fR displayname\|] 
-[\|\fB-g\fR geometry\|] 
-[\|\fB-hints\fR\|] 
-[\|\fB-icon\fR filename\|] 
-[\|\fB-plaid\| | \|\fRfilename\| | \|-\|]
-[\|\fB-o\fR filename\| | \|\fB-o\fR -\|] 
-[\|\fB-pcmap\fR\|] 
-[\|\fB-closecolors\fR\|] 
-[\|\fB-nod\fR\|] 
-[\|\fB-nom\fR\|] 
-[\|\fB-mono | -grey4 | -grey | -color\fR\|] 
-[\|\fB-sc\fR symbol color\|] 
-[\|\fB-sp\fR symbol pixel\|] 
-[\|\fB-cp\fR color pixel\|] 
-[\|\fB-rgb\fR filename\|] 
-[\|\fB-v\fR\|] 
-.SH DESCRIPTION
-.PP
-The \fIsxpm\fP program can be used to view any XPM (version 1, 2, or 3) file
-and/or to convert a file from XPM1 or XPM2 to XPM version 3. If \fIsxpm\fP is
-run with any dummy option specified, the usage is displayed. If no geometry is
-specified, the show window will have the size of the read pixmap. Pressing the
-key Q in the window will quit the program.
-.SH OPTIONS
-.TP 8
-.B \-d \fIdisplay\fP
-Specifies the display to connect to.
-.TP 8
-.B \-g \fIgeom\fP
-Window geometry (default is pixmap's size).
-.TP 8
-.B \-hints
-Set ResizeInc for window.
-.TP 8
-.B \-icon \fIfilename\fP
-Set icon to pixmap created from the file \fIfilename\fP.
-.TP 8
-.B \-plaid
-Show the plaid pixmap which is stored as data\fP.
-.TP 8
-.B \fIfilename\fP
-Read from the file \fIfilename\fP and from standard input if \fIfilename\fP is '-'.
-If no input is specified sxpm reads from standard input.
-.TP 8
-.B \-o \fIfilename\fP
-Write to the file \fIfilename\fP (overwrite if it already exists) and to
-standard output if \fIfilename\fP is '-'.
-.TP 8
-.B \-mono
-Use the colors specified for a monochrome visual.
-.TP 8
-.B \-grey4
-Use the colors specified for a 4 color greyscale visual.
-.TP 8
-.B \-grey
-Use the colors specified for a greyscale visual.
-.TP 8
-.B \-color
-Use the colors specified for a color visual.
-.TP 8
-.B \-pcmap
-Use a private colormap.
-.TP 8
-.B \-closecolors
-Try to use "close colors" before reverting to other visuals.
-.TP 8
-.B \-nod
-Do not display the pixmap in a window.  (Useful when using as converter)
-.TP 8
-.B \-nom
-Do not use the clipmask if there is any.
-.TP 8
-.B \-sc \fIsymbol colorname\fP
-Override default color to \fIsymbol\fP to \fIcolorname\fP.
-.TP 8
-.B \-sp \fIsymbol pixelvalue\fP
-Override default color to \fIsymbol\fP to \fIpixelvalue\fP.
-.TP 8
-.B \-cp \fIcolorname pixelvalue\fP
-Override default color to \fIcolorname\fP to \fIpixelvalue\fP.
-.TP 8
-.B \-rgb \fIfilename\fP
-Search color names in the file \fIfilename\fP and write them out instead of
-the rgb values.
-.TP 8
-.B \-v
-Verbose - to print out extensions (stderr).
-
-
-.SH KNOWN BUGS
-Some window managers may not accept a pixmap which is not a bitmap as icon
-because this does not respect ICCCM, many of the well known ones will accept
-it though.
-
-.SH AUTHOR
-Arnaud Le Hors    (lehors@sophia.inria.fr)
-.br
-Bull Research France
-.br
-Copyright (C) 1989-95 by Groupe Bull.