pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/tcl-tclcl Update tcl-tclcl to 1.15 and take main...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a6af417c05ec
branches:  trunk
changeset: 470399:a6af417c05ec
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon Mar 08 23:49:41 2004 +0000

description:
Update tcl-tclcl to 1.15 and take maintainership.

Changes:
        - Made changes to config for support to tcl/tk8.4.5 libs

diffstat:

 devel/tcl-tclcl/Makefile         |  29 ++++++++++++++++++-----------
 devel/tcl-tclcl/buildlink2.mk    |  30 ------------------------------
 devel/tcl-tclcl/buildlink3.mk    |  23 +++++++++++++++++++++++
 devel/tcl-tclcl/distinfo         |   8 ++++----
 devel/tcl-tclcl/patches/patch-aa |  18 +++++++++---------
 5 files changed, 54 insertions(+), 54 deletions(-)

diffs (165 lines):

diff -r 4cc3a3ddd852 -r a6af417c05ec devel/tcl-tclcl/Makefile
--- a/devel/tcl-tclcl/Makefile  Mon Mar 08 23:47:44 2004 +0000
+++ b/devel/tcl-tclcl/Makefile  Mon Mar 08 23:49:41 2004 +0000
@@ -1,25 +1,32 @@
-# $NetBSD: Makefile,v 1.7 2004/03/08 20:27:14 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/08 23:49:41 minskim Exp $
 
-DISTNAME=      tclcl-src-1.0b13
-PKGNAME=       tcl-${DISTNAME:S/b/rc/:S/-src//}
+DISTNAME=      tclcl-src-1.15
+PKGNAME=       tcl-${DISTNAME:S/-src//}
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=otcl-tclcl/}
 
-MAINTAINER=    tech-pkg%NetBSD.org@localhost
+MAINTAINER=    minskim%NetBSD.org@localhost
 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
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+WRKSRC=                ${WRKDIR}/${DISTNAME:S/-src//}
+USE_BUILDLINK3=        yes
+USE_LANGUAGES= c c++
+GNU_CONFIGURE= yes
+USE_LIBTOOL=   yes
+USE_X11=       yes
 
 CONFIGURE_ARGS+=       --with-tcl=${BUILDLINK_PREFIX.tcl}
 CONFIGURE_ARGS+=       --with-tk=${BUILDLINK_PREFIX.tk}
+CONFIGURE_ARGS+=       --with-otcl=${BUILDLINK_PREFIX.tcl-otcl}
 
 CPPFLAGS+=     -I${BUILDLINK_PREFIX.tcl}/include/tcl/generic
 
-.include  "../../lang/tcl-otcl/buildlink2.mk"
-.include "../../x11/tk83/buildlink2.mk"
+INSTALLATION_DIRS=     bin include lib
+
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl-otcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4cc3a3ddd852 -r a6af417c05ec devel/tcl-tclcl/buildlink2.mk
--- a/devel/tcl-tclcl/buildlink2.mk     Mon Mar 08 23:47:44 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2004/03/08 20:27:14 minskim 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/tk83/buildlink2.mk"
-
-BUILDLINK_TARGETS+=            tcl-tclcl-buildlink
-
-tcl-tclcl-buildlink: _BUILDLINK_USE
-
-.endif # TCL_TCLCL_BUILDLINK2_MK
diff -r 4cc3a3ddd852 -r a6af417c05ec devel/tcl-tclcl/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/tcl-tclcl/buildlink3.mk     Mon Mar 08 23:49:41 2004 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/03/08 23:49:41 minskim Exp $
+
+BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
+TCL_TCLCL_BUILDLINK3_MK:=      ${TCL_TCLCL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=    tcl-tclcl
+.endif
+
+BUILDLINK_PACKAGES:=   ${BUILDLINK_PACKAGES:Ntcl-tclcl}
+BUILDLINK_PACKAGES+=   tcl-tclcl
+
+.if !empty(TCL_TCLCL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.tcl-tclcl+=  tcl-tclcl>=1.15
+BUILDLINK_PKGSRCDIR.tcl-tclcl?=        ../../devel/tcl-tclcl
+
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl-otcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
+
+.endif # TCL_TCLCL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 4cc3a3ddd852 -r a6af417c05ec devel/tcl-tclcl/distinfo
--- a/devel/tcl-tclcl/distinfo  Mon Mar 08 23:47:44 2004 +0000
+++ b/devel/tcl-tclcl/distinfo  Mon Mar 08 23:49:41 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/08/31 19:45:21 jschauma Exp $
+$NetBSD: distinfo,v 1.3 2004/03/08 23:49:41 minskim Exp $
 
-SHA1 (tclcl-src-1.0b13.tar.gz) = eca9abf853eab66d2fd6e402a4af4d357621b855
-Size (tclcl-src-1.0b13.tar.gz) = 142021 bytes
-SHA1 (patch-aa) = 994299e43a792b7af58807157b6ba41c30fc9950
+SHA1 (tclcl-src-1.15.tar.gz) = 5b927893d4d3b3f49e86f4ee43266668595d34e3
+Size (tclcl-src-1.15.tar.gz) = 143000 bytes
+SHA1 (patch-aa) = b86e9d208e131b142a5ee81ebd2247718c2e1773
diff -r 4cc3a3ddd852 -r a6af417c05ec devel/tcl-tclcl/patches/patch-aa
--- a/devel/tcl-tclcl/patches/patch-aa  Mon Mar 08 23:47:44 2004 +0000
+++ b/devel/tcl-tclcl/patches/patch-aa  Mon Mar 08 23:49:41 2004 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/28 10:00:12 seb Exp $
+$NetBSD: patch-aa,v 1.2 2004/03/08 23:49:41 minskim Exp $
 
---- Makefile.in.orig   Thu Nov  9 20:48:33 2000
+--- Makefile.in.orig   Fri Jan  9 16:38:18 2004
 +++ Makefile.in
 @@ -52,6 +52,9 @@ TEST = test
  RM    = rm -f
@@ -26,16 +26,16 @@
  
  
  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
+@@ -106,7 +109,7 @@ TCL_83_LIBRARY_FILES = \
+       $(LIBRARY_TCL)/http2.3/http.tcl
+ TCL_84_LIBRARY_FILES = \
+         $(TCL_BASE_LIBRARY_FILES) \
+-      $(LIBRARY_TCL)/http/http.tcl
 +      $(LIBRARY_TCL)/http2.4/http.tcl
  
  TCL_LIBRARY_FILES = \
        @V_TCL_LIBRARY_FILES@
-@@ -149,13 +152,12 @@ all:     $(TCL2C) $(LIB_TCLCL)
+@@ -152,13 +155,12 @@ all:     $(TCL2C) $(LIB_TCLCL)
  
  $(TCL2C): tcl2c++.o
        $(RM) $@
@@ -51,7 +51,7 @@
  
  #
  # pass-1 embedded tcl files
-@@ -180,9 +182,12 @@ embedded-console.cc: $(CONSOLE_FILES) $(
+@@ -183,9 +185,12 @@ embedded-console.cc: $(CONSOLE_FILES) $(
        $(TCL2C) et_console $(CONSOLE_FILES) > embedded-console.cc
  
  install: force



Home | Main Index | Thread Index | Old Index