Update to tcl-8.5.11 and tk-8.5.11, use bsd.port.arch.mk. Diffs are also in cvs:~/diffs if these don't make it through properly. Stu
Index: lang/tcl/8.5/Makefile =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- lang/tcl/8.5/Makefile 17 Oct 2011 15:18:39 -0000 1.17 +++ lang/tcl/8.5/Makefile 7 Nov 2011 17:59:02 -0000 @@ -2,9 +2,9 @@ COMMENT = Tool Command Language -DISTNAME = tcl8.5.10 -PKGNAME = tcl-8.5.10 -SHARED_LIBS = tcl85 1.0 +DISTNAME = tcl8.5.11 +PKGNAME = tcl-8.5.11 +SHARED_LIBS = tcl85 1.1 CATEGORIES = lang lang/tcl HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <[email protected]> @@ -46,13 +46,6 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ EXTRA_INSTALL="install-private-headers" \ SHLIB_VERSION="${LIBtcl85_VERSION}" -.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax" -ALL_TARGET = all libtcl85.a -CONFIGURE_ARGS += EXTRA_INSTALL_BINARIES='@echo "Installing libtcl85.a to $$(LIB_INSTALL_DIR)/" \ - && $$(INSTALL_DATA) libtcl85.a $$(LIB_INSTALL_DIR)/libtcl85.a \ - && (cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtcl85.a)' -.endif - FLAVORS = threaded FLAVOR ?= @@ -61,6 +54,15 @@ CONFIGURE_ARGS += --enable-threads WANTLIB += pthread .endif +.include <bsd.port.arch.mk> + +.if ${NO_SHARED_LIBS:L} == "no" +ALL_TARGET = all libtcl85.a +CONFIGURE_ARGS += EXTRA_INSTALL_BINARIES='@echo "Installing libtcl85.a to $$(LIB_INSTALL_DIR)/" \ + && $$(INSTALL_DATA) libtcl85.a $$(LIB_INSTALL_DIR)/libtcl85.a \ + && (cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtcl85.a)' +.endif + WRKSRC = ${WRKDIST}/unix REGRESS_TARGET = test SUBST_VARS += _README_DIR @@ -72,7 +74,7 @@ pre-regress: post-install: ${INSTALL_DATA} ${WRKDIST}/license.terms ${PREFIX}/lib/tcl/tcl8.5/man -.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax" +.if ${NO_SHARED_LIBS:L} == "no" ln -s libtcl85.a ${PREFIX}/lib/libtcl85_pic.a ln -s libtclstub85.a ${PREFIX}/lib/libtclstub85_pic.a .endif Index: lang/tcl/8.5/distinfo =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- lang/tcl/8.5/distinfo 17 Oct 2011 15:18:39 -0000 1.8 +++ lang/tcl/8.5/distinfo 7 Nov 2011 17:59:02 -0000 @@ -1,5 +1,5 @@ -MD5 (tcl8.5.10-src.tar.gz) = oI6vhGfAYxk3BnwZSN0yaw== -RMD160 (tcl8.5.10-src.tar.gz) = mxkjiOdORqSXLRjCS3Cxo9cM66Q= -SHA1 (tcl8.5.10-src.tar.gz) = 5siU07jLy/tyk6LgxeLNFeF4vi4= -SHA256 (tcl8.5.10-src.tar.gz) = 9YIGPt1UGaOe6Pe1yPldVXtdqtE++w7S8JZ8oYVhO7c= -SIZE (tcl8.5.10-src.tar.gz) = 4498413 +MD5 (tcl8.5.11-src.tar.gz) = sBqWkcg5kLPbDOYtEBLKZw== +RMD160 (tcl8.5.11-src.tar.gz) = NhQLXoNlwZAgITLdbw3+uDHqm8g= +SHA1 (tcl8.5.11-src.tar.gz) = y3Dc+3YlOJr9d04EOKet4+eqE8g= +SHA256 (tcl8.5.11-src.tar.gz) = it3DhfprW+RgXm1o+9xMDmdMWvHcHJXsVCA5DEsIBCo= +SIZE (tcl8.5.11-src.tar.gz) = 4484001 Index: lang/tcl/8.5/patches/patch-unix_Makefile_in =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-unix_Makefile_in,v retrieving revision 1.6 diff -u -p -r1.6 patch-unix_Makefile_in --- lang/tcl/8.5/patches/patch-unix_Makefile_in 17 Oct 2011 15:18:39 -0000 1.6 +++ lang/tcl/8.5/patches/patch-unix_Makefile_in 7 Nov 2011 17:59:02 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.6 2011/10/17 15:18:39 stu Exp $ ---- unix/Makefile.in.orig Thu Jun 23 09:18:36 2011 -+++ unix/Makefile.in Wed Oct 5 01:55:17 2011 -@@ -554,6 +554,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} +--- unix/Makefile.in.orig Thu Oct 20 12:06:53 2011 ++++ unix/Makefile.in Wed Oct 26 11:47:46 2011 +@@ -556,6 +556,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ @MAKE_STUB_LIB@ @@ -12,7 +12,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.6 2 # Make target which outputs the list of the .o contained in the Tcl lib useful # to build a single big shared library containing Tcl and other extensions. # Used for the Tcl Plugin. -- dl -@@ -709,17 +713,12 @@ install-binaries: binaries +@@ -711,17 +715,12 @@ install-binaries: binaries do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -31,7 +31,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.6 2 @echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@" @$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@ @echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/" -@@ -735,23 +734,18 @@ install-libraries: libraries $(INSTALL_TZDATA) install +@@ -737,23 +736,18 @@ install-libraries: libraries $(INSTALL_TZDATA) install do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -58,12 +58,12 @@ $OpenBSD: patch-unix_Makefile_in,v 1.6 2 @echo "Installing header files"; @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ $(GENERIC_DIR)/tclPlatDecls.h \ -@@ -772,21 +766,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install +@@ -774,21 +768,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.7.6 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.6.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/http-2.7.6.tm; + @echo "Installing package http 2.7.7 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.7.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/http-2.7.7.tm; @echo "Installing library opt0.4 directory"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ @@ -85,7 +85,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.6 2 @echo "Installing library encoding directory"; @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ -@@ -817,8 +811,7 @@ install-doc: doc +@@ -819,8 +813,7 @@ install-doc: doc do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -95,7 +95,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.6 2 else true; \ fi; \ done; -@@ -843,14 +836,10 @@ install-private-headers: libraries +@@ -845,14 +838,10 @@ install-private-headers: libraries do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ Index: lang/tcl/8.5/pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- lang/tcl/8.5/pkg/PLIST 17 Oct 2011 15:18:39 -0000 1.8 +++ lang/tcl/8.5/pkg/PLIST 7 Nov 2011 17:59:02 -0000 @@ -807,7 +807,7 @@ lib/tcl/tcl8.5/man/catn/ lib/tcl/tcl8.5/man/license.terms lib/tcl/tcl8.5/modules/ lib/tcl/tcl8.5/modules/8.5/ -lib/tcl/tcl8.5/modules/8.5/http-2.7.6.tm +lib/tcl/tcl8.5/modules/8.5/http-2.7.7.tm lib/tcl/tcl8.5/modules/8.5/msgcat-1.4.4.tm lib/tcl/tcl8.5/modules/8.5/platform/ lib/tcl/tcl8.5/modules/8.5/platform-1.0.10.tm Index: x11/tk/8.5/Makefile =================================================================== RCS file: /cvs/ports/x11/tk/8.5/Makefile,v retrieving revision 1.23 diff -u -p -r1.23 Makefile --- x11/tk/8.5/Makefile 17 Oct 2011 15:19:22 -0000 1.23 +++ x11/tk/8.5/Makefile 7 Nov 2011 18:01:29 -0000 @@ -2,9 +2,9 @@ COMMENT = graphical toolkit for Tcl -DISTNAME = tk8.5.10 -PKGNAME = tk-8.5.10 -SHARED_LIBS = tk85 0.7 +DISTNAME = tk8.5.11 +PKGNAME = tk-8.5.11 +SHARED_LIBS = tk85 0.8 CATEGORIES = x11 x11/tk HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <[email protected]> @@ -51,26 +51,27 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ EXTRA_CC_SWITCHES="-I${LOCALBASE}/include/tcl8.5" \ SHLIB_VERSION="${LIBtk85_VERSION}" -.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax" -ALL_TARGET = all libtk85.a -CONFIGURE_ARGS += EXTRA_INSTALL_BINARIES='@echo "Installing libtk85.a to $$(LIB_INSTALL_DIR)/" \ - && $$(INSTALL_DATA) libtk85.a $$(LIB_INSTALL_DIR)/libtk85.a \ - && (cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtk85.a)' -.endif - -REGRESS_IS_INTERACTIVE = x11 - FLAVORS = threaded FLAVOR ?= .if ${FLAVOR:L:Mthreaded} CONFIGURE_ARGS += --enable-threads WANTLIB += pthread -LIB_DEPENDS += tcl->=8.5.10,<8.5.11-threaded:lang/tcl/8.5,threaded +LIB_DEPENDS += tcl->=8.5.11,<8.5.12-threaded:lang/tcl/8.5,threaded .else -LIB_DEPENDS += tcl->=8.5.10,<8.5.11-!threaded:lang/tcl/8.5 +LIB_DEPENDS += tcl->=8.5.11,<8.5.12-!threaded:lang/tcl/8.5 +.endif + +.include <bsd.port.arch.mk> + +.if ${NO_SHARED_LIBS:L} == "no" +ALL_TARGET = all libtk85.a +CONFIGURE_ARGS += EXTRA_INSTALL_BINARIES='@echo "Installing libtk85.a to $$(LIB_INSTALL_DIR)/" \ + && $$(INSTALL_DATA) libtk85.a $$(LIB_INSTALL_DIR)/libtk85.a \ + && (cd $$(LIB_INSTALL_DIR) ; $$(RANLIB) libtk85.a)' .endif +REGRESS_IS_INTERACTIVE = X11 WRKSRC = ${WRKDIST}/unix REGRESS_TARGET = test @@ -81,7 +82,7 @@ pre-regress: post-install: ${INSTALL_DATA} ${WRKDIST}/license.terms ${PREFIX}/lib/tcl/tk8.5/man -.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax" +.if ${NO_SHARED_LIBS:L} == "no" ln -s libtk85.a ${PREFIX}/lib/libtk85_pic.a ln -s libtkstub85.a ${PREFIX}/lib/libtkstub85_pic.a .endif Index: x11/tk/8.5/distinfo =================================================================== RCS file: /cvs/ports/x11/tk/8.5/distinfo,v retrieving revision 1.8 diff -u -p -r1.8 distinfo --- x11/tk/8.5/distinfo 17 Oct 2011 15:19:22 -0000 1.8 +++ x11/tk/8.5/distinfo 7 Nov 2011 18:01:29 -0000 @@ -1,5 +1,5 @@ -MD5 (tk8.5.10-src.tar.gz) = rf2spGzJX+yFV9+OzbBxXA== -RMD160 (tk8.5.10-src.tar.gz) = ME/foUmMt71BYemlcEdt4hWQCtU= -SHA1 (tk8.5.10-src.tar.gz) = OF34V7hLLNrBl2Ofz94aAHq2Cjw= -SHA256 (tk8.5.10-src.tar.gz) = 9qxZo0FKCYnJyjAjezwUzu6Vcz60hnOf/CccgFXjfJ8= -SIZE (tk8.5.10-src.tar.gz) = 3807862 +MD5 (tk8.5.11-src.tar.gz) = thty8KrSMAkbEAdG8Hi48Q== +RMD160 (tk8.5.11-src.tar.gz) = pH+iCe2GtCXpBHEckQ1AFXPdidI= +SHA1 (tk8.5.11-src.tar.gz) = PXyIy0zDKMkG4uTDYx/ZPtM+bLM= +SHA256 (tk8.5.11-src.tar.gz) = 01gQszoJMWVvHRKOfgd2zAxNi5xyrzIsq1p+4wSF63A= +SIZE (tk8.5.11-src.tar.gz) = 3809826
