- Don't install the short names for section 3 manpages as the names are

  too generic, e.g. Hash, Object, Access.  Approved by jwise@netbsd.org.
- Touch ${TCL_LIB_FILE} after the build so that the library isn't relinked
  during installation.

4 files changed, 42 insertions, 92 deletions

diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 896392b122a..4b4fba7fc98 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/06/21 18:07:51 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/06/30 18:24:17 jlam Exp $
 #
 
 DISTNAME=		tcl8.3.2
@@ -17,13 +17,38 @@ CONFLICTS+=		tclman80-*
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=		yes
+MAKE_ENV+=		TOUCH="${TOUCH}"
 
 USE_BUILDLINK_ONLY=	yes
 USE_LIBTOOL=		yes
 
 INSTALL_TARGET=		install
 
+# Initially install the man pages into ${WRKDIR}/man, as we need a staged
+# install to avoid overwriting existing manpages in ${PREFIX}/man.
+#
+CONFIGURE_ARGS+=	--mandir=${WRKDIR}/man
+
+# Modify mkLinks script to remove the short-filename manpage if it was
+# linked to a longer filename.
+#
+post-patch:
+	@cd ${WRKSRC};							\
+	${MV} -f mkLinks mkLinks.tmp;					\
+	${GREP} -v "^exit 0" mkLinks.tmp > mkLinks;			\
+	${CAT} mkLinks.tmp						\
+		| ${AWK} '/^  *ln / { print $$2 }'			\
+		| ${SORT} -u						\
+		| ${GREP} -v ".*\.n"					\
+		| ${SED} -e "s,^,${RM} -f ,"				\
+		>> mkLinks;						\
+	${RM} -f mkLinks.tmp;						\
+	${CHMOD} +x mkLinks;
+
 post-install:
+	${CHMOD} -R ugo-w ${WRKDIR}/man
+	cd ${WRKDIR}; ${PAX} -rw man ${PREFIX}
+	${CHMOD} -R ug+rw ${WRKDIR}/man
 	cd ${PREFIX}/bin && ${LN} -s tclsh8.3 tclsh
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl/unix
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index bc9ce9b49b9..a728866fedf 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2001/06/13 20:48:01 jlam Exp $
+$NetBSD: distinfo,v 1.7 2001/06/30 18:24:17 jlam Exp $
 
 SHA1 (tcl8.3.2.tar.gz) = be2701bca3f4fd9c49ef3e2e8932f8b0a10d28fa
 Size (tcl8.3.2.tar.gz) = 2594407 bytes
-SHA1 (patch-aa) = d0ca1287d6d4416da4bad69525285ccd785b553f
+SHA1 (patch-aa) = 3f5afe145a5e05f512d3a66c774091e26bf380bf
 SHA1 (patch-ab) = 5241c5187031de8c8eca3627e286a78e133d36ef
 SHA1 (patch-ac) = 6f6f8e8b0ab6744662e7365511161e29affe62fc
 SHA1 (patch-ad) = 22412c6b564e7b6baced01c4c35bc6efa994fc8f
diff --git a/lang/tcl/patches/patch-aa b/lang/tcl/patches/patch-aa
index b4f744695d0..1cf2a83e2be 100644
--- a/lang/tcl/patches/patch-aa
+++ b/lang/tcl/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2000/12/08 20:41:19 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2001/06/30 18:24:17 jlam Exp $
 
 --- Makefile.in.orig	Tue Aug  8 15:17:11 2000
 +++ Makefile.in
@@ -52,7 +52,15 @@ $NetBSD: patch-aa,v 1.4 2000/12/08 20:41:19 jlam Exp $
  
  #----------------------------------------------------------------
  # The information below should be usable as is.  The configure
-@@ -428,11 +429,11 @@
+@@ -409,6 +410,7 @@
+ 	rm -f ${TCL_LIB_FILE}
+ 	@MAKE_LIB@
+ 	$(RANLIB) ${TCL_LIB_FILE}
++	${TOUCH} ${TCL_LIB_FILE}
+ 
+ ${STUB_LIB_FILE}: ${STUB_LIB_OBJS}
+ 	rm -f ${STUB_LIB_FILE}
+@@ -428,11 +430,11 @@
  
  
  tclsh: ${TCLSH_OBJS} ${TCL_LIB_FILE}
@@ -66,7 +74,7 @@ $NetBSD: patch-aa,v 1.4 2000/12/08 20:41:19 jlam Exp $
  		@TCL_LD_SEARCH_FLAGS@ -o tcltest
  
  
-@@ -522,7 +523,7 @@
+@@ -522,7 +524,7 @@
  	    chmod +x $(SRC_DIR)/install-sh; \
  	    fi
  	@echo "Installing $(TCL_LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@ -75,7 +83,7 @@ $NetBSD: patch-aa,v 1.4 2000/12/08 20:41:19 jlam Exp $
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TCL_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TCL_LIB_FILE)
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
-@@ -646,7 +647,7 @@
+@@ -646,7 +648,7 @@
  	makedepend -- $(DEPEND_SWITCHES) -- $(SRCS)
  
  bp: $(UNIX_DIR)/bp.c
@@ -84,7 +92,7 @@ $NetBSD: patch-aa,v 1.4 2000/12/08 20:41:19 jlam Exp $
  
  # Test binaries.  The rules for tclTestInit.o and xtTestInit.o are
  # complicated because they are compiled from tclAppInit.c.  Can't use
-@@ -956,7 +957,7 @@
+@@ -956,7 +958,7 @@
  
  xttest:  ${XTTEST_OBJS} ${GENERIC_OBJS} ${UNIX_OBJS} ${COMPAT_OBJS} \
  	@DL_OBJS@ ${BUILD_DLTEST}
diff --git a/lang/tcl/pkg/PLIST b/lang/tcl/pkg/PLIST
index 4d2dd355ac2..848db3e4df0 100644
--- a/lang/tcl/pkg/PLIST
+++ b/lang/tcl/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2001/05/12 06:05:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/06/30 18:24:18 jlam Exp $
 bin/tclsh
 bin/tclsh8.3
 include/tcl.h
@@ -114,82 +114,6 @@ lib/tcl8.3/tcltest1.0/tcltest.tcl
 lib/tcl8.3/word.tcl
 lib/tclConfig.sh
 man/man1/tclsh.1
-man/man3/Access.3
-man/man3/AddErrInfo.3
-man/man3/Alloc.3
-man/man3/AllowExc.3
-man/man3/AppInit.3
-man/man3/AssocData.3
-man/man3/Async.3
-man/man3/BackgdErr.3
-man/man3/Backslash.3
-man/man3/BoolObj.3
-man/man3/ByteArrObj.3
-man/man3/CallDel.3
-man/man3/ChnlStack.3
-man/man3/CmdCmplt.3
-man/man3/Concat.3
-man/man3/CrtChannel.3
-man/man3/CrtChnlHdlr.3
-man/man3/CrtCloseHdlr.3
-man/man3/CrtCommand.3
-man/man3/CrtFileHdlr.3
-man/man3/CrtInterp.3
-man/man3/CrtMathFnc.3
-man/man3/CrtObjCmd.3
-man/man3/CrtSlave.3
-man/man3/CrtTimerHdlr.3
-man/man3/CrtTrace.3
-man/man3/DString.3
-man/man3/DetachPids.3
-man/man3/DoOneEvent.3
-man/man3/DoWhenIdle.3
-man/man3/DoubleObj.3
-man/man3/DumpActiveMemory.3
-man/man3/Encoding.3
-man/man3/Eval.3
-man/man3/Exit.3
-man/man3/ExprLong.3
-man/man3/ExprLongObj.3
-man/man3/FindExec.3
-man/man3/GetCwd.3
-man/man3/GetHostName.3
-man/man3/GetIndex.3
-man/man3/GetInt.3
-man/man3/GetOpnFl.3
-man/man3/GetStdChan.3
-man/man3/GetVersion.3
-man/man3/Hash.3
-man/man3/Init.3
-man/man3/InitStubs.3
-man/man3/IntObj.3
-man/man3/Interp.3
-man/man3/LinkVar.3
-man/man3/ListObj.3
-man/man3/Notifier.3
-man/man3/Object.3
-man/man3/ObjectType.3
-man/man3/OpenFileChnl.3
-man/man3/OpenTcp.3
-man/man3/ParseCmd.3
-man/man3/PkgRequire.3
-man/man3/Preserve.3
-man/man3/PrintDbl.3
-man/man3/RecEvalObj.3
-man/man3/RecordEval.3
-man/man3/RegExp.3
-man/man3/SaveResult.3
-man/man3/SetErrno.3
-man/man3/SetRecLmt.3
-man/man3/SetResult.3
-man/man3/SetVar.3
-man/man3/Sleep.3
-man/man3/SourceRCFile.3
-man/man3/SplitList.3
-man/man3/SplitPath.3
-man/man3/StaticPkg.3
-man/man3/StrMatch.3
-man/man3/StringObj.3
 man/man3/TCL_MEM_DEBUG.3
 man/man3/Tcl_Access.3
 man/man3/Tcl_AddErrorInfo.3
@@ -574,13 +498,6 @@ man/man3/Tcl_Write.3
 man/man3/Tcl_WriteChars.3
 man/man3/Tcl_WriteObj.3
 man/man3/Tcl_WrongNumArgs.3
-man/man3/Thread.3
-man/man3/ToUpper.3
-man/man3/TraceVar.3
-man/man3/Translate.3
-man/man3/UpVar.3
-man/man3/Utf.3
-man/man3/WrongNumArgs.3
 man/mann/Http.n
 man/mann/SafeBase.n
 man/mann/Tcl.n