3 files changed, 29 insertions, 17 deletions

diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index 6fdaacf50028..3d344daf5747 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.5.a.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -37,7 +37,7 @@ NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
 MANCOMPRESSED=	no
 DATADIR=	${PREFIX}/share/${PORTNAME}${TK_VER}
 
-OPTIONS=	TK85_MAN "Install tk 8.5 manpages" on \
+OPTIONS=	TK85_MAN "Install tk 8.5 manpages" off \
 		WISH_WRAPPER "Require wish wrapper from ports" off
 
 .include <bsd.port.pre.mk>
@@ -69,7 +69,14 @@ CONFLICTS=		tk-threads-8.5*
 RUN_DEPENDS+=		wish:${PORTSDIR}/lang/tcl-tk-wrapper
 .endif
 
-.if !defined(NO_INSTALL_MANPAGES) && !defined(WITHOUT_TK85_MAN)
+.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK84_MAN)
+
+PLIST_SUB+=	INSTMAN='@comment '
+
+.else
+
+DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
+PLIST_SUB+=	INSTMAN=''
 
 MAN1=	wish.1
 MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
@@ -389,26 +396,22 @@ pre-everything::
 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} \
 		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
 		${WRKSRC}/tkConfig.sh
-.if defined(NO_INSTALL_MANPAGES) || defined(WITHOUT_TK85_MAN)
-	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
-		${WRKSRC}/Makefile
-.endif
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}/
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK85_MAN)
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
-.if exists(${PKGINSTALL})
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
+. for mp in ${MAN1} ${MAN3} ${MANN}
+	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
+		${WRKSRC}/../doc/${mp}
+. endfor
+	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
 .endif
 
 regression-test:	build
diff --git a/x11-toolkits/tk85/files/patch-unix::Makefile.in b/x11-toolkits/tk85/files/patch-unix::Makefile.in
index 8c3c679eb1e1..f603f71bf0e6 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	Tue Jan 30 11:20:44 2007
-+++ Makefile.in	Tue Jan 30 11:30:35 2007
+--- Makefile.in.orig	Mon Oct 23 15:45:33 2006
++++ Makefile.in	Mon Mar 12 18:32:29 2007
 @@ -64,6 +64,8 @@
  
  # Directory in which to install the include file tk.h:
@@ -58,6 +58,15 @@
  
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f $@
+@@ -613,7 +623,7 @@
+ 	gdb ./wish --command=gdb.run
+ 	rm gdb.run
+ 
+-INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
++INSTALL_TARGETS = install-binaries install-libraries install-demos @EXTRA_INSTALL@
+ 
+ install: $(INSTALL_TARGETS)
+ 
 @@ -626,7 +636,8 @@
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
diff --git a/x11-toolkits/tk85/pkg-plist b/x11-toolkits/tk85/pkg-plist
index 1790e76e2c4e..65f9d0476336 100644
--- a/x11-toolkits/tk85/pkg-plist
+++ b/x11-toolkits/tk85/pkg-plist
@@ -166,8 +166,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%%
+%%INSTMAN%%%%DATADIR%%/man.macros
+%%INSTMAN%%@dirrm %%DATADIR%%
 @dirrm lib/tk%%TK_VER%%/demos/images
 @dirrm lib/tk%%TK_VER%%/demos
 @dirrm lib/tk%%TK_VER%%/images