Get rid of some use of __NetBSD__. "values.h" is either inexistant or

deprecated on most systems.

12 files changed, 94 insertions, 144 deletions

diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index 1219f48ce42..9f17b10a6c1 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/03/03 19:22:23 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/04/11 21:31:59 jtb Exp $
 
 DISTNAME=		tcm-2.01.src
 PKGNAME=		tcm-2.01
@@ -11,15 +11,19 @@ COMMENT=		TCM - Toolkit for Conceptual Modeling
 
 WRKSRC=			${WRKDIR}/tcm-2.01/src
 
-HAS_CONFIGURE=		#defined
+HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	${SCRIPTDIR}/configure
-USE_X11=		#defined
-USE_X11BASE=		#defined
-USE_MOTIF=		#defined
+
+USE_X11=		yes
+USE_X11BASE=		yes
+USE_MOTIF=		yes
+
 MAKE_ENV+=		XWIN_HOME="${X11BASE}"
 MAKE_ENV+=		MOTIF_HOME="${MOTIFBASE}"
+
 TCM_SRC=		${WRKDIR}/tcm-2.01
 MAKE_ENV+=		TCM_HOME=${TCM_SRC}
+
 ALL_TARGET=		depend all
 
 post-extract:
@@ -29,80 +33,45 @@ do-configure:
 	${CONFIGURE_SCRIPT} ${WRKSRC}
 
 do-install:
-	@for f in tcm tcmd tcmt text2ps; do				\
-	i="${INSTALL_PROGRAM} ${TCM_SRC}/bin/$$f			\
-	${PREFIX}/bin/";						\
-	${ECHO} $$i; $$i;						\
-	done
-	@for f in tatd tcpd tcrd tdfd tdpd tefd terd tesd tfrt tgd	\
+	cd ${TCM_SRC}/bin && ${INSTALL_PROGRAM} tcm tcmd tcmt text2ps 	\
+		${PREFIX}/bin/
+	for f in tatd tcpd tcrd tdfd tdpd tefd terd tesd tfrt tgd	\
 	tgtt tpsd trpg tsnd tssd tstd tucd; do				\
 	${LN} -fs ${PREFIX}/bin/tcmd ${PREFIX}/bin/$$f;			\
 	done
-	@for f in tfet tgt ttdt ttut; do				\
+	for f in tfet tgt ttdt ttut; do					\
 	${LN} -fs ${PREFIX}/bin/tcmt ${PREFIX}/bin/$$f;			\
 	done
 	${INSTALL_SCRIPT} ${TCM_SRC}/bin/psf ${PREFIX}/bin
 	${INSTALL_DATA} ${TCM_SRC}/lib/tcm.conf ${PREFIX}/etc
-
-	${INSTALL_DATA} ${TCM_SRC}/lib/TCM				\
-	${PREFIX}/lib/X11/app-defaults/
-	@for f in ${TCM_SRC}/man/man1/*.1; do				\
-	i="${INSTALL_MAN} $$f ${PREFIX}/man/man1/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/lib/TCM ${PREFIX}/lib/X11/app-defaults/
+	${INSTALL_DATA} ${TCM_SRC}/man/man1/*.1 ${PREFIX}/man/man1/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tcm
 	${INSTALL_DATA} ${TCM_SRC}/lib/colorrgb.txt ${PREFIX}/share/tcm
 	${INSTALL_DATA} ${TCM_SRC}/lib/banner.ps ${PREFIX}/share/tcm
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tcm/help
-	@for f in ${TCM_SRC}/lib/help/* ${TCM_SRC}/CHANGELOG 		\
-	${TCM_SRC}/COPYING; do					   	\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/tcm/help/";		\
-	${ECHO} $$i; $$i;						\
-	done
+	cd ${TCM_SRC} && ${INSTALL_DATA} COPYING CHANGELOG lib/help/* 	\
+		${PREFIX}/share/tcm/help/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcm
-	@for f in README COPYING CHANGELOG; do				\
-	i="${INSTALL_DATA} ${TCM_SRC}/$$f				\
-	${PREFIX}/share/doc/tcm/";					\
-	${ECHO} $$i; $$i;						\
-	done
-	@for f in ${TCM_SRC}/doc/*.ps.gz; do				\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/doc/tcm/";		\
-	${ECHO} $$i; $$i;						\
-	done
+	cd ${TCM_SRC} && ${INSTALL_DATA} README COPYING CHANGELOG 	\
+		${PREFIX}/share/doc/tcm/
+	${INSTALL_DATA} ${TCM_SRC}/doc/*.ps.gz ${PREFIX}/share/doc/tcm/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm
-	@for f in ${TCM_SRC}/doc/*.html; do				\
-	i="${INSTALL_DATA} $$f ${PREFIX}/share/doc/html/tcm/";		\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/*.html ${PREFIX}/share/doc/html/tcm/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm/developersguide
-	@for f in ${TCM_SRC}/doc/developersguide/*; do			\
-	i="${INSTALL_DATA} $$f						\
-	${PREFIX}/share/doc/html/tcm/developersguide/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/developersguide/* 		\
+		${PREFIX}/share/doc/html/tcm/developersguide/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm/sourcecode
-	@for f in ${TCM_SRC}/doc/sourcecode/*; do			\
-	i="${INSTALL_DATA} $$f						\
-	${PREFIX}/share/doc/html/tcm/sourcecode/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/sourcecode/* 			\
+		${PREFIX}/share/doc/html/tcm/sourcecode/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm/specifications
-	@for f in ${TCM_SRC}/doc/specifications/*; do			\
-	i="${INSTALL_DATA} $$f						\
-	${PREFIX}/share/doc/html/tcm/specifications/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/specifications/* 		\
+		${PREFIX}/share/doc/html/tcm/specifications/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm/usersguide
-	@for f in ${TCM_SRC}/doc/usersguide/*; do			\
-	i="${INSTALL_DATA} $$f						\
-	${PREFIX}/share/doc/html/tcm/usersguide/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/usersguide/* 			\
+		${PREFIX}/share/doc/html/tcm/usersguide/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/tcm/wishlist
-	@for f in ${TCM_SRC}/doc/wishlist/*; do			\
-	i="${INSTALL_DATA} $$f						\
-	${PREFIX}/share/doc/html/tcm/wishlist/";			\
-	${ECHO} $$i; $$i;						\
-	done
+	${INSTALL_DATA} ${TCM_SRC}/doc/wishlist/* 			\
+		${PREFIX}/share/doc/html/tcm/wishlist/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tcm/files/patch-sum b/graphics/tcm/files/patch-sum
index c0db9584019..d1ab2b3a711 100644
--- a/graphics/tcm/files/patch-sum
+++ b/graphics/tcm/files/patch-sum
@@ -1,24 +1,24 @@
-$NetBSD: patch-sum,v 1.1.1.1 2001/02/24 01:30:05 jtb Exp $
+$NetBSD: patch-sum,v 1.2 2001/04/11 21:32:00 jtb Exp $
 
-MD5 (patch-aa) = e2768bfa8e1bac71ee5f484a328701e4
-MD5 (patch-ab) = 0a42af541371a6e4ea898819d8607f2c
-MD5 (patch-ac) = acb88ff211d3cec434ddc24b472e1080
-MD5 (patch-ad) = 36f2b5fd3cf2dd2338a807139038b93c
-MD5 (patch-ae) = 35dfda52e5c3e472358fafc7608ca99f
-MD5 (patch-af) = 9a4b8c08e5c89f969b6e044b684346f2
-MD5 (patch-ag) = 2b03ba6a93c59e9feeab4bfb9a15f547
-MD5 (patch-ah) = 1edf399d3a11fea221372a8980edcf47
-MD5 (patch-ai) = b96b99c0a374e95e133714e37ed4345b
-MD5 (patch-aj) = 6c069ce657ed7ab097e3e39b42c44277
-MD5 (patch-ak) = 2215a5937370e48340781c8dec6ae14d
-MD5 (patch-al) = d1d3b83071849b10aba7c48bbeed4afc
-MD5 (patch-am) = 0bff1f17c4389bd1375b5b9085f16ffd
-MD5 (patch-an) = 981f5e4824d2992e0f00269640c3bc69
-MD5 (patch-ao) = d8c533226d02143c817aceee05195d24
-MD5 (patch-ap) = 45b7c391b0a3125cd6cbf36bb8157349
-MD5 (patch-aq) = 0053801b9fe0d9f692ba4e4c7095d111
-MD5 (patch-ar) = b6cafe548382f903331be4ce62f4ab9e
-MD5 (patch-as) = a6977614bea29f17c23993f1954e20c2
-MD5 (patch-at) = 288731dd14948417e5f1e859616bf8f5
-MD5 (patch-au) = e97d10f50cc0378207276ca6d8d61510
-MD5 (patch-av) = 70e99407d9e679ceac47cfb36cc18761
+SHA1 (patch-aa) = dbace6684330391301e97c74a53f91ef8481a7f9
+SHA1 (patch-ab) = f2270a49bca9fe40d524f532999b95997b9820d4
+SHA1 (patch-ac) = 1a85d3b44dbbf9291bec2f1a915ae23eec9818b3
+SHA1 (patch-ad) = e2b6b15d6265bf0077cebce9d25623ae06ef16e2
+SHA1 (patch-ae) = b710a716cbfd2bed5ffdb21c5e793185db9a07d8
+SHA1 (patch-af) = 50c87ea3ca5b2b494b51ea272aa0c43c02f7daa3
+SHA1 (patch-ag) = e29f2518c9e63f2b9e427a6b4af6978ef6f285f0
+SHA1 (patch-ah) = 095886753437f5b0c2d65333d846635abdddd81c
+SHA1 (patch-ai) = 5ac6114b5a2b1f72e7c03bc6ec722a1626e4a3ec
+SHA1 (patch-aj) = d8c2af60833f0316f37130b2e83be26efe3b6e86
+SHA1 (patch-ak) = a5258112b0635f410265911017909dc089670cc1
+SHA1 (patch-al) = 960f194ad17b38de64dd2737e43e4af7c6d6d979
+SHA1 (patch-am) = 7aa052825735b055f622c3917e14529ef5d808a5
+SHA1 (patch-an) = 49c046db0c5119685844bd4d54fb90ea52a2fae8
+SHA1 (patch-ao) = 3581a8395b2ad1a861781f12f1a2fe05b3970cf4
+SHA1 (patch-ap) = 8470d73a87c586989dedd9391ba511f3d4941dce
+SHA1 (patch-aq) = ed86083b7e02a235c84ffab3acbaffa8146f0945
+SHA1 (patch-ar) = e1e240d877c858c4e011b6199612f9409c1828c8
+SHA1 (patch-as) = a1800eedc10c93eaad394bb1eb5c081699fca864
+SHA1 (patch-at) = 6a013cb6f1339de575591c1697029b927b371243
+SHA1 (patch-au) = f8115a17a91f9617e87c6c74c37be1d0015b297b
+SHA1 (patch-av) = a3da31babd92db7877f9bb52f5f8be31ab9f49ae
diff --git a/graphics/tcm/patches/patch-ac b/graphics/tcm/patches/patch-ac
index e456a3b6e17..ff6a0c9c3ad 100644
--- a/graphics/tcm/patches/patch-ac
+++ b/graphics/tcm/patches/patch-ac
@@ -1,14 +1,12 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/02/24 01:30:05 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2001/04/11 21:32:00 jtb Exp $
 
---- dg/diagramchecks.h.orig	Thu Feb 22 17:24:21 2001
+--- dg/diagramchecks.h.orig	Fri Aug 27 14:11:46 1999
 +++ dg/diagramchecks.h
-@@ -23,7 +23,9 @@
+@@ -23,7 +23,6 @@
  #define _DIAGRAMCHECKS_H
  
  #include "bool.h"
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
+-#include <values.h>
  class Graph;
  class Diagram;
  class string;
diff --git a/graphics/tcm/patches/patch-ae b/graphics/tcm/patches/patch-ae
index df69edb2297..effd88b7326 100644
--- a/graphics/tcm/patches/patch-ae
+++ b/graphics/tcm/patches/patch-ae
@@ -1,18 +1,15 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/02/24 01:30:06 jtb Exp $
+$NetBSD: patch-ae,v 1.2 2001/04/11 21:32:00 jtb Exp $
 
---- sd/bv/stdiagram.c.orig	Thu Feb 22 17:27:07 2001
+--- sd/bv/stdiagram.c.orig	Tue Mar 21 12:53:27 2000
 +++ sd/bv/stdiagram.c
-@@ -34,7 +34,13 @@
+@@ -34,7 +34,9 @@
  #include "transitionarrow.h"
  #include "initialstatebox.h"
  #include "stdiagram.h"
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
-+#ifdef __NetBSD__
+-#include <values.h>
 +#include <limits.h>
++
 +#define MAXINT INT_MAX
-+#endif
  
  const int STDiagram::BOX_WIDTH = 100;
  const int STDiagram::BOX_HEIGHT = 38;
diff --git a/graphics/tcm/patches/patch-af b/graphics/tcm/patches/patch-af
index 9109e6aa9c9..a6d066e6699 100644
--- a/graphics/tcm/patches/patch-af
+++ b/graphics/tcm/patches/patch-af
@@ -1,18 +1,15 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/02/24 01:30:06 jtb Exp $
+$NetBSD: patch-af,v 1.2 2001/04/11 21:32:00 jtb Exp $
 
---- sd/bv/rpdiagram.c.orig	Thu Feb 22 17:30:14 2001
+--- sd/bv/rpdiagram.c.orig	Mon Jul 26 10:44:03 1999
 +++ sd/bv/rpdiagram.c
-@@ -34,7 +34,13 @@
+@@ -34,7 +34,9 @@
  #include "line.h"
  #include "rpdiagram.h"
  #include "diagramchecks.h"
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
-+#ifdef __NetBSD__
+-#include <values.h>
 +#include <limits.h>
++
 +#define MAXINT INT_MAX
-+#endif
  
  const int RPDiagram::BOX_WIDTH = 58;
  const int RPDiagram::BOX_HEIGHT = 38;
diff --git a/graphics/tcm/patches/patch-ag b/graphics/tcm/patches/patch-ag
index 53921ffcf04..82b6604c7e8 100644
--- a/graphics/tcm/patches/patch-ag
+++ b/graphics/tcm/patches/patch-ag
@@ -1,15 +1,14 @@
-$NetBSD: patch-ag,v 1.1.1.1 2001/02/24 01:30:06 jtb Exp $
+$NetBSD: patch-ag,v 1.2 2001/04/11 21:32:00 jtb Exp $
 
---- sd/bv/atdiagram.c.orig	Thu Feb 22 17:31:41 2001
+--- sd/bv/atdiagram.c.orig	Mon Oct 23 10:30:35 2000
 +++ sd/bv/atdiagram.c
-@@ -46,6 +46,10 @@
+@@ -46,6 +46,9 @@
  #include "atgraph.h"
  #include "atviewer.h"
  #include "atwindow.h"
-+#ifdef __NetBSD__
 +#include <limits.h>
++
 +#define MAXINT INT_MAX
-+#endif
  
  const int ATDiagram::DOT_WIDTH = 8;
   
diff --git a/graphics/tcm/patches/patch-ah b/graphics/tcm/patches/patch-ah
index 4ad0e2ca72e..a1601ae15dd 100644
--- a/graphics/tcm/patches/patch-ah
+++ b/graphics/tcm/patches/patch-ah
@@ -1,18 +1,15 @@
-$NetBSD: patch-ah,v 1.1.1.1 2001/02/24 01:30:06 jtb Exp $
+$NetBSD: patch-ah,v 1.2 2001/04/11 21:32:01 jtb Exp $
 
---- sd/dv/crdiagram.c.orig	Thu Feb 22 17:33:44 2001
+--- sd/dv/crdiagram.c.orig	Mon Sep 25 11:34:40 2000
 +++ sd/dv/crdiagram.c
-@@ -38,7 +38,13 @@
+@@ -38,7 +38,9 @@
  #include "textbox.h"
  #include "comment.h"
  #include "crdiagram.h"
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
-+#ifdef __NetBSD__
+-#include <values.h>
 +#include <limits.h>
++
 +#define MAXINT INT_MAX
-+#endif
  
  CRDiagram::CRDiagram(Config *c, CRWindow *d, CRViewer *v, CRGraph *g): 
  	   ERDiagram(c, d, v, g) {
diff --git a/graphics/tcm/patches/patch-ai b/graphics/tcm/patches/patch-ai
index 4ee2a29bb8f..fea0f33ce49 100644
--- a/graphics/tcm/patches/patch-ai
+++ b/graphics/tcm/patches/patch-ai
@@ -1,14 +1,12 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/02/24 01:30:06 jtb Exp $
+$NetBSD: patch-ai,v 1.2 2001/04/11 21:32:01 jtb Exp $
 
---- sd/dv/esddiagram.c.orig	Thu Feb 22 17:36:02 2001
+--- sd/dv/esddiagram.c.orig	Mon Oct 23 09:27:10 2000
 +++ sd/dv/esddiagram.c
-@@ -56,7 +56,9 @@
+@@ -56,7 +56,6 @@
  #include "miniellipse.h"
  #include "esddiagram.h"
  #include <stdio.h>
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
+-#include <values.h>
  
  const int ESDDiagram::MINI_ELLIPSE_WIDTH = 8;
  const int ESDDiagram::MINI_ELLIPSE_HEIGHT = 8;
diff --git a/graphics/tcm/patches/patch-aj b/graphics/tcm/patches/patch-aj
index 4925c4a0da9..1785cafea7b 100644
--- a/graphics/tcm/patches/patch-aj
+++ b/graphics/tcm/patches/patch-aj
@@ -1,14 +1,12 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/02/24 01:30:06 jtb Exp $
+$NetBSD: patch-aj,v 1.2 2001/04/11 21:32:01 jtb Exp $
 
---- sd/dv/ssddiagram.c.orig	Thu Feb 22 17:37:36 2001
+--- sd/dv/ssddiagram.c.orig	Mon Oct 23 09:22:45 2000
 +++ sd/dv/ssddiagram.c
-@@ -56,7 +56,9 @@
+@@ -56,7 +56,6 @@
  #include "note.h"
  #include "ssddiagram.h"
  #include <stdio.h>
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
+-#include <values.h>
  
  const int SSDDiagram::MINI_ELLIPSE_WIDTH = 8;
  const int SSDDiagram::MINI_ELLIPSE_HEIGHT = 8;
diff --git a/graphics/tcm/patches/patch-ak b/graphics/tcm/patches/patch-ak
index 5dd0e2ba964..ad522c4490a 100644
--- a/graphics/tcm/patches/patch-ak
+++ b/graphics/tcm/patches/patch-ak
@@ -1,14 +1,12 @@
-$NetBSD: patch-ak,v 1.1.1.1 2001/02/24 01:30:06 jtb Exp $
+$NetBSD: patch-ak,v 1.2 2001/04/11 21:32:01 jtb Exp $
 
---- sd/dv/ucdiagram.c.orig	Thu Feb 22 17:38:29 2001
+--- sd/dv/ucdiagram.c.orig	Mon Oct 23 10:09:42 2000
 +++ sd/dv/ucdiagram.c
-@@ -41,7 +41,9 @@
+@@ -41,7 +41,6 @@
  #include "ucdiagram.h"
  #include "note.h"
  #include <stdio.h>
-+#ifndef __NetBSD__
- #include <values.h>
-+#endif
+-#include <values.h>
  
  UCDiagram::UCDiagram(Config *c, UCWindow *d, UCViewer *v, UCGraph *g): 
  	   ERDiagram(c, d, v, g) {
diff --git a/graphics/tcm/patches/patch-am b/graphics/tcm/patches/patch-am
index 3de6439cac5..2f11e44af9a 100644
--- a/graphics/tcm/patches/patch-am
+++ b/graphics/tcm/patches/patch-am
@@ -1,16 +1,15 @@
-$NetBSD: patch-am,v 1.1.1.1 2001/02/24 01:30:07 jtb Exp $
+$NetBSD: patch-am,v 1.2 2001/04/11 21:32:01 jtb Exp $
 
 --- sd/tr/trdiagram.c.orig	Fri Jun 18 15:30:17 1999
 +++ sd/tr/trdiagram.c
-@@ -32,7 +32,11 @@
+@@ -32,7 +32,10 @@
  #include "trgraph.h"
  #include "trview.h"
  #include "diagramchecks.h"
 - 
-+#ifdef __NetBSD__
 +#include <limits.h>
++
 +#define MAXINT INT_MAX
-+#endif
 +
  TRDiagram::TRDiagram(Config *c, TRWindow *d, TRViewer *v, TRGraph *g): 
  		Diagram(c,d,v,g) {
diff --git a/graphics/tcm/scripts/configure b/graphics/tcm/scripts/configure
index 52b47efb6a0..c35217c5cd0 100755
--- a/graphics/tcm/scripts/configure
+++ b/graphics/tcm/scripts/configure
@@ -9,7 +9,7 @@ for f in `/usr/bin/find $WRKSRC -name Makefile`; do			   \
 	    -e 's/$(MV)/$(MV) -f/g'					   \
 	    -e 's/$(RM)/$(RM) -fr/g'					   \
 	    -e 's/$(LIB_DIR)\/libglobal.a/ -lglobal/g'	                   \
-        < $f > $f.tmp && /bin/mv -f $f.tmp $f; 				   \
+        $f > $f.tmp && /bin/mv -f $f.tmp $f; 				   \
 done
 
 /bin/rm -f $WRKSRC/Config.tmpl
@@ -21,7 +21,7 @@ for f in $WRKSRC/gl/system.c; do 					\
 	/usr/bin/sed -e 's:@PREFIX@:'$PREFIX':g'			\
 		     -e 's:@X11BASE@:'$X11BASE':g'			\
 		     -e 's:@LOCALBASE@:'$LOCALBASE':g'			\
-	< $f > $f.tmp && /bin/mv $f.tmp $f; 				\
+	$f > $f.tmp && /bin/mv $f.tmp $f; 				\
 done
 
 for f in `/usr/bin/find $WRKSRC -name \*.c`; do				\