Simple upgrade, drop a couple of patches since some stuff went upstream.
Index: lang/tcl/8.5/Makefile =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- lang/tcl/8.5/Makefile 2 Jun 2011 13:41:39 -0000 1.16 +++ lang/tcl/8.5/Makefile 6 Oct 2011 21:14:40 -0000 @@ -2,13 +2,12 @@ COMMENT = Tool Command Language -DISTNAME = tcl8.5.9 -PKGNAME = tcl-8.5.9 -SHARED_LIBS = tcl85 0.6 +DISTNAME = tcl8.5.10 +PKGNAME = tcl-8.5.10 +SHARED_LIBS = tcl85 0.7 CATEGORIES = lang lang/tcl HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <[email protected]> -REVISION = 0 # BSD PERMIT_PACKAGE_CDROM = Yes @@ -33,7 +32,7 @@ FAKE_FLAGS = INSTALL_DATA_DIR="${INSTAL REGRESS_FLAGS = HOME=${TESTHOME} SEPARATE_BUILD = concurrent USE_GROFF = Yes -CONFIGURE_STYLE = autoconf no-autoheader old +CONFIGURE_STYLE = gnu old CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ --includedir="${PREFIX}/include/tcl8.5" \ @@ -43,8 +42,6 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ --disable-rpath \ EXTRA_INSTALL="install-private-headers" \ SHLIB_VERSION="${LIBtcl85_VERSION}" - -AUTOCONF_VERSION = 2.59 .if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax" ALL_TARGET = all libtcl85.a Index: lang/tcl/8.5/distinfo =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- lang/tcl/8.5/distinfo 5 Jan 2011 16:13:53 -0000 1.7 +++ lang/tcl/8.5/distinfo 6 Oct 2011 21:14:40 -0000 @@ -1,5 +1,5 @@ -MD5 (tcl8.5.9-src.tar.gz) = hRLY2zIzBB3WioFHaQYBKg== -RMD160 (tcl8.5.9-src.tar.gz) = 2FjE++GnW++cSkwD5Q2KqAep0os= -SHA1 (tcl8.5.9-src.tar.gz) = rofF5YuiB2DZvHcRfSGbvxtqVVc= -SHA256 (tcl8.5.9-src.tar.gz) = OrZxtBfj7rQbnO9ibXQtj39XQlEB6D5fytHVUs2ZI30= -SIZE (tcl8.5.9-src.tar.gz) = 4469603 +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 Index: lang/tcl/8.5/patches/patch-library_init_tcl =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-library_init_tcl,v retrieving revision 1.1 diff -u -p -r1.1 patch-library_init_tcl --- lang/tcl/8.5/patches/patch-library_init_tcl 5 Jan 2011 16:13:53 -0000 1.1 +++ lang/tcl/8.5/patches/patch-library_init_tcl 6 Oct 2011 21:14:40 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-library_init_tcl,v 1.1 2011/01/05 16:13:53 stu Exp $ ---- library/init.tcl.orig Sat Oct 2 08:31:44 2010 -+++ library/init.tcl Sat Oct 2 08:33:17 2010 -@@ -53,11 +53,14 @@ namespace eval tcl { +--- library/init.tcl.orig Tue May 31 11:03:46 2011 ++++ library/init.tcl Wed Oct 5 01:55:14 2011 +@@ -51,11 +51,14 @@ namespace eval tcl { lappend ::auto_path $Dir } } Index: lang/tcl/8.5/patches/patch-library_safe_tcl =================================================================== RCS file: lang/tcl/8.5/patches/patch-library_safe_tcl diff -N lang/tcl/8.5/patches/patch-library_safe_tcl --- lang/tcl/8.5/patches/patch-library_safe_tcl 5 Jan 2011 16:13:53 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-library_safe_tcl,v 1.1 2011/01/05 16:13:53 stu Exp $ ---- library/safe.tcl.orig Thu Sep 23 17:54:01 2010 -+++ library/safe.tcl Fri Sep 24 03:28:58 2010 -@@ -492,9 +492,9 @@ proc ::safe::InterpInit { - # Sync the paths used to search for Tcl modules. This can be done only - # now, after tm.tcl was loaded. - namespace upvar ::safe S$slave state -- ::interp eval $slave [list \ -- ::tcl::tm::add {*}$state(tm_path_slave)] -- -+ if {[llength $state(tm_path_slave)] > 0} { -+ ::interp eval $slave [list ::tcl::tm::add {*}$state(tm_path_slave)] -+ } - return $slave - } - Index: lang/tcl/8.5/patches/patch-tests_safe_test =================================================================== RCS file: lang/tcl/8.5/patches/patch-tests_safe_test diff -N lang/tcl/8.5/patches/patch-tests_safe_test --- lang/tcl/8.5/patches/patch-tests_safe_test 5 Jan 2011 16:13:53 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-tests_safe_test,v 1.1 2011/01/05 16:13:53 stu Exp $ ---- tests/safe.test.orig Sat Sep 25 11:21:37 2010 -+++ tests/safe.test Sat Sep 25 11:24:25 2010 -@@ -197,7 +197,7 @@ test safe-7.2 {tests specific path and interpFind/AddT - [catch {interp eval $i {package require http 1}} msg] $msg \ - [safe::interpConfigure $i]\ - [safe::interpDelete $i] --} -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library * /dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}" -+} -match glob -result "{\$p(:0:)} {\$p(:*:)} 1 {can't find package http 1} {-accessPath {[list $tcl_library */dummy/unixlike/test/path]} -statics 0 -nested 1 -deleteHook {}} {}" - - - # test source control on file name Index: lang/tcl/8.5/patches/patch-tools_installData_tcl =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/patches/patch-tools_installData_tcl,v retrieving revision 1.2 diff -u -p -r1.2 patch-tools_installData_tcl --- lang/tcl/8.5/patches/patch-tools_installData_tcl 5 Jan 2011 16:13:53 -0000 1.2 +++ lang/tcl/8.5/patches/patch-tools_installData_tcl 6 Oct 2011 21:14:40 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-tools_installData_tcl,v 1.2 2011/01/05 16:13:53 stu Exp $ ---- tools/installData.tcl.orig Sat Sep 11 08:30:54 2010 -+++ tools/installData.tcl Sat Sep 11 08:31:16 2010 -@@ -35,7 +35,7 @@ proc copyDir {d1 d2} { +--- tools/installData.tcl.orig Tue May 31 11:03:47 2011 ++++ tools/installData.tcl Wed Oct 5 01:55:14 2011 +@@ -32,7 +32,7 @@ proc copyDir {d1 d2} { } elseif {[file isfile $f]} { file copy -force $f [file join $d2 $ftail] if {$::tcl_platform(platform) eq {unix}} { 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.5 diff -u -p -r1.5 patch-unix_Makefile_in --- lang/tcl/8.5/patches/patch-unix_Makefile_in 5 Jan 2011 16:13:53 -0000 1.5 +++ lang/tcl/8.5/patches/patch-unix_Makefile_in 6 Oct 2011 21:14:40 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2011/01/05 16:13:53 stu Exp $ ---- unix/Makefile.in.orig Wed Sep 8 13:40:48 2010 -+++ unix/Makefile.in Sun Nov 28 00:17:39 2010 +--- 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} rm -f $@ @MAKE_STUB_LIB@ @@ -12,7 +12,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 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 -@@ -716,17 +720,12 @@ install-binaries: binaries +@@ -709,17 +713,12 @@ install-binaries: binaries do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -31,7 +31,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 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)/" -@@ -742,23 +741,18 @@ install-libraries: libraries $(INSTALL_TZDATA) install +@@ -735,23 +734,18 @@ install-libraries: libraries $(INSTALL_TZDATA) install do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -58,34 +58,34 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2 @echo "Installing header files"; @for i in $(GENERIC_DIR)/tcl.h $(GENERIC_DIR)/tclDecls.h \ $(GENERIC_DIR)/tclPlatDecls.h \ -@@ -779,21 +773,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install +@@ -772,21 +766,21 @@ install-libraries: libraries $(INSTALL_TZDATA) install $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.7.5 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.5.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/http-2.7.5.tm; + @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 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.3 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.3.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.4.3.tm; - @echo "Installing package tcltest 2.3.2 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.2.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.2.tm; + @echo "Installing package msgcat 1.4.4 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.4.4.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/msgcat-1.4.4.tm; + @echo "Installing package tcltest 2.3.3 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.3.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/tcltest-2.3.3.tm; - @echo "Installing package platform 1.0.9 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.9.tm; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.9.tm; + @echo "Installing package platform 1.0.10 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.10.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform-1.0.10.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_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/modules/8.5/platform/shell-1.1.4.tm; @echo "Installing library encoding directory"; @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ -@@ -824,8 +818,7 @@ install-doc: doc +@@ -817,8 +811,7 @@ install-doc: doc do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -95,7 +95,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.5 2 else true; \ fi; \ done; -@@ -850,14 +843,10 @@ install-private-headers: libraries +@@ -843,14 +836,10 @@ install-private-headers: libraries do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ Index: lang/tcl/8.5/patches/patch-unix_tcl_m4 =================================================================== RCS file: lang/tcl/8.5/patches/patch-unix_tcl_m4 diff -N lang/tcl/8.5/patches/patch-unix_tcl_m4 --- lang/tcl/8.5/patches/patch-unix_tcl_m4 5 Jan 2011 16:13:53 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,65 +0,0 @@ -$OpenBSD: patch-unix_tcl_m4,v 1.4 2011/01/05 16:13:53 stu Exp $ ---- unix/tcl.m4.orig Wed Sep 8 13:40:48 2010 -+++ unix/tcl.m4 Mon Dec 6 14:13:49 2010 -@@ -1522,17 +1522,37 @@ dnl AC_CHECK_TOOL(AR, ar) - TCL_LIB_VERSIONS_OK=nodots - ;; - OpenBSD-*) -- CFLAGS_OPTIMIZE='-O2' -- SHLIB_CFLAGS="-fPIC" -- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' -- SHLIB_LD_LIBS='${LIBS}' -- SHLIB_SUFFIX=".so" -- DL_OBJS="tclLoadDl.o" -- DL_LIBS="" -- AS_IF([test $doRpath = yes], [ -- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) -- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' -+ arch=`arch -s` -+ case "$arch" in -+ m88k|vax) -+ # Equivalent using configure option --disable-load -+ # Step 4 will set the necessary variables -+ DL_OBJS="" -+ ;; -+ *) -+ SHLIB_CFLAGS="-fPIC" -+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' -+ SHLIB_LD_LIBS='${LIBS}' -+ SHLIB_SUFFIX=".so" -+ DL_OBJS="tclLoadDl.o" -+ DL_LIBS="" -+ AS_IF([test $doRpath = yes], [ -+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) -+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' -+ ;; -+ esac -+ case "$arch" in -+ m88k|vax) -+ CFLAGS_OPTIMIZE="-O1" -+ ;; -+ sh) -+ CFLAGS_OPTIMIZE="-O0" -+ ;; -+ *) -+ CFLAGS_OPTIMIZE="-O2" -+ ;; -+ esac - AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [ - AC_EGREP_CPP(yes, [ - #ifdef __ELF__ -@@ -1543,10 +1563,10 @@ dnl AC_CHECK_TOOL(AR, ar) - LDFLAGS=-Wl,-export-dynamic - ], [LDFLAGS=""]) - AS_IF([test "${TCL_THREADS}" = "1"], [ -- # OpenBSD builds and links with -pthread, never -lpthread. -+ # On OpenBSD: Compile with -pthread -+ # Don't link with -lpthread - LIBS=`echo $LIBS | sed s/-lpthread//` - CFLAGS="$CFLAGS -pthread" -- SHLIB_CFLAGS="$SHLIB_CFLAGS -pthread" - ]) - # OpenBSD doesn't do version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' Index: lang/tcl/8.5/pkg/PLIST =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/pkg/PLIST,v retrieving revision 1.7 diff -u -p -r1.7 PLIST --- lang/tcl/8.5/pkg/PLIST 5 Jan 2011 16:13:53 -0000 1.7 +++ lang/tcl/8.5/pkg/PLIST 6 Oct 2011 21:14:41 -0000 @@ -108,12 +108,12 @@ lib/tcl/tcl8.5/http1.0/pkgIndex.tcl lib/tcl/tcl8.5/init.tcl lib/tcl/tcl8.5/modules/ lib/tcl/tcl8.5/modules/8.5/ -lib/tcl/tcl8.5/modules/8.5/http-2.7.5.tm -lib/tcl/tcl8.5/modules/8.5/msgcat-1.4.3.tm +lib/tcl/tcl8.5/modules/8.5/http-2.7.6.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.9.tm +lib/tcl/tcl8.5/modules/8.5/platform-1.0.10.tm lib/tcl/tcl8.5/modules/8.5/platform/shell-1.1.4.tm -lib/tcl/tcl8.5/modules/8.5/tcltest-2.3.2.tm +lib/tcl/tcl8.5/modules/8.5/tcltest-2.3.3.tm lib/tcl/tcl8.5/msgs/ lib/tcl/tcl8.5/msgs/af.msg lib/tcl/tcl8.5/msgs/af_za.msg Index: lang/tcl/8.5/pkg/README =================================================================== RCS file: /cvs/ports/lang/tcl/8.5/pkg/README,v retrieving revision 1.3 diff -u -p -r1.3 README --- lang/tcl/8.5/pkg/README 2 Jun 2011 13:41:39 -0000 1.3 +++ lang/tcl/8.5/pkg/README 6 Oct 2011 21:14:41 -0000 @@ -1,8 +1,8 @@ # $OpenBSD: README,v 1.3 2011/06/02 13:41:39 ajacoutot Exp $ -+----------------------------------------------------------------------- -| Running ${FULLPKGNAME} on OpenBSD -+----------------------------------------------------------------------- +# +----------------------------------------------------------------------- +# | Running ${FULLPKGNAME} on OpenBSD +# +----------------------------------------------------------------------- cat << "EOTEXT" > /dev/null Index: x11/tk/8.5/Makefile =================================================================== RCS file: /cvs/ports/x11/tk/8.5/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- x11/tk/8.5/Makefile 17 Apr 2011 18:13:10 -0000 1.22 +++ x11/tk/8.5/Makefile 6 Oct 2011 21:17:14 -0000 @@ -2,10 +2,9 @@ COMMENT = graphical toolkit for Tcl -DISTNAME = tk8.5.9 -PKGNAME = tk-8.5.9 -SHARED_LIBS = tk85 0.6 -REVISION = 1 +DISTNAME = tk8.5.10 +PKGNAME = tk-8.5.10 +SHARED_LIBS = tk85 0.7 CATEGORIES = x11 x11/tk HOMEPAGE = http://www.tcl.tk/ MAINTAINER = Stuart Cassoff <[email protected]> @@ -16,13 +15,14 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB += X11 Xau Xdmcp Xext Xft Xrender Xss c expat fontconfig -WANTLIB += freetype m tcl85 z +WANTLIB += X11 Xext Xft Xss c m tcl85 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tcl/} DISTFILES = ${DISTNAME}-src.tar.gz -MAKE_FLAGS += TK_LIBRARY='$$(prefix)/lib/tcl/tk$$(VERSION)' +MAKE_FLAGS += TK_LIBRARY='$$(prefix)/lib/tcl/tk$$(VERSION)' \ + TCL_GENERIC_DIR='$$(GENERIC_DIR)' \ + TCL_PLATFORM_DIR='$$(GENERIC_DIR)' FAKE_FLAGS = INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \ INSTALL_LIBRARY="${INSTALL_DATA}" \ @@ -35,7 +35,7 @@ FAKE_FLAGS = INSTALL_DATA_DIR="${INSTAL REGRESS_FLAGS = HOME=${TESTHOME} SEPARATE_BUILD = concurrent USE_GROFF = Yes -CONFIGURE_STYLE = autoconf no-autoheader old +CONFIGURE_STYLE = gnu old CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ --includedir="${PREFIX}/include/tk8.5" \ @@ -48,8 +48,6 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ EXTRA_CC_SWITCHES="-I${LOCALBASE}/include/tcl8.5" \ SHLIB_VERSION="${LIBtk85_VERSION}" -AUTOCONF_VERSION = 2.59 - .if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax" WANTLIB += pthread-stubs xcb ALL_TARGET = all libtk85.a @@ -66,9 +64,9 @@ FLAVOR ?= .if ${FLAVOR:L:Mthreaded} CONFIGURE_ARGS += --enable-threads WANTLIB += pthread -LIB_DEPENDS += tcl->=8.5.9,<8.5.10-threaded:lang/tcl/8.5,threaded +LIB_DEPENDS += tcl->=8.5.10,<8.5.11-threaded:lang/tcl/8.5,threaded .else -LIB_DEPENDS += tcl->=8.5.9,<8.5.10-!threaded:lang/tcl/8.5 +LIB_DEPENDS += tcl->=8.5.10,<8.5.11-!threaded:lang/tcl/8.5 .endif WRKSRC = ${WRKDIST}/unix Index: x11/tk/8.5/distinfo =================================================================== RCS file: /cvs/ports/x11/tk/8.5/distinfo,v retrieving revision 1.7 diff -u -p -r1.7 distinfo --- x11/tk/8.5/distinfo 5 Jan 2011 16:18:09 -0000 1.7 +++ x11/tk/8.5/distinfo 6 Oct 2011 21:17:14 -0000 @@ -1,5 +1,5 @@ -MD5 (tk8.5.9-src.tar.gz) = fN65/rYVk/WKCuYfJJdYDg== -RMD160 (tk8.5.9-src.tar.gz) = iz8Tgf7PiP0icmkOxnhuwYDssv0= -SHA1 (tk8.5.9-src.tar.gz) = FhoTPgtlPV/fb8/0e9v3aNc/Mjg= -SHA256 (tk8.5.9-src.tar.gz) = 9Gsz1B5x71MxQPGBSWHw3CLWKqwxbfSk/TNX4f14i4M= -SIZE (tk8.5.9-src.tar.gz) = 3825659 +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 Index: x11/tk/8.5/patches/patch-library_tk_tcl =================================================================== RCS file: /cvs/ports/x11/tk/8.5/patches/patch-library_tk_tcl,v retrieving revision 1.1 diff -u -p -r1.1 patch-library_tk_tcl --- x11/tk/8.5/patches/patch-library_tk_tcl 5 Jan 2011 16:18:09 -0000 1.1 +++ x11/tk/8.5/patches/patch-library_tk_tcl 6 Oct 2011 21:17:14 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-library_tk_tcl,v 1.1 2011/01/05 16:18:09 stu Exp $ ---- library/tk.tcl.orig Sun Oct 3 14:36:58 2010 -+++ library/tk.tcl Sun Oct 3 14:37:21 2010 -@@ -57,12 +57,12 @@ namespace eval ::ttk { +--- library/tk.tcl.orig Mon Jun 20 16:17:08 2011 ++++ library/tk.tcl Wed Oct 5 11:26:28 2011 +@@ -55,12 +55,12 @@ namespace eval ::ttk { } } Index: x11/tk/8.5/patches/patch-unix_Makefile_in =================================================================== RCS file: /cvs/ports/x11/tk/8.5/patches/patch-unix_Makefile_in,v retrieving revision 1.7 diff -u -p -r1.7 patch-unix_Makefile_in --- x11/tk/8.5/patches/patch-unix_Makefile_in 5 Jan 2011 16:18:09 -0000 1.7 +++ x11/tk/8.5/patches/patch-unix_Makefile_in 6 Oct 2011 21:17:14 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2011/01/05 16:18:09 stu Exp $ ---- unix/Makefile.in.orig Thu Sep 2 14:12:14 2010 -+++ unix/Makefile.in Mon Dec 6 21:08:12 2010 -@@ -552,6 +552,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec +--- unix/Makefile.in.orig Thu Jun 23 14:37:39 2011 ++++ unix/Makefile.in Wed Oct 5 11:26:28 2011 +@@ -550,6 +550,7 @@ PUBLIC_HDRS = $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDec # The private headers we want installed for install-private-headers PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \ $(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \ @@ -9,7 +9,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 $(TTK_HDRS) $(@TK_WINDOWINGSYSTEM@_PRIVATE_HDRS) DEMOPROGS = browse hello ixset rmt rolodex tcolor timer widget -@@ -584,6 +585,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} +@@ -582,6 +583,10 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ @MAKE_STUB_LIB@ @@ -20,7 +20,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 # Build Aqua resource files ${TK_RSRC_FILE}: $(AQUA_RESOURCES) rm -f $@ -@@ -704,14 +709,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) w +@@ -702,14 +707,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) w do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -36,7 +36,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 @if test "x$(TK_SHARED_BUILD)" = "x1"; then \ echo "Creating package index $(PKG_INDEX)"; \ rm -f "$(PKG_INDEX)"; \ -@@ -721,10 +722,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) w +@@ -719,10 +720,10 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) w echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\ [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ ) > "$(PKG_INDEX)"; \ @@ -48,7 +48,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 @echo "Installing wish@EXEEXT@ as $(BIN_INSTALL_DIR)/wish$(VERSION)@EXEEXT@" @$(INSTALL_PROGRAM) wish@EXEEXT@ "$(BIN_INSTALL_DIR)"/wish$(VERSION)@EXEEXT@ @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/" -@@ -744,14 +745,10 @@ install-libraries: libraries +@@ -742,14 +743,10 @@ install-libraries: libraries do \ if [ -n "$$i" -a ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -64,7 +64,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 @echo "Installing header files"; @for i in $(PUBLIC_HDRS); \ do \ -@@ -794,8 +791,7 @@ install-demos: +@@ -792,8 +789,7 @@ install-demos: do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -74,7 +74,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 else true; \ fi; \ done; -@@ -805,11 +801,12 @@ install-demos: +@@ -803,11 +799,12 @@ install-demos: if [ -f $$i ] ; then \ sed -e '3 s|exec wish|exec wish$(VERSION)|' \ $$i > "$(DEMO_INSTALL_DIR)"/`basename $$i`; \ @@ -88,7 +88,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 done; @echo "Installing demo images"; @for i in $(TOP_DIR)/library/demos/images/*; \ -@@ -824,8 +821,7 @@ install-doc: +@@ -822,8 +819,7 @@ install-doc: do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ @@ -98,7 +98,7 @@ $OpenBSD: patch-unix_Makefile_in,v 1.7 2 else true; \ fi; \ done; -@@ -850,14 +846,10 @@ install-private-headers: libraries +@@ -848,14 +844,10 @@ install-private-headers: libraries do \ if [ ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ Index: x11/tk/8.5/patches/patch-unix_tcl_m4 =================================================================== RCS file: x11/tk/8.5/patches/patch-unix_tcl_m4 diff -N x11/tk/8.5/patches/patch-unix_tcl_m4 --- x11/tk/8.5/patches/patch-unix_tcl_m4 5 Jan 2011 16:18:09 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,65 +0,0 @@ -$OpenBSD: patch-unix_tcl_m4,v 1.4 2011/01/05 16:18:09 stu Exp $ ---- unix/tcl.m4.orig Thu Sep 2 14:12:14 2010 -+++ unix/tcl.m4 Mon Dec 6 18:57:26 2010 -@@ -1522,17 +1522,37 @@ dnl AC_CHECK_TOOL(AR, ar) - TCL_LIB_VERSIONS_OK=nodots - ;; - OpenBSD-*) -- CFLAGS_OPTIMIZE='-O2' -- SHLIB_CFLAGS="-fPIC" -- SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' -- SHLIB_LD_LIBS='${LIBS}' -- SHLIB_SUFFIX=".so" -- DL_OBJS="tclLoadDl.o" -- DL_LIBS="" -- AS_IF([test $doRpath = yes], [ -- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) -- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} -- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' -+ arch=`arch -s` -+ case "$arch" in -+ m88k|vax) -+ # Equivalent using configure option --disable-load -+ # Step 4 will set the necessary variables -+ DL_OBJS="" -+ ;; -+ *) -+ SHLIB_CFLAGS="-fPIC" -+ SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}' -+ SHLIB_LD_LIBS='${LIBS}' -+ SHLIB_SUFFIX=".so" -+ DL_OBJS="tclLoadDl.o" -+ DL_LIBS="" -+ AS_IF([test $doRpath = yes], [ -+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}']) -+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} -+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' -+ ;; -+ esac -+ case "$arch" in -+ m88k|vax) -+ CFLAGS_OPTIMIZE="-O1" -+ ;; -+ sh) -+ CFLAGS_OPTIMIZE="-O0" -+ ;; -+ *) -+ CFLAGS_OPTIMIZE="-O2" -+ ;; -+ esac - AC_CACHE_CHECK([for ELF], tcl_cv_ld_elf, [ - AC_EGREP_CPP(yes, [ - #ifdef __ELF__ -@@ -1543,10 +1563,10 @@ dnl AC_CHECK_TOOL(AR, ar) - LDFLAGS=-Wl,-export-dynamic - ], [LDFLAGS=""]) - AS_IF([test "${TCL_THREADS}" = "1"], [ -- # OpenBSD builds and links with -pthread, never -lpthread. -+ # On OpenBSD: Compile with -pthread -+ # Don't link with -lpthread - LIBS=`echo $LIBS | sed s/-lpthread//` - CFLAGS="$CFLAGS -pthread" -- SHLIB_CFLAGS="$SHLIB_CFLAGS -pthread" - ]) - # OpenBSD doesn't do version numbers with dots. - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
