6 files changed, 100 insertions, 57 deletions

diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index b2d441aff3a2..dc18dc6c792a 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tk
-PORTVERSION=	8.5.15
+PORTVERSION=	8.5.16
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_TCLTK} \
 		SF/tcl/Tcl/${PORTVERSION}
@@ -96,8 +96,8 @@ post-configure:
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/tk${TK_VER}/
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/wish${TK_VER}
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtk${SHORT_TK_VER}.so.1
+	${LN} -fs libtk${SHORT_TK_VER}.so.1.0 \
+	    ${STAGEDIR}${PREFIX}/lib/libtk${SHORT_TK_VER}.so.1
 
 regression-test:	build
 	cd ${WRKSRC}; ${MAKE} test
diff --git a/x11-toolkits/tk85/distinfo b/x11-toolkits/tk85/distinfo
index ccad6e81ad67..5ed57130d688 100644
--- a/x11-toolkits/tk85/distinfo
+++ b/x11-toolkits/tk85/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tk8.5.15-src.tar.gz) = 815c6706d0b4fdd432fe16b82e7b9adfa1f057c44edd11d28f7c4b0ac104323f
-SIZE (tk8.5.15-src.tar.gz) = 4086650
+SHA256 (tk8.5.16-src.tar.gz) = e67a20c51f8798e4a23a3c7c1590012e17159d148f048d61f1aa0c69cb8e1349
+SIZE (tk8.5.16-src.tar.gz) = 4095815
diff --git a/x11-toolkits/tk85/files/patch-unix__Makefile.in b/x11-toolkits/tk85/files/patch-unix-Makefile.in
index 6a53806ceffd..90938d9ad226 100644
--- a/x11-toolkits/tk85/files/patch-unix__Makefile.in
+++ b/x11-toolkits/tk85/files/patch-unix-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2013-08-30 18:28:24.000000000 +0200
-+++ Makefile.in	2013-09-02 16:01:49.000000000 +0200
+--- Makefile.in.orig	2014-08-22 16:06:02.000000000 +0200
++++ Makefile.in	2014-08-27 09:46:38.000000000 +0200
 @@ -63,6 +63,8 @@
  
  # Directory in which to install the include file tk.h:
@@ -14,12 +14,12 @@
  # for this version of Tk ("srcdir" will be replaced or has already
  # been replaced by the configure script):
 -TCL_GENERIC_DIR		= @TCL_SRC_DIR@/generic
-+TCL_GENERIC_DIR		= %%LOCALBASE%%/include/tcl@TCL_VERSION@/generic 
++TCL_GENERIC_DIR		= /usr/local/include/tcl@TCL_VERSION@/generic 
  
  # The directory containing the platform specific Tcl sources and headers
  # appropriate for this version of Tk:
 -TCL_PLATFORM_DIR	= @TCL_SRC_DIR@/unix
-+TCL_PLATFORM_DIR	= %%LOCALBASE%%/include/tcl@TCL_VERSION@/unix
++TCL_PLATFORM_DIR	= /usr/local/include/tcl@TCL_VERSION@/unix
  
  # The directory containing the Tcl library archive file appropriate
  # for this version of Tk:
@@ -28,10 +28,21 @@
  
  # 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@
+@@ -220,8 +222,8 @@
+ INSTALL_STRIP_LIBRARY   = -S -x
+ 
+ INSTALL			= $(SHELL) $(UNIX_DIR)/install-sh -c
+-INSTALL_PROGRAM		= ${INSTALL}
+-INSTALL_LIBRARY		= ${INSTALL}
++INSTALL_PROGRAM		= ${INSTALL} -s
++INSTALL_LIBRARY		= ${INSTALL} -s
+ INSTALL_DATA		= ${INSTALL} -m 644
+ INSTALL_DATA_DIR	= ${INSTALL} -d -m 755
+ 
 @@ -273,7 +275,7 @@
  STLIB_LD		= @STLIB_LD@
  SHLIB_LD		= @SHLIB_LD@
@@ -51,7 +62,7 @@
  	@LD_LIBRARY_PATH_VAR@="`pwd`:${TCL_BIN_DIR}:$${@LD_LIBRARY_PATH_VAR@}"; \
  	export @LD_LIBRARY_PATH_VAR@; \
 @@ -567,6 +571,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 @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so
@@ -62,7 +73,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 \
 @@ -671,8 +681,7 @@
  INSTALL_DEV_TARGETS = install-headers
  INSTALL_DEMO_TARGETS = install-demos
@@ -77,8 +88,8 @@
  # 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_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} libtk${SHORT_TK_VER}.a
+-install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE}
++install-binaries: $(TK_STUB_LIB_FILE) $(TK_LIB_FILE) ${WISH_EXE} libtk${SHORT_TK_VER}.a
  	@for i in "$(LIB_INSTALL_DIR)" "$(BIN_INSTALL_DIR)" \
  	    "$(PKG_INSTALL_DIR)" "$(CONFIG_INSTALL_DIR)" ; \
  	    do \
@@ -93,7 +104,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 @@
+@@ -724,16 +737,17 @@
  	fi
  	@echo "Installing ${WISH_EXE} as $(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
  	@$(INSTALL_PROGRAM) ${WISH_EXE} "$(BIN_INSTALL_DIR)/wish$(VERSION)${EXE_SUFFIX}"
@@ -105,7 +116,18 @@
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
  	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    @INSTALL_STUB_LIB@ ; \
-@@ -828,7 +842,7 @@
+ 	fi
+ 	@EXTRA_INSTALL_BINARIES@
+-	@echo "Installing pkg-config file to $(LIB_INSTALL_DIR)/pkgconfig/"
+-	@$(INSTALL_DATA_DIR) $(LIB_INSTALL_DIR)/pkgconfig
+-	@$(INSTALL_DATA) tk.pc $(LIB_INSTALL_DIR)/pkgconfig/tk.pc
++	@echo "Installing pkg-config file to $(DESTDIR)$(prefix)/libdata/pkgconfig/"
++	@$(INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/libdata/pkgconfig
++	@$(INSTALL_DATA) tk.pc $(DESTDIR)$(prefix)/libdata//pkgconfig/tk85.pc
+ 
+ install-libraries: libraries
+ 	@for i in "$(SCRIPT_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)/images" \
+@@ -831,7 +845,7 @@
  install-headers:
  	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
  	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
@@ -114,7 +136,7 @@
  	    do \
  	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
  		echo "Making directory $$i"; \
-@@ -837,9 +851,12 @@
+@@ -840,9 +854,12 @@
  		fi; \
  	    done;
  	@echo "Installing header files to $(INCLUDE_INSTALL_DIR)/";
diff --git a/x11-toolkits/tk85/files/patch-unix-configure b/x11-toolkits/tk85/files/patch-unix-configure
new file mode 100644
index 000000000000..db91aa7e2448
--- /dev/null
+++ b/x11-toolkits/tk85/files/patch-unix-configure
@@ -0,0 +1,59 @@
+--- configure.orig	2014-08-22 16:06:02.000000000 +0200
++++ configure	2014-08-27 09:28:32.000000000 +0200
+@@ -3538,6 +3538,7 @@
+ # Threads support - this auto-enables if Tcl was compiled threaded
+ #------------------------------------------------------------------------
+ 
++TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION}
+ 
+     # Check whether --enable-threads or --disable-threads was given.
+ if test "${enable_threads+set}" = set; then
+@@ -5829,7 +5830,7 @@
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+-	    LDFLAGS="$LDFLAGS -export-dynamic"
++	    LDFLAGS=""
+ 	    if test $doRpath = yes; then
+ 
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+@@ -5852,33 +5853,19 @@
+ 	    SHLIB_LD="${CC} -shared"
+ 	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
+ 	    TK_SHLIB_LD_EXTRAS="-Wl,-soname,\$@"
+-	    SHLIB_SUFFIX=".so"
++	    SHLIB_SUFFIX=".so.${SHLIB_VERSION}"
+ 	    DL_OBJS="tclLoadDl.o"
+ 	    DL_LIBS=""
+ 	    LDFLAGS=""
++	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
++	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
++	    TCL_LIB_VERSIONS_OK=nodots
+ 	    if test $doRpath = yes; then
+ 
+ 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+-fi
+-
+-	    if test "${TCL_THREADS}" = "1"; then
+-
+-		# The -pthread needs to go in the LDFLAGS, not LIBS
+-		LIBS=`echo $LIBS | sed s/-pthread//`
+-		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-		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'
+-		TCL_LIB_VERSIONS_OK=nodots
+-		;;
+-	    esac
++	    fi
+ 	    ;;
+ 	Darwin-*)
+ 	    CFLAGS_OPTIMIZE="-Os"
diff --git a/x11-toolkits/tk85/files/patch-unix__configure b/x11-toolkits/tk85/files/patch-unix__configure
deleted file mode 100644
index 7e2cd669c000..000000000000
--- a/x11-toolkits/tk85/files/patch-unix__configure
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.orig	2011-06-23 20:37:39.000000000 +0200
-+++ configure	2011-06-26 10:43:11.471967707 +0200
-@@ -3538,6 +3538,7 @@
- # Threads support - this auto-enables if Tcl was compiled threaded
- #------------------------------------------------------------------------
- 
-+TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION}
- 
-     # Check whether --enable-threads or --disable-threads was given.
- if test "${enable_threads+set}" = set; then
-@@ -5854,7 +5855,7 @@
- 	    SHLIB_SUFFIX=".so"
- 	    DL_OBJS="tclLoadDl.o"
- 	    DL_LIBS=""
--	    LDFLAGS="$LDFLAGS -export-dynamic"
-+	    LDFLAGS=""
- 	    if test $doRpath = yes; then
- 
- 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -5865,16 +5866,16 @@
- 
- 		# The -pthread needs to go in the CFLAGS, not LIBS
- 		LIBS=`echo $LIBS | sed s/-pthread//`
--		CFLAGS="$CFLAGS -pthread"
--	    	LDFLAGS="$LDFLAGS -pthread"
-+		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+	    	LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- 
- fi
- 
- 	    case $system in
--	    FreeBSD-3.*)
-+	    FreeBSD-*)
- 	    	# FreeBSD-3 doesn't handle version numbers with dots.
- 	    	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
diff --git a/x11-toolkits/tk85/pkg-plist b/x11-toolkits/tk85/pkg-plist
index 9fc81fa17a84..9f5e3c9b9279 100644
--- a/x11-toolkits/tk85/pkg-plist
+++ b/x11-toolkits/tk85/pkg-plist
@@ -34,6 +34,7 @@ include/tk%%TK_VER%%/unix/tkUnixPort.h
 lib/libtk%%SHORT_TK_VER%%.a
 lib/libtk%%SHORT_TK_VER%%.so
 lib/libtk%%SHORT_TK_VER%%.so.1
+lib/libtk%%SHORT_TK_VER%%.so.1.0
 lib/libtkstub%%SHORT_TK_VER%%.a
 lib/tk%%TK_VER%%/bgerror.tcl
 lib/tk%%TK_VER%%/button.tcl
@@ -41,6 +42,7 @@ lib/tk%%TK_VER%%/choosedir.tcl
 lib/tk%%TK_VER%%/clrpick.tcl
 lib/tk%%TK_VER%%/comdlg.tcl
 lib/tk%%TK_VER%%/console.tcl
+libdata/pkgconfig/tk85.pc
 %%DEMOS%%lib/tk%%TK_VER%%/demos/README
 %%DEMOS%%lib/tk%%TK_VER%%/demos/anilabel.tcl
 %%DEMOS%%lib/tk%%TK_VER%%/demos/aniwave.tcl