From 2c47fce0e6f526d1935c4dcfe0005290c14f78b7 Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Mon, 2 Mar 2009 23:53:17 +0000 Subject: - Separate common tcl85 and tcl86 modules to a new port lang/tcl-modules - Make tcl-modules a slave port of tcl85 - Fix incompatible pkg-lists of tcl85 and tcl86 - Add modules to OPTIONS - Bump PORTREVISION --- lang/tcl85/Makefile | 28 +++++++++--- lang/tcl85/files/patch-unix-Makefile.in | 75 ++++++++++++++++++++++++++++++--- lang/tcl85/pkg-plist | 10 ----- lang/tcl85/pkg-plist.tm | 11 +++++ 4 files changed, 100 insertions(+), 24 deletions(-) create mode 100644 lang/tcl85/pkg-plist.tm (limited to 'lang/tcl85') diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile index 6cc5e6e608a3..369065b823dc 100644 --- a/lang/tcl85/Makefile +++ b/lang/tcl85/Makefile @@ -5,17 +5,17 @@ # $FreeBSD$ # -PORTNAME= tcl +PORTNAME?= tcl PORTVERSION= 8.5.6 -PORTREVISION= 2 +PORTREVISION?= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= tcl PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2} -DISTNAME= ${PORTNAME}${PORTVERSION}-src +DISTNAME= tcl${PORTVERSION}-src MAINTAINER= mm@FreeBSD.org -COMMENT= Tool Command Language +COMMENT?= Tool Command Language LATEST_LINK?= tcl85 PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP} @@ -32,18 +32,30 @@ NOPRECIOUSMAKEVARS= Too many _MLINKS for README.html PLIST_SUB= TCL_VER=${TCL_VER} SHORT_TCL_VER=${SHORT_TCL_VER} EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/ -.if !defined(BUILDING_TCL_THREADS) +.if !defined(BUILDING_TCL_THREADS) && !defined(BUILDING_TCL_TM) OPTIONS= TCL85_MAN "Install tcl 8.5 function manpages" off \ - TZDATA "Install tcl timezone data" off -.else + TZDATA "Install tcl timezone data" off \ + TCL_MODULES "Install tcl common modules" on +.elif defined(BUILDING_TCL_THREADS) USE_TCL= ${SHORT_TCL_VER} PLIST= ${PKGDIR}/pkg-plist.threads THREADS_SUFFIX= -threads LATEST_LINK= tcl85${THREADS_SUFFIX} +.elif defined(BUILDING_TCL_TM) +LATEST_LINK= tcl-modules +NO_BUILD= yes +INSTALL_TARGET= install-tm +PLIST= ${PKGDIR}/pkg-plist.tm .endif .include +.if !defined(BUILDING_TCL_TM) + +.if !defined(WITHOUT_TCL_MODULES) +RUN_DEPENDS+= ${LOCALBASE}/lib/tcl8/8.5/tcltest-2.3.0.tm:${PORTSDIR}/lang/tcl-modules +.endif + DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} .if defined(WITH_TZDATA) @@ -767,4 +779,6 @@ post-install: regression-test: build cd ${WRKSRC} && LC_ALL=C ${MAKE} test +.endif # !defined(BUILDING_TCL_TM) + .include diff --git a/lang/tcl85/files/patch-unix-Makefile.in b/lang/tcl85/files/patch-unix-Makefile.in index 24d2e4fd3857..fb47b46a49da 100644 --- a/lang/tcl85/files/patch-unix-Makefile.in +++ b/lang/tcl85/files/patch-unix-Makefile.in @@ -1,5 +1,5 @@ --- Makefile.in.orig 2008-12-22 15:16:08.000000000 +0100 -+++ Makefile.in 2009-02-26 11:52:42.428721740 +0100 ++++ Makefile.in 2009-03-03 00:11:50.256476506 +0100 @@ -55,6 +55,8 @@ # Directory in which to install the include file tcl.h: @@ -89,6 +89,15 @@ do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ +@@ -751,7 +772,7 @@ + else true; \ + fi; \ + done; +- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.3 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5; \ ++ @for i in opt0.4 http1.0 encoding; \ + do \ + if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ + echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ @@ -764,13 +785,17 @@ chmod +x $(SRC_DIR)/../unix/install-sh; \ fi @@ -98,21 +107,73 @@ - $(GENERIC_DIR)/tclTomMath.h \ - $(GENERIC_DIR)/tclTomMathDecls.h ; \ + @for i in $(GENERIC_DIR)/*.h ; \ - do \ -- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ ++ do \ + $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"; \ - done; ++ done; + @for i in $(UNIX_DIR)/*.h ; \ -+ do \ + do \ +- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \ + $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"; \ -+ done; + done; + @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h + @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h + @ln -sf "$(GENERIC_INCLUDE_INSTALL_DIR)"/tclPlatDecls.h "$(INCLUDE_INSTALL_DIR)"/tclPlatDecls.h @echo "Installing library files to $(SCRIPT_INSTALL_DIR)"; @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ $(UNIX_DIR)/tclAppInit.c $(UNIX_DIR)/ldAix @DTRACE_SRC@; \ -@@ -836,20 +861,25 @@ +@@ -782,22 +807,11 @@ + do \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ + done; +- @echo "Installing package http 2.7.2 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.2.tm; + @echo "Installing library opt0.4 directory"; + @for i in $(TOP_DIR)/library/opt/*.tcl ; \ + do \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \ + done; +- @echo "Installing package msgcat 1.4.2 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.2.tm; +- @echo "Installing package tcltest 2.3.0 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.0.tm; +- +- @echo "Installing package platform 1.0.3 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.3.tm; +- @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm; + + @echo "Installing library encoding directory"; + @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ +@@ -809,6 +823,28 @@ + "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ + fi + ++install-tm: ++ @for i in ../tcl8 ../tcl8/8.3 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \ ++ do \ ++ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ ++ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ ++ mkdir -p "$(SCRIPT_INSTALL_DIR)"/$$i; \ ++ chmod 755 "$(SCRIPT_INSTALL_DIR)"/$$i; \ ++ else true; \ ++ fi; \ ++ done; ++ @echo "Installing package http 2.7.2 as a Tcl Module"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.2.tm; ++ @echo "Installing package msgcat 1.4.2 as a Tcl Module"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.2.tm; ++ @echo "Installing package tcltest 2.3.0 as a Tcl Module"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.0.tm; ++ ++ @echo "Installing package platform 1.0.3 as a Tcl Module"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.3.tm; ++ @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm; ++ + install-tzdata: tclsh + @echo "Installing time zone data" + @@LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export @LD_LIBRARY_PATH_VAR@; \ +@@ -836,20 +872,25 @@ else true; \ fi; \ done; diff --git a/lang/tcl85/pkg-plist b/lang/tcl85/pkg-plist index f4fde9505315..bf05bb978e08 100644 --- a/lang/tcl85/pkg-plist +++ b/lang/tcl85/pkg-plist @@ -819,11 +819,6 @@ lib/tcl%%TCL_VER%%/tclIndex %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Pacific-New %%TZDATA%%lib/tcl%%TCL_VER%%/tzdata/US/Samoa lib/tcl%%TCL_VER%%/word.tcl -lib/tcl8/8.4/http-2.7.2.tm -lib/tcl8/8.4/platform/shell-1.1.4.tm -lib/tcl8/8.4/platform-1.0.3.tm -lib/tcl8/8.5/msgcat-1.4.2.tm -lib/tcl8/8.5/tcltest-2.3.0.tm %%DATADIR%%/man.macros @dirrm %%DATADIR%% %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/US @@ -853,11 +848,6 @@ lib/tcl8/8.5/tcltest-2.3.0.tm @dirrm lib/tcl%%TCL_VER%%/http1.0 @dirrm lib/tcl%%TCL_VER%%/encoding @dirrmtry lib/tcl%%TCL_VER%% -@dirrmtry lib/tcl8/8.3 -@dirrmtry lib/tcl8/8.4/platform -@dirrmtry lib/tcl8/8.4 -@dirrmtry lib/tcl8/8.5 -@dirrmtry lib/tcl8 @dirrm include/tcl%%TCL_VER%%/unix @dirrm include/tcl%%TCL_VER%%/generic @dirrm include/tcl%%TCL_VER%% diff --git a/lang/tcl85/pkg-plist.tm b/lang/tcl85/pkg-plist.tm new file mode 100644 index 000000000000..a2bdba3996fb --- /dev/null +++ b/lang/tcl85/pkg-plist.tm @@ -0,0 +1,11 @@ +lib/tcl8/8.4/http-2.7.2.tm +lib/tcl8/8.4/platform/shell-1.1.4.tm +lib/tcl8/8.4/platform-1.0.3.tm +lib/tcl8/8.5/msgcat-1.4.2.tm +lib/tcl8/8.5/tcltest-2.3.0.tm +@dirrmtry lib/tcl8/8.3 +@dirrmtry lib/tcl8/8.4/platform +@dirrmtry lib/tcl8/8.4 +@dirrmtry lib/tcl8/8.5 +@dirrmtry lib/tcl8/8.6 +@dirrmtry lib/tcl8 -- cgit v1.2.3