- Upgrade to 8.4.13; (1)

- Fix man pages: the required macros were not sourced. (2)

Changelog at
<http://sourceforge.net/project/shownotes.php?release_id=399452%26group_id=10894>

PR:		ports/96622 (1)
Noticed by:     phk (2)

5 files changed, 111 insertions, 36 deletions

diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 371f1e6..6a48f49 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tk
-PORTVERSION=	8.4.11
+PORTVERSION=	8.4.13
 PORTEPOCH=	2
 CATEGORIES=	x11-toolkits tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -33,16 +33,18 @@ PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
 PKGINSTALL=	${PKGDIR}/pkg-install.wish
 PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.wish
 NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
-TCL84_PORT?=	lang/tcl84
 MANCOMPRESSED=	no
+DATADIR=	${PREFIX}/share/${PORTNAME}${TK_VER}
 
 .ifdef (WITH_THREADS)
 CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD_LIBS}" PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 PKGNAMESUFFIX?=		-threads
+TCL84_PORT?=		lang/tcl84-thread
+.else
+TCL84_PORT?=		lang/tcl84
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if !defined(WITHOUT_TK84_MAN)
 
 MAN1=	wish.1
@@ -353,9 +355,13 @@ TKBASE?=	${PORTSDIR}/${PKGCATEGORY}/${LATEST_LINK}
 pre-everything::
 	@if ${TEST} -e "${NONEXISTENT}"; then ${ECHO_MSG} "=== Aborted, please remove ${NONEXISTENT}"; exit 1; fi
 
-post-patch:
+pre-configure:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
+.for mp in ${MAN1} ${MAN3} ${MANN}
+	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
+		${WRKSRC}/../doc/${mp}
+.endfor
 
 post-configure:
 	${REINPLACE_CMD} \
@@ -368,13 +374,15 @@ post-configure:
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
 .if exists(${PKGINSTALL})
 	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
 .endif
 
-test:
+regression-test:	build
 	cd ${WRKSRC}; ${MAKE} test
 	${ECHO_CMD} "package require Tk" | tclsh${TK_VER}
 	${ECHO_CMD} "load libtk${SHORT_TK_VER}.so" | tclsh${TK_VER}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/tk84/distinfo b/x11-toolkits/tk84/distinfo
index 06cbe13..40dad1d 100644
--- a/x11-toolkits/tk84/distinfo
+++ b/x11-toolkits/tk84/distinfo
@@ -1,3 +1,3 @@
-MD5 (tk8.4.11-src.tar.gz) = 408e34fe8a1cec497f98f05bbe89b348
-SHA256 (tk8.4.11-src.tar.gz) = 8475bb2ff42f5f162de6825c8c700fd61bae7b629de3e0aaf95cb54a224220ba
-SIZE (tk8.4.11-src.tar.gz) = 3236334
+MD5 (tk8.4.13-src.tar.gz) = 0a16d4d9398e43cbb85784c85fb807a4
+SHA256 (tk8.4.13-src.tar.gz) = 1beb64f178c644bae251c61639b461fe6c632717dc8bfb0339db68cc336f1b0f
+SIZE (tk8.4.13-src.tar.gz) = 3253070
diff --git a/x11-toolkits/tk84/files/patch-aa b/x11-toolkits/tk84/files/patch-aa
index c78536a..326322b 100644
--- a/x11-toolkits/tk84/files/patch-aa
+++ b/x11-toolkits/tk84/files/patch-aa
@@ -1,17 +1,29 @@
---- configure.orig	Thu Jul 29 14:57:48 2004
-+++ configure	Thu Oct 28 11:16:40 2004
-@@ -2590,3 +2590,4 @@
+--- configure.orig	Wed Apr 19 14:29:37 2006
++++ configure	Mon May  1 17:59:53 2006
+@@ -2881,25 +2881,26 @@
+ 	FreeBSD-*)
+ 	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
 -	    SHLIB_LD="ld -Bshareable -x"
 +	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
 +	    SHLIB_LD="ld -shared -x"
  	    SHLIB_LD_LIBS='${LIBS}'
-@@ -2595,3 +2596,3 @@
+ 	    SHLIB_SUFFIX=".so"
+ 	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
 -	    LDFLAGS="$LDFLAGS -export-dynamic"
 +	    LDFLAGS=""
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-@@ -2605,6 +2606,6 @@
+ 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+ 	    if test "${TCL_THREADS}" = "1" ; then
+-		# The -pthread needs to go in the CFLAGS, not LIBS
++		# The -pthread needs to go in the LDFLAGS, 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-*)
@@ -20,7 +32,13 @@
 -	    	SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
 +		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}${DBGX}.so.1'
  	    	TCL_LIB_VERSIONS_OK=nodots
-@@ -2841,2 +2842,3 @@
+ 		;;
+ 	    esac
+@@ -3472,6 +3473,7 @@
+ #define _POSIX_PTHREAD_SEMANTICS 1
+ EOF
  
 +TCL_SRC_DIR=${prefix}/include/tcl${TCLVERSION}
  
+ 	    SHLIB_CFLAGS="-KPIC"
+ 
diff --git a/x11-toolkits/tk84/files/patch-ab b/x11-toolkits/tk84/files/patch-ab
index cf29d6e..ddbdc17 100644
--- a/x11-toolkits/tk84/files/patch-ab
+++ b/x11-toolkits/tk84/files/patch-ab
@@ -1,29 +1,53 @@
---- Makefile.in	Fri Jun  3 15:59:49 2005
-+++ Makefile.in	Thu Jun  9 08:35:12 2005
-@@ -65,2 +65,4 @@
+--- Makefile.in.orig	Wed Apr 19 14:29:37 2006
++++ Makefile.in	Sun Jun  4 22:40:52 2006
+@@ -63,6 +63,8 @@
+ 
+ # Directory in which to install the include file tk.h:
  INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
 +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
 +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
  
-@@ -96,1 +96,1 @@
+ # Path to the private tk header dir:
+ PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
+@@ -93,7 +95,7 @@
+ # 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):
 -TCL_GENERIC_DIR		= @TCL_SRC_DIR@/generic
 +TCL_GENERIC_DIR		= @prefix@/include/tcl@TCL_VERSION@/generic
-@@ -131,3 +133,3 @@
+ 
+ # The directory containing the Tcl library archive file appropriate
+ # for this version of Tk:
+@@ -129,7 +131,7 @@
+ #CFLAGS			= $(CFLAGS_DEBUG)
+ #CFLAGS			= $(CFLAGS_OPTIMIZE)
  #CFLAGS			= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
 -CFLAGS			= @CFLAGS_DEFAULT@ @CFLAGS@
 +CFLAGS			?= @CFLAGS_DEFAULT@ @CFLAGS@
  
-@@ -258,3 +260,3 @@
+ # Flags to pass to the linker
+ LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
+@@ -264,7 +266,7 @@
+ STLIB_LD		= @STLIB_LD@
+ SHLIB_LD		= @SHLIB_LD@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
 -TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
 +TK_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
  
-@@ -469,2 +471,4 @@
+ # Additional search flags needed to find the various shared libraries
+ # at run-time.  The first symbol is for use when creating a binary
+@@ -476,6 +478,8 @@
+ 	default.h ks_names.h tkPatch.h tk.h tkButton.h tkCanvas.h tkInt.h  \
+ 	tkPort.h tkScrollbar.h tkText.h
  
 +INSTALL_HDRS = tk.h tkDecls.h tkInt.h tkIntXlibDecls.h
 +
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
-@@ -488,2 +492,8 @@
+ 
+ all: binaries libraries doc
+@@ -495,6 +499,12 @@
+ ${LIB_FILE}: ${OBJS} ${STUB_LIB_FILE} @LIB_RSRC_FILE@
+ 	rm -f $@
  	@MAKE_LIB@
 +	ln -sf @TK_LIB_FILE@ libtk${SHORT_TK_VER}.so
 +
@@ -32,13 +56,21 @@
 +	ar cr libtk${SHORT_TK_VER}.a ${OBJS}
 +	$(RANLIB) libtk${SHORT_TK_VER}.a
  
-@@ -607,3 +617,4 @@
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ 	rm -f $@
+@@ -613,7 +623,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) $(TK_BUILD_EXP_FILE) wish
 +install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) \
 +	libtk${SHORT_TK_VER}.a wish
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) $(PKG_INSTALL_DIR); \
-@@ -639,6 +650,11 @@
+ 	    do \
+ 		if [ ! -d $$i ] ; then \
+@@ -645,10 +656,15 @@
+ 	    $(INSTALL_DATA) $(TK_BUILD_EXP_FILE) \
+ 			$(LIB_INSTALL_DIR)/$(TK_EXP_FILE); \
  	    fi
 +	@ln -sf $(LIB_INSTALL_DIR)/$(TK_LIB_FILE) $(LIB_INSTALL_DIR)/libtk${SHORT_TK_VER}.so
 +	@echo "Installing libtk${SHORT_TK_VER}.a"
@@ -52,11 +84,19 @@
 +	@mkdir -p $(LIB_INSTALL_DIR)/tk$(VERSION)
 +	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tk$(VERSION)/tkConfig.sh
  	@if test "$(STUB_LIB_FILE)" != "" ; then \
-@@ -653,2 +669,3 @@
+ 	    echo "Installing $(STUB_LIB_FILE) to $(LIB_INSTALL_DIR)/"; \
+ 	    @INSTALL_STUB_LIB@ ; \
+@@ -659,6 +675,7 @@
+ 	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
+ 	    XLIB_INCLUDE_INSTALL_DIR=$(INCLUDE_INSTALL_DIR)/X11; fi; \
  	for i in $(INCLUDE_INSTALL_DIR) $${XLIB_INCLUDE_INSTALL_DIR} \
 +		$(GENERIC_INCLUDE_INSTALL_DIR) $(UNIX_INCLUDE_INSTALL_DIR) \
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \
-@@ -667,7 +684,10 @@
+ 		$(SCRIPT_INSTALL_DIR)/msgs; \
+ 	    do \
+@@ -673,11 +690,14 @@
+ 	    chmod +x $(SRC_DIR)/install-sh; \
+ 	    fi
  	@echo "Installing header files";
 -	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkDecls.h \
 -		$(GENERIC_DIR)/tkPlatDecls.h $(@TK_WINDOWINGSYSTEM@_HDRS) ; \
@@ -71,7 +111,11 @@
 +	done
 +
  	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
-@@ -742,16 +762,8 @@
+ 	    do \
+ 	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \
+@@ -748,20 +768,13 @@
+ 		else true; \
+ 		fi; \
  	    done;
 -	@echo "Installing and cross-linking top-level (.1) docs";
 -	@for i in $(TOP_DIR)/doc/*.1; do \
@@ -82,7 +126,7 @@
 -	@for i in $(TOP_DIR)/doc/*.3; do \
 -	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MAN3_INSTALL_DIR); \
 -	done
--
+ 
 -	@echo "Installing and cross-linking command (.n) docs";
 -	@for i in $(TOP_DIR)/doc/*.n; do \
 -	    $(UNIX_DIR)/installManPage $(MAN_FLAGS) $$i $(MANN_INSTALL_DIR); \
@@ -94,3 +138,5 @@
 +	@echo "Installing command (.n) docs";
 +	${BSD_INSTALL_MAN} $(TOP_DIR)/doc/*.n $(MANN_INSTALL_DIR)
  
+ # Optional target to install private headers
+ install-private-headers: libraries
diff --git a/x11-toolkits/tk84/pkg-plist b/x11-toolkits/tk84/pkg-plist
index 5a138af..2b5b10c 100644
--- a/x11-toolkits/tk84/pkg-plist
+++ b/x11-toolkits/tk84/pkg-plist
@@ -122,28 +122,29 @@ lib/tk%%TK_VER%%/images/pwrdLogo175.gif
 lib/tk%%TK_VER%%/images/pwrdLogo200.gif
 lib/tk%%TK_VER%%/images/pwrdLogo75.gif
 lib/tk%%TK_VER%%/images/tai-ku.gif
+lib/tk%%TK_VER%%/listbox.tcl
+lib/tk%%TK_VER%%/menu.tcl
+lib/tk%%TK_VER%%/mkpsenc.tcl
+lib/tk%%TK_VER%%/msgbox.tcl
 lib/tk%%TK_VER%%/msgs/cs.msg
 lib/tk%%TK_VER%%/msgs/de.msg
 lib/tk%%TK_VER%%/msgs/el.msg
 lib/tk%%TK_VER%%/msgs/en.msg
 lib/tk%%TK_VER%%/msgs/en_gb.msg
+lib/tk%%TK_VER%%/msgs/eo.msg
 lib/tk%%TK_VER%%/msgs/es.msg
 lib/tk%%TK_VER%%/msgs/es_ES.msg
-lib/tk%%TK_VER%%/msgs/eo.msg
 lib/tk%%TK_VER%%/msgs/fr.msg
 lib/tk%%TK_VER%%/msgs/it.msg
 lib/tk%%TK_VER%%/msgs/nl.msg
 lib/tk%%TK_VER%%/msgs/pl.msg
+lib/tk%%TK_VER%%/msgs/pt.msg
 lib/tk%%TK_VER%%/msgs/ru.msg
-lib/tk%%TK_VER%%/listbox.tcl
-lib/tk%%TK_VER%%/menu.tcl
-lib/tk%%TK_VER%%/msgbox.tcl
-lib/tk%%TK_VER%%/mkpsenc.tcl
 lib/tk%%TK_VER%%/obsolete.tcl
 lib/tk%%TK_VER%%/optMenu.tcl
 lib/tk%%TK_VER%%/palette.tcl
-lib/tk%%TK_VER%%/pkgIndex.tcl
 lib/tk%%TK_VER%%/panedwindow.tcl
+lib/tk%%TK_VER%%/pkgIndex.tcl
 lib/tk%%TK_VER%%/prolog.ps
 lib/tk%%TK_VER%%/safetk.tcl
 lib/tk%%TK_VER%%/scale.tcl
@@ -158,6 +159,8 @@ lib/tk%%TK_VER%%/tkConfig.sh
 lib/tk%%TK_VER%%/tkfbox.tcl
 lib/tk%%TK_VER%%/unsupported.tcl
 lib/tk%%TK_VER%%/xmfbox.tcl
+%%DATADIR%%/man.macros
+@dirrm %%DATADIR%%
 @dirrm lib/tk%%TK_VER%%/demos/images
 @dirrm lib/tk%%TK_VER%%/demos
 @dirrm lib/tk%%TK_VER%%/images