From f89d41e5fceed6919201148d8ee6af3d1b812091 Mon Sep 17 00:00:00 2001
From: miwi <miwi@FreeBSD.org>
Date: Tue, 13 Mar 2007 10:01:24 +0000
Subject: - Removed unnecessary PKGINSTALL and PKGDEINSTALL - Improved handling
 of WITH_TCL82_MAN - Manpages are not installed by default (default on for
 default TCL - 8.4)

PR:             110236
Submitted by:   Martin Matuska <martin@matuska.org> (maintainer)
---
 lang/tcl82/Makefile       | 16 +++++-----------
 lang/tcl82/files/patch-aa | 13 +++++++++++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index c451662f3f6..c2b5c2ca459 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -7,11 +7,11 @@
 
 PORTNAME=	tcl
 PORTVERSION=	8.2.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang tcl82
 MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_2
-DISTNAME=	tcl8.2.3
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	martin@matuska.org
 COMMENT=	Tool Command Language
@@ -23,12 +23,10 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 MAKE_ENV=	SHORT_TCL_VER=82
-PKGINSTALL=	${PKGDIR}/pkg-install.tclsh
-PKGDEINSTALL=	${PKGDIR}/pkg-deinstall.tclsh
 NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
 PLIST_SUB=	TCL_VER=8.2 SHORT_TCL_VER=82
 
-OPTIONS=	TCL82_MAN "Install tcl 8.2 manpages" on \
+OPTIONS=	TCL82_MAN "Install tcl 8.2 manpages" off \
 		TCLSH_WRAPPER "Require tclsh wrapper from ports" off
 
 .include <bsd.port.pre.mk>
@@ -391,14 +389,10 @@ post-configure:
 	${REINPLACE_CMD} \
 		-e 's|${WRKDIRPREFIX}${.CURDIR}|$${WRKDIRPREFIX}${TCLBASE}|' \
 		${WRKSRC}/tclConfig.sh
-.if defined(NO_INSTALL_MANPAGES) || !defined(WITH_TCL82_MAN)
-	${REINPLACE_CMD} -e 's|^MAN_INSTALL_DIR.*$$|MAN_INSTALL_DIR = ${WRKDIR}|' \
-		${WRKSRC}/Makefile
-.endif
 
 post-install:
-.if exists(${PKGINSTALL})
-	${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
+.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL82_MAN)
+	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc
 .endif
 
 test:
diff --git a/lang/tcl82/files/patch-aa b/lang/tcl82/files/patch-aa
index 07db0c35ca9..3612968f004 100644
--- a/lang/tcl82/files/patch-aa
+++ b/lang/tcl82/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Wed Nov  3 21:37:24 1999
-+++ Makefile.in	Sun Nov 21 15:31:00 1999
+--- Makefile.in.orig	Wed Dec 15 04:59:18 1999
++++ Makefile.in	Mon Mar 12 17:35:17 2007
 @@ -48,7 +48,9 @@
  SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY)
  
@@ -53,6 +53,15 @@
  ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
  	rm -f ${STUB_LIB_FILE}
  	@MAKE_STUB_LIB@
+@@ -485,7 +493,7 @@
+ 	cd dltest; if test -f configure; then ./configure; else \
+ 	    $(DLTEST_DIR)/configure; fi
+ 
+-install: install-binaries install-libraries install-doc
++install: install-binaries install-libraries
+ 
+ # Note: before running ranlib below, must cd to target directory because
+ # some ranlibs write to current directory, and this might not always be
 @@ -504,8 +512,13 @@
  	@echo "Installing $(TCL_LIB_FILE)"
  	chmod +x $(SRC_DIR)/install-sh
-- 
cgit