Otcl was reimported as tcl-otcl.

6 files changed, 0 insertions, 211 deletions

diff --git a/lang/otcl/DESCR b/lang/otcl/DESCR
deleted file mode 100644
index 1b611c9d393..00000000000
--- a/lang/otcl/DESCR
+++ /dev/null
@@ -1,13 +0,0 @@
-OTcl, short for MIT Object Tcl, is an extension to Tcl/Tk for
-object-oriented programming. It shouldn't be confused with the IXI
-Object Tcl extension by Dean Sheenan.
-
-   Some of OTcl's features as compared to alternatives are:
-     * designed to be dynamically extensible, like Tcl, from the ground
-       up
-     * builds on Tcl syntax and concepts rather than importing another
-       language
-     * compact yet powerful object programming system (draws on CLOS,
-       Smalltalk, and Self)
-     * fairly portable implementation (2000 lines of C, without core
-       hacks)
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
deleted file mode 100644
index 82ecc7a7bad..00000000000
--- a/lang/otcl/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/27 08:04:10 seb Exp $
-
-DISTNAME=	otcl-1.0a8
-PKGNAME=	${DISTNAME:S/a/rc/}
-CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://otcl-tclcl.sourceforge.net/otcl/
-COMMENT=	MIT Object Tcl
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_BUILDLINK2=	yes
-USE_X11=	yes
-
-CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}
-CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}
-
-CPPFLAGS+=	-I${BUILDLINK_PREFIX.tcl}/include/tcl/generic
-
-HTMLDOCS=	CHANGES.html autoload.html capi.html class.html object.html \
-		tutorial.html
-DOCS=		otcl-paper.ps.gz
-HTMLDOCDIR=	${PREFIX}/share/doc/html/${PKGBASE}
-DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
-
-post-install:
-	${INSTALL_DATA_DIR} ${HTMLDOCDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}
-.for _file_ in ${HTMLDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${_file_} ${HTMLDOCDIR}
-.endfor
-.for _file_ in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${_file_} ${DOCDIR}
-.endfor
-
-.include "../../x11/tk/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/lang/otcl/PLIST b/lang/otcl/PLIST
deleted file mode 100644
index 5e0098c7d2b..00000000000
--- a/lang/otcl/PLIST
+++ /dev/null
@@ -1,18 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/27 08:04:10 seb Exp $
-bin/otclsh
-bin/owish
-include/otcl.h
-lib/libotcl.a
-lib/libotcl.la
-lib/libotcl.so
-lib/libotcl.so.0
-lib/libotcl.so.0.0
-share/doc/html/otcl/CHANGES.html
-share/doc/html/otcl/autoload.html
-share/doc/html/otcl/capi.html
-share/doc/html/otcl/class.html
-share/doc/html/otcl/object.html
-share/doc/html/otcl/tutorial.html
-share/doc/otcl/otcl-paper.ps.gz
-@dirrm share/doc/otcl
-@dirrm share/doc/html/otcl
diff --git a/lang/otcl/buildlink2.mk b/lang/otcl/buildlink2.mk
deleted file mode 100644
index c3e2848d282..00000000000
--- a/lang/otcl/buildlink2.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/08/27 08:04:10 seb Exp $
-
-.if !defined(OTCL_BUILDLINK2_MK)
-OTCL_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		otcl
-BUILDLINK_DEPENDS.otcl?=		otcl>=1.0rc8
-BUILDLINK_PKGSRCDIR.otcl?=	../../lang/otcl
-
-EVAL_PREFIX+=		BUILDLINK_PREFIX.otcl=otcl
-BUILDLINK_PREFIX.otcl_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.otcl+=	include/otcl.h
-BUILDLINK_FILES.otcl+=	lib/libotcl.*
-
-.include "../../x11/tk/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	otcl-buildlink
-
-otcl-buildlink: _BUILDLINK_USE
-
-.endif	# OTCL_BUILDLINK2_MK
diff --git a/lang/otcl/distinfo b/lang/otcl/distinfo
deleted file mode 100644
index 9b320f98c9a..00000000000
--- a/lang/otcl/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/27 08:04:10 seb Exp $
-
-SHA1 (otcl-1.0a8.tar.gz) = 84cf8ec97a79230f5de6ae65ccee3ff788c7c20c
-Size (otcl-1.0a8.tar.gz) = 300607 bytes
-SHA1 (patch-aa) = aa5e68245897764a12c098a73f8e2f06f5672474
diff --git a/lang/otcl/patches/patch-aa b/lang/otcl/patches/patch-aa
deleted file mode 100644
index dc29911d1ce..00000000000
--- a/lang/otcl/patches/patch-aa
+++ /dev/null
@@ -1,115 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/27 08:04:10 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