- Removed unnecessary PKGINSTALL and PKGDEINSTALL

- Improved handling of WITH_TK83_MAN
- Manpages are not installed by default (default on for default TK - 8.4)
- Bump PORTREVISION

PR:             110238
Submitted by:   Martin Matuska <martin@matuska.org> (maintainer)

2 files changed, 18 insertions, 19 deletions

diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index d129dbf7af6f..6ff36178f575 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	8.3.5
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits tk83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcl
@@ -31,13 +31,11 @@ CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl${TK_VER} \
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1
 MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
 PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
-PKGINSTALL=	${PKGDIR}/pkg-install.wish
-PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.wish
 NOPRECIOUSMAKEVARS=	Too many _MLINKS for README.html
 TCL83_PORT?=	lang/tcl83
 MANCOMPRESSED=	no
 
-OPTIONS=	TK83_MAN "Install tk 8.3 manpages" on \
+OPTIONS=	TK83_MAN "Install tk 8.3 manpages" off \
 		WISH_WRAPPER "Require wish wrapper from ports" off
 
 .include <bsd.port.pre.mk>
@@ -338,15 +336,11 @@ post-configure:
 	${REINPLACE_CMD} \
 		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TKBASE}|' \
 		${WRKSRC}/tkConfig.sh
-.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TK83_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 exists(${PKGINSTALL})
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK83_MAN)
+	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc
 .endif
 
 test:
diff --git a/x11-toolkits/tk83/files/patch-ab b/x11-toolkits/tk83/files/patch-ab
index 354172c7ef89..a44f52617111 100644
--- a/x11-toolkits/tk83/files/patch-ab
+++ b/x11-toolkits/tk83/files/patch-ab
@@ -1,11 +1,9 @@
 --- Makefile.in.orig	Wed Oct 23 19:45:50 2002
-+++ Makefile.in	Tue Nov 12 21:56:31 2002
-@@ -57,7 +57,9 @@
- SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TK_LIBRARY)
++++ Makefile.in	Mon Mar 12 18:00:56 2007
+@@ -58,6 +58,8 @@
  
  # Directory in which to install the include file tk.h:
--INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
-+INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
+ INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
 +GENERIC_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/generic
 +UNIX_INCLUDE_INSTALL_DIR = $(INCLUDE_INSTALL_DIR)/unix
  
@@ -53,7 +51,14 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
-@@ -460,7 +470,7 @@
+@@ -454,13 +464,13 @@
+ 	gdb ./wish --command=gdb.run
+ 	rm gdb.run
+ 
+-install: all install-binaries install-libraries install-demos install-doc
++install: all install-binaries install-libraries install-demos
+ 
+ # Note: before running ranlib below, must cd to target directory because
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
@@ -97,8 +102,7 @@
 -	@for i in $(GENERIC_DIR)/tk.h $(GENERIC_DIR)/tkPlatDecls.h \
 -		$(GENERIC_DIR)/tkDecls.h ; \
 +	@for i in $(GENERIC_DIR)/*.h ; \
- 	    do \
--	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
++	    do \
 +	    $(INSTALL_DATA) $$i $(GENERIC_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@for i in $(UNIX_DIR)/*.h ; \
@@ -106,7 +110,8 @@
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
 +	    done;
 +	@for i in $(INSTALL_HDRS) ; \
-+  	    do \
+ 	    do \
+-	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \
 +	    j=`basename $$i` ; \
 +	    ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/$$j $(INCLUDE_INSTALL_DIR)/$$j ; \
  	    done;