ports/110236: [MAINTAINER] lang/tcl82

[Martin Matuska]

>Number:         110236
>Category:       ports
>Synopsis:       [MAINTAINER] lang/tcl82
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 12 17:00:27 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 6.2-RELEASE
>Organization:
>Environment:
FreeBSD 6.2-RELEASE i386 and amd64
>Description:
This update changes the following:
- removed unnecessary PKGINSTALL and PKGDEINSTALL
- improved handling of WITH_TCL82_MAN
- manpages are not installed by default (default on for default TCL - 8.4)

Portlint -A and tinderbox do not complain.
>How-To-Repeat:
>Fix:
diff -Nbur lang/tcl82.orig/Makefile lang/tcl82/Makefile
--- lang/tcl82.orig/Makefile	Fri Mar  9 10:49:14 2007
+++ lang/tcl82/Makefile	Mon Mar 12 17:40:23 2007
@@ -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 at matuska.org
 COMMENT=	Tool Command Language
@@ -23,12 +23,10 @@
 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 @@
 	${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 -Nbur lang/tcl82.orig/files/patch-aa lang/tcl82/files/patch-aa
--- lang/tcl82.orig/files/patch-aa	Wed Jan  5 08:11:52 2000
+++ lang/tcl82/files/patch-aa	Mon Mar 12 17:35:51 2007
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted: