svn commit: r366510 - in head: lang/tcl86 lang/tcl86/files x11-toolkits/tk86 x11-toolkits/tk86/files
Pietro Cerutti
gahr at FreeBSD.org
Fri Aug 29 14:19:57 UTC 2014
Author: gahr
Date: Fri Aug 29 14:19:55 2014
New Revision: 366510
URL: http://svnweb.freebsd.org/changeset/ports/366510
QAT: https://qat.redports.org/buildarchive/r366510/
Log:
- Update Tcl/Tk 8.6 to 8.6.2
Release notes: http://code.activestate.com/lists/tcl-core/14072/
Added:
head/lang/tcl86/files/patch-unix-configure (contents, props changed)
head/x11-toolkits/tk86/files/patch-unix-configure (contents, props changed)
Deleted:
head/lang/tcl86/files/patch-unix-tcl.pc.in
head/x11-toolkits/tk86/files/patch-configure
Modified:
head/lang/tcl86/Makefile
head/lang/tcl86/distinfo
head/lang/tcl86/files/patch-unix-Makefile.in
head/lang/tcl86/pkg-plist
head/x11-toolkits/tk86/Makefile
head/x11-toolkits/tk86/distinfo
head/x11-toolkits/tk86/files/patch-unix__Makefile.in
Modified: head/lang/tcl86/Makefile
==============================================================================
--- head/lang/tcl86/Makefile Fri Aug 29 13:38:17 2014 (r366509)
+++ head/lang/tcl86/Makefile Fri Aug 29 14:19:55 2014 (r366510)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tcl
-PORTVERSION= 8.6.1
+PORTVERSION= 8.6.2
CATEGORIES= lang
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} \
${MASTER_SITE_TCLTK}
Modified: head/lang/tcl86/distinfo
==============================================================================
--- head/lang/tcl86/distinfo Fri Aug 29 13:38:17 2014 (r366509)
+++ head/lang/tcl86/distinfo Fri Aug 29 14:19:55 2014 (r366510)
@@ -1,2 +1,2 @@
-SHA256 (tcl8.6.1-src.tar.gz) = 16ee769248e64ba1cae6b4834fcc4e4edd7470d881410e8d58f7dd1434343514
-SIZE (tcl8.6.1-src.tar.gz) = 8755700
+SHA256 (tcl8.6.2-src.tar.gz) = 86f7ae5f581dd0904d04415637ab3aef5a50986c1b6d04c340e2b1b0258da9c4
+SIZE (tcl8.6.2-src.tar.gz) = 8857161
Modified: head/lang/tcl86/files/patch-unix-Makefile.in
==============================================================================
--- head/lang/tcl86/files/patch-unix-Makefile.in Fri Aug 29 13:38:17 2014 (r366509)
+++ head/lang/tcl86/files/patch-unix-Makefile.in Fri Aug 29 14:19:55 2014 (r366510)
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2013-09-19 22:17:13.000000000 +0200
-+++ Makefile.in 2014-08-08 12:36:53.000000000 +0200
+--- Makefile.in.orig 2014-08-26 17:23:08.000000000 +0200
++++ Makefile.in 2014-08-29 15:37:31.000000000 +0200
@@ -54,6 +54,8 @@
# Directory in which to install the include file tcl.h:
@@ -29,25 +29,24 @@
-all: binaries libraries doc packages
+all: binaries libraries doc
--binaries: ${LIB_FILE} $(STUB_LIB_FILE) ${TCL_EXE}
-+binaries: ${LIB_FILE} $(STUB_LIB_FILE) libtcl${SHORT_TCL_VER}.a ${TCL_EXE}
+-binaries: ${LIB_FILE} ${TCL_EXE}
++binaries: ${LIB_FILE} ${TCL_EXE} libtcl${SHORT_TCL_VER}.a
libraries:
-@@ -624,7 +626,12 @@
- ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE}
+@@ -625,6 +627,11 @@
rm -f $@
@MAKE_LIB@
-+ @ln -sf ${LIB_FILE} ./libtcl${SHORT_TCL_VER}.so
+libtcl${SHORT_TCL_VER}.a: ${OBJS}
+ rm -f libtcl${SHORT_TCL_VER}.a
+ ar cr libtcl${SHORT_TCL_VER}.a ${OBJS}
+ ${RANLIB} libtcl${SHORT_TCL_VER}.a
-
++
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- rm -f $@
-@@ -765,13 +772,13 @@
+ @if test "x${LIB_FILE}" = "xlibtcl${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
+ (cd ${TOP_DIR}/win; ${MAKE} tcldde14.dll tclreg13.dll); \
+@@ -767,13 +774,13 @@
# Installation rules
#--------------------------------------------------------------------------
@@ -64,26 +63,26 @@
install: $(INSTALL_TARGETS)
-@@ -797,6 +804,11 @@
+@@ -799,6 +806,11 @@
@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
@@INSTALL_LIB@
@chmod 555 "$(DLL_INSTALL_DIR)/$(LIB_FILE)"
+ @ln -sf $(LIB_FILE) "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.so
+ @echo "Installing libtcl${SHORT_TCL_VER}.a to $(DLL_INSTALL_DIR)"
+ @$(INSTALL_DATA) libtcl${SHORT_TCL_VER}.a "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
-+ @(cd "@DLL_INSTALL_DIR@" && ${RANLIB} libtcl${SHORT_TCL_VER}.a)
++ @(cd "$(DLL_INSTALL_DIR)" && ${RANLIB} libtcl${SHORT_TCL_VER}.a)
+ @chmod 555 "$(DLL_INSTALL_DIR)"/libtcl${SHORT_TCL_VER}.a
@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)/tclsh$(VERSION)${EXE_SUFFIX}"
@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
-@@ -809,12 +821,12 @@
+@@ -811,12 +823,12 @@
@INSTALL_STUB_LIB@ ; \
fi
@EXTRA_INSTALL_BINARIES@
- @echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
- @$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
- @$(INSTALL_DATA) tcl.pc $(LIB_INSTALL_DIR)/pkgconfig/tcl.pc
-+ @echo "Installing pkg-config file to $(prefix)/libdata/pkgconfig/"
++ @echo "Installing pkg-config file to $(prefix)/libdata/pkgconfig"
+ @$(INSTALL_DATA_DIR) $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig
+ @$(INSTALL_DATA) tcl.pc $(INSTALL_ROOT)$(prefix)/libdata/pkgconfig/tcl.pc
@@ -93,21 +92,15 @@
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
-@@ -822,7 +834,22 @@
+@@ -824,7 +836,16 @@
else true; \
fi; \
done;
- @for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.4 ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
-+ @echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
++ @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; \
++ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
+ done;
-+ @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@; \
-+ do \
-+ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
-+ done;
+ @echo "Customizing tcl module path"; \
+ echo "::tcl::tm::path add {$(TCL_LIBRARY)}" >> \
+ "$(SCRIPT_INSTALL_DIR)"/tm.tcl;
@@ -117,24 +110,12 @@
do \
if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
-@@ -830,43 +857,26 @@
- else true; \
- fi; \
- done;
-- @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@; \
-- do \
-- $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"; \
-- done;
- @echo "Installing package http1.0 files to $(SCRIPT_INSTALL_DIR)/http1.0/";
- @for i in $(TOP_DIR)/library/http1.0/*.tcl ; \
- do \
+@@ -844,31 +865,21 @@
$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \
done;
- @echo "Installing package http 2.8.7 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.7.tm;
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.7.tm;
+ @echo "Installing package http 2.8.8 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.8.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/http-2.8.8.tm;
@echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/";
@for i in $(TOP_DIR)/library/opt/*.tcl ; \
do \
@@ -143,13 +124,13 @@
@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.6 as a Tcl Module";
-- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.6.tm;
--
-+ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.6.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 tcltest 2.3.8 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.5/tcltest-2.3.8.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/tcltest/tcltest.tcl "$(SCRIPT_INSTALL_DIR)"/tcltest-2.3.8.tm;
+
+ @echo "Installing package platform 1.0.13 as a Tcl Module";
+- @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform-1.0.13.tm;
++ @$(INSTALL_DATA) $(TOP_DIR)/library/platform/platform.tcl "$(SCRIPT_INSTALL_DIR)"/platform-1.0.13.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;
-
@@ -166,7 +147,7 @@
install-tzdata:
@for i in tzdata; \
-@@ -941,7 +951,7 @@
+@@ -943,7 +954,7 @@
done
install-headers:
@@ -175,7 +156,7 @@
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
-@@ -950,14 +960,21 @@
+@@ -952,14 +963,19 @@
fi; \
done;
@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
@@ -184,14 +165,13 @@
- $(GENERIC_DIR)/tclPlatDecls.h \
- $(GENERIC_DIR)/tclTomMath.h \
- $(GENERIC_DIR)/tclTomMathDecls.h ; \
-+ @for i in $(GENERIC_DIR)/*.h; \
-+ do \
-+ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)/"; \
-+ done;
-+ @for i in $(UNIX_DIR)/*.h; \
- do \
+- do \
- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"; \
-+ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)/"; \
++ @for i in $(GENERIC_DIR)/*.h; do \
++ $(INSTALL_DATA) $$i "$(GENERIC_INCLUDE_INSTALL_DIR)"/; \
++ done;
++ @for i in $(UNIX_DIR)/*.h; do \
++ $(INSTALL_DATA) $$i "$(UNIX_INCLUDE_INSTALL_DIR)"/; \
done;
+ @ln -sf generic/tcl.h "$(INCLUDE_INSTALL_DIR)"/tcl.h
+ @ln -sf generic/tclDecls.h "$(INCLUDE_INSTALL_DIR)"/tclDecls.h
Added: head/lang/tcl86/files/patch-unix-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lang/tcl86/files/patch-unix-configure Fri Aug 29 14:19:55 2014 (r366510)
@@ -0,0 +1,19 @@
+--- configure.orig 2014-08-29 15:40:10.000000000 +0200
++++ configure 2014-08-29 15:40:23.000000000 +0200
+@@ -7764,15 +7764,11 @@
+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+ fi
+
+- case $system in
+- FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
+ TCL_LIB_VERSIONS_OK=nodots
+- ;;
+- esac
+ ;;
+ Darwin-*)
+ CFLAGS_OPTIMIZE="-Os"
Modified: head/lang/tcl86/pkg-plist
==============================================================================
--- head/lang/tcl86/pkg-plist Fri Aug 29 13:38:17 2014 (r366509)
+++ head/lang/tcl86/pkg-plist Fri Aug 29 14:19:55 2014 (r366510)
@@ -23,6 +23,7 @@ include/tcl%%TCL_VER%%/generic/tclParse.
include/tcl%%TCL_VER%%/generic/tclPlatDecls.h
include/tcl%%TCL_VER%%/generic/tclPort.h
include/tcl%%TCL_VER%%/generic/tclRegexp.h
+include/tcl%%TCL_VER%%/generic/tclStringTrim.h
include/tcl%%TCL_VER%%/generic/tclTomMath.h
include/tcl%%TCL_VER%%/generic/tclTomMathInt.h
include/tcl%%TCL_VER%%/generic/tclTomMathDecls.h
@@ -36,15 +37,15 @@ include/tcl%%TCL_VER%%/tclOO.h
include/tcl%%TCL_VER%%/tclOODecls.h
include/tcl%%TCL_VER%%/tclTomMath.h
include/tcl%%TCL_VER%%/tclTomMathDecls.h
-%%MODULES%%lib/tcl%%TCL_VER%%/http-2.8.7.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/http-2.8.8.tm
%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/http.tcl
%%MODULES%%lib/tcl%%TCL_VER%%/http1.0/pkgIndex.tcl
%%MODULES%%lib/tcl%%TCL_VER%%/msgcat-1.5.2.tm
%%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/optparse.tcl
%%MODULES%%lib/tcl%%TCL_VER%%/opt0.4/pkgIndex.tcl
-%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.12.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/platform-1.0.13.tm
%%MODULES%%lib/tcl%%TCL_VER%%/platform/shell-1.1.4.tm
-%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.6.tm
+%%MODULES%%lib/tcl%%TCL_VER%%/tcltest-2.3.8.tm
lib/tcl%%TCL_VER%%/auto.tcl
lib/tcl%%TCL_VER%%/clock.tcl
lib/tcl%%TCL_VER%%/encoding/ascii.enc
@@ -708,6 +709,7 @@ lib/tcl%%TCL_VER%%/word.tcl
%%MAN%%man/man3/Tcl_OpenFileChannel.tcl86.3.gz
%%MAN%%man/man3/Tcl_OpenTcpClient.tcl86.3.gz
%%MAN%%man/man3/Tcl_OpenTcpServer.tcl86.3.gz
+%%MAN%%man/man3/Tcl_OOInitStubs.tcl86.3.gz
%%MAN%%man/man3/Tcl_OutputBuffered.tcl86.3.gz
%%MAN%%man/man3/Tcl_Panic.tcl86.3.gz
%%MAN%%man/man3/Tcl_PanicVA.tcl86.3.gz
@@ -1045,7 +1047,7 @@ lib/tcl%%TCL_VER%%/word.tcl
%%MAN%%man/mann/tcl_startOfNextWord.tcl86.n.gz
%%MAN%%man/mann/tcl_startOfPreviousWord.tcl86.n.gz
%%MAN%%man/mann/tcl_traceCompile.tcl86.n.gz
-%%MAN%%man/mann/tcl_traceEval.tcl86.n.gz
+%%MAN%%man/mann/tcl_traceExec.tcl86.n.gz
%%MAN%%man/mann/tcl_version.tcl86.n.gz
%%MAN%%man/mann/tcl_wordBreakAfter.tcl86.n.gz
%%MAN%%man/mann/tcl_wordBreakBefore.tcl86.n.gz
Modified: head/x11-toolkits/tk86/Makefile
==============================================================================
--- head/x11-toolkits/tk86/Makefile Fri Aug 29 13:38:17 2014 (r366509)
+++ head/x11-toolkits/tk86/Makefile Fri Aug 29 14:19:55 2014 (r366510)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tk
-PORTVERSION= 8.6.1
+PORTVERSION= 8.6.2
CATEGORIES= x11-toolkits
MASTER_SITES= SF/tcl/Tcl/${PORTVERSION} \
${MASTER_SITE_TCLTK}
@@ -27,7 +27,7 @@ XSS_DESC= XScrnSaver support
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
ALL_TARGET= all
-INSTALL_TARGET= install
+INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
USES+= tcl:${SHORT_TK_VER}
@@ -57,7 +57,7 @@ PLIST_SUB= TK_VER=${TK_VER} \
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDEMOS}
-INSTALL_TARGET+= install install-demos
+INSTALL_TARGET+= install-demos
PLIST_SUB+= DEMOS=""
.else
PLIST_SUB+= DEMOS="@comment "
@@ -84,10 +84,6 @@ post-patch:
s|@TK_SRC_DIR@|${PREFIX}/include/tk${TK_VER}|' \
${WRKSRC}/tkConfig.sh.in
-post-install:
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wish${TK_VER}
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtk${SHORT_TK_VER}.so.1
-
regression-test: build
cd ${WRKSRC}; ${MAKE} test
${ECHO_CMD} "package require Tk" | tclsh${TK_VER}
Modified: head/x11-toolkits/tk86/distinfo
==============================================================================
--- head/x11-toolkits/tk86/distinfo Fri Aug 29 13:38:17 2014 (r366509)
+++ head/x11-toolkits/tk86/distinfo Fri Aug 29 14:19:55 2014 (r366510)
@@ -1,2 +1,2 @@
-SHA256 (tk8.6.1-src.tar.gz) = b691a2e84907392918665fe03a0deb913663a026bed2162185b4a9a14898162c
-SIZE (tk8.6.1-src.tar.gz) = 4244010
+SHA256 (tk8.6.2-src.tar.gz) = afb6639043ec38905afe22b61ca54820217f4d4e81e0ad49f839c16d2bf98579
+SIZE (tk8.6.2-src.tar.gz) = 4246617
Added: head/x11-toolkits/tk86/files/patch-unix-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/tk86/files/patch-unix-configure Fri Aug 29 14:19:55 2014 (r366510)
@@ -0,0 +1,19 @@
+--- configure.orig 2014-08-27 18:23:13.000000000 +0200
++++ configure 2014-08-29 13:46:28.000000000 +0200
+@@ -5606,15 +5606,11 @@
+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+ fi
+
+- case $system in
+- FreeBSD-3.*)
+ # Version numbers are dot-stripped by system policy.
+ TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
+ TCL_LIB_VERSIONS_OK=nodots
+- ;;
+- esac
+ ;;
+ Darwin-*)
+ CFLAGS_OPTIMIZE="-Os"
Modified: head/x11-toolkits/tk86/files/patch-unix__Makefile.in
==============================================================================
--- head/x11-toolkits/tk86/files/patch-unix__Makefile.in Fri Aug 29 13:38:17 2014 (r366509)
+++ head/x11-toolkits/tk86/files/patch-unix__Makefile.in Fri Aug 29 14:19:55 2014 (r366510)
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2013-09-17 14:25:13.000000000 +0200
-+++ Makefile.in 2014-02-03 12:02:57.000000000 +0100
+--- Makefile.in.orig 2014-08-27 18:23:13.000000000 +0200
++++ Makefile.in 2014-08-29 12:16:47.000000000 +0200
@@ -64,6 +64,8 @@
# Directory in which to install the include file tk.h:
@@ -28,7 +28,7 @@
PRIVATE_HDRS = $(GENERIC_DIR)/tkInt.h $(GENERIC_DIR)/tkIntDecls.h \
$(GENERIC_DIR)/tkIntPlatDecls.h $(GENERIC_DIR)/tkPort.h \
@@ -584,6 +588,12 @@
- ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
+ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_FILE@ ${OBJS}
rm -f $@
@MAKE_LIB@
+ @ln -sf ${LIB_FILE} ./libtk${SHORT_TK_VER}.so
@@ -39,7 +39,7 @@
+ $(RANLIB) libtk${SHORT_TK_VER}.a
${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
- rm -f $@
+ @if test "x${LIB_FILE}" = "xlibtk${MAJOR_VERSION}.${MINOR_VERSION}.dll"; then \
@@ -699,8 +709,7 @@
INSTALL_DEV_TARGETS = install-headers
INSTALL_DEMO_TARGETS = install-demos
@@ -54,7 +54,7 @@
# some ranlibs write to current directory, and this might not always be
# possible (e.g. if installing as root).
--install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE}
+-install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
+install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) libtk${SHORT_TK_VER}.a ${WISH_EXE}
@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
"$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
More information about the svn-ports-all
mailing list