diff options
Diffstat (limited to 'x11/tk')
| -rw-r--r-- | x11/tk/Makefile | 4 | ||||
| -rw-r--r-- | x11/tk/buildlink3.mk | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 2f77d69e382..28dd8f77ca4 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/04/13 20:41:03 jschauma Exp $ +# $NetBSD: Makefile,v 1.46 2005/06/01 18:03:31 jlam Exp $ DISTNAME= tk8.4.9-src PKGNAME= tk-8.4.9 @@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${DISTNAME:C/-src//}/unix -USE_X11= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib @@ -30,6 +29,7 @@ CONFIGURE_ARGS+= --mandir=${WRKDIR:Q}/man .include "../../lang/tcl/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" post-build: ${SED} -e "s|^\(.*\)='\(.*\)'|\1=\"\2\"|" \ diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index c4d2457551f..4a100846d09 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/10/03 00:18:38 tv Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2005/06/01 18:03:31 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ TK_BUILDLINK3_MK:= ${TK_BUILDLINK3_MK}+ @@ -22,12 +22,11 @@ BUILDLINK_FILES.tk= bin/wish* # BUILDLINK_TRANSFORM+= l:tk:tk84 BUILDLINK_TRANSFORM+= l:tk8.4:tk84 - .endif # TK_BUILDLINK3_MK -USE_X11= yes TKCONFIG_SH?= ${BUILDLINK_PREFIX.tk}/lib/tkConfig.sh .include "../../lang/tcl/buildlink3.mk" +.include "../../mk/x11.buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |