Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/x11/tk/Makefile	2000/08/29 16:16:06	1.1
+++ pkgsrc/x11/tk/Makefile	2004/06/15 16:17:48	1.34
@@ -1,28 +1,62 @@
-# $NetBSD: Makefile,v 1.1 2000/08/29 16:16:06 jwise Exp $
+# $NetBSD: Makefile,v 1.34 2004/06/15 16:17:48 drochner Exp $
 
-DISTNAME=	tk8.3.2
-PKGNAME=	tk-8.3.2
+DISTNAME=	tk8.4.6-src
+PKGNAME=	tk-8.4.6
+PKGREVISION=	4
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
-MAINTAINER=	jwise@netbsd.org
-HOMEPAGE=	http://www.tcltk.com/
-
-DEPENDS+=	tcl-8.3.2:../../lang/tcl
-
-WRKSRC=		${WRKDIR}/${DISTNAME}/unix
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib
-
-USE_X11=	yes
-
-USE_LIBTOOL=	yes
+MAINTAINER=	jwise@NetBSD.org
+HOMEPAGE=	http://www.tcl.tk/
+COMMENT=	Graphical toolkit for TCL
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+WRKSRC=			${WRKDIR}/${DISTNAME:C/-src//}/unix
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
+# see comment in lang/tcl/Makefile
+#CONFIGURE_ARGS+=	--enable-threads
+MAKE_ENV+=		TOUCH="${TOUCH}"
+
+USE_X11=		yes
+USE_LIBTOOL=		yes
+USE_BUILDLINK3=		yes
+TEST_TARGET=		test
+
+# 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
+
+.include "../../lang/tcl/buildlink3.mk"
+
+# 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 $$3 }'			\
+		| ${SORT} -u						\
+		| ${GREP} -v ".*\.n"					\
+		| ${SED} -e "s,^,${RM} -f ,"				\
+		>> mkLinks;						\
+	${RM} -f mkLinks.tmp;						\
+	${CHMOD} +x mkLinks;
 
 post-install:
-	cd ${PREFIX}/bin && ${LN} -s wish8.3 wish
-	${MKDIR} ${PREFIX}/include/tk
-	${MKDIR} ${PREFIX}/include/tk/generic
-	${MKDIR} ${PREFIX}/include/tk/unix
+	cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
+	${RM} -rf ${WRKDIR}/man
+	${RM} -f ${PREFIX}/bin/wish
+	cd ${PREFIX}/bin && ${LN} -s wish8.4 wish
+	${INSTALL_DATA_DIR} ${PREFIX}/include/tk
+	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/generic
+	${INSTALL_DATA_DIR} ${PREFIX}/include/tk/unix
+	${INSTALL_DATA} ${WRKSRC}/../generic/default.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/ks_names.h ${PREFIX}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/../generic/tk.h ${PREFIX}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/../generic/tk3d.h ${PREFIX}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/../generic/tkButton.h ${PREFIX}/include/tk/generic
@@ -44,11 +78,9 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/../generic/tkScrollbar.h ${PREFIX}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/../generic/tkSelect.h ${PREFIX}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/../generic/tkText.h ${PREFIX}/include/tk/generic
+	${INSTALL_DATA} ${WRKSRC}/../generic/tkUndo.h ${PREFIX}/include/tk/generic
 	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixDefault.h ${PREFIX}/include/tk/unix
 	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixInt.h ${PREFIX}/include/tk/unix
 	${INSTALL_DATA} ${WRKSRC}/../unix/tkUnixPort.h ${PREFIX}/include/tk/unix
 
-test:
-	cd ${WRKSRC}; ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test
-
 .include "../../mk/bsd.pkg.mk"