* update to 0.17.0 * add examples * sort plist Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->makc I'll take it.
- prefer PORTDOCS - make do-* targets a bit more like the ones in bsd.port.mk, i.e. respect MAKE_ENV, _MAKE_JOBS, etc. - mark MAKE_JOBS_UNSAFE - use {...} (curly) braces consistently --- a.diff begins here --- diff --git devel/mk-configure/Makefile devel/mk-configure/Makefile index c3ac14d..da47fad 100644 --- devel/mk-configure/Makefile +++ devel/mk-configure/Makefile @@ -14,14 +14,15 @@ MAINTAINER= to.my.trociny@gmail.com COMMENT= Lightweight, easy to use replacement for GNU autotools BUILD_DEPENDS= bmake:${PORTSDIR}/devel/bmake -RUN_DEPENDS= $(BUILD_DEPENDS) +RUN_DEPENDS= ${BUILD_DEPENDS} -.if !defined(NOPORTDOCS) -DOCFILES= README NEWS TODO COPYRIGHT FAQ doc/presentation.pdf -.else -DOCFILES= -.endif +MAKE_JOBS_UNSAFE=yes + +BMAKE= bmake +MAKE_ENV+= EXTRAFILES="${PORTDOCS:C|.*\.pdf|doc/&|}" +INSTALL_TARGET= installdirs install +PORTDOCS= README NEWS TODO COPYRIGHT FAQ presentation.pdf PORTEXAMPLES= * MAN1= mkc_check_funclib.1 mkc_check_header.1 mkc_check_sizeof.1 \ @@ -30,10 +31,10 @@ MAN1= mkc_check_funclib.1 mkc_check_header.1 mkc_check_sizeof.1 \ MAN7= mk-configure.7 do-build: - bmake -C ${WRKSRC} all + @${SETENV} ${MAKE_ENV} ${BMAKE} -C ${BUILD_WRKSRC} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} do-install: - bmake -C ${WRKSRC} installdirs install EXTRAFILES="${DOCFILES}" + @${SETENV} ${MAKE_ENV} ${BMAKE} -C ${INSTALL_WRKSRC} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} ${INSTALL_TARGET} .if !defined(NOPORTEXAMPLES) cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} .endif diff --git devel/mk-configure/pkg-plist devel/mk-configure/pkg-plist index e0315ea..bd3641a 100644 --- devel/mk-configure/pkg-plist +++ devel/mk-configure/pkg-plist @@ -52,10 +52,3 @@ share/mkc-mk/mkc_imp.sys.mk share/mkc-mk/mkc_imp.vars.mk share/mkc-mk/sys.mk @dirrm share/mkc-mk -%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT -%%PORTDOCS%%%%DOCSDIR%%/FAQ -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/presentation.pdf -%%PORTDOCS%%@dirrm %%DOCSDIR%% --- a.diff ends here ---
Anonymous <swell.k@gmail.com> writes: > +BMAKE= bmake Oops, it should be possible to override BMAKE from make.conf. IOW, use `?=' like in bsd.commands.mk.
- update to 0.17.0 - add examples - sort plist - prefer PORTDOCS - make do-* targets a bit more like the ones in bsd.port.mk, i.e. respect MAKE_ENV, _MAKE_JOBS, etc. - mark MAKE_JOBS_UNSAFE - use {...} (curly) braces consistently -- Mikolaj Golub
makc 2010-07-18 21:28:34 UTC FreeBSD ports repository Modified files: devel/mk-configure Makefile distinfo pkg-plist Log: Update to 0.17.0 [1] - add examples [1] - sort plist [1] - prefer PORTDOCS [2] - make do-* targets a bit more like the ones in bsd.port.mk, i.e. respect MAKE_ENV, _MAKE_JOBS, etc. [2] - mark MAKE_JOBS_UNSAFE [2] - use {...} (curly) braces consistently [2] PR: ports/148737 Submitted by: Mikolaj Golub (maintainer) [1], Anonymous <swell.k at gmail.com> [2] Aprroved by: maintainer Revision Changes Path 1.6 +18 -10 ports/devel/mk-configure/Makefile 1.5 +3 -3 ports/devel/mk-configure/distinfo 1.4 +20 -22 ports/devel/mk-configure/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!