Changes the names of the libraries created during the build --

"libtcmgui" instead of "libgui".  emulators/gpsim installs a libgui
which causes problems.  There may be conflicts with the other libs
(libglobal, libtable, etc). To be safe, rename them all similarly.

Get rid of the terrible configure script.  It saved a few patches, but
isn't worth the ugliness.

18 files changed, 642 insertions, 95 deletions

diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index 8b6b1315838..e15c6502cd6 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2001/04/14 21:43:45 jtb Exp $
+# $NetBSD: Makefile,v 1.7 2001/05/10 23:35:27 jtb Exp $
 
 DISTNAME=		tcm-2.01.src
 PKGNAME=		tcm-2.01
-CATEGORIES=		graphics
+CATEGORIES=		graphics devel
 MASTER_SITES=		ftp://ftp.cs.utwente.nl/pub/tcm/
 
 MAINTAINER=		packages@netbsd.org
@@ -11,15 +11,12 @@ COMMENT=		TCM - Toolkit for Conceptual Modeling
 
 WRKSRC=			${WRKDIR}/tcm-2.01/src
 
-HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	${SCRIPTDIR}/configure
-
 USE_X11=		yes
 USE_X11BASE=		yes
 USE_MOTIF=		yes
 
-MAKE_ENV+=		XWIN_HOME="${X11BASE}"
-MAKE_ENV+=		MOTIF_HOME="${MOTIFBASE}"
+MAKE_ENV+=		XWIN_HOME=${X11BASE}
+MAKE_ENV+=		MOTIF_HOME=${MOTIFBASE}
 
 TCM_SRC=		${WRKDIR}/tcm-2.01
 MAKE_ENV+=		TCM_HOME=${TCM_SRC}
@@ -30,7 +27,19 @@ post-extract:
 	${RM} -f ${TCM_SRC}/lib/COPYING ${TCM_SRC}/lib/CHANGELOG
 
 do-configure:
-	${CONFIGURE_SCRIPT} ${WRKSRC}
+	${RM} -f ${WRKSRC}/Config.tmpl
+	${LN} -fs ${WRKSRC}/Config.tmpl_netbsd ${WRKSRC}/Config.tmpl
+	${RM} -f ${WRKSRC}/Makefile
+	${LN} -fs ${WRKSRC}/Makefile.gcc ${WRKSRC}/Makefile
+	${MV} -f ${WRKSRC}/gl/system.c ${WRKSRC}/gl/system.c.dist
+	${SED} -e 's:@PREFIX@:${PREFIX}:g'				\
+		-e 's:@X11BASE@:${X11BASE}:g'				\
+		-e 's:@LOCALBASE@:${LOCALBASE}':g			\
+	${WRKSRC}/gl/system.c.dist > ${WRKSRC}/gl/system.c
+	for f in `${FIND} ${WRKSRC} -name \*.c`; do			\
+		${MV} -f $$f $$f`${ECHO} c`;				\
+	done
+	${MV} -f ${WRKSRC}/gl/text2ps.cc ${WRKSRC}/gl/text2ps.c
 
 do-install:
 	cd ${TCM_SRC}/bin && ${INSTALL_PROGRAM} tcm tcmd tcmt text2ps 	\
diff --git a/graphics/tcm/distinfo b/graphics/tcm/distinfo
index 25712f9c575..a2f23dfbc5f 100644
--- a/graphics/tcm/distinfo
+++ b/graphics/tcm/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:27 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/05/10 23:35:27 jtb Exp $
 
 SHA1 (tcm-2.01.src.tar.gz) = ce63d4310f43c89984cfcf2fc3da38eb55907c0f
 Size (tcm-2.01.src.tar.gz) = 3624778 bytes
-SHA1 (patch-aa) = dbace6684330391301e97c74a53f91ef8481a7f9
-SHA1 (patch-ab) = f2270a49bca9fe40d524f532999b95997b9820d4
+SHA1 (patch-aa) = 37673406cf7b87628a29c55f8d66eca58df536e7
+SHA1 (patch-ab) = 68d58e4fcba032a3385c181878fab6452527a13a
 SHA1 (patch-ac) = 1a85d3b44dbbf9291bec2f1a915ae23eec9818b3
 SHA1 (patch-ad) = e2b6b15d6265bf0077cebce9d25623ae06ef16e2
 SHA1 (patch-ae) = b710a716cbfd2bed5ffdb21c5e793185db9a07d8
@@ -19,8 +19,16 @@ 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
+SHA1 (patch-ar) = 6b9b71925eb9a90d738c2646d51b0fd38f54a2d0
+SHA1 (patch-as) = acfdbdbaaac5878e658a83ba1c9a9d64f12db26f
+SHA1 (patch-at) = a29da35a72967d05914d9c994eca66ae42caccea
+SHA1 (patch-au) = 1fd448579b3add5793b94877c04e19c31bf04112
+SHA1 (patch-av) = 4f87570d2c1ca0f5640fd2426b4927994162035d
+SHA1 (patch-aw) = aee0469f06370ee85920ade20f85b34ff4991506
+SHA1 (patch-ax) = f4627c5fcaf2e82c2c6fcf171dcdd9ee756949aa
+SHA1 (patch-ay) = 2ac5cf63c87d4ff550908a16056b7b7074cd2d6f
+SHA1 (patch-az) = cc01691826393fbf829b186f173eb0e44a27aad1
+SHA1 (patch-ba) = 198f12f68fd58ce09127d435334b1db718f8b969
+SHA1 (patch-bb) = 00aa951e4de26aec458bb1435d2d68a116380f3a
+SHA1 (patch-bc) = 04ffc44017cb7c5a9bf1aaf0936a522c0d0271ad
+SHA1 (patch-bd) = 858598fa54a61f1e136f59556eda5eb49423569e
diff --git a/graphics/tcm/patches/patch-aa b/graphics/tcm/patches/patch-aa
index 0a8475f9c97..6305a1ceb7b 100644
--- a/graphics/tcm/patches/patch-aa
+++ b/graphics/tcm/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/02/24 01:30:05 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2001/05/10 23:35:27 jtb Exp $
 
---- /dev/null	Fri Feb 23 22:20:01 2001
+--- /dev/null	Thu May 10 23:00:48 2001
 +++ Config.tmpl_netbsd
-@@ -0,0 +1,43 @@
-+# Configuration file for NetBSD 1.5 and GNU compilers.
+@@ -0,0 +1,41 @@
++# Configuration file for NetBSD and LessTif.
 +
 +SYSFLAGS        = -DBSD -DLESSTIF
 +
@@ -11,8 +11,6 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/02/24 01:30:05 jtb Exp $
 +BIN_DIR         = $(TCM_HOME)/bin
 +LIB_DIR         = $(TCM_HOME)/lib
 +
-+SHAREDFLAGS	= -shared
-+
 +MOTIF_INCLUDE	= $(MOTIF_HOME)/include
 +MOTIF_LIB	= $(MOTIF_HOME)/lib
 +
diff --git a/graphics/tcm/patches/patch-ab b/graphics/tcm/patches/patch-ab
index 0785d48a328..26a14c762fc 100644
--- a/graphics/tcm/patches/patch-ab
+++ b/graphics/tcm/patches/patch-ab
@@ -1,15 +1,61 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/02/24 01:30:05 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2001/05/10 23:35:28 jtb Exp $
 
 --- st/Makefile.orig	Wed Dec 20 13:32:45 2000
 +++ st/Makefile
-@@ -10,8 +10,8 @@
+@@ -9,40 +9,30 @@
+ TBOBJECTS = $(TDOBJECTS) $(TUOBJECTS) $(FEOBJECTS)
  
  tcmt:   $(TBOBJECTS) tcmt.o
- 	$(PURIFY) $(CC) $(CFLAGS) $(TBOBJECTS) tcmt.o \
+-	$(PURIFY) $(CC) $(CFLAGS) $(TBOBJECTS) tcmt.o \
 -	$(LIB_DIR)/libtable.a $(LIB_DIR)/libeditor.a $(LIB_DIR)/libgui.a \
 -         -o $@ $(LDFLAGS) $(LIB_DIR)/libglobal.a $(LDLIBS)
-+	-L$(LIB_DIR) -ltable -leditor -lgui \
-+         -o $@ $(LDFLAGS) -lglobal $(LDLIBS)
- 	chmod a+rx $@
- 	$(STRIP) $@
- 	$(MV) $@ $(BIN_DIR)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(TBOBJECTS) tcmt.o \
++	-L$(LIB_DIR) -ltcmtable -ltcmeditor -ltcmgui \
++         -o $@ $(LDFLAGS) -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tgt:    $(OBJECTS) tableeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) tableeditor.o -o $@ \
+-	$(LDFLAGS) -ltable -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) tableeditor.o -o $@ \
++	$(LDFLAGS) -ltcmtable -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ ttdt:   $(TDOBJECTS) tdeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(TDOBJECTS) tdeditor.o -o $@ \
+-	$(LDFLAGS) -ltable -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(TDOBJECTS) tdeditor.o -o $@ \
++	$(LDFLAGS) -ltcmtable -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ ttut:   $(TUOBJECTS) tueditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(TUOBJECTS) tueditor.o -o $@ \
+-	$(LDFLAGS) -ltable -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(TUOBJECTS) tueditor.o -o $@ \
++	$(LDFLAGS) -ltcmtable -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tfet:   $(FEOBJECTS) feeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(FEOBJECTS) feeditor.o -o $@ \
+-	$(LDFLAGS) -ltable -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(FEOBJECTS) feeditor.o -o $@ \
++	$(LDFLAGS) -ltcmtable -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ clean: xclean
+ 
diff --git a/graphics/tcm/patches/patch-ar b/graphics/tcm/patches/patch-ar
index d5c93ddc330..684869f308d 100644
--- a/graphics/tcm/patches/patch-ar
+++ b/graphics/tcm/patches/patch-ar
@@ -1,18 +1,54 @@
-$NetBSD: patch-ar,v 1.1.1.1 2001/02/24 01:30:07 jtb Exp $
+$NetBSD: patch-ar,v 1.2 2001/05/10 23:35:28 jtb Exp $
 
 --- sd/gd/Makefile.orig	Wed Dec 20 13:33:23 2000
 +++ sd/gd/Makefile
-@@ -30,11 +30,8 @@
+@@ -7,37 +7,27 @@
+ 	gdwindow.o
+ 
+ tcmgd:  $(GDOBJECTS) tcmgd.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(GDOBJECTS) \
+-	-ldiagram -leditor -lguix $(LIB_DIR)/libglobal.a \
++	$(CXX) $(CXXFLAGS) $(GDOBJECTS) \
++	-ltcmdiagram -ltcmeditor -ltcmguix -ltcmglobal \
+ 	tcmgd.o -o $@ $(LDFLAGS) $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ libtcmgd.a: $(GDOBJECTS)
+-	$(AR) $@ $(GDOBJECTS)
+-	chmod a+rx $@
++	$(AR) cr $@ $(GDOBJECTS)
+ 	$(RANLIB) $@
+-	$(MV) $@ $(LIB_DIR)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ tgd:    $(GDOBJECTS) gdeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(GDOBJECTS) gdeditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(GDOBJECTS) gdeditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
  tcmd:   tcmd.o
- 	$(PURIFY) $(CC) $(CFLAGS) tcmd.o -o $@ \
+-	$(PURIFY) $(CC) $(CFLAGS) tcmd.o -o $@ \
++	$(CXX) $(CXXFLAGS) tcmd.o -o $@ \
  	-I../dv -I../bv -I../tr -I../fv \
 -	$(LDFLAGS) $(LIB_DIR)/libtcmgd.a $(LIB_DIR)/libtcmtr.a \
 -        $(LIB_DIR)/libtcmdv.a $(LIB_DIR)/libtcmbv.a $(LIB_DIR)/libtcmfv.a \
 -	$(LIB_DIR)/libtcmpv.a \
 -	$(LIB_DIR)/libdiagram.a $(LIB_DIR)/libeditor.a \
 -        $(LIB_DIR)/libgui.a $(LIB_DIR)/libglobal.a $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
 +	$(LDFLAGS) -ltcmgd -ltcmtr -ltcmdv -ltcmbv -ltcmfv -ltcmpv \
-+	-ldiagram -leditor -lgui -lglobal $(LDLIBS)
- 	chmod a+rx $@
- 	$(STRIP) $@
- 	$(MV) $@ $(BIN_DIR)
++	-ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ 
+ clean: xclean
diff --git a/graphics/tcm/patches/patch-as b/graphics/tcm/patches/patch-as
index fd2770d58b3..d9217e88b84 100644
--- a/graphics/tcm/patches/patch-as
+++ b/graphics/tcm/patches/patch-as
@@ -1,44 +1,49 @@
-$NetBSD: patch-as,v 1.1.1.1 2001/02/24 01:30:08 jtb Exp $
+$NetBSD: patch-as,v 1.2 2001/05/10 23:35:28 jtb Exp $
 
---- Makefile.gcc.orig	Fri Feb 23 23:59:17 2001
+--- Makefile.gcc.orig	Wed Dec 13 10:57:07 2000
 +++ Makefile.gcc
-@@ -18,13 +18,13 @@
+@@ -18,45 +18,45 @@
  
  tcm:
  	( cp ed/edinstances.h gl/instances.h )
 -	( cd ./gl ; touch llist.c )
+-	( $(MAKE) libglobal.a )
 +	( cd ./gl ; touch llist.cc )
- 	( $(MAKE) libglobal.a )
++	( $(MAKE) libtcmglobal.a )
  	( cd ./ed ; $(MAKE) $@)
  
  tcmd:
  	( cp sd/sdinstances.h gl/instances.h )
 -	( cd ./gl ; touch llist.c )
+-	( $(MAKE) libglobal.a )
 +	( cd ./gl ; touch llist.cc )
- 	( $(MAKE) libglobal.a )
++	( $(MAKE) libtcmglobal.a )
  	( cd ./sd ; $(MAKE) $@)
  
-@@ -32,31 +32,31 @@
+ tcmgd tcmtr tcmdv tcmbv \
  tgtt tfrt tgd terd tesd tcrd tssd tucd tatd tstd tpsd tsnd trpg \
  tscd tsqd tcbd tcpd tdpd:
  	( cp dg/dginstances.h gl/instances.h )
 -	( cd ./gl ; touch llist.c )
+-	( $(MAKE) libglobal.a )
 +	( cd ./gl ; touch llist.cc )
- 	( $(MAKE) libglobal.a )
++	( $(MAKE) libtcmglobal.a )
  	( cd ./sd ; $(MAKE) $@)
  
  tcmfv tdfd tefd:
  	( cp sd/fv/dfinstances.h gl/instances.h )
 -	( cd ./gl ; touch llist.c )
+-	( $(MAKE) libglobal.a )
 +	( cd ./gl ; touch llist.cc )
- 	( $(MAKE) libglobal.a )
++	( $(MAKE) libtcmglobal.a )
  	( cd ./sd ; $(MAKE) $@)
  
  tcmt tgt ttdt ttut tfet:
  	( cp tb/tbinstances.h gl/instances.h )
 -	( cd ./gl ; touch llist.c )
+-	( $(MAKE) libglobal.a )
 +	( cd ./gl ; touch llist.cc )
- 	( $(MAKE) libglobal.a )
++	( $(MAKE) libtcmglobal.a )
  	( cd ./st ; $(MAKE) $@)
  
  # csod:
diff --git a/graphics/tcm/patches/patch-at b/graphics/tcm/patches/patch-at
index 1309058047f..48f2e29c6b5 100644
--- a/graphics/tcm/patches/patch-at
+++ b/graphics/tcm/patches/patch-at
@@ -1,21 +1,76 @@
-$NetBSD: patch-at,v 1.1.1.1 2001/02/24 01:30:08 jtb Exp $
+$NetBSD: patch-at,v 1.2 2001/05/10 23:35:28 jtb Exp $
 
---- Makefile.GEN.orig	Fri Feb 23 23:59:25 2001
+--- Makefile.GEN.orig	Wed Dec 13 10:57:26 2000
 +++ Makefile.GEN
-@@ -62,14 +62,14 @@
+@@ -18,7 +18,7 @@
+ # colorx: libs text2ps csod ced
+ 
+ # make static libs.
+-staticlibs: libglobal.a libgui.a libeditor.a libdiagram.a libtable.a
++staticlibs: libtcmglobal.a libtcmgui.a libtcmeditor.a libtcmdiagram.a libtcmtable.a
+ 
+ # make dynamic libs.
+ dynamiclibs: libglobal.so libgui.so libeditor.so libdiagram.so libtable.so
+@@ -42,37 +42,37 @@
+ 	( cd ./tb ; $(MAKE) libtable.so)
+ 
+ 
+-libglobal.a: 
+-	( cd ./gl ; $(MAKE) libglobal.a)
+-	( cd $(LIB_DIR) ; $(RANLIB) libglobal.a)
+-
+-libgui.a:
+-	( cd ./ui ; $(MAKE) libgui.a)
+-	( cd $(LIB_DIR) ; $(RANLIB) libgui.a)
+-
+-libguix.a:
+-	( cd ./ui ; $(MAKE) libguix.a)
+-	( cd $(LIB_DIR) ; $(RANLIB) libguix.a)
+-
+-libeditor.a:
+-	( cd ./ed ; $(MAKE) libeditor.a)
+-	( cd $(LIB_DIR) ; $(RANLIB) libeditor.a)
++libtcmglobal.a: 
++	( cd ./gl ; $(MAKE) libtcmglobal.a)
++	( cd $(LIB_DIR) ; $(RANLIB) libtcmglobal.a)
++
++libtcmgui.a:
++	( cd ./ui ; $(MAKE) libtcmgui.a)
++	( cd $(LIB_DIR) ; $(RANLIB) libtcmgui.a)
++
++libtcmguix.a:
++	( cd ./ui ; $(MAKE) libtcmguix.a)
++	( cd $(LIB_DIR) ; $(RANLIB) libtcmguix.a)
++
++libtcmeditor.a:
++	( cd ./ed ; $(MAKE) libtcmeditor.a)
++	( cd $(LIB_DIR) ; $(RANLIB) libtcmeditor.a)
+ 
+ # the touchy thing is necessary that the right template
  # instances are linked in the static lib.
- libdiagram.a:
+-libdiagram.a:
++libtcmdiagram.a:
  	( cp dg/dginstances.h gl/instances.h )
 -	( cd ./gl ; touch llist.c )
+-	( $(MAKE) libglobal.a )
+-	( cd ./dg ; $(MAKE) libdiagram.a)
+-	( cd $(LIB_DIR) ; $(RANLIB) libdiagram.a)
 +	( cd ./gl ; touch llist.cc )
- 	( $(MAKE) libglobal.a )
- 	( cd ./dg ; $(MAKE) libdiagram.a)
- 	( cd $(LIB_DIR) ; $(RANLIB) libdiagram.a)
++	( $(MAKE) libtcmglobal.a )
++	( cd ./dg ; $(MAKE) libtcmdiagram.a)
++	( cd $(LIB_DIR) ; $(RANLIB) libtcmdiagram.a)
  
- libtable.a:
+-libtable.a:
++libtcmtable.a:
  	( cp tb/tbinstances.h gl/instances.h )
 -	( cd ./gl ; touch llist.c )
+-	( $(MAKE) libglobal.a )
+-	( cd ./tb ; $(MAKE) libtable.a)
+-	( cd $(LIB_DIR) ; $(RANLIB) libtable.a)
 +	( cd ./gl ; touch llist.cc )
- 	( $(MAKE) libglobal.a )
- 	( cd ./tb ; $(MAKE) libtable.a)
- 	( cd $(LIB_DIR) ; $(RANLIB) libtable.a)
++	( $(MAKE) libtcmglobal.a )
++	( cd ./tb ; $(MAKE) libtcmtable.a)
++	( cd $(LIB_DIR) ; $(RANLIB) libtcmtable.a)
+ 
+ 
+ SUBDIRS = gl ui ed dg tb sd st
diff --git a/graphics/tcm/patches/patch-au b/graphics/tcm/patches/patch-au
index 7bdf9e5088f..d074ee77fe2 100644
--- a/graphics/tcm/patches/patch-au
+++ b/graphics/tcm/patches/patch-au
@@ -1,9 +1,78 @@
-$NetBSD: patch-au,v 1.1.1.1 2001/02/24 01:30:08 jtb Exp $
+$NetBSD: patch-au,v 1.2 2001/05/10 23:35:28 jtb Exp $
 
 --- sd/dv/Makefile.orig	Wed Dec 20 13:33:17 2000
 +++ sd/dv/Makefile
-@@ -142,9 +142,9 @@
- 	$(MV) $@ $(BIN_DIR)
+@@ -93,64 +93,51 @@
+ 	$(SESDOBJECTSX) $(ESDOBJECTSX) $(SSDOBJECTSX) $(UCDOBJECTSX)
+ 
+ tcmdv:  $(DVOBJECTS) tcmdv.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(DVOBJECTS) \
+-	$(LDFLAGS) -ldiagram -leditor -lguix $(LIB_DIR)/libglobal.a \
++	$(CXX) $(CXXFLAGS) $(DVOBJECTS) \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmguix -ltcmglobal \
+ 	tcmdv.o -o $@ $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ libtcmdv.a: $(DVOBJECTS)
+-	$(AR) $@ $(DVOBJECTS)
+-	chmod a+rx $@
++	$(AR) cr $@ $(DVOBJECTS)
+ 	$(RANLIB) $@
+-	$(MV) $@ $(LIB_DIR)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ terd:   $(EROBJECTS) ereditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(EROBJECTS) ereditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(EROBJECTS) ereditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tcrd:   $(CROBJECTS) creditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(CROBJECTS) creditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(CROBJECTS) creditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tesd:   $(ESDOBJECTS) esdeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(ESDOBJECTS) esdeditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(ESDOBJECTS) esdeditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tssd:   $(SSDOBJECTS) ssdeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(SSDOBJECTS) ssdeditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(SSDOBJECTS) ssdeditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tucd:   $(UCDOBJECTS) uceditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(UCDOBJECTS) uceditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(UCDOBJECTS) uceditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
  
  cardconstraint.tab.h: cardconstraint.y
 -	$(YACC) --debug -p cardconstraint -d cardconstraint.y
@@ -14,3 +83,11 @@ $NetBSD: patch-au,v 1.1.1.1 2001/02/24 01:30:08 jtb Exp $
  cardconstraint.c: cardconstraint.l cardconstraint.tab.h
  	$(LEX) -Pcardconstraint -ocardconstraint.c cardconstraint.l
  cardconstraint.o: cardconstraint.c
+-	$(Cc) -c cardconstraint.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c cardconstraint.c
+ cardconstraint.tab.o: cardconstraint.tab.h cardconstraint.tab.c
+-	$(Cc) -c cardconstraint.tab.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c cardconstraint.tab.c
+ 
+ clean: xclean
+ 	rm -f cardconstraint.c cardconstraint.tab.h cardconstraint.tab.c
diff --git a/graphics/tcm/patches/patch-av b/graphics/tcm/patches/patch-av
index 4b21de7e156..cd7453f63b3 100644
--- a/graphics/tcm/patches/patch-av
+++ b/graphics/tcm/patches/patch-av
@@ -1,9 +1,58 @@
-$NetBSD: patch-av,v 1.1.1.1 2001/02/24 01:30:08 jtb Exp $
+$NetBSD: patch-av,v 1.2 2001/05/10 23:35:28 jtb Exp $
 
---- sd/fv/Makefile.orig	Sat Feb 24 00:38:00 2001
+--- sd/fv/Makefile.orig	Wed Dec 20 13:33:20 2000
 +++ sd/fv/Makefile
-@@ -86,9 +86,9 @@
- 	$(MV) $@ $(BIN_DIR)
+@@ -51,50 +51,42 @@
+ FVOBJECTS = $(DCFOBJECTS) $(SNOBJECTS)
+ 
+ tcmfv:  $(FVOBJECTS) tcmfv.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(FVOBJECTS) \
+-	-ldiagram -leditor -lguix $(LIB_DIR)/libglobal.a \
++	$(CXX) $(CXXFLAGS) $(FVOBJECTS) \
++	-ltcmdiagram -ltcmeditor -ltcmguix -ltcmlglobal \
+ 	tcmfv.o -o $@ $(LDFLAGS) $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ libtcmfv.a: $(FVOBJECTS)
+-	$(AR) $@ $(FVOBJECTS)
+-	chmod a+rx $@
++	$(AR) cr $@ $(FVOBJECTS)
+ 	$(RANLIB) $@
+-	$(MV) $@ $(LIB_DIR)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ tdfd:   $(DFOBJECTS) dfeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(DFOBJECTS) dfeditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(DFOBJECTS) dfeditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tsnd:   $(SNOBJECTS) $(PARSER) sneditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(SNOBJECTS) $(PARSER) sneditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
++	$(CXX) $(CXXFLAGS) $(SNOBJECTS) $(PARSER) sneditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
+ 	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tefd:  $(DCFOBJECTS) dcfeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(DCFOBJECTS) dcfeditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(DCFOBJECTS) dcfeditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
  
  cardconstraint.tab.h: cardconstraint.y
 -	$(YACC) --debug -p cardconstraint -d cardconstraint.y
@@ -14,3 +63,11 @@ $NetBSD: patch-av,v 1.1.1.1 2001/02/24 01:30:08 jtb Exp $
  cardconstraint.c: cardconstraint.l cardconstraint.tab.h
  	$(LEX) -Pcardconstraint -ocardconstraint.c cardconstraint.l
  cardconstraint.o: cardconstraint.c
+-	$(Cc) -c cardconstraint.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c cardconstraint.c
+ cardconstraint.tab.o: cardconstraint.tab.h cardconstraint.tab.c
+-	$(Cc) -c cardconstraint.tab.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c cardconstraint.tab.c
+ 
+ clean: xclean
+ 	rm -f cardconstraint.c cardconstraint.tab.h cardconstraint.tab.c
diff --git a/graphics/tcm/patches/patch-aw b/graphics/tcm/patches/patch-aw
new file mode 100644
index 00000000000..05d8a7f5b20
--- /dev/null
+++ b/graphics/tcm/patches/patch-aw
@@ -0,0 +1,18 @@
+$NetBSD: patch-aw,v 1.1 2001/05/10 23:35:28 jtb Exp $
+
+--- dg/Makefile.orig	Wed Dec 20 13:32:28 2000
++++ dg/Makefile
+@@ -117,10 +117,9 @@
+ 	whitedot.o
+  
+ 
+-libdiagram.a: $(OBJECTS)
+-	$(AR) $@ $(OBJECTS)
+-	chmod a+rx $@
+-	$(MV) $@ $(LIB_DIR)
++libtcmdiagram.a: $(OBJECTS)
++	$(AR) cr $@ $(OBJECTS)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ libdiagram.so: $(OBJECTS)
+ 	$(CC) $(CFLAGS) $(SHAREDFLAG) $(OBJECTS) -o $@
diff --git a/graphics/tcm/patches/patch-ax b/graphics/tcm/patches/patch-ax
new file mode 100644
index 00000000000..fffc9b7c667
--- /dev/null
+++ b/graphics/tcm/patches/patch-ax
@@ -0,0 +1,33 @@
+$NetBSD: patch-ax,v 1.1 2001/05/10 23:35:28 jtb Exp $
+
+--- ed/Makefile.orig	Wed Dec 20 13:32:34 2000
++++ ed/Makefile
+@@ -18,10 +18,9 @@
+ 	startupwindow.o\
+ 	startup.o
+ 
+-libeditor.a: $(OBJECTS) 
+-	$(AR) $@ $(OBJECTS) 
+-	chmod a+rx $@
+-	$(MV) $@ $(LIB_DIR)
++libtcmeditor.a: $(OBJECTS) 
++	$(AR) cr $@ $(OBJECTS) 
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ libeditor.so: $(OBJECTS) 
+ 	$(CC) $(CFLAGS) $(SHAREDFLAG) $(OBJECTS) -o $@
+@@ -30,11 +29,9 @@
+ 	$(MV) $@ $(LIB_DIR)
+ 
+ tcm: $(STARTOBJECTS)
+-	$(PURIFY) $(CC) $(CFLAGS) $(STARTOBJECTS) -o $@ \
+-	$(LDFLAGS) -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(STARTOBJECTS) -o $@ \
++	$(LDFLAGS) -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ clean: xclean
+ 
diff --git a/graphics/tcm/patches/patch-ay b/graphics/tcm/patches/patch-ay
new file mode 100644
index 00000000000..a0f01652bed
--- /dev/null
+++ b/graphics/tcm/patches/patch-ay
@@ -0,0 +1,28 @@
+$NetBSD: patch-ay,v 1.1 2001/05/10 23:35:28 jtb Exp $
+
+--- gl/Makefile.orig	Wed Dec 20 13:32:38 2000
++++ gl/Makefile
+@@ -28,17 +28,15 @@
+ 	version.o
+ 
+ text2ps.o:
+-	$(Cc) -c text2ps.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c text2ps.c
+ 
+ text2ps: text2ps.o
+-	$(Cc) text2ps.o -o $@ 
+-	chmod a+rx $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CC) text2ps.o -o $@ 
++	$(MV) -f $@ $(BIN_DIR)
+ 
+-libglobal.a: $(OBJECTS)
+-	$(AR) $@ $(OBJECTS)
+-	chmod a+rx $@
+-	$(MV) $@ $(LIB_DIR)
++libtcmglobal.a: $(OBJECTS)
++	$(AR) cr $@ $(OBJECTS)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ libglobal.so: $(OBJECTS)
+ 	$(CC) $(CFLAGS) $(SHAREDFLAG) $(OBJECTS) -o $@
diff --git a/graphics/tcm/patches/patch-az b/graphics/tcm/patches/patch-az
new file mode 100644
index 00000000000..e034244f2de
--- /dev/null
+++ b/graphics/tcm/patches/patch-az
@@ -0,0 +1,68 @@
+$NetBSD: patch-az,v 1.1 2001/05/10 23:35:28 jtb Exp $
+
+--- sd/bv/Makefile.orig	Wed Dec 20 13:33:13 2000
++++ sd/bv/Makefile
+@@ -50,46 +50,35 @@
+ BVOBJECTS = $(STOBJECTS) $(PSOBJECTS) $(RPOBJECTS) $(ATOBJECTS)
+  
+ tcmbv:  $(BVOBJECTS) tcmbv.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(BVOBJECTS) \
+-	-ldiagram -leditor -lguix $(LIB_DIR)/libglobal.a \
++	$(CXX) $(CXXFLAGS) $(BVOBJECTS) \
++	-ltcmdiagram -ltcmeditor -ltcmguix -ltcmglobal \
+ 	tcmbv.o -o $@ $(LDFLAGS) $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ libtcmbv.a: $(BVOBJECTS)
+-	$(AR) $@ $(BVOBJECTS)
+-	chmod a+rx $@
++	$(AR) cr $@ $(BVOBJECTS)
+ 	$(RANLIB) $@
+-	$(MV) $@ $(LIB_DIR)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ tpsd:   $(PSOBJECTS) pseditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(PSOBJECTS) pseditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(PSOBJECTS) pseditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tstd:   $(STOBJECTS) steditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(STOBJECTS) steditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(STOBJECTS) steditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ trpg:   $(RPOBJECTS) rpeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(RPOBJECTS) rpeditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(RPOBJECTS) rpeditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tatd:   $(ATOBJECTS) ateditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(ATOBJECTS) ateditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(ATOBJECTS) ateditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ 
+ clean: xclean
diff --git a/graphics/tcm/patches/patch-ba b/graphics/tcm/patches/patch-ba
new file mode 100644
index 00000000000..056ab3cbc3a
--- /dev/null
+++ b/graphics/tcm/patches/patch-ba
@@ -0,0 +1,48 @@
+$NetBSD: patch-ba,v 1.1 2001/05/10 23:35:28 jtb Exp $
+
+--- sd/pv/Makefile.orig	Wed Dec 20 13:33:26 2000
++++ sd/pv/Makefile
+@@ -17,32 +17,25 @@
+ PVOBJECTS = $(CPOBJECTS) $(DPOBJECTS)
+ 
+ tcmpv:  $(PVOBJECTS) tcmpv.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(PVOBJECTS) \
+-	-ldiagram -leditor -lguix $(LIB_DIR)/libglobal.a \
++	$(CXX) $(CXXFLAGS) $(PVOBJECTS) \
++	-ltcmdiagram -ltcmeditor -ltcmguix -ltcmglobal \
+ 	tcmpv.o -o $@ $(LDFLAGS) $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ libtcmpv.a: $(PVOBJECTS)
+-	$(AR) $@ $(PVOBJECTS)
+-	chmod a+rx $@
++	$(AR) cr $@ $(PVOBJECTS)
+ 	$(RANLIB) $@
+-	$(MV) $@ $(LIB_DIR)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ tcpd:   $(CPOBJECTS) cpeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(CPOBJECTS) cpeditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(CPOBJECTS) cpeditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tdpd:   $(PVOBJECTS) dpeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(PVOBJECTS) dpeditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(PVOBJECTS) dpeditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ clean: xclean
+ 
diff --git a/graphics/tcm/patches/patch-bb b/graphics/tcm/patches/patch-bb
new file mode 100644
index 00000000000..334ea9f5e04
--- /dev/null
+++ b/graphics/tcm/patches/patch-bb
@@ -0,0 +1,48 @@
+$NetBSD: patch-bb,v 1.1 2001/05/10 23:35:28 jtb Exp $
+
+--- sd/tr/Makefile.orig	Wed Dec 20 13:33:29 2000
++++ sd/tr/Makefile
+@@ -17,32 +17,25 @@
+ TROBJECTS = $(FDOBJECTS)
+  
+ tcmtr:  $(TROBJECTS) tcmtr.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(TROBJECTS) \
+-	-ldiagram -leditor -lguix $(LIB_DIR)/libglobal.a \
++	$(CXX) $(CXXFLAGS) $(TROBJECTS) \
++	-ltcmdiagram -ltcmeditor -ltcmguix -ltcmglobal \
+ 	tcmtr.o -o $@ $(LDFLAGS) $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ libtcmtr.a: $(TROBJECTS)
+-	$(AR) $@ $(TROBJECTS)
+-	chmod a+rx $@
++	$(AR) cr $@ $(TROBJECTS)
+ 	$(RANLIB) $@
+-	$(MV) $@ $(LIB_DIR)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ tgtt:   $(GTOBJECTS) gteditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(GTOBJECTS) gteditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(GTOBJECTS) gteditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ tfrt:   $(FDOBJECTS) fdeditor.o
+-	$(PURIFY) $(CC) $(CFLAGS) $(FDOBJECTS) fdeditor.o -o $@ \
+-	$(LDFLAGS) -ldiagram -leditor -lgui -lglobal $(LDLIBS)
+-	chmod a+rx $@
+-	$(STRIP) $@
+-	$(MV) $@ $(BIN_DIR)
++	$(CXX) $(CXXFLAGS) $(FDOBJECTS) fdeditor.o -o $@ \
++	$(LDFLAGS) -ltcmdiagram -ltcmeditor -ltcmgui -ltcmglobal $(LDLIBS)
++	$(MV) -f $@ $(BIN_DIR)
+ 
+ clean: xclean
+ 
diff --git a/graphics/tcm/patches/patch-bc b/graphics/tcm/patches/patch-bc
new file mode 100644
index 00000000000..ac1aef2db28
--- /dev/null
+++ b/graphics/tcm/patches/patch-bc
@@ -0,0 +1,18 @@
+$NetBSD: patch-bc,v 1.1 2001/05/10 23:35:28 jtb Exp $
+
+--- tb/Makefile.orig	Wed Dec 20 13:32:48 2000
++++ tb/Makefile
+@@ -54,10 +54,9 @@
+ 	updatecelltextunderlinecmd.o\
+ 	updatecelltextfontcmd.o
+ 
+-libtable.a: $(OBJECTS)
+-	$(AR) $@ $(OBJECTS)
+-	chmod a+rx $@
+-	$(MV) $@ $(LIB_DIR)
++libtcmtable.a: $(OBJECTS)
++	$(AR) cr $@ $(OBJECTS)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ libtable.so: $(OBJECTS)
+ 	$(CC) $(CFLAGS) $(SHAREDFLAG) $(OBJECTS) -o $@
diff --git a/graphics/tcm/patches/patch-bd b/graphics/tcm/patches/patch-bd
new file mode 100644
index 00000000000..f7044b92714
--- /dev/null
+++ b/graphics/tcm/patches/patch-bd
@@ -0,0 +1,26 @@
+$NetBSD: patch-bd,v 1.1 2001/05/10 23:35:28 jtb Exp $
+
+--- ui/Makefile.orig	Wed Dec 20 13:32:52 2000
++++ ui/Makefile
+@@ -49,15 +49,13 @@
+ 
+ MAIN = main.o
+ 
+-libgui.a: $(OBJECTS) $(MAIN)
+-	$(AR) $@ $(OBJECTS) $(MAIN)
+-	chmod a+rx $@
+-	$(MV) $@ $(LIB_DIR)
++libtcmgui.a: $(OBJECTS) $(MAIN)
++	$(AR) cr $@ $(OBJECTS) $(MAIN)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+-libguix.a: $(OBJECTS)
+-	ar cr $@ $(OBJECTS)
+-	chmod a+rx $@
+-	$(MV) $@ $(LIB_DIR)
++libtcmguix.a: $(OBJECTS)
++	$(AR) cr $@ $(OBJECTS)
++	$(MV) -f $@ $(LIB_DIR)
+ 
+ libgui.so: $(OBJECTS) $(MAIN)
+ 	$(CC) $(CFLAGS) $(SHAREDFLAG) $(OBJECTS) $(MAIN) -o $@
diff --git a/graphics/tcm/scripts/configure b/graphics/tcm/scripts/configure
deleted file mode 100755
index c35217c5cd0..00000000000
--- a/graphics/tcm/scripts/configure
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-WRKSRC=$1
-
-for f in `/usr/bin/find $WRKSRC -name Makefile`; do			   \
-	/usr/bin/sed -e 's/$(PURIFY) $(CC) $(CFLAGS)/$(CXX) $(CXXFLAGS)/g' \
-	    -e 's/$(Cc)/$(CC) $(CPPFLAGS) $(CFLAGS)/g'			   \
-	    -e 's/$(AR)/$(AR) cr/g'					   \
-	    -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; 				   \
-done
-
-/bin/rm -f $WRKSRC/Config.tmpl
-/bin/ln -fs $WRKSRC/Config.tmpl_netbsd $WRKSRC/Config.tmpl
-/bin/rm -f $WRKSRC/Makefile
-/bin/ln -fs $WRKSRC/Makefile.gcc $WRKSRC/Makefile
-
-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; 				\
-done
-
-for f in `/usr/bin/find $WRKSRC -name \*.c`; do				\
-	/bin/mv -f $f $f`/bin/echo c`;					\
-done
-
-/bin/mv -f $WRKSRC/gl/text2ps.cc $WRKSRC/gl/text2ps.c