5 files changed, 29 insertions, 24 deletions

diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index dcf0344610d8..a838b79e7830 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -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}
diff --git a/x11-toolkits/tk86/distinfo b/x11-toolkits/tk86/distinfo
index 432b11d5ca31..cf3b89d2eeee 100644
--- a/x11-toolkits/tk86/distinfo
+++ b/x11-toolkits/tk86/distinfo
@@ -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
diff --git a/x11-toolkits/tk86/files/patch-configure b/x11-toolkits/tk86/files/patch-configure
deleted file mode 100644
index 4aef68428116..000000000000
--- a/x11-toolkits/tk86/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	2014-01-17 18:09:55.000000000 +0100
-+++ configure	2014-01-17 18:10:02.000000000 +0100
-@@ -5655,6 +5655,7 @@
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
- 	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname=\$@"
-+	    TK_SHLIB_LD_EXTRAS="-Wl,-soname=\$@"
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
diff --git a/x11-toolkits/tk86/files/patch-unix-configure b/x11-toolkits/tk86/files/patch-unix-configure
new file mode 100644
index 000000000000..d7f9b59ae0df
--- /dev/null
+++ b/x11-toolkits/tk86/files/patch-unix-configure
@@ -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"
diff --git a/x11-toolkits/tk86/files/patch-unix__Makefile.in b/x11-toolkits/tk86/files/patch-unix__Makefile.in
index f93cefd929aa..4cd0b1be1000 100644
--- a/x11-toolkits/tk86/files/patch-unix__Makefile.in
+++ b/x11-toolkits/tk86/files/patch-unix__Makefile.in
@@ -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)" ; \