Reimport devel/tclcl as devel/tcl-tclcl to follow established practices.

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

6 files changed, 149 insertions, 0 deletions

diff --git a/devel/tcl-tclcl/DESCR b/devel/tcl-tclcl/DESCR
new file mode 100644
index 00000000000..d4b5ef44186
--- /dev/null
+++ b/devel/tcl-tclcl/DESCR
@@ -0,0 +1,2 @@
+TclCL (Tcl with classes) is a Tcl/C++ interface used by Mash, vic, vat,
+rtp_play, ns, and nam.  It provides a layer of C++ glue over OTcl.
diff --git a/devel/tcl-tclcl/Makefile b/devel/tcl-tclcl/Makefile
new file mode 100644
index 00000000000..06cde788ba9
--- /dev/null
+++ b/devel/tcl-tclcl/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1.1.1 2002/08/28 10:00:11 seb Exp $
+
+DISTNAME=	tclcl-src-1.0b12
+PKGNAME=	tcl-${DISTNAME:S/b/rc/:S/-src//}
+CATEGORIES=	devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
+
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://otcl-tclcl.sourceforge.net/tclcl/
+COMMENT=	Tcl/C++ interface used by ns and nam
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
+
+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
+
+.include  "../../lang/tcl-otcl/buildlink2.mk"
+.include "../../x11/tk/buildlink2.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/tcl-tclcl/PLIST b/devel/tcl-tclcl/PLIST
new file mode 100644
index 00000000000..e6b2389a2e7
--- /dev/null
+++ b/devel/tcl-tclcl/PLIST
@@ -0,0 +1,17 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/28 10:00:11 seb Exp $
+bin/otcldoc
+bin/tcl2c++
+include/idlecallback.h
+include/iohandler.h
+include/rate-variable.h
+include/tclcl-config.h
+include/tclcl-internal.h
+include/tclcl-mappings.h
+include/tclcl.h
+include/timer.h
+include/tracedvar.h
+lib/libtclcl.a
+lib/libtclcl.la
+lib/libtclcl.so
+lib/libtclcl.so.0
+lib/libtclcl.so.0.0
diff --git a/devel/tcl-tclcl/buildlink2.mk b/devel/tcl-tclcl/buildlink2.mk
new file mode 100644
index 00000000000..89c162671ab
--- /dev/null
+++ b/devel/tcl-tclcl/buildlink2.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink2.mk,v 1.1.1.1 2002/08/28 10:00:11 seb Exp $
+
+.if !defined(TCL_TCLCL_BUILDLINK2_MK)
+TCL_TCLCL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			tcl-tclcl
+BUILDLINK_DEPENDS.tcl-tclcl?=		tcl-tclcl>=1.0rc12
+BUILDLINK_PKGSRCDIR.tcl-tclcl?=	      ../../devel/tcl-tclcl
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.tcl-tclcl=tcl-tclcl
+BUILDLINK_PREFIX.tcl-tclcl_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.tcl-tclcl+=		include/idlecallback.h
+BUILDLINK_FILES.tcl-tclcl+=		include/iohandler.h
+BUILDLINK_FILES.tcl-tclcl+=		include/rate-variable.h
+BUILDLINK_FILES.tcl-tclcl+=		include/tclcl-config.h
+BUILDLINK_FILES.tcl-tclcl+=		include/tclcl-internal.h
+BUILDLINK_FILES.tcl-tclcl+=		include/tclcl-mappings.h
+BUILDLINK_FILES.tcl-tclcl+=		include/tclcl.h
+BUILDLINK_FILES.tcl-tclcl+=		include/timer.h
+BUILDLINK_FILES.tcl-tclcl+=		include/tracedvar.h
+BUILDLINK_FILES.tcl-tclcl+=		lib/libtclcl.*
+
+.include  "../../lang/tcl-otcl/buildlink2.mk"
+.include "../../x11/tk/buildlink2.mk"
+
+BUILDLINK_TARGETS+=		tcl-tclcl-buildlink
+
+tcl-tclcl-buildlink: _BUILDLINK_USE
+
+.endif	# TCL_TCLCL_BUILDLINK2_MK
diff --git a/devel/tcl-tclcl/distinfo b/devel/tcl-tclcl/distinfo
new file mode 100644
index 00000000000..030cd28b70d
--- /dev/null
+++ b/devel/tcl-tclcl/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2002/08/28 10:00:11 seb Exp $
+
+SHA1 (tclcl-src-1.0b12.tar.gz) = f5d40cd49c6bcc11df04356d24c40df8007267c6
+Size (tclcl-src-1.0b12.tar.gz) = 142505 bytes
+SHA1 (patch-aa) = 994299e43a792b7af58807157b6ba41c30fc9950
diff --git a/devel/tcl-tclcl/patches/patch-aa b/devel/tcl-tclcl/patches/patch-aa
new file mode 100644
index 00000000000..5e144789dcf
--- /dev/null
+++ b/devel/tcl-tclcl/patches/patch-aa
@@ -0,0 +1,69 @@
+$NetBSD: patch-aa,v 1.1.1.1 2002/08/28 10:00:12 seb Exp $
+
+--- Makefile.in.orig	Thu Nov  9 20:48:33 2000
++++ Makefile.in
+@@ -52,6 +52,9 @@ TEST	= test
+ RM	= rm -f
+ PERL	= perl
+ 
++INSTALL_DATA = ${BSD_INSTALL_DATA}
++INSTALL_PROGRAM = ${BSD_INSTALL_PROGRAM}
++INSTALL_SCRIPT = ${BSD_INSTALL_SCRIPT}
+ 
+ CCOPT	= @V_CCOPT@
+ STATIC	= @V_STATIC@
+@@ -75,11 +78,11 @@ CFLAGS	= $(CCOPT) $(DEFINE)
+ 
+ .cc.o:
+ 	@rm -f $@
+-	$(CPP) -c $(CFLAGS) $(INCLUDES) -o $@ $*.cc
++	${LIBTOOL} --mode=compile $(CPP) -c $(CFLAGS) $(INCLUDES) -o $@ $*.cc
+ 
+ .c.o:
+ 	@rm -f $@
+-	$(CC) -c $(CFLAGS) $(INCLUDES) -o $@ $*.c
++	${LIBTOOL} --mode=compile $(CC) -c $(CFLAGS) $(INCLUDES) -o $@ $*.c
+ 
+ 
+ GEN_DIR	= gen/
+@@ -103,7 +106,7 @@ TCL_82_LIBRARY_FILES = \
+ 	$(LIBRARY_TCL)/http2.1/http.tcl
+ TCL_83_LIBRARY_FILES = \
+ 	$(TCL_BASE_LIBRARY_FILES) \
+-	$(LIBRARY_TCL)/http2.3/http.tcl
++	$(LIBRARY_TCL)/http2.4/http.tcl
+ 
+ TCL_LIBRARY_FILES = \
+ 	@V_TCL_LIBRARY_FILES@
+@@ -149,13 +152,12 @@ all:	$(TCL2C) $(LIB_TCLCL)
+ 
+ $(TCL2C): tcl2c++.o
+ 	$(RM) $@
+-	$(LINK) $(STATIC) $(LDFLAGS) $(LDOUT)$@ tcl2c++.o
++	${LIBTOOL} --mode=link $(LINK) $(LDOUT)$@ tcl2c++.o
+ 
+ # We used to link to libTcl.a for backwards compatibilty, but no more.
+ $(LIB_TCLCL): $(OBJ_CC) $(OBJ_COMPAT_C)
+ 	$(RM) $@
+-	$(AR)$@ $(OBJ_CC) $(OBJ_COMPAT_C)
+-	$(RANLIB) $@
++	${LIBTOOL} --mode=link ${CPP} -o ${.TARGET:.a=.la} $(OBJ_CC:.o=.lo) $(OBJ_COMPAT_C:.o=.lo) -rpath ${PREFIX}/lib -version-info 0:0
+ 
+ #
+ # pass-1 embedded tcl files
+@@ -180,9 +182,12 @@ embedded-console.cc: $(CONSOLE_FILES) $(
+ 	$(TCL2C) et_console $(CONSOLE_FILES) > embedded-console.cc
+ 
+ install: force
+-	$(INSTALL) *.h @prefix@/include
+-	$(INSTALL) tcl2c++ @prefix@/bin
+-	$(INSTALL) $(LIB_TCLCL) @prefix@/lib
++	for f in *.h ; do				\
++		${INSTALL_DATA} $$f ${PREFIX}/include;	\
++	done
++	${INSTALL_PROGRAM} tcl2c++ ${PREFIX}/bin
++	${INSTALL_SCRIPT} otcldoc ${PREFIX}/bin
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libtclcl.la ${PREFIX}/lib
+ 
+ # libTcl is no longer installed as of 13-Nov-99
+ #	-test -f @prefix@/lib/libTcl.a && rm -f @prefix@/lib/libTcl.a || true