Reimport lang/otcl as lang/tcl-otcl to follow established practices.

Do various otcl -> tcl[-/]otcl substitutions along the way.
Sorry for the inconvenience.

1 files changed, 115 insertions, 0 deletions

diff --git a/lang/tcl-otcl/patches/patch-aa b/lang/tcl-otcl/patches/patch-aa
new file mode 100644
index 00000000000..4111c77ea0a
--- /dev/null
+++ b/lang/tcl-otcl/patches/patch-aa
@@ -0,0 +1,115 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/08/28 09:57:35 seb Exp $
+
+--- Makefile.in.orig	Thu Nov  2 02:45:59 2000
++++ Makefile.in
+@@ -5,6 +5,7 @@
+ #
+ 
+ CC=		@CC@
++CPPFLAGS=	@CPPFLAGS@
+ CFLAGS=		@CFLAGS@
+ RANLIB= 	@RANLIB@
+ INSTALL=	@INSTALL@
+@@ -28,7 +29,7 @@
+ INST_OTCLSH=	@prefix@/bin
+ INST_OWISH=	@prefix@/bin
+ INST_OLIB=	@prefix@/lib
+-INST_OLIBSH=	@INST_OLIBSH@
++INST_OLIBSH=	@prefix@/lib
+ INST_OINC=	@prefix@/include
+ 
+ 
+@@ -40,7 +41,6 @@
+ 	-I. \
+ 	@V_INCLUDES@ \
+ 	@V_INCLUDE_X11@ \
+-	-I@includedir@ \
+ 	@V_INCLUDE@
+ 
+ DEFINES = \
+@@ -58,9 +58,9 @@
+ CFILES = otcl.c otclAppInit.c otkAppInit.c
+ 
+ .c.o:
+-	$(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $<
++	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) $<
+ 
+-all: libotcl.a libotcl$(SHLIB_SUFFIX) otclsh owish
++all: libotcl.a otclsh owish
+ 
+ #
+ # compile an appinit with tcl and otcl and link against
+@@ -69,8 +69,8 @@
+ 
+ otclsh: otclAppInit.c libotcl.a
+ 	rm -f libotcl$(SHLIB_SUFFIX)
+-	$(CC) -o otclsh $(SHLD_FLAGS) $(CFLAGS) $(INCLUDES) otclAppInit.c \
+-	$(OTCLLIB) $(LIB)
++	${LIBTOOL} --mode=link $(CC) -o otclsh $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(LDFLAGS) otclAppInit.c \
++	./libotcl.la $(LIB)
+ 
+ #
+ # compile an appinit with tcl/tk and otcl and link against
+@@ -79,8 +79,8 @@
+ 
+ owish: otkAppInit.c libotcl.a
+ 	rm -f libotcl$(SHLIB_SUFFIX)
+-	$(CC) -o owish $(SHLD_FLAGS) $(CFLAGS) $(INCLUDES) otkAppInit.c \
+-	$(OTCLLIB) $(LIB)
++	${LIBTOOL} --mode=link $(CC) -o owish $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(LDFLAGS) otkAppInit.c \
++	./libotcl.la $(LIB)
+ 
+ #
+ # compile otcl.c and link it into a library archive
+@@ -89,36 +89,25 @@
+ 
+ libotcl.a: otcl.c
+ 	rm -f libotcl.a otcl.o
+-	$(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) otcl.c
+-	ar cq libotcl.a otcl.o
+-	$(RANLIB) libotcl.a
+-
+-#
+-# compile otcl.c and link it into a shared object
+-# INCLUDES give a path to tclInt.h (plus tk and X11)
+-#
+-
+-libotcl$(SHLIB_SUFFIX): otcl.c
+-	rm -f libotcl$(SHLIB_SUFFIX) otcl.o so_locations
+-	$(CC) -c $(CFLAGS) $(DEFINES) $(SHLIB_CFLAGS) $(INCLUDES) otcl.c
+-	$(SHLIB_LD) -o libotcl$(SHLIB_SUFFIX) otcl.o
++	${LIBTOOL} --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) otcl.c
++	${LIBTOOL} --mode=link ${CC} -o ${.TARGET:.a=.la} otcl.lo -rpath ${PREFIX}/lib -version-info 0:0
+ 
+ test: otclsh owish
+ 	./otclsh lib/test.tcl
+ 	./owish lib/test.tcl
+ 
+-install: owish otclsh libotcl.a libotcl$(SHLIB_SUFFIX) otcl.h
++install: owish otclsh libotcl.a otcl.h
+ 	$(INSTALL) owish $(INST_OWISH)
+ 	$(INSTALL) otclsh $(INST_OTCLSH)
+-	$(INSTALL) libotcl.a $(INST_OLIB)
+-	$(INSTALL) libotcl$(SHLIB_SUFFIX) $(INST_OLIBSH)
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libotcl.la ${PREFIX}/lib
+ 	$(INSTALL) otcl.h $(INST_OINC)
+ 
+ clean:
+-	rm -f owish otclsh libotcl.a libotcl$(SHLIB_SUFFIX) \
++	rm -f owish otclsh libotcl.la \
+ 	otcl.o otkAppInit.o otclAppInit.o \
+ 	config.status config.log config.cache \
+ 	core so_locations *.core Makefile
++	rm -rf .libs
+ 
+ # To be compatible with ns/nam
+ distclean: clean
+@@ -146,7 +135,7 @@
+ 
+ depend: $(CFILES)
+ 	@echo Making dependencies for $(srcdir){$(CFILES)}
+-	@$(CC) -MM $(CFLAGS) $(INCLUDES) $(DEFINES) $(CFILES) > makedep
++	@$(CC) -MM $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(DEFINES) $(CFILES) > makedep
+ 	@echo '/^# DO NOT DELETE THIS LINE/+1,$$d' > eddep
+ 	@echo '$$r makedep' >> eddep
+ 	@echo 'w' >>eddep