Revision bump, closes bug #72818

2 files changed, 1389 insertions, 0 deletions

diff --git a/x11-plugins/wmnet/files/digest-wmnet-1.06-r1 b/x11-plugins/wmnet/files/digest-wmnet-1.06-r1
new file mode 100644
index 000000000000..5c529e7b47d4
--- /dev/null
+++ b/x11-plugins/wmnet/files/digest-wmnet-1.06-r1
@@ -0,0 +1 @@
+MD5 64e74c37c0cb5fd4fb81cfb0f5c4a264 wmnet-1.06.tar.gz 27506
diff --git a/x11-plugins/wmnet/files/wmnet-1.06-misc.patch b/x11-plugins/wmnet/files/wmnet-1.06-misc.patch
new file mode 100644
index 000000000000..b8b798d71e08
--- /dev/null
+++ b/x11-plugins/wmnet/files/wmnet-1.06-misc.patch
@@ -0,0 +1,1388 @@
+diff -Naur wmnet-1.06/Imakefile wmnet-1.06.new/Imakefile
+--- wmnet-1.06/Imakefile	2000-05-05 02:34:29.000000000 +0200
++++ wmnet-1.06.new/Imakefile	2004-12-05 12:08:30.858261448 +0100
+@@ -1,10 +1,10 @@
+ DEPLIBS = $(DEPXLIB) 
+-CC = gcc -Wall
++CC = gcc -Wall -O2
+ 
+ #ifdef LinuxArchitecture
+ STD_DEFINES = -Dlinux
+ DEFINES = -Dlinux_libc5
+-#if LinuxCLibMajorVersion > 5
++#if 1
+ DEFINES = -Dlinux_libc6
+ #endif
+ LOCAL_LIBRARIES = $(XLIB) -lm 
+diff -Naur wmnet-1.06/Makefile wmnet-1.06.new/Makefile
+--- wmnet-1.06/Makefile	1970-01-01 01:00:00.000000000 +0100
++++ wmnet-1.06.new/Makefile	2004-12-05 12:08:30.873259168 +0100
+@@ -0,0 +1,1107 @@
++# Makefile generated by imake - do not edit!
++# $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $
++
++# ----------------------------------------------------------------------
++# Makefile generated from "Imake.tmpl" and <Imakefile>
++# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
++#
++#
++#
++#
++# $XFree86: xc/config/cf/Imake.tmpl,v 3.141 2003/03/19 01:49:23 dawes Exp $
++# ----------------------------------------------------------------------
++
++all::
++
++.SUFFIXES: .i
++
++# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $
++
++# $XFree86: xc/config/cf/Imake.cf,v 3.81 2003/02/18 16:51:45 tsi Exp $
++
++# Keep cpp from replacing path elements containing i486/i586/i686
++
++# -----------------------------------------------------------------------
++# site-specific configuration parameters that need to come before
++# the platform-specific parameters - edit site.def to change
++
++# site:  $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
++
++# site:  $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $
++
++# $XFree86: xc/config/cf/xf86site.def,v 3.182 2002/10/11 01:40:22 dawes Exp $
++
++# ----------------------------------------------------------------------
++# platform-specific configuration parameters - edit linux.cf to change
++
++# platform:  $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
++
++# platform:  $XFree86: xc/config/cf/linux.cf,v 3.201.2.1 2003/03/13 04:10:40 tsi Exp $
++
++# operating system:  Linux 2.6.7 i686 [ELF] (2.6.7)
++# libc:	(6.3.2)
++# binutils:	(215)
++
++# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
++# $XFree86: xc/config/cf/lnxLib.rules,v 3.44 2002/11/18 22:47:25 dawes Exp $
++
++# $XFree86: xc/config/cf/xfree86.cf,v 3.439.2.2 2003/04/23 19:55:19 herrb Exp $
++
++# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
++
++VENDORMANNAME = XFree86
++VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
++
++AFB_DEFS = -DUSE_AFB
++
++DRIVERSDKDIR = $(USRLIBDIR)/Server
++DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules
++DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include
++
++       XF86SRC = $(SERVERSRC)/hw/xfree86
++    XF86COMSRC = $(XF86SRC)/common
++ XF86PARSERSRC = $(XF86SRC)/parser
++     XF86OSSRC = $(XF86SRC)/os-support
++ XF86DRIVERSRC = $(XF86SRC)/drivers
++     DRIVERSRC = $(XF86DRIVERSRC)
++
++        XFREE86DOCDIR = $(DOCDIR)
++      XFREE86PSDOCDIR = $(DOCPSDIR)
++    XFREE86HTMLDOCDIR = $(DOCHTMLDIR)
++XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
++
++# $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $
++
++# $XFree86: xc/config/cf/xf86.rules,v 3.34 2001/07/19 02:22:44 tsi Exp $
++
++# ----------------------------------------------------------------------
++# site-specific configuration parameters that go after
++# the platform-specific parameters - edit site.def to change
++
++# site:  $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $
++
++# site:  $XFree86: xc/config/cf/site.def,v 3.25 2002/02/27 00:51:12 dawes Exp $
++
++# ---------------------------------------------------------------------
++# Imake rules for building libraries, programs, scripts, and data files
++# rules:  $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $
++#
++#
++#
++#
++# rules:  $XFree86: xc/config/cf/Imake.rules,v 3.114 2003/03/19 01:49:23 dawes Exp $
++
++ _NULLCMD_ = @ echo -n
++
++GLIDE2INCDIR =
++
++GLIDE3INCDIR =
++
++GLIDE3LIBNAME =
++
++TKLIBNAME =
++
++TKLIBDIR =
++
++TCLLIBNAME =
++
++TCLIBDIR =
++
++          PATHSEP = /
++            SHELL = /bin/sh -e
++
++              TOP = .
++      CURRENT_DIR = .
++
++            IMAKE = imake
++           DEPEND = gccmakedep
++        MKDIRHIER = mkdir -p
++          REVPATH = revpath
++    EXPORTLISTGEN =
++             RMAN = rman
++     RMANBASENAME = rman
++      RMANOPTIONS = -f HTML
++        CONFIGSRC = $(TOP)/config
++         IMAKESRC = $(CONFIGSRC)/imake
++        DEPENDSRC = $(CONFIGSRC)/util
++
++          INCROOT = /usr/X11R6/include
++        USRLIBDIR = /usr/X11R6/lib
++           VARDIR = /var
++        VARLIBDIR = $(VARDIR)/lib
++  SYSTEMUSRLIBDIR = /usr/lib
++  SYSTEMUSRINCDIR = /usr/include
++         SHLIBDIR = /usr/X11R6/lib
++       LINTLIBDIR = $(USRLIBDIR)/lint
++          MANPATH = /usr/X11R6/man
++    MANSOURCEPATH = $(MANPATH)/man
++           MANDIR = $(MANSOURCEPATH)$(MANSECT)
++    SYSCALLMANDIR = $(MANSOURCEPATH)$(SYSCALLMANSECT)
++        LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSECT)
++     DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSECT)
++       FILEMANDIR = $(MANSOURCEPATH)$(FILEMANSECT)
++       GAMEMANDIR = $(MANSOURCEPATH)$(GAMEMANSECT)
++       MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSECT)
++        ADMMANDIR = $(MANSOURCEPATH)$(ADMMANSECT)
++          ICONDIR = "/usr/share/icons"
++      XCURSORPATH = "~/.icons:/usr/share/icons:/usr/share/pixmaps"
++     LOGDIRECTORY = $(VARDIR)/log
++
++        VARRUNDIR = $(VARDIR)/run
++
++         VARDBDIR = $(VARDIR)/lib
++
++               AR = ar clq
++
++# Nice try but useless: make will inherit BOOTSTRAPCFLAGS
++# from  top Makefile
++  BOOTSTRAPCFLAGS =
++
++               CC = gcc -m32
++               AS = gcc -m32 -c -x assembler
++
++.SUFFIXES: .cc
++
++              CXX = c++ -m32
++
++          CXXFILT = c++filt
++           CXXLIB =
++    CXXDEBUGFLAGS = -g -O2 -fno-strict-aliasing
++CXXDEPENDINCLUDES =
++ CXXEXTRA_DEFINES =
++CXXEXTRA_INCLUDES =
++   CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L 				-D_POSIX_SOURCE -D_XOPEN_SOURCE 				-D_BSD_SOURCE -D_SVID_SOURCE 				  				 $(CXXPROJECT_DEFINES)
++       CXXOPTIONS =
++      CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
++       CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
++         CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES)
++
++         COMPRESS = compress
++          GZIPCMD = gzip
++
++              CPP = /usr/bin/cpp $(STD_CPP_DEFINES)
++           RAWCPP = /usr/bin/cpp -undef $(STD_CPP_OPTIONS)
++    PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES)
++
++          INSTALL = install
++     INSTALLFLAGS = -c
++
++               LD = gcc -m32 -nostdlib
++
++              LEX = flex -l
++               M4 = m4
++          M4FLAGS =
++           LEXLIB = -lfl
++             YACC = bison -y
++           CCYACC = bison -y
++
++             LINT = lint
++
++      LINTLIBFLAG = -C
++         LINTOPTS = -axz
++               LN = ln -s
++             MAKE = make
++               MV = mv -f
++               CP = cp
++
++           RANLIB = ranlib
++
++  RANLIBINSTFLAGS =
++
++               RM = rm -f
++             PERL = perl
++         PERLOPTS =
++
++          MANSECT = 1
++   SYSCALLMANSECT = 2
++       LIBMANSECT = 3
++    DRIVERMANSECT = 4
++      FILEMANSECT = 5
++      GAMEMANSECT = 6
++      MISCMANSECT = 7
++       ADMMANSECT = 8
++       MANSRCSECT = s
++       MANNEWSECT = n
++ PROJECTMANSUFFIX = X11
++        MANSUFFIX = $(MANSECT)$(PROJECTMANSUFFIX)
++ SYSCALLMANSUFFIX = $(SYSCALLMANSECT)$(PROJECTMANSUFFIX)
++     LIBMANSUFFIX = $(LIBMANSECT)$(PROJECTMANSUFFIX)
++  DRIVERMANSUFFIX = $(DRIVERMANSECT)$(PROJECTMANSUFFIX)
++    FILEMANSUFFIX = $(FILEMANSECT)$(PROJECTMANSUFFIX)
++    GAMEMANSUFFIX = $(GAMEMANSECT)$(PROJECTMANSUFFIX)
++    MISCMANSUFFIX = $(MISCMANSECT)$(PROJECTMANSUFFIX)
++     ADMMANSUFFIX = $(ADMMANSECT)$(PROJECTMANSUFFIX)
++     MANSRCSUFFIX = man
++     MANNEWSUFFIX = _man
++          MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__mansuffix__=$(MANSECT)$(PROJECTMANSUFFIX) -D__osmansuffix__=$(MANSECT) -D__syscallmansuffix__=$(SYSCALLMANSECT)$(PROJECTMANSUFFIX) -D__ossysmansuffix__=$(SYSCALLMANSECT) -D__libmansuffix__=$(LIBMANSECT)$(PROJECTMANSUFFIX) -D__oslibmansuffix__=$(LIBMANSECT) -D__drivermansuffix__=$(DRIVERMANSECT)$(PROJECTMANSUFFIX) -D__osdrivermansuffix__=$(DRIVERMANSECT) -D__filemansuffix__=$(FILEMANSECT)$(PROJECTMANSUFFIX) -D__osfilemansuffix__=$(FILEMANSECT) -D__gamemansuffix__=$(GAMEMANSECT)$(PROJECTMANSUFFIX) -D__osgamemansuffix__=$(GAMEMANSECT) -D__miscmansuffix__=$(MISCMANSECT)$(PROJECTMANSUFFIX) -D__osmiscmansuffix__=$(MISCMANSECT) -D__admmansuffix__=$(ADMMANSECT)$(PROJECTMANSUFFIX) -D__osadmmansuffix__=$(ADMMANSECT) -D__projectroot__=$(PROJECTROOT) $(XORGMANDEFS) $(VENDORMANDEFS)
++
++   COMPRESSMANCMD = gzip -n
++
++            TROFF = groff -Tps
++            NROFF = nroff
++
++         HTMLROFF = groff -Thtml
++
++         MSMACROS = -ms
++        MANMACROS = -man
++              TBL = tbl
++              EQN = eqn
++             NEQN = neqn
++              COL = col
++         COLFLAGS = -b
++
++            MODCC = gcc -m32
++
++           MODCPP = /usr/bin/cpp
++        MODCFLAGS = $(CFLAGS)
++            MODAS = gcc -m32 -c -x assembler
++       MODASFLAGS =
++
++            MODLD = gcc -m32 -nostdlib
++
++       MODLDFLAGS =
++MODLDCOMBINEFLAGS = -r
++            MODAR = ar clq
++
++        MODRANLIB = ranlib
++
++     STD_INCLUDES =
++  STD_CPP_OPTIONS = -traditional
++  STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L 				-D_POSIX_SOURCE -D_XOPEN_SOURCE 				-D_BSD_SOURCE -D_SVID_SOURCE 				  				 $(PROJECT_DEFINES)
++      STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L 				-D_POSIX_SOURCE -D_XOPEN_SOURCE 				-D_BSD_SOURCE -D_SVID_SOURCE 				  				 $(PROJECT_DEFINES)
++ EXTRA_LOAD_FLAGS =
++  EXTRA_LDOPTIONS =
++  EXTRA_LIBRARIES =
++             TAGS = ctags
++
++   PARALLELMFLAGS =
++
++    SHAREDCODEDEF =
++         SHLIBDEF =
++
++     SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS)
++
++         PICFLAGS = -fPIC
++
++      CXXPICFLAGS = -fPIC
++
++    PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO
++
++     INSTPGMFLAGS =
++
++     INSTBINFLAGS = -m 0755
++     INSTUIDFLAGS = -m 4711
++     INSTLIBFLAGS = -m 0644
++     INSTINCFLAGS = -m 0444
++     INSTMANFLAGS = -m 0444
++     INSTDATFLAGS = -m 0444
++    INSTKMEMFLAGS = -m 4711
++
++      PROJECTROOT = /usr/X11R6
++
++      CDEBUGFLAGS = -g -O2 -fno-strict-aliasing
++        CCOPTIONS =
++
++      ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
++       ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
++           CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
++        LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
++         LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS)
++        LDPOSTLIB =
++        LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS)  $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
++     CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
++
++           LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
++
++           CCLINK = $(CC)
++
++          CXXLINK = $(CXX)
++
++     LDSTRIPFLAGS = -x
++   LDCOMBINEFLAGS = -r
++      DEPENDFLAGS =
++   DEPEND_DEFINES =
++
++# Not sure this belongs here
++         TKLIBDIR =
++         TKINCDIR =
++        TKLIBNAME =
++        TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME)
++        TCLLIBDIR =
++        TCLINCDIR =
++       TCLLIBNAME =
++       TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME)
++
++        MACROFILE = linux.cf
++           RM_CMD = $(RM)
++
++    IMAKE_DEFINES =
++   IMAKE_WARNINGS = -Wundef
++
++         IRULESRC = $(CONFIGDIR)
++        IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) 		    $(IMAKE_WARNINGS)
++
++     ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl 			$(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) 			$(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xf86site.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES)
++
++# $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $
++
++# $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
++
++# ----------------------------------------------------------------------
++# X Window System Build Parameters and Rules
++# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $
++#
++#
++#
++#
++# $XFree86: xc/config/cf/X11.tmpl,v 1.196.2.3 2003/10/08 17:56:30 eich Exp $
++
++XORGRELSTRING = Release 6.6
++XORGMANNAME = X Version 11
++
++VENDORMANNAME = XFree86
++VENDORMANVERSION = `echo 4 3 0 1 | sed -e 's/ /./g' -e 's/^/Version\\\ /'`
++
++STICKY_DEFINES = -DHAS_STICKY_DIR_BIT
++
++FCHOWN_DEFINES = -DHAS_FCHOWN
++
++# -----------------------------------------------------------------------
++# X Window System make variables; these need to be coordinated with rules
++
++             XTOP = $(TOP)
++           BINDIR = /usr/X11R6/bin
++     BUILDINCROOT = $(TOP)/exports
++      BUILDINCDIR = $(BUILDINCROOT)/include
++      BUILDINCTOP = ../..
++      BUILDLIBDIR = $(TOP)/exports/lib
++      BUILDLIBTOP = ../..
++      BUILDBINDIR = $(TOP)/exports/bin
++      BUILDBINTOP = ../..
++   BUILDMODULEDIR = $(BUILDLIBDIR)/modules
++   BUILDMODULETOP = $(BUILDLIBTOP)/..
++    XBUILDINCROOT = $(XTOP)/exports
++     XBUILDINCDIR = $(XBUILDINCROOT)/include/X11
++     XBUILDINCTOP = ../../..
++     XBUILDBINDIR = $(XBUILDINCROOT)/bin
++           INCDIR = $(INCROOT)
++           ADMDIR = /usr/adm
++           LIBDIR = /usr/X11R6/lib/X11
++       LIBEXECDIR = /usr/X11R6/libexec
++        MODULEDIR = $(USRLIBDIR)/modules
++   TOP_X_INCLUDES =
++
++        ETCX11DIR = /etc/X11
++
++          CONFDIR = $(ETCX11DIR)
++
++           DOCDIR = $(LIBDIR)/doc
++       DOCHTMLDIR = $(DOCDIR)/html
++         DOCPSDIR = $(DOCDIR)/PostScript
++        DOCPDFDIR = $(DOCDIR)/PDF
++          FONTDIR = $(LIBDIR)/fonts
++     ENCODINGSDIR = $(FONTDIR)/encodings
++         XINITDIR = $(LIBDIR)/xinit
++           XDMDIR = $(LIBDIR)/xdm
++        XDMVARDIR = $(VARLIBDIR)/xdm
++           TWMDIR = $(LIBDIR)/twm
++           XSMDIR = $(LIBDIR)/xsm
++           NLSDIR = $(LIBDIR)/nls
++       XLOCALEDIR = $(LIBDIR)/locale
++        PEXAPIDIR = $(LIBDIR)/PEX
++      LBXPROXYDIR = $(LIBDIR)/lbxproxy
++  PROXYMANAGERDIR = $(LIBDIR)/proxymngr
++        XPRINTDIR = $(LIBDIR)/xserver
++      XAPPLOADDIR = $(LIBDIR)/app-defaults
++       FONTCFLAGS = -t
++
++     INSTAPPFLAGS = $(INSTDATFLAGS)
++
++              RGB = $(BINDIR)/rgb
++            FONTC = $(BINDIR)/bdftopcf
++        MKFONTDIR = $(BINDIR)/mkfontdir
++      MKHTMLINDEX = $(BINDIR)/mkhtmlindex
++          UCS2ANY = $(BINDIR)/ucs2any
++      BDFTRUNCATE = $(BINDIR)/bdftruncate
++     UCSMAPPREFIX = $(FONTDIR)/util/map-
++       XCURSORGEN = $(BINDIR)/xcursorgen
++
++     HTMLINDEXCMD = $(MKHTMLINDEX)
++
++       DOCUTILSRC = $(XTOP)/doc/util
++        CLIENTSRC = $(TOP)/clients
++          DEMOSRC = $(TOP)/demos
++       XDOCMACROS = $(DOCUTILSRC)/macros.t
++       XIDXMACROS = $(DOCUTILSRC)/indexmacros.t
++       PROGRAMSRC = $(TOP)/programs
++           LIBSRC = $(XTOP)/lib
++          FONTSRC = $(XTOP)/fonts
++     ENCODINGSSRC = $(FONTSRC)/encodings
++       INCLUDESRC = $(BUILDINCROOT)/include
++      XINCLUDESRC = $(INCLUDESRC)/X11
++        SERVERSRC = $(XTOP)/programs/Xserver
++       CONTRIBSRC = $(XTOP)/../contrib
++   UNSUPPORTEDSRC = $(XTOP)/unsupported
++           DOCSRC = $(XTOP)/doc
++           RGBSRC = $(XTOP)/programs/rgb
++      BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf
++     MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir
++    FONTSERVERSRC = $(PROGRAMSRC)/xfs
++       FONTINCSRC = $(XTOP)/include/fonts
++        EXTINCSRC = $(XTOP)/include/extensions
++      FTSOURCEDIR = $(TOP)/extras/FreeType
++     XTTSOURCEDIR = $(TOP)/extras/X-TrueType
++       MESASRCDIR = $(TOP)/extras/Mesa
++  OGLSAMPLESRCDIR = $(TOP)/extras/ogl-sample
++        PSWRAPSRC = $(XTOP)/config/pswrap
++     TRANSCOMMSRC = $(LIBSRC)/xtrans
++   TRANS_INCLUDES = -I$(TRANSCOMMSRC)
++ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES)
++
++      XORGMANDEFS = -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"'
++    VENDORMANDEFS = -D__vendorversion__="\"Version $(VENDORMANVERSION)\" $(VENDORMANNAME)"
++
++       XENVLIBDIR = $(USRLIBDIR)
++   CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR)
++
++# $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $
++# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.14 2001/08/01 00:44:32 tsi Exp $
++
++          XLIBSRC = $(LIBSRC)/X11
++
++SOXLIBREV = 6.2
++DEPXONLYLIB =
++XONLYLIB =  -lX11
++
++LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln
++
++         XLIBONLY = $(XONLYLIB)
++
++      XEXTLIBSRC = $(LIBSRC)/Xext
++
++SOXEXTREV = 6.4
++DEPEXTENSIONLIB =
++EXTENSIONLIB =  -lXext
++
++LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln
++
++LINTEXTENSIONLIB = $(LINTEXTENSION)
++          DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB)
++             XLIB = $(EXTENSIONLIB) $(XONLYLIB)
++         LINTXLIB = $(LINTXONLYLIB)
++
++    XSSLIBSRC = $(LIBSRC)/Xss
++
++DEPXSSLIB = $(USRLIBDIR)/libXss.a
++XSSLIB =  -lXss
++
++LINTXSS = $(LINTLIBDIR)/llib-lXss.ln
++
++    XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc
++
++DEPXXF86MISCLIB = $(USRLIBDIR)/libXxf86misc.a
++XXF86MISCLIB =  -lXxf86misc
++
++LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln
++
++    XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm
++
++DEPXXF86VMLIB = $(USRLIBDIR)/libXxf86vm.a
++XXF86VMLIB =  -lXxf86vm
++
++LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln
++
++    XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga
++
++DEPXXF86DGALIB = $(USRLIBDIR)/libXxf86dga.a
++XXF86DGALIB =  -lXxf86dga
++
++LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln
++
++    XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush
++
++DEPXXF86RUSHLIB = $(USRLIBDIR)/libXxf86rush.a
++XXF86RUSHLIB =  -lXxf86rush
++
++LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln
++
++    XVLIBSRC = $(LIBSRC)/Xv
++
++SOXVREV = 1.0
++DEPXVLIB =
++XVLIB =  -lXv
++
++LINTXV = $(LINTLIBDIR)/llib-lXv.ln
++
++    XVMCLIBSRC = $(LIBSRC)/XvMC
++
++DEPXVMCLIB = $(USRLIBDIR)/libXvMC.a
++XVMCLIB =  -lXvMC
++
++LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln
++
++    XINERAMALIBSRC = $(LIBSRC)/Xinerama
++
++DEPXINERAMALIB = $(USRLIBDIR)/libXinerama.a
++XINERAMALIB =  -lXinerama
++
++LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln
++
++    XRESLIBSRC = $(LIBSRC)/XRes
++
++DEPXRESLIB = $(USRLIBDIR)/libXRes.a
++XRESLIB =  -lXRes
++
++LINTXRES = $(LINTLIBDIR)/llib-lXRes.ln
++
++    DPSLIBSRC = $(LIBSRC)/dps
++
++SODPSREV = 1.0
++DEPDPSLIB =
++DPSLIB =  -ldps
++
++LINTDPS = $(LINTLIBDIR)/llib-ldps.ln
++
++    DPSTKLIBSRC = $(LIBSRC)/dpstk
++
++SODPSTKREV = 1.0
++DEPDPSTKLIB =
++DPSTKLIB =  -ldpstk
++
++LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln
++
++    PSRESLIBSRC = $(LIBSRC)/psres
++
++SOPSRESREV = 1.0
++DEPPSRESLIB =
++PSRESLIB =  -lpsres
++
++LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln
++
++    GLULIBSRC = $(LIBSRC)/GLU
++
++SOGLUREV = 1.3
++DEPGLULIB =
++GLULIB =  -lGLU
++
++LINTGLU = $(LINTLIBDIR)/llib-lGLU.ln
++
++    GLXLIBSRC = $(LIBSRC)/GL
++
++SOGLREV = 1.2
++DEPGLXLIB =
++GLXLIB =  -lGL
++
++LINTGLX = $(LINTLIBDIR)/llib-lGL.ln
++
++    GLWIDGETSRC = $(LIBSRC)/GLw
++
++DEPGLWLIB = $(USRLIBDIR)/libGLw.a
++GLWLIB =  -lGLw
++
++LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln
++
++    XRENDERLIBSRC = $(LIBSRC)/Xrender
++
++SOXRENDERREV = 1.2
++DEPXRENDERLIB =
++XRENDERLIB =  -lXrender
++
++LINTXRENDER = $(LINTLIBDIR)/llib-lXrender.ln
++
++XRENDERINCDIR=$(INCDIR)
++
++XRENDERINCLUDES = -I$(XRENDERINCDIR)
++
++    XRANDRRLIBSRC = $(LIBSRC)/Xrandr
++
++SOXRANDRREV = 2.0
++DEPXRANDRLIB =
++XRANDRLIB =  -lXrandr
++
++LINTXRANDR = $(LINTLIBDIR)/llib-lXrandr.ln
++
++   XCURSORRLIBSRC = $(LIBSRC)/Xcursor
++
++SOXCURSORREV = 1.0
++DEPXCURSORLIB =
++XCURSORLIB =  -lXcursor
++
++LINTXCURSOR = $(LINTLIBDIR)/llib-lXcursor.ln
++
++XCURSORINCDIR=$(INCDIR)
++
++XCURSORINCLUDES=-I$(XCURSORINCDIR) $(XRENDERINCLUDES)
++
++    XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache
++
++DEPXFONTCACHELIB = $(USRLIBDIR)/libXfontcache.a
++XFONTCACHELIB =  -lXfontcache
++
++LINTXFONTCACHE = $(LINTLIBDIR)/llib-lXfontcache.ln
++
++         XAUTHSRC = $(LIBSRC)/Xau
++
++DEPXAUTHLIB = $(USRLIBDIR)/libXau.a
++XAUTHLIB =  -lXau
++
++LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln
++
++      XDMCPLIBSRC = $(LIBSRC)/Xdmcp
++
++DEPXDMCPLIB = $(USRLIBDIR)/libXdmcp.a
++XDMCPLIB =  -lXdmcp
++
++LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln
++
++           XMUSRC = $(LIBSRC)/Xmu
++
++SOXMUREV = 6.2
++DEPXMULIB =
++XMULIB =  -lXmu
++
++LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln
++
++           XMUUSRC = $(LIBSRC)/Xmuu
++
++SOXMUUREV = 1.0
++DEPXMUULIB =
++XMUULIB =  -lXmuu
++
++LINTXMUU = $(LINTLIBDIR)/llib-lXmuu.ln
++
++       OLDXLIBSRC = $(LIBSRC)/oldX
++
++DEPOLDXLIB = $(USRLIBDIR)/liboldX.a
++OLDXLIB =  -loldX
++
++LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln
++
++         XPLIBSRC = $(LIBSRC)/Xp
++
++SOXPREV = 6.2
++DEPXPLIB =
++XPLIB =  -lXp
++
++LINTXP = $(LINTLIBDIR)/llib-lXp.ln
++
++       TOOLKITSRC = $(LIBSRC)/Xt
++
++SOXTREV = 6.0
++DEPXTOOLONLYLIB =
++XTOOLONLYLIB =  -lXt
++
++LINTXTOOLONLY = $(LINTLIBDIR)/llib-lXt.ln
++
++      DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB)
++         XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB)
++     LINTXTOOLLIB = $(LINTXTOOLONLYLIB)
++
++       XALIBSRC = $(LIBSRC)/Xa
++
++SOXAREV = 1.0
++DEPXALIB =
++XALIB =  -lXa
++
++LINTXA = $(LINTLIBDIR)/llib-lXa.ln
++
++       AWIDGETSRC = $(LIBSRC)/Xaw
++
++SOXAWREV = 7.0
++DEPXAWLIB =
++XAWLIB =  -lXaw
++
++LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln
++
++       AWIDGET6SRC = $(LIBSRC)/Xaw6
++
++SOXAW6REV = 6.1
++DEPXAW6LIB =
++XAW6LIB =  -lXaw
++
++LINTXAW6 = $(LINTLIBDIR)/llib-lXaw.ln
++
++         XILIBSRC = $(LIBSRC)/Xi
++
++SOXINPUTREV = 6.0
++DEPXILIB =
++XILIB =  -lXi
++
++LINTXI = $(LINTLIBDIR)/llib-lXi.ln
++
++      XTESTLIBSRC = $(LIBSRC)/Xtst
++
++SOXTESTREV = 6.1
++DEPXTESTLIB =
++XTESTLIB =  -lXtst
++
++LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln
++
++        PEXLIBSRC = $(LIBSRC)/PEX5
++
++SOPEXREV = 6.0
++DEPPEXLIB =
++PEXLIB =  -lPEX5
++
++LINTPEX = $(LINTLIBDIR)/llib-lPEX5.ln
++
++        XIELIBSRC = $(LIBSRC)/XIE
++
++SOXIEREV = 6.0
++DEPXIELIB =
++XIELIB =  -lXIE
++
++LINTXIE = $(LINTLIBDIR)/llib-lXIE.ln
++
++      PHIGSLIBSRC = $(LIBSRC)/PHIGS
++
++DEPPHIGSLIB = $(USRLIBDIR)/libphigs.a
++PHIGSLIB =  -lphigs
++
++LINTPHIGS = $(LINTLIBDIR)/llib-lphigs.ln
++
++DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a
++XBSDLIB =  -lXbsd
++
++LINTXBSD = $(LINTLIBDIR)/llib-lXbsd.ln
++
++           ICESRC = $(LIBSRC)/ICE
++
++SOICEREV = 6.3
++DEPICELIB =
++ICELIB =  -lICE
++
++LINTICE = $(LINTLIBDIR)/llib-lICE.ln
++
++            SMSRC = $(LIBSRC)/SM
++
++SOSMREV = 6.0
++DEPSMLIB =
++SMLIB =  -lSM
++
++LINTSM = $(LINTLIBDIR)/llib-lSM.ln
++
++           XKEYSRC = $(LIBSRC)/Xkey
++
++SOXKEYREV = 6.0
++DEPXKEYLIB =
++XKEYLIB =  -lXkey
++
++LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln
++
++         FSLIBSRC = $(LIBSRC)/FS
++
++DEPFSLIB = $(USRLIBDIR)/libFS.a
++FSLIB =  -lFS
++
++LINTFS = $(LINTLIBDIR)/llib-lFS.ln
++
++         FONTLIBSRC = $(LIBSRC)/font
++
++SOFONTREV = 1.4
++DEPFONTLIB =
++FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC)  -lXfont
++
++LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln
++#
++SOFONTREV = 1.4
++DEPXFONTLIB =
++XFONTLIB =  -lXfont
++
++LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln
++
++     FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs
++
++DEPFONTSTUBLIB = $(USRLIBDIR)/libfntstubs.a
++FONTSTUBLIB =  -lfntstubs
++
++LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln
++         DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB)
++            FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FONTFT2LIB)
++
++         FONTENCLIBSRC = $(LIBSRC)/fontenc
++
++DEPXFONTENCLIB = $(USRLIBDIR)/libfontenc.a
++XFONTENCLIB =  -lfontenc
++
++LINTXFONTENC = $(LINTLIBDIR)/llib-lfontenc.ln
++
++          XPMLIBSRC = $(LIBSRC)/Xpm
++
++SOXPMREV = 4.11
++DEPXPMLIB =
++XPMLIB =  -lXpm
++
++LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln
++
++          FREETYPE2LIBSRC = $(LIBSRC)/freetype2
++
++SOFREETYPE2REV = 6.3
++DEPFREETYPE2LIB =
++FREETYPE2LIB =  -lfreetype
++
++LINTFREETYPE2 = $(LINTLIBDIR)/llib-lfreetype.ln
++
++FREETYPE2INCDIR=$(INCDIR)/freetype2
++
++FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
++FREETYPE2DEFINES = -DFREETYPE2
++
++          EXPATLIBSRC = $(LIBSRC)/expat
++
++SOEXPATREV = 1.0
++DEPEXPATLIB =
++EXPATLIB =  -lexpat
++
++LINTEXPAT = $(LINTLIBDIR)/llib-lexpat.ln
++
++EXPATINCLUDES=$(TOP_X_INCLUDES)
++EXPATDEFINES=-DEXPAT
++
++          XFT1LIBSRC = $(LIBSRC)/Xft1
++
++SOXFT1REV = 1.1
++DEPXFT1LIB =
++XFT1LIB =  -lXft
++
++LINTXFT1 = $(LINTLIBDIR)/llib-lXft.ln
++
++          XFTLIBSRC = $(LIBSRC)/Xft
++
++SOXFTREV = 2.1
++DEPXFTLIB =
++XFTLIB =  -lXft
++
++LINTXFT = $(LINTLIBDIR)/llib-lXft.ln
++
++XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) $(XRENDERINCLUDES)
++
++          FONTCONFIGLIBSRC = $(LIBSRC)/fontconfig
++
++SOFONTCONFIGREV = 1.0
++DEPFONTCONFIGLIB =
++FONTCONFIGLIB =  -lfontconfig
++
++LINTFONTCONFIG = $(LINTLIBDIR)/llib-lfontconfig.ln
++
++FONTCONFIGINCDIR=$(INCDIR)
++
++FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR)
++
++FCCACHE = $(BINDIR)/fc-cache
++
++FONTCONFIGDEFINES = -DFONTCONFIG
++
++LIBPNGINCDIR = /usr/include
++
++LIBPNGINC=
++
++LIBPNGDIR = /usr
++LIBPNGLIBDIR = /usr/lib
++LIBPNGINCDIR = /usr/include
++
++LIBPNGLIB = -lpng
++
++    XKBFILELIBSRC = $(LIBSRC)/xkbfile
++
++DEPXKBFILELIB = $(USRLIBDIR)/libxkbfile.a
++XKBFILELIB =  -lxkbfile
++
++LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln
++
++     XKBCOMPCMD = $(BINDIR)/xkbcomp
++
++    XKBUILIBSRC = $(LIBSRC)/xkbui
++
++DEPXKBUILIB = $(USRLIBDIR)/libxkbui.a
++XKBUILIB =  -lxkbui
++
++LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln
++
++        XTRAPLIBSRC = $(LIBSRC)/XTrap
++
++SOXTRAPREV = 6.4
++DEPXTRAPLIB =
++XTRAPLIB =  -lXTrap
++
++LINTXTRAP = $(LINTLIBDIR)/llib-lXTrap.ln
++
++          DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB)
++
++         DEPLIBS1 = $(DEPLIBS)
++         DEPLIBS2 = $(DEPLIBS)
++         DEPLIBS3 = $(DEPLIBS)
++         DEPLIBS4 = $(DEPLIBS)
++         DEPLIBS5 = $(DEPLIBS)
++         DEPLIBS6 = $(DEPLIBS)
++         DEPLIBS7 = $(DEPLIBS)
++         DEPLIBS8 = $(DEPLIBS)
++         DEPLIBS9 = $(DEPLIBS)
++         DEPLIBS10 = $(DEPLIBS)
++
++XMULIBONLY = -lXmu
++XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
++
++        CONFIGDIR = $(LIBDIR)/config
++
++    USRLIBDIRPATH = $(USRLIBDIR)
++        LDPRELIBS = -L$(USRLIBDIR)  $(INSTALLED_LIBS)
++       LDPOSTLIBS =
++     TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES)
++  PROJECT_DEFINES =
++
++CXXPROJECT_DEFINES =
++
++# ----------------------------------------------------------------------
++# start of Imakefile
++
++DEPLIBS = $(DEPXLIB)
++CC = gcc -Wall -O2
++
++STD_DEFINES = -Dlinux
++DEFINES = -Dlinux_libc5
++
++DEFINES = -Dlinux_libc6
++
++LOCAL_LIBRARIES = $(XLIB) -lm
++
++LINTLIBS = $(LINTXLIB)
++
++SRCS = wmnet.c drivers.c
++OBJS = wmnet.o drivers.o
++
++        PROGRAM = wmnet
++
++all:: wmnet
++
++wmnet: $(OBJS) $(DEPLIBS)
++	$(RM) $@
++	$(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS)  $(EXTRA_LOAD_FLAGS)
++
++install:: wmnet
++	@if [ -d $(DESTDIR)$(BINDIR) ]; then \
++		set +x; \
++	else \
++		if [ -h $(DESTDIR)$(BINDIR) ]; then \
++			(set -x; rm -f $(DESTDIR)$(BINDIR)); \
++		fi; \
++		(set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \
++	fi
++	$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS)  wmnet $(DESTDIR)$(BINDIR)/wmnet
++
++all:: wmnet.$(MANSUFFIX).html
++
++wmnet.$(MANSUFFIX).html: wmnet.$(MANNEWSUFFIX)
++	$(RM) wmnet.$(MANSUFFIX).html wmnet.$(MANSUFFIX)-html
++	$(RMAN) $(RMANOPTIONS) < wmnet.$(MANNEWSUFFIX) \
++	  > wmnet.$(MANSUFFIX)-html && $(MV) wmnet.$(MANSUFFIX)-html $@
++
++install.man:: wmnet.$(MANSUFFIX).html
++	@if [ -d $(DESTDIR)$(DOCHTMLDIR) ]; then \
++		set +x; \
++	else \
++		if [ -h $(DESTDIR)$(DOCHTMLDIR) ]; then \
++			(set -x; rm -f $(DESTDIR)$(DOCHTMLDIR)); \
++		fi; \
++		(set -x; $(MKDIRHIER) $(DESTDIR)$(DOCHTMLDIR)); \
++	fi
++	@(SUF=`expr $(MANSUFFIX) \: '\(.\)'`; \
++	 set -x; \
++	 $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) wmnet.$(MANSUFFIX).html $(DESTDIR)$(DOCHTMLDIR)/wmnet.$$SUF.html)
++
++cleandir::
++	$(RM) wmnet.$(MANSUFFIX).html wmnet.$(MANSUFFIX)-html
++
++all:: wmnet.$(MANNEWSUFFIX)
++
++wmnet.$(MANNEWSUFFIX): wmnet.$(MANSRCSUFFIX)
++	$(RM) $@
++	cd `dirname wmnet` && \
++		$(LN) `basename wmnet.$(MANSRCSUFFIX)` `basename $@`
++
++cleandir::
++	$(RM) wmnet.$(MANNEWSUFFIX)
++
++install.man:: wmnet.$(MANNEWSUFFIX)
++	@if [ -d $(DESTDIR)$(MANDIR) ]; then \
++		set +x; \
++	else \
++		if [ -h $(DESTDIR)$(MANDIR) ]; then \
++			(set -x; rm -f $(DESTDIR)$(MANDIR)); \
++		fi; \
++		(set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); \
++	fi
++	$(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) wmnet.$(MANNEWSUFFIX) $(DESTDIR)$(MANDIR)/wmnet.$(MANSUFFIX)
++
++depend::
++	$(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS)
++
++lint:
++	$(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS)
++lint1:
++	$(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS)
++
++cleandir::
++	$(RM) wmnet
++
++# ----------------------------------------------------------------------
++# common rules for all Makefiles - do not edit
++
++.c.i:
++	$(RM) $@
++	 	$(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
++
++.SUFFIXES: .s
++
++.c.s:
++	$(RM) $@
++	 	$(CC) -S $(CFLAGS) $(_NOOP_) $*.c
++
++emptyrule::
++
++cleandir::
++	$(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut  "#"*
++
++Makefile::
++	-@if [ -f Makefile ]; then set -x; \
++	$(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \
++	else exit 0; fi
++	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
++
++tags::
++	$(TAGS) -w *.[ch]
++	$(TAGS) -xw *.[ch] > TAGS
++
++man_keywords::
++
++html_index::
++	$(HTMLINDEXCMD) $(DESTDIR)$(DOCHTMLDIR)
++
++clean:: cleandir
++
++distclean:: cleandir
++
++# ----------------------------------------------------------------------
++# empty rules for directories that do not have SUBDIRS - do not edit
++
++install::
++	@echo "install in $(CURRENT_DIR) done"
++
++install.man::
++	@echo "install.man in $(CURRENT_DIR) done"
++
++install.sdk::
++	@echo "install.sdk in $(CURRENT_DIR) done"
++
++Makefiles::
++
++includes::
++
++depend::
++
++distclean::
++	$(RM) Makefile Makefile.dep
++
++# ----------------------------------------------------------------------
++# dependencies generated by makedepend
++
+diff -Naur wmnet-1.06/drivers.c wmnet-1.06.new/drivers.c
+--- wmnet-1.06/drivers.c	2000-05-05 02:34:29.000000000 +0200
++++ wmnet-1.06.new/drivers.c	2004-12-05 12:08:30.866260232 +0100
+@@ -9,6 +9,7 @@
+  *  great, but please send me the diff.  
+  */
+ 
++#include<ctype.h>
+ #include<stdlib.h>
+ #include<stdio.h>
+ #include<string.h>
+@@ -318,6 +319,11 @@
+ 
+ #ifdef USE_2_1_DEV
+ 
++/* nelson@media.mit.edu - simple macro to skip to the next field in a character string.
++ * First skip all the non-space characters, then skip all the space characters.
++ */
++#define NEXTFIELD(p) while (!isspace(*(p))) (p)++; while (isspace(*(p))) (p)++;
++
+ int updateStats_dev(void) {
+ 	FILE *dev;
+         char *ptr;
+@@ -332,25 +338,42 @@
+ 				"Perhaps we are not running Linux?\n");
+ 		exit(4);
+ 	}
+-        /* the first two lines we can skip */
++        /* the first two lines we can skip - just text headers */
+         fgets(buffer, 256, dev);
+         fgets(buffer, 256, dev);
+ 
+-	/* IP Chain Rules for Linux kernel 2_1.x */
++	/* devstats for Linux kernel 2_1.x */
+ 	while(flag != (ACCOUNT_IN_FOUND|ACCOUNT_OUT_FOUND) && fgets(buffer, 256, dev)) {
++                /* scan to the first : to find the device name */
+ 		ptr = buffer;
+ 		while(*ptr == ' ') ptr++;
+ 		name = ptr;
+                 while(*ptr != ':') ptr++;
+-                *ptr = '\0';
++                *ptr = '\0';                      /* ptr used below! */
+ 
+ 		if (!strcmp(name, device)) {
++                        /* found the device we are monitoring, parse data. */
++                        /* nelson@media.mit.edu - hacked to deal with variable width data */
++
++                        int i;
++                        char *bytes_in_str, *packets_in_str, *bytes_out_str, *packets_out_str;
+ 				
+ 			flag = (ACCOUNT_IN_FOUND|ACCOUNT_OUT_FOUND);
+ 
+-			totalpackets_in = strtoul(&buffer[15], NULL, 10);	
++                        /* Bytes in is the first field after the :
++                         * Note, there may be no whitespace after :
++                         */
++                        bytes_in_str = ptr + 1;
++                        while (isspace(*bytes_in_str))
++                            bytes_in_str++;
++                        
++                        /* Packets in is the next field after bytes in */
++                        packets_in_str = bytes_in_str;
++                        NEXTFIELD(packets_in_str);
++                        
++			totalpackets_in = strtoul(packets_in_str, NULL, 10);	
+ 			if (totalpackets_in != lastpackets_in) {
+-				totalbytes_in = strtoul(&buffer[7], NULL, 10);
++				totalbytes_in = strtoul(bytes_in_str, NULL, 10);
+ 				diffpackets_in += totalpackets_in - lastpackets_in;
+ 				diffbytes_in += totalbytes_in - lastbytes_in;
+ 				lastpackets_in = totalpackets_in;
+@@ -358,16 +381,29 @@
+ 				rx = True; 
+ 			}
+ 			
++                        /* Bytes out is the seventh field after packets in */
++                        bytes_out_str = packets_in_str;
++                        for (i = 0; i < 7; i++) {
++                            NEXTFIELD(bytes_out_str);
++                        }
++                        
++                        /* Packets out is the next field after bytes out */
++                        packets_out_str = bytes_out_str;
++                        NEXTFIELD(packets_out_str);
+ 			
+-			totalpackets_out = strtoul(&buffer[74], NULL, 10);	
++			totalpackets_out = strtoul(packets_out_str, NULL, 10);	
+ 			if (totalpackets_out != lastpackets_out) {
+-				totalbytes_out = strtoul(&buffer[66], NULL, 10);
++				totalbytes_out = strtoul(bytes_out_str, NULL, 10);
+ 				diffpackets_out += totalpackets_out - lastpackets_out;
+ 				diffbytes_out += totalbytes_out - lastbytes_out;
+ 				lastpackets_out = totalpackets_out;
+ 				lastbytes_out = totalbytes_out;
+ 				tx = True; 
+ 			}
++#ifdef NELSONDEBUG
++                        fprintf(stderr, "%lu %lu %lu %lu\n", totalbytes_in, totalpackets_in,
++                                totalbytes_out, totalpackets_out);
++#endif
+ 		}
+ 	}
+ 	
+diff -Naur wmnet-1.06/wmnet.c wmnet-1.06.new/wmnet.c
+--- wmnet-1.06/wmnet.c	2000-05-05 03:01:14.000000000 +0200
++++ wmnet-1.06.new/wmnet.c	2004-12-05 12:08:30.850262664 +0100
+@@ -283,14 +283,14 @@
+                                        "  -L, --label=LABEL        display LABEL on bottom of window\n"
+                                        "  -F, --labelfg=COLOR      foreground color for the label\n"
+                                        "  -B, --labelbg=COLOR      background color for the label\n"
+-                                       "  -e, --execute=COMMAND    run COMMAND on click\n"
++                                       "  -e, --execute=COMMAND    run COMMAND on click\n");
+ #ifdef linux
+-				       "  -T, --txrule=RULE        accounting rule number (ipfwadm) or\n"
++				printf("  -T, --txrule=RULE        accounting rule number (ipfwadm) or\n"
+ 				       "                           IP chain name (ipchains) to monitor for tx\n"
+ 				       "  -R, --rxrule=RULE        accounting rule number (ipfwadm) or\n"
+-				       "                           IP chain name (ipchains) to monitor for rx\n"
++				       "                           IP chain name (ipchains) to monitor for rx\n");
+ #endif
+-				       "  -W, --device=DEVICE      monitor DEVICE for stats (devstats,kmem,pppstats)\n"
++				printf("  -W, --device=DEVICE      monitor DEVICE for stats (devstats,kmem,pppstats)\n"
+                                        "  -w, --withdrawn          start up in withdrawn state\n"
+                                        "  -n, --normalstate        start up in normal, shaped state\n"
+ 				       "  -t, --txcolor=COLOR      color for tx\n"
+@@ -343,8 +343,10 @@
+ 	sigemptyset(&signal_action.sa_mask);
+ 	signal_action.sa_flags = (SA_NOCLDSTOP|SA_RESTART);
+ #ifdef linux
++#if !defined(__alpha) && !defined(__hppa__) && !defined(__ia64__) // Alpha doen't have this structure member
+ 	signal_action.sa_restorer = NULL;
+ #endif
++#endif
+ 	if ((sigaction(SIGCHLD, &signal_action, NULL) == -1) ||
+ 	    (sigaction(SIGINT, &signal_action, NULL) == -1) ||
+ 	    (sigaction(SIGTERM, &signal_action, NULL) == -1)) {
+@@ -426,6 +428,8 @@
+ 
+ 	root_window = DefaultRootWindow(dpy);
+ 	createWin(&main_window);	
++	/*Trilobit anlegen eines buffers als pixmap*/
++	buffer_pixmap=XCreatePixmap(dpy, root_window, 64, 64, DefaultDepth(dpy, screen));
+ 
+ 	color.red = color.green = color.blue = 12000;
+ 	XAllocColor(dpy, DefaultColormap(dpy, screen), &color);
+@@ -474,9 +478,12 @@
+ 	XShapeCombineRectangles(dpy, *visible_window, ShapeBounding, 4, 4, &bound, 1, ShapeBounding, 0); 
+ 	XSelectInput(dpy, *visible_window, (ExposureMask|ButtonPressMask));
+ 	XMapSubwindows(dpy, *visible_window);
+-
++	/*Trilobit initialisieren des Buffers:*/
++	XSetForeground(dpy, graphics_context, darkgrey_pixel);
++	XFillRectangle(dpy, buffer_pixmap, graphics_context, GRAPH_X, GRAPH_Y, GRAPH_WIDTH, GRAPH_HEIGHT);
+ }
+ 
++/*************************** anfang zu verändern ************/
+ /* Utility function to create a window for setupX() */
+ void createWin(Window *win) {
+ 	XClassHint classHint;
+@@ -522,8 +529,10 @@
+ 	XSetBackground(dpy, graphics_context, black_pixel);
+ 	XCopyPlane(dpy, arrow, *visible_window, graphics_context, 7, 0, 7, 9, 53, 5, 1);
+ 	XCopyPlane(dpy, arrow, *visible_window, graphics_context, 0, 0, 7, 9, 46, 5, 1);
++	/*Trilobit ganz billig, einfach buffer zurückschreiben:*/
++	XCopyArea(dpy, buffer_pixmap, *visible_window, graphics_context, GRAPH_X, GRAPH_Y, GRAPH_WIDTH, GRAPH_HEIGHT, GRAPH_X, GRAPH_Y);
+ }
+-	
++/******************* ende zu verändern *********************/	
+ 	
+ /* Main loop that is called every delaytime.  This calls stat_gather() and updateSpeedometer() when needed 
+  * and takes care of the displaying and scrolling the graph */
+@@ -563,17 +572,17 @@
+ 		yy =  GRAPH_Y_UPPER + (GRAPH_HEIGHT * percent_tx) ; 
+ 		yy = yy > GRAPH_Y_BOTTOM ? GRAPH_Y_BOTTOM : yy; 
+ 
+-
++/************************ anfang zu verändern ***************/
+ 		/* only update the speedometer every 7th displayDelay */
+ 		if (t == 7) updateSpeedometer(rate_rx, rate_tx);
+ 		
+ 		/* blank var is just for stopping executing the X* funcs when the disp is all black */
+ 		if ((y == GRAPH_Y_BOTTOM && yy == GRAPH_Y_UPPER) && (diffbytes_in + diffbytes_out) == 0) blank++; else blank = 0;
+ 		if (blank < (GRAPH_WIDTH + 1) ) {
+-			XCopyArea(dpy, *visible_window, *visible_window, graphics_context, GRAPH_X + 1,
++			XCopyArea(dpy, buffer_pixmap, buffer_pixmap, graphics_context, GRAPH_X + 1,
+ 			   GRAPH_Y, GRAPH_WIDTH - 1, GRAPH_HEIGHT, GRAPH_X, GRAPH_Y);
+ 			XSetForeground(dpy, graphics_context, darkgrey_pixel);
+-			XDrawLine(dpy, *visible_window, graphics_context, GRAPH_X_RIGHT, y, GRAPH_X_RIGHT, yy);
++			XDrawLine(dpy, buffer_pixmap, graphics_context, GRAPH_X_RIGHT, y, GRAPH_X_RIGHT, yy);
+ 			if (( (yy == GRAPH_Y_UPPER && diffbytes_out > 0 && rate_rx > rate_tx) || (rate_rx >= rate_tx && yy != GRAPH_Y_UPPER)) ) {
+ 				drawColoredLine(GRAPH_Y_UPPER, yy, tx_pixel);				
+ 			}
+@@ -583,14 +592,17 @@
+ 			if (( (yy == GRAPH_Y_UPPER && diffbytes_out > 0) || (rate_rx < rate_tx && yy != GRAPH_Y_UPPER)) ) {
+ 				drawColoredLine(GRAPH_Y_UPPER, yy, tx_pixel);				
+ 			}
+-		}
+-
++			/* Trilobit nachdem buffer zurechtgebastelt, den kram ins fenster kopieren: */
++			XCopyArea(dpy, buffer_pixmap, *visible_window, graphics_context, GRAPH_X,
++			   GRAPH_Y, GRAPH_WIDTH, GRAPH_HEIGHT, GRAPH_X, GRAPH_Y);
++		}/*END if blank*/
++/************************* ende zu verändern *******************/
+ 
+ 		diffbytes_in = diffbytes_out = 0;
+ 		timelast = timenow;
+ 	}	
+ 
+-	if (!stat_gather()) {  /* Anything change? */
++	if (!stat_gather()) {  /* Anything change? erneuert nur die Pfeilanzeigen */
+ 		current_rx = rx;
+ 		current_tx = tx;
+ 		XSetBackground(dpy, graphics_context, black_pixel);
+@@ -675,7 +687,7 @@
+ 
+ }
+ 
+-
++/*************************** anfang zu verändern ***************/
+ /* called from within tock to draw the shaded lines making up our bar-graph */
+ void drawColoredLine(int y1, int y2, unsigned long *shadecolor) {
+ 	int subline[4], i;
+@@ -684,10 +696,13 @@
+ 	for(i = 0; i < 3; i++) {
+ 		if (y1 > y2) subline[i+1] = y1 - (((y1 - y2) * linebreaks[i]) / 100);
+ 		else subline[i+1] = y1 + (((y2 - y1) * linebreaks[i]) / 100);
+-		XSetForeground(dpy, graphics_context, shadecolor[i]); 
+-		XDrawLine(dpy, *visible_window, graphics_context, GRAPH_X_RIGHT, subline[i], GRAPH_X_RIGHT, subline[i+1]);
++		XSetForeground(dpy, graphics_context, shadecolor[i]);
++		/*Trilobit alles erstmal in meinen buffer schreiben: */
++		XDrawLine(dpy, buffer_pixmap, graphics_context, GRAPH_X_RIGHT, subline[i], GRAPH_X_RIGHT, subline[i+1]);
++		//XDrawLine(dpy, *visible_window, graphics_context, GRAPH_X_RIGHT, subline[i], GRAPH_X_RIGHT, subline[i+1]);
+ 	}
+ }
++/************************* ende zu verändern *******************/
+ 
+ 
+ /* Returns in returnarray a 3 value array containing 3 shades (low, normal, and high) of XColor shade.
+diff -Naur wmnet-1.06/wmnet.h wmnet-1.06.new/wmnet.h
+--- wmnet-1.06/wmnet.h	2000-05-05 03:02:26.000000000 +0200
++++ wmnet-1.06.new/wmnet.h	2004-12-05 12:08:30.853262208 +0100
+@@ -66,6 +66,7 @@
+ Window root_window, main_window, icon_window, *visible_window;
+ Font thefont;
+ Pixmap arrow;
++Pixmap buffer_pixmap; /*Trilobit pixmap als zwischenbuffer*/
+ Atom delete_atom;
+ int screen, specified_state = -1;
+ GC graphics_context;
+diff -Naur wmnet-1.06/wmnet.man wmnet-1.06.new/wmnet.man
+--- wmnet-1.06/wmnet.man	2000-05-05 02:43:35.000000000 +0200
++++ wmnet-1.06.new/wmnet.man	2004-12-05 12:08:30.861260992 +0100
+@@ -28,7 +28,7 @@
+ the data it gets.  It has small blinking lights for the rx and tx of IP
+ packets, a digital speedometer of your networks current
+ speed and a bar graph like xload plotting your throughput. It
+-has a tx speed graph from bottom-up and rx speed graph from the top-down.
++has a rx speed graph from bottom-up and tx speed graph from the top-down.
+ The speedometer keeps track of the current speed per second and shows
+ it in a color corresponding to which of rx or tx that has the highest
+ speed at the moment.  Also, the graph is drawn in a way that the highest