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

--- pkgsrc/x11/tk/Makefile	2009/08/20 15:25:01	1.63
+++ pkgsrc/x11/tk/Makefile	2014/10/31 21:11:18	1.82
@@ -1,37 +1,39 @@
-# $NetBSD: Makefile,v 1.63 2009/08/20 15:25:01 jwise Exp $
+# $NetBSD: Makefile,v 1.82 2014/10/31 21:11:18 adam Exp $
 
 DISTNAME=	tk${TK_VERSION}-src
 PKGNAME=	tk-${TK_VERSION}
-PKGREVISION=	1
 CATEGORIES=	x11 lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcl/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tcl.tk/
 COMMENT=	Graphical toolkit for TCL
+LICENSE=	2-clause-bsd
 
 .include "../../x11/tk/Makefile.version"
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-
 WRKSRC=			${WRKDIR}/tk${TK_VERSION}
 
-USE_LIBTOOL=		yes
+USE_GCC_RUNTIME=	yes
+
 GNU_CONFIGURE=		yes
 CONFIGURE_DIRS=		unix
 BUILD_DIRS=		${CONFIGURE_DIRS}
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=	--x-libraries=${X11BASE}/lib${LIBABISUFFIX:Q}
 CONFIGURE_ENV+=		LIB_RUNTIME_DIR=${PREFIX}/lib
-MAKE_ENV+=		TOUCH=${TOUCH:Q}
 PTHREAD_OPTS+=		require
 
+PKGCONFIG_OVERRIDE+=	unix/tk.pc.in
+
 TEST_TARGET=		test
 
-.include "../../lang/tcl/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
+.if defined(ABI) && ${ABI} == "64"
+CONFIGURE_ARGS+=	--enable-64bit
+.endif
+
+.include "options.mk"
 
 SUBST_CLASSES+=		tk-config
 SUBST_STAGE.tk-config=	post-build
@@ -39,41 +41,9 @@ SUBST_FILES.tk-config=	unix/tkConfig.sh
 SUBST_SED.tk-config+=	-e "s|${WRKSRC}/unix|${PREFIX}/lib|"
 SUBST_SED.tk-config+=	-e "s|${WRKSRC}|${PREFIX}/include/tk|"
 
-INSTALLATION_DIRS+=	include/tk
-INSTALLATION_DIRS+=	include/tk/generic
-INSTALLATION_DIRS+=	include/tk/unix
-
-DESTDIRPREFIX=		${DESTDIR}${PREFIX}
-
-post-install:
-	rm -f ${DESTDIRPREFIX:Q}/bin/wish
-	ln -s wish8.4 ${DESTDIRPREFIX:Q}/bin/wish
-	${INSTALL_DATA} ${WRKSRC}/generic/default.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/ks_names.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tk.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tk3d.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkButton.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkCanvas.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkColor.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkDecls.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkFileFilter.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkFont.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkInitScript.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkInt.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntDecls.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntPlatDecls.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkIntXlibDecls.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkMenu.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkMenubutton.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkPlatDecls.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkPort.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkScale.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkScrollbar.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkSelect.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkText.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/generic/tkUndo.h ${DESTDIRPREFIX:Q}/include/tk/generic
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixDefault.h ${DESTDIRPREFIX:Q}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixInt.h ${DESTDIRPREFIX:Q}/include/tk/unix
-	${INSTALL_DATA} ${WRKSRC}/unix/tkUnixPort.h ${DESTDIRPREFIX:Q}/include/tk/unix
+PLIST_SUBST+=		SONUM=${TK_SONUM}
+PLIST_SUBST+=		BASEVER=${TK_BASEVER}
 
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"