diff options
| author | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-25 18:38:05 +0000 |
| commit | f22b8c42a61ccfbb462bf2b94c3486b7baec18bd (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /x11/tk | |
| parent | 71eaa77968f19e23d72fdc88e5f38259b8f7cdf3 (diff) | |
| download | pkgsrc-f22b8c42a61ccfbb462bf2b94c3486b7baec18bd.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'x11/tk')
| -rw-r--r-- | x11/tk/Makefile | 10 | ||||
| -rw-r--r-- | x11/tk/buildlink2.mk | 26 |
2 files changed, 30 insertions, 6 deletions
diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 116f8eae19e..c2e7acf3edf 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/03/20 17:38:23 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2002/08/25 18:40:48 jlam Exp $ DISTNAME= tk8.3.4 PKGNAME= tk-8.3.4 @@ -12,13 +12,12 @@ COMMENT= Graphical toolkit for TCL WRKSRC= ${WRKDIR}/${DISTNAME}/unix GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_DIR}/lib +CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib MAKE_ENV+= TOUCH="${TOUCH}" USE_X11= yes USE_LIBTOOL= yes -USE_BUILDLINK_ONLY= yes -REPLACE_BUILDLINK+= tkConfig.sh +USE_BUILDLINK2= yes # Initially install the man pages into ${WRKDIR}/man, as we need a staged # install to avoid overwriting existing manpages in ${PREFIX}/man. @@ -87,6 +86,5 @@ post-install: test: cd ${WRKSRC}; ${SETENV} LIBTOOL=${LIBTOOL} PREFIX=${PREFIX} ${MAKE} test -.include "../../lang/tcl/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../lang/tcl/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/buildlink2.mk b/x11/tk/buildlink2.mk new file mode 100644 index 00000000000..fda29966ba8 --- /dev/null +++ b/x11/tk/buildlink2.mk @@ -0,0 +1,26 @@ +# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:48 jlam Exp $ + +.if !defined(TK_BUILDLINK2_MK) +TK_BUILDLINK2_MK= # defined + +BUILDLINK_PACKAGES+= tk +BUILDLINK_DEPENDS.tk?= tk>=8.3.4 +BUILDLINK_PKGSRCDIR.tk?= ../../x11/tk + +EVAL_PREFIX+= BUILDLINK_PREFIX.tk=tk +BUILDLINK_PREFIX.tk_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.tk= include/tk.h +BUILDLINK_FILES.tk+= include/tkDecls.h +BUILDLINK_FILES.tk+= include/tkPlatDecls.h +BUILDLINK_FILES.tk+= include/tkIntXlibDecls.h +BUILDLINK_FILES.tk+= include/tk/*/*.h +BUILDLINK_FILES.tk+= lib/libtk83.* +BUILDLINK_FILES.tk+= lib/libtkstub83.* + +.include "../../lang/tcl/buildlink2.mk" + +BUILDLINK_TARGETS+= tk-buildlink + +tk-buildlink: _BUILDLINK_USE + +.endif # TK_BUILDLINK2_MK |