diff options
Diffstat (limited to 'graphics/tcm/patches')
33 files changed, 0 insertions, 1044 deletions
diff --git a/graphics/tcm/patches/patch-aa b/graphics/tcm/patches/patch-aa deleted file mode 100644 index 9d1f7f273f4..00000000000 --- a/graphics/tcm/patches/patch-aa +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2002/09/23 01:26:26 jlam Exp $ - ---- /dev/null Thu May 10 23:00:48 2001 -+++ Config.tmpl_netbsd -@@ -0,0 +1,41 @@ -+# Configuration file for NetBSD and OpenMotif/LessTif. -+ -+SYSFLAGS = -DBSD -+ -+SRC_DIR = $(TCM_HOME)/src -+BIN_DIR = $(TCM_HOME)/bin -+LIB_DIR = $(TCM_HOME)/lib -+ -+MOTIF_INCLUDE = $(MOTIF_HOME)/include -+MOTIF_LIB = $(MOTIF_HOME)/lib -+ -+XWIN_INCLUDE = $(XWIN_HOME)/include -+XWIN_LIB = $(XWIN_HOME)/lib -+ -+LDFLAGS += -L$(LIB_DIR) -R$(MOTIF_LIB) -L$(MOTIF_LIB) -R$(XWIN_LIB) -L$(XWIN_LIB) -+ -+LDLIBS += ${MOTIFLIB} -lXt -lSM -lICE -lXext -lX11 -lm -+ -+STRIP ?= /usr/bin/true -+MV ?= /bin/mv -+RM ?= /bin/rm -+ -+INCLUDEDIRS = -I.\ -+ -I$(SRC_DIR)/bitmaps\ -+ -I$(SRC_DIR)/gl\ -+ -I$(SRC_DIR)/ui\ -+ -I$(SRC_DIR)/ed\ -+ -I$(SRC_DIR)/dg\ -+ -I$(SRC_DIR)/tb\ -+ -I$(MOTIF_INCLUDE)\ -+ -I$(XWIN_INCLUDE)\ -+ -+CPPFLAGS += $(SYSFLAGS) $(INCLUDEDIRS) -+MKDEPEND = $(XWIN_HOME)/bin/makedepend -+MKDEPENDFLAGS = $(CPPFLAGS) -I/usr/include/g++ -+ -+xclean: -+ $(RM) *.o core $(SRC_DIR)/ptrepository/* $(SRC_DIR)/Templates.DB/* -+ -+xdepend: -+ $(MKDEPEND) $(MKDEPENDFLAGS) *.*c diff --git a/graphics/tcm/patches/patch-ab b/graphics/tcm/patches/patch-ab deleted file mode 100644 index 26a14c762fc..00000000000 --- a/graphics/tcm/patches/patch-ab +++ /dev/null @@ -1,61 +0,0 @@ -$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 -@@ -9,40 +9,30 @@ - TBOBJECTS = $(TDOBJECTS) $(TUOBJECTS) $(FEOBJECTS) - - tcmt: $(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) -- 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-ac b/graphics/tcm/patches/patch-ac deleted file mode 100644 index ff6a0c9c3ad..00000000000 --- a/graphics/tcm/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2001/04/11 21:32:00 jtb Exp $ - ---- dg/diagramchecks.h.orig Fri Aug 27 14:11:46 1999 -+++ dg/diagramchecks.h -@@ -23,7 +23,6 @@ - #define _DIAGRAMCHECKS_H - - #include "bool.h" --#include <values.h> - class Graph; - class Diagram; - class string; diff --git a/graphics/tcm/patches/patch-ad b/graphics/tcm/patches/patch-ad deleted file mode 100644 index 0fe86d62692..00000000000 --- a/graphics/tcm/patches/patch-ad +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2002/06/28 09:29:02 agc Exp $ - ---- gl/system.c.orig Tue Nov 21 12:32:14 2000 -+++ gl/system.c -@@ -47,7 +47,7 @@ - - const char System::TOOLKIT_HOME_VAR_NAME[] = "TCM_HOME"; - --const char System::TOOLKIT_HOME_DEFAULT[] = "/home/tcm"; -+const char System::TOOLKIT_HOME_DEFAULT[] = "@PREFIX@"; - - bool System::sendBugEmail = True; - char System::emailAddress[MAXNAME] = "tcm@cs.vu.nl"; -@@ -63,13 +63,11 @@ - // most common Unix directories for system wide available binaries. - const char *System::STD_SEARCH_DIRS[] = - {"./", "/bin/", "/usr/bin/", "/usr/local/bin/", -- "/usr/local/tcm/bin", "/home/tcm/bin", "/usr/bin/X11/", -- "/usr/ucb/", "/usr/sbin/", "/usr/X11/bin/", "/usr/openwin/bin/", -- "/opt/tcm/bin", "/usr/local/X11/bin", "/usr/local/bin/X11/", -- "/usr/openwin/contrib/bin", "/Window/X11/bin", -- "/Window/X11/contrib/bin", 0}; -+ "@PREFIX@/bin/", "@X11BASE@/bin/", "@LOCALBASE@/bin/", -+ "/usr/openwin/bin", "/usr/sbin/", "/usr/X11/bin/", -+ "/opt/tcm/bin", "/usr/local/X11/bin", "/usr/local/bin/X11/", 0}; - --#if defined(LINUX) || defined(AIX) || defined(HPUX) || defined(OSF1) -+#if defined(LINUX) || defined(AIX) || defined(HPUX) || defined(OSF1) || defined(__NetBSD__) - typedef void (*SIG_PF)(int); - #endif - -@@ -177,11 +175,14 @@ - return; - } - else { -- cerr << "Error: " << TOOLKIT_HOME_VAR_NAME -- << " environment variable is not set" << endl; -- cerr << "please set this variable to the" -- " directory where the software is installed " -- "and try it again" << endl; -+ const char *p2 = TOOLKIT_HOME_DEFAULT; -+ strncpy(home, p2, MAXNAME-1); -+ return; -+ // cerr << "Error: " << TOOLKIT_HOME_VAR_NAME -+ // << " environment variable is not set" << endl; -+ //cerr << "please set this variable to the" -+ // " directory where the software is installed " -+ // "and try it again" << endl; - } - exit(1); - } diff --git a/graphics/tcm/patches/patch-ae b/graphics/tcm/patches/patch-ae deleted file mode 100644 index effd88b7326..00000000000 --- a/graphics/tcm/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2001/04/11 21:32:00 jtb Exp $ - ---- sd/bv/stdiagram.c.orig Tue Mar 21 12:53:27 2000 -+++ sd/bv/stdiagram.c -@@ -34,7 +34,9 @@ - #include "transitionarrow.h" - #include "initialstatebox.h" - #include "stdiagram.h" --#include <values.h> -+#include <limits.h> -+ -+#define MAXINT INT_MAX - - 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 deleted file mode 100644 index a6d066e6699..00000000000 --- a/graphics/tcm/patches/patch-af +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-af,v 1.2 2001/04/11 21:32:00 jtb Exp $ - ---- sd/bv/rpdiagram.c.orig Mon Jul 26 10:44:03 1999 -+++ sd/bv/rpdiagram.c -@@ -34,7 +34,9 @@ - #include "line.h" - #include "rpdiagram.h" - #include "diagramchecks.h" --#include <values.h> -+#include <limits.h> -+ -+#define MAXINT INT_MAX - - 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 deleted file mode 100644 index 82b6604c7e8..00000000000 --- a/graphics/tcm/patches/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2001/04/11 21:32:00 jtb Exp $ - ---- sd/bv/atdiagram.c.orig Mon Oct 23 10:30:35 2000 -+++ sd/bv/atdiagram.c -@@ -46,6 +46,9 @@ - #include "atgraph.h" - #include "atviewer.h" - #include "atwindow.h" -+#include <limits.h> -+ -+#define MAXINT INT_MAX - - const int ATDiagram::DOT_WIDTH = 8; - diff --git a/graphics/tcm/patches/patch-ah b/graphics/tcm/patches/patch-ah deleted file mode 100644 index a1601ae15dd..00000000000 --- a/graphics/tcm/patches/patch-ah +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ah,v 1.2 2001/04/11 21:32:01 jtb Exp $ - ---- sd/dv/crdiagram.c.orig Mon Sep 25 11:34:40 2000 -+++ sd/dv/crdiagram.c -@@ -38,7 +38,9 @@ - #include "textbox.h" - #include "comment.h" - #include "crdiagram.h" --#include <values.h> -+#include <limits.h> -+ -+#define MAXINT INT_MAX - - 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 deleted file mode 100644 index fea0f33ce49..00000000000 --- a/graphics/tcm/patches/patch-ai +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ai,v 1.2 2001/04/11 21:32:01 jtb Exp $ - ---- sd/dv/esddiagram.c.orig Mon Oct 23 09:27:10 2000 -+++ sd/dv/esddiagram.c -@@ -56,7 +56,6 @@ - #include "miniellipse.h" - #include "esddiagram.h" - #include <stdio.h> --#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 deleted file mode 100644 index 1785cafea7b..00000000000 --- a/graphics/tcm/patches/patch-aj +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aj,v 1.2 2001/04/11 21:32:01 jtb Exp $ - ---- sd/dv/ssddiagram.c.orig Mon Oct 23 09:22:45 2000 -+++ sd/dv/ssddiagram.c -@@ -56,7 +56,6 @@ - #include "note.h" - #include "ssddiagram.h" - #include <stdio.h> --#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 deleted file mode 100644 index ad522c4490a..00000000000 --- a/graphics/tcm/patches/patch-ak +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2001/04/11 21:32:01 jtb Exp $ - ---- sd/dv/ucdiagram.c.orig Mon Oct 23 10:09:42 2000 -+++ sd/dv/ucdiagram.c -@@ -41,7 +41,6 @@ - #include "ucdiagram.h" - #include "note.h" - #include <stdio.h> --#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-al b/graphics/tcm/patches/patch-al deleted file mode 100644 index 543d0f9b39d..00000000000 --- a/graphics/tcm/patches/patch-al +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-al,v 1.3 2002/07/08 02:48:18 wiz Exp $ - ---- ed/startupwindow.c.orig Fri Feb 9 15:44:45 2001 -+++ ed/startupwindow.c -@@ -38,6 +38,9 @@ - #include "liteclue.h" - #include "grafport.h" - #include "Teapot2a.xbm" -+#ifdef LESSTIF -+#include <stdio.h> -+#endif - #include <stdlib.h> - #include <Xm/XmAll.h> - diff --git a/graphics/tcm/patches/patch-am b/graphics/tcm/patches/patch-am deleted file mode 100644 index 2f11e44af9a..00000000000 --- a/graphics/tcm/patches/patch-am +++ /dev/null @@ -1,16 +0,0 @@ -$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,10 @@ - #include "trgraph.h" - #include "trview.h" - #include "diagramchecks.h" -- -+#include <limits.h> -+ -+#define MAXINT INT_MAX -+ - TRDiagram::TRDiagram(Config *c, TRWindow *d, TRViewer *v, TRGraph *g): - Diagram(c,d,v,g) { - UpdateNodeType(1); diff --git a/graphics/tcm/patches/patch-an b/graphics/tcm/patches/patch-an deleted file mode 100644 index 63f04cb0b88..00000000000 --- a/graphics/tcm/patches/patch-an +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-an,v 1.3 2002/07/08 02:48:18 wiz Exp $ - ---- ui/application.c.orig Fri Nov 10 04:52:16 2000 -+++ ui/application.c -@@ -28,6 +28,9 @@ - #include "inputfile.h" - #include "system.h" - #include "color.h" -+#ifdef LESSTIF -+#include <stdio.h> -+#endif - #include <stdlib.h> - #include <string.h> - #include <Xm/XmStrDefs.h> -@@ -41,7 +44,7 @@ - return Application::XErrorHandler(dpy, err_event); - } - --const char Application::COLORFILE[] = "lib/colorrgb.txt"; -+const char Application::COLORFILE[] = "share/tcm/colorrgb.txt"; - - Application *theApplication = 0; - diff --git a/graphics/tcm/patches/patch-ao b/graphics/tcm/patches/patch-ao deleted file mode 100644 index b10aa2b5ab7..00000000000 --- a/graphics/tcm/patches/patch-ao +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ao,v 1.1.1.1 2001/02/24 01:30:07 jtb Exp $ - ---- ui/psgrafport.c.orig Fri Feb 23 18:12:13 2001 -+++ ui/psgrafport.c -@@ -25,7 +25,7 @@ - #include "color.h" - #include <ctype.h> - --const char PSGrafport::BANNER[] = "lib/banner.ps"; -+const char PSGrafport::BANNER[] = "share/tcm/banner.ps"; - - const double PSGrafport::DEFAULT_LINE_WIDTH = 0.750; - diff --git a/graphics/tcm/patches/patch-ap b/graphics/tcm/patches/patch-ap deleted file mode 100644 index 0befece9af0..00000000000 --- a/graphics/tcm/patches/patch-ap +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ap,v 1.2 2003/01/01 22:02:02 jmmv Exp $ - ---- gl/config.c.orig Fri Feb 23 18:13:48 2001 -+++ gl/config.c -@@ -27,7 +27,7 @@ - #include <stdlib.h> - #include <string.h> - --const char Config::SYS_CONFIG[] = "lib/tcm.conf"; -+const char Config::SYS_CONFIG[] = PKG_SYSCONFDIR "/tcm.conf"; - const char Config::USER_CONFIG[] = ".tcmrc"; - - Config::Config(const char *s) { diff --git a/graphics/tcm/patches/patch-aq b/graphics/tcm/patches/patch-aq deleted file mode 100644 index b9043c153d4..00000000000 --- a/graphics/tcm/patches/patch-aq +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aq,v 1.1.1.1 2001/02/24 01:30:07 jtb Exp $ - ---- ed/helper.c.orig Fri Feb 23 18:17:11 2001 -+++ ed/helper.c -@@ -44,7 +44,7 @@ - char home[MAXNAME]; - System::GetToolkitHome(home); - string helpFile = home; -- helpFile += "/lib/help/"; -+ helpFile += "/share/tcm/help/"; - - switch(tp) { - case WELCOME: diff --git a/graphics/tcm/patches/patch-ar b/graphics/tcm/patches/patch-ar deleted file mode 100644 index 684869f308d..00000000000 --- a/graphics/tcm/patches/patch-ar +++ /dev/null @@ -1,54 +0,0 @@ -$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 -@@ -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 $@ \ -+ $(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 \ -+ -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 deleted file mode 100644 index d9217e88b84..00000000000 --- a/graphics/tcm/patches/patch-as +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-as,v 1.2 2001/05/10 23:35:28 jtb Exp $ - ---- Makefile.gcc.orig Wed Dec 13 10:57:07 2000 -+++ Makefile.gcc -@@ -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) 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) libtcmglobal.a ) - ( cd ./sd ; $(MAKE) $@) - - 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) 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) 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) libtcmglobal.a ) - ( cd ./st ; $(MAKE) $@) - - # csod: - # ( cp cx/cx_instances.h gl/instances.h ) --# ( cd ./gl ; touch llist.c ) -+# ( cd ./gl ; touch llist.cc ) - # ( $(MAKE) libglobal.a ) - # ( cd ./cx ; $(MAKE) $@) - - # ced: - # ( cp dg/dginstances.h gl/instances.h ) --# ( cd ./gl ; touch llist.c ) -+# ( cd ./gl ; touch llist.cc ) - # ( $(MAKE) libglobal.a ) - # ( cd ./cx ; $(MAKE) $@) - diff --git a/graphics/tcm/patches/patch-at b/graphics/tcm/patches/patch-at deleted file mode 100644 index 48f2e29c6b5..00000000000 --- a/graphics/tcm/patches/patch-at +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-at,v 1.2 2001/05/10 23:35:28 jtb Exp $ - ---- Makefile.GEN.orig Wed Dec 13 10:57:26 2000 -+++ Makefile.GEN -@@ -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: -+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) libtcmglobal.a ) -+ ( cd ./dg ; $(MAKE) libtcmdiagram.a) -+ ( cd $(LIB_DIR) ; $(RANLIB) libtcmdiagram.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) 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 deleted file mode 100644 index d074ee77fe2..00000000000 --- a/graphics/tcm/patches/patch-au +++ /dev/null @@ -1,93 +0,0 @@ -$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 -@@ -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 -+ $(YACC) -b cardconstraint -p cardconstraint -d cardconstraint.y - cardconstraint.tab.c: cardconstraint.y cardconstraint.l -- $(YACC) --debug -p cardconstraint -d cardconstraint.y -+ $(YACC) -b cardconstraint -p cardconstraint -d cardconstraint.y - 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 deleted file mode 100644 index cd7453f63b3..00000000000 --- a/graphics/tcm/patches/patch-av +++ /dev/null @@ -1,73 +0,0 @@ -$NetBSD: patch-av,v 1.2 2001/05/10 23:35:28 jtb Exp $ - ---- sd/fv/Makefile.orig Wed Dec 20 13:33:20 2000 -+++ sd/fv/Makefile -@@ -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 -+ $(YACC) -b cardconstraint -p cardconstraint -d cardconstraint.y - cardconstraint.tab.c: cardconstraint.y cardconstraint.l -- $(YACC) --debug -p cardconstraint -d cardconstraint.y -+ $(YACC) -b cardconstraint -p cardconstraint -d cardconstraint.y - 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 deleted file mode 100644 index 05d8a7f5b20..00000000000 --- a/graphics/tcm/patches/patch-aw +++ /dev/null @@ -1,18 +0,0 @@ -$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 deleted file mode 100644 index fffc9b7c667..00000000000 --- a/graphics/tcm/patches/patch-ax +++ /dev/null @@ -1,33 +0,0 @@ -$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 deleted file mode 100644 index a0f01652bed..00000000000 --- a/graphics/tcm/patches/patch-ay +++ /dev/null @@ -1,28 +0,0 @@ -$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 deleted file mode 100644 index e034244f2de..00000000000 --- a/graphics/tcm/patches/patch-az +++ /dev/null @@ -1,68 +0,0 @@ -$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 deleted file mode 100644 index 056ab3cbc3a..00000000000 --- a/graphics/tcm/patches/patch-ba +++ /dev/null @@ -1,48 +0,0 @@ -$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 deleted file mode 100644 index 334ea9f5e04..00000000000 --- a/graphics/tcm/patches/patch-bb +++ /dev/null @@ -1,48 +0,0 @@ -$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 deleted file mode 100644 index ac1aef2db28..00000000000 --- a/graphics/tcm/patches/patch-bc +++ /dev/null @@ -1,18 +0,0 @@ -$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 deleted file mode 100644 index f7044b92714..00000000000 --- a/graphics/tcm/patches/patch-bd +++ /dev/null @@ -1,26 +0,0 @@ -$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/patches/patch-be b/graphics/tcm/patches/patch-be deleted file mode 100644 index 38d79b686ee..00000000000 --- a/graphics/tcm/patches/patch-be +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-be,v 1.1 2002/07/08 02:48:18 wiz Exp $ - ---- ui/textviewdialog.c.orig Tue Apr 4 18:25:17 2000 -+++ ui/textviewdialog.c -@@ -30,6 +30,9 @@ - #include "printeroptions.h" - #include "application.h" - #include <Xm/XmAll.h> -+#ifdef LESSTIF -+#include <stdio.h> -+#endif - #include <stdlib.h> - #include <unistd.h> - #include <ctype.h> diff --git a/graphics/tcm/patches/patch-bf b/graphics/tcm/patches/patch-bf deleted file mode 100644 index b340f3c7b0c..00000000000 --- a/graphics/tcm/patches/patch-bf +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2002/07/08 02:48:18 wiz Exp $ - ---- ui/error.c.orig Fri Jun 18 10:29:04 1999 -+++ ui/error.c -@@ -23,6 +23,9 @@ - #include "application.h" - #include "messagelogdialog.h" - #include <stdarg.h> -+#ifdef LESSTIF -+#include <stdio.h> -+#endif - - void error(const char *fmt ...) { - // we're not getting huge strings diff --git a/graphics/tcm/patches/patch-bg b/graphics/tcm/patches/patch-bg deleted file mode 100644 index f0e1a03faa3..00000000000 --- a/graphics/tcm/patches/patch-bg +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2002/07/08 02:48:18 wiz Exp $ - ---- ui/colorchooserdialog.c.orig Mon Mar 20 16:27:05 2000 -+++ ui/colorchooserdialog.c -@@ -22,6 +22,9 @@ - #include "colorchooserdialog.h" - #include "application.h" - #include "mstring.h" -+#ifdef LESSTIF -+#include <stdio.h> -+#endif - #include <Xm/XmAll.h> - #include <stdlib.h> - |