Date: Wed, 18 Sep 2013 21:01:43 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327575 - in head: lang/tcl85 lang/tcl85/files x11-toolkits/tk85 x11-toolkits/tk85/files Message-ID: <201309182101.r8IL1hb8053090@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Wed Sep 18 21:01:43 2013 New Revision: 327575 URL: http://svnweb.freebsd.org/changeset/ports/327575 Log: - Update Tcl/Tk 8.5 to 8.5.15 Release notes: http://code.activestate.com/lists/tcl-core/13585/ Modified: head/lang/tcl85/Makefile head/lang/tcl85/distinfo head/lang/tcl85/files/patch-unix-Makefile.in head/lang/tcl85/files/patch-unix-configure (contents, props changed) head/lang/tcl85/pkg-plist head/x11-toolkits/tk85/Makefile head/x11-toolkits/tk85/distinfo head/x11-toolkits/tk85/files/patch-unix::Makefile.in head/x11-toolkits/tk85/files/patch-unix::configure (contents, props changed) Modified: head/lang/tcl85/Makefile ============================================================================== --- head/lang/tcl85/Makefile Wed Sep 18 20:54:24 2013 (r327574) +++ head/lang/tcl85/Makefile Wed Sep 18 21:01:43 2013 (r327575) @@ -2,11 +2,12 @@ # $FreeBSD$ PORTNAME= tcl -PORTVERSION= 8.5.14 -PORTREVISION= 1 +DISTVERSION= 8.5.15 CATEGORIES= lang -MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} -DISTNAME= tcl${PORTVERSION}-src +MASTER_SITES= ${MASTER_SITE_TCLTK} \ + SF/tcl/Tcl/${PORTVERSION} +MASTER_SITE_SUBDIR=tcl8_5 +DISTNAME= ${PORTNAME}${DISTVERSION}-src MAINTAINER= tcltk@FreeBSD.org COMMENT= Tool Command Language Modified: head/lang/tcl85/distinfo ============================================================================== --- head/lang/tcl85/distinfo Wed Sep 18 20:54:24 2013 (r327574) +++ head/lang/tcl85/distinfo Wed Sep 18 21:01:43 2013 (r327575) @@ -1,2 +1,2 @@ -SHA256 (tcl8.5.14-src.tar.gz) = 7494e94f1e195a505c542a3c50e01589d2f8bfd19597382827a895fa1c471f2d -SIZE (tcl8.5.14-src.tar.gz) = 4528533 +SHA256 (tcl8.5.15-src.tar.gz) = f24eaae461795e6b09bf54c7e9f38def025892da55f26008c16413cfdda2884e +SIZE (tcl8.5.15-src.tar.gz) = 4536117 Modified: head/lang/tcl85/files/patch-unix-Makefile.in ============================================================================== --- head/lang/tcl85/files/patch-unix-Makefile.in Wed Sep 18 20:54:24 2013 (r327574) +++ head/lang/tcl85/files/patch-unix-Makefile.in Wed Sep 18 21:01:43 2013 (r327575) @@ -1,5 +1,5 @@ ---- Makefile.in.orig 2013-04-03 16:58:41.000000000 +0200 -+++ Makefile.in 2013-04-03 17:13:01.000000000 +0200 +--- Makefile.in.orig 2013-08-30 18:26:25.000000000 +0200 ++++ Makefile.in 2013-09-02 15:13:47.000000000 +0200 @@ -54,6 +54,8 @@ # Directory in which to install the include file tcl.h: @@ -81,7 +81,7 @@ do \ if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \ echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \ -@@ -748,13 +766,17 @@ +@@ -748,51 +766,53 @@ fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; @@ -104,56 +104,66 @@ @echo "Installing library files to $(SCRIPT_INSTALL_DIR)/"; @for i in $(TOP_DIR)/library/*.tcl $(TOP_DIR)/library/tclIndex \ $(UNIX_DIR)/tclAppInit.c @LDAIX_SRC@ @DTRACE_SRC@; \ -@@ -766,32 +788,31 @@ do \ - $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ + $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \ done; -- @echo "Installing package http 2.7.11 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.11.tm; +- @echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/"; +- @for i in $(TOP_DIR)/library/http1.0/*.tcl ; \ +- do \ +- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ +- done; +- @echo "Installing package http 2.7.12 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/http-2.7.12.tm; ++ @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; ++ @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ ++ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ ++ done; ++ @echo "Customizing tcl module path"; ++ @echo "::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)}" >> \ ++ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; ++ ++install-tm: @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/opt0.4; \ done; -- @echo "Installing package msgcat 1.5.1 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.1.tm; -- @echo "Installing package tcltest 2.3.5 as a Tcl Module"; ++ @echo "Installing package http 2.7.12 as a Tcl Module"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.7.12.tm + @echo "Installing package msgcat 1.5.2 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/msgcat-1.5.2.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.5.2.tm + @echo "Installing package tcltest 2.3.5 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.5.tm; - -- @echo "Installing package platform 1.0.11 as a Tcl Module"; -- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.11.tm; -- @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.5.tm + @echo "Installing package platform 1.0.12 as a Tcl Module"; +- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.12.tm; ++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.12.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 encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; - @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ - $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ - done; +- @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/"; +- @for i in $(TOP_DIR)/library/encoding/*.enc ; do \ +- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \ +- done; - @if [ -n "$(TCL_MODULE_PATH)" -a -f $(TOP_DIR)/library/tm.tcl ]; then \ - echo "Customizing tcl module path"; \ - echo "if {![interp issafe]} { ::tcl::tm::roots {$(TCL_MODULE_PATH)} }" >> \ - "$(SCRIPT_INSTALL_DIR)"/tm.tcl; \ - fi -+ @echo "Customizing tcl module path"; -+ @echo "::tcl::tm::path add {$(SCRIPT_INSTALL_DIR)}" >> \ -+ "$(SCRIPT_INSTALL_DIR)"/tm.tcl; -+ -+install-tm: -+ @echo "Installing package http 2.7.11 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.7.11.tm -+ @echo "Installing package msgcat 1.5.1 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/msgcat/msgcat.tcl "$(SCRIPT_INSTALL_DIR)"/msgcat-1.5.1.tm -+ @echo "Installing package tcltest 2.3.5 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.5.tm -+ @echo "Installing package platform 1.0.11 as a Tcl Module"; -+ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.11.tm -+ @echo "Installing package platform::shell 1.1.4 as a Tcl Module"; +- + @$(INSTALL_DATA_DIR) "$(SCRIPT_INSTALL_DIR)"/platform; + @$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/platform/shell-1.1.4.tm - ++ @echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/"; ++ @for i in $(TOP_DIR)/library/http1.0/*.tcl ; \ ++ do \ ++ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ ++ done; install-tzdata: @for i in tzdata; \ -@@ -1564,7 +1585,7 @@ + do \ +@@ -1564,7 +1584,7 @@ match=1; \ fi; \ done; \ @@ -162,7 +172,7 @@ done # -@@ -1581,7 +1602,7 @@ +@@ -1581,7 +1601,7 @@ match=1; \ fi; \ done; \ Modified: head/lang/tcl85/files/patch-unix-configure ============================================================================== --- head/lang/tcl85/files/patch-unix-configure Wed Sep 18 20:54:24 2013 (r327574) +++ head/lang/tcl85/files/patch-unix-configure Wed Sep 18 21:01:43 2013 (r327575) @@ -39,12 +39,3 @@ TCL_LIB_VERSIONS_OK=nodots ;; esac -@@ -7677,7 +7677,7 @@ - # This configuration from FreeBSD Ports. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" -- TCL_SHLIB_LD_EXTRAS="-soname \$@" -+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS="" Modified: head/lang/tcl85/pkg-plist ============================================================================== --- head/lang/tcl85/pkg-plist Wed Sep 18 20:54:24 2013 (r327574) +++ head/lang/tcl85/pkg-plist Wed Sep 18 21:01:43 2013 (r327575) @@ -861,10 +861,10 @@ lib/tcl%%TCL_VER%%/word.tcl %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/America %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata/Africa %%TZDATA%%@dirrm lib/tcl%%TCL_VER%%/tzdata -%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.11.tm +%%MODULES%%lib/tcl%%TCL_VER%%/http-2.7.12.tm %%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm -%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.11.tm -%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.1.tm +%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.12.tm +%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.2.tm %%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.5.tm @dirrm lib/tcl%%TCL_VER%%/platform @dirrm lib/tcl%%TCL_VER%%/opt0.4 Modified: head/x11-toolkits/tk85/Makefile ============================================================================== --- head/x11-toolkits/tk85/Makefile Wed Sep 18 20:54:24 2013 (r327574) +++ head/x11-toolkits/tk85/Makefile Wed Sep 18 21:01:43 2013 (r327575) @@ -2,11 +2,12 @@ # $FreeBSD$ PORTNAME= tk -PORTVERSION= 8.5.14 -PORTREVISION= 1 +DISTVERSION= 8.5.15 CATEGORIES= x11-toolkits -MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} -DISTNAME= ${PORTNAME}${PORTVERSION}-src +MASTER_SITES= ${MASTER_SITE_TCLTK} \ + SF/tcl/Tcl/${PORTVERSION} +MASTER_SITE_SUBDIR=tcl8_5 +DISTNAME= ${PORTNAME}${DISTVERSION}-src MAINTAINER= tcltk@FreeBSD.org COMMENT= Graphical toolkit for Tcl @@ -16,15 +17,19 @@ LICENSE= BSD LICENSE_TERMS= ${WRKSRC}/../license.terms LATEST_LINK= tk85 -USE_XORG= x11 +USE_XORG= x11 xft xscrnsaver USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}/unix GNU_CONFIGURE= yes TK_VER= 8.5 SHORT_TK_VER= 85 -CONFIGURE_ARGS= --enable-shared --with-tcl=${TCL_LIBDIR} \ - --includedir=${PREFIX}/include/tk${TK_VER} \ - --enable-man-suffix=.${MAN_SUFFIX} +CONFIGURE_ARGS= --enable-shared \ + --enable-xss \ + --enable-xft \ + --enable-man-suffix=.${MAN_SUFFIX} \ + --with-tcl=${TCL_LIBDIR} \ + --includedir=${PREFIX}/include/tk${TK_VER} + CONFIGURE_ENV= PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 \ ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}" LATEST_LINK= ${PORTNAME}${SHORT_TK_VER} @@ -39,13 +44,11 @@ MANCOMPRESSED= no DATADIR= ${PREFIX}/share/${PORTNAME}${TK_VER} SUB_FILES= pkgIndex.tcl - USE_TCL= ${SHORT_TK_VER} -OPTIONS_DEFINE= TK85_MAN XFT DEMOS THREADS -OPTIONS_DEFAULT= XFT THREADS +OPTIONS_DEFINE= TK85_MAN DEMOS THREADS +OPTIONS_DEFAULT=THREADS TK85_MAN_DESC= Install tk 8.5 function manpages -XFT_DESC= Use Xft fonts DEMOS_DESC= Install demos SUB_LIST+= TCLPATCHLEVEL="${PORTVERSION}" @@ -54,13 +57,6 @@ SUB_LIST+= TCLPATCHLEVEL="${PORTVERSION} DATADIR= ${PREFIX}/share/${PORTNAME}${TCL_VER} -.if ${PORT_OPTIONS:MXFT} -CONFIGURE_ARGS+= --enable-xft -LIB_DEPENDS+= Xft:${PORTSDIR}/x11-fonts/libXft -.else -CONFIGURE_ARGS+= --disable-xft -.endif - .if ${PORT_OPTIONS:MTHREADS} CONFIGURE_ARGS+= --enable-threads .else Modified: head/x11-toolkits/tk85/distinfo ============================================================================== --- head/x11-toolkits/tk85/distinfo Wed Sep 18 20:54:24 2013 (r327574) +++ head/x11-toolkits/tk85/distinfo Wed Sep 18 21:01:43 2013 (r327575) @@ -1,2 +1,2 @@ -SHA256 (tk8.5.14-src.tar.gz) = 9a7ba8ce73f8a329bde894954e70f9345cbb07aac1d7e674683c47270b32e1a1 -SIZE (tk8.5.14-src.tar.gz) = 4093990 +SHA256 (tk8.5.15-src.tar.gz) = 815c6706d0b4fdd432fe16b82e7b9adfa1f057c44edd11d28f7c4b0ac104323f +SIZE (tk8.5.15-src.tar.gz) = 4086650 Modified: head/x11-toolkits/tk85/files/patch-unix::Makefile.in ============================================================================== --- head/x11-toolkits/tk85/files/patch-unix::Makefile.in Wed Sep 18 20:54:24 2013 (r327574) +++ head/x11-toolkits/tk85/files/patch-unix::Makefile.in Wed Sep 18 21:01:43 2013 (r327575) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2012-11-09 16:15:03.000000000 +0100 -+++ Makefile.in 2013-01-28 09:24:31.000000000 +0100 -@@ -64,6 +64,8 @@ +--- Makefile.in.orig 2013-08-30 18:28:24.000000000 +0200 ++++ Makefile.in 2013-09-02 16:01:49.000000000 +0200 +@@ -63,6 +63,8 @@ # Directory in which to install the include file tk.h: INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) @@ -9,7 +9,7 @@ # Path to the private tk header dir: PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ -@@ -100,11 +102,11 @@ +@@ -99,11 +101,11 @@ # The directory containing the Tcl sources and headers appropriate # for this version of Tk ("srcdir" will be replaced or has already # been replaced by the configure script): @@ -23,16 +23,16 @@ # The directory containing the Tcl library archive file appropriate # for this version of Tk: -@@ -114,7 +116,7 @@ +@@ -113,7 +115,7 @@ TCL_LIB_FLAG = @TCL_LIB_FLAG@ # Flag, 1: we're building a shared lib, 0 we're not -TK_SHARED_BUILD = @TK_SHARED_BUILD@ -+TK_SHARED_BUILD = ####@TK_SHARED_BUILD@ ++TK_SHARED_BUILD = #####@TK_SHARED_BUILD@ # Subdirectory of $(libdir) containing the pkgIndex.tcl file for loadable Tk TK_PKG_DIR = @TK_PKG_DIR@ -@@ -274,7 +276,7 @@ +@@ -273,7 +275,7 @@ STLIB_LD = @STLIB_LD@ SHLIB_LD = @SHLIB_LD@ SHLIB_LD_LIBS = @SHLIB_LD_LIBS@ @@ -41,7 +41,7 @@ # Additional search flags needed to find the various shared libraries # at run-time. The first symbol is for use when creating a binary -@@ -546,6 +548,8 @@ +@@ -545,6 +547,8 @@ DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget @@ -50,7 +50,7 @@ SHELL_ENV = \ @LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \ export @LD_LIBRARY_PATH_VAR@; \ -@@ -568,6 +572,12 @@ +@@ -567,6 +571,12 @@ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@ rm -f $@ @MAKE_LIB@ @@ -63,7 +63,7 @@ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS} rm -f $@ -@@ -672,8 +682,7 @@ +@@ -671,8 +681,7 @@ INSTALL_DEV_TARGETS = install-headers INSTALL_DEMO_TARGETS = install-demos INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@ @@ -73,7 +73,7 @@ install: $(INSTALL_TARGETS) -@@ -686,7 +695,7 @@ +@@ -685,7 +694,7 @@ # some ranlibs write to current directory, and this might not always be # possible (e.g. if installing as root). @@ -82,7 +82,7 @@ @for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \ "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \ do \ -@@ -717,14 +726,19 @@ +@@ -716,6 +725,10 @@ @echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/" @@INSTALL_LIB@ @chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)" @@ -93,6 +93,7 @@ @if test -f "tk${MAJOR_VERSION}${MINOR_VERSION}.dll"; then \ $(INSTALL_LIBRARY) "tk${MAJOR_VERSION}${MINOR_VERSION}.dll" "$(DLL_INSTALL_DIR)";\ chmod 555 "$(DLL_INSTALL_DIR)/tk${MAJOR_VERSION}${MINOR_VERSION}.dll";\ +@@ -724,8 +737,9 @@ fi @echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" @$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}" @@ -100,11 +101,11 @@ - @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tkConfig.sh" + @echo "Installing tkConfig.sh to $(CONFIG_INSTALL_DIR)/tk$(VERSION)" + @mkdir -p "${CONFIG_INSTALL_DIR}"/tk$(VERSION) -+ @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh" ++ @$(INSTALL_DATA) tkConfig.sh "$(CONFIG_INSTALL_DIR)"/tk$(VERSION)/tkConfig.sh @if test "$(STUB_LIB_FILE)" != "" ; then \ echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \ @INSTALL_STUB_LIB@ ; \ -@@ -827,7 +841,7 @@ +@@ -828,7 +842,7 @@ install-headers: @if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \ XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \ @@ -113,7 +114,7 @@ do \ if [ -n "$$i" -a ! -d "$$i" ] ; then \ echo "Making directory $$i"; \ -@@ -836,9 +851,12 @@ +@@ -837,9 +851,12 @@ fi; \ done; @echo "Installing header files to $(INCLUDE_INSTALL_DIR)/"; Modified: head/x11-toolkits/tk85/files/patch-unix::configure ============================================================================== --- head/x11-toolkits/tk85/files/patch-unix::configure Wed Sep 18 20:54:24 2013 (r327574) +++ head/x11-toolkits/tk85/files/patch-unix::configure Wed Sep 18 21:01:43 2013 (r327575) @@ -38,12 +38,3 @@ TCL_LIB_VERSIONS_OK=nodots ;; esac -@@ -5883,7 +5884,7 @@ - # This configuration from FreeBSD Ports. - SHLIB_CFLAGS="-fPIC" - SHLIB_LD="${CC} -shared" -- TCL_SHLIB_LD_EXTRAS="-soname \$@" -+ TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@" - SHLIB_SUFFIX=".so" - DL_OBJS="tclLoadDl.o" - DL_LIBS=""
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309182101.r8IL1hb8053090>