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

--- pkgsrc/x11/tk/Makefile	2004/01/20 12:28:27	1.25
+++ pkgsrc/x11/tk/Makefile	2005/08/31 09:40:15	1.48
@@ -1,61 +1,49 @@
-# $NetBSD: Makefile,v 1.25 2004/01/20 12:28:27 agc Exp $
+# $NetBSD: Makefile,v 1.48 2005/08/31 09:40:15 seb Exp $
 
-DISTNAME=	tk8.3.4
-PKGNAME=	tk-8.3.4
-CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
-		ftp://ftp.informatik.uni-hamburg.de/pub/soft/lang/tcl/tcl8_3/
+DISTNAME=	tk8.4.11-src
+PKGNAME=	tk-8.4.11
+PKGREVISION=		1
+CATEGORIES=	x11 lang
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
 MAINTAINER=	jwise@NetBSD.org
-HOMEPAGE=	http://www.tcltk.com/
+HOMEPAGE=	http://www.tcl.tk/
 COMMENT=	Graphical toolkit for TCL
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-WRKSRC=			${WRKDIR}/${DISTNAME}/unix
+WRKSRC=			${WRKDIR}/${DISTNAME:C/-src//}/unix
+
+USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-MAKE_ENV+=		TOUCH="${TOUCH}"
+CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ENV+=		LIB_RUNTIME_DIR=${PREFIX}/lib
+MAKE_ENV+=		TOUCH=${TOUCH:Q}
+PTHREAD_OPTS+=		require
 
-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
+CONFIGURE_ARGS+=	--mandir=${WRKDIR:Q}/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;
-
-pre-install:
-	cd ${WRKSRC}; for file in					\
-		tkUnixInit.o libtk83.so wish;				\
-	do								\
-		${TOUCH} $${file};					\
-	done
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
+
+post-build:
+	${SED} 								\
+		-e "s|${WRKSRC}|${PREFIX}/lib|"				\
+		-e "s|${WRKDIR}/${DISTNAME:C/-src//}|${PREFIX}/include/tk|"	\
+		${WRKSRC}/tkConfig.sh > ${WRKSRC}/tkConfig.sh.tmp &&	\
+		${MV} ${WRKSRC}/tkConfig.sh.tmp ${WRKSRC}/tkConfig.sh
 
 post-install:
-	${CHMOD} -R ugo-w ${WRKDIR}/man
-	cd ${WRKDIR} && ${PAX} -rw man ${PREFIX}
-	${CHMOD} -R ug+rw ${WRKDIR}/man
+	cd ${WRKDIR} && ${PAX} -rwpm man ${PREFIX}
+	${RM} -rf ${WRKDIR}/man
 	${RM} -f ${PREFIX}/bin/wish
-	cd ${PREFIX}/bin && ${LN} -s wish8.3 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
@@ -82,9 +70,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
 
-.include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"