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

--- pkgsrc/x11/tk/Makefile	2004/06/15 16:17:48	1.34
+++ pkgsrc/x11/tk/Makefile	2005/04/13 17:37:43	1.44
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.34 2004/06/15 16:17:48 drochner Exp $
+# $NetBSD: Makefile,v 1.44 2005/04/13 17:37:43 tron Exp $
 
-DISTNAME=	tk8.4.6-src
-PKGNAME=	tk-8.4.6
-PKGREVISION=	4
-CATEGORIES=	x11
+DISTNAME=	tk8.4.9-src
+PKGNAME=	tk-8.4.9
+CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
 MAINTAINER=	jwise@NetBSD.org
@@ -13,39 +12,31 @@ 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
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
+CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ENV+=		LIB_RUNTIME_DIR=${PREFIX}/lib
+MAKE_ENV+=		TOUCH=${TOUCH:Q}
+PTHREAD_OPTS+=		require
+
 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
+CONFIGURE_ARGS+=	--mandir=${WRKDIR:Q}/man
 
 .include "../../lang/tcl/buildlink3.mk"
+.include "../../mk/pthread.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-build:
+	${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|"			\
+		-e "s|${WRKSRC}|${PREFIX}/lib|"				\
+		-e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}|"	\
+		${WRKSRC}/tkConfig.sh > ${WRKSRC}/tkConfig.sh.tmp &&	\
+		${MV} ${WRKSRC}/tkConfig.sh.tmp ${WRKSRC}/tkConfig.sh
 
 post-install:
 	cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}