diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2010-12-10 19:12:01 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2010-12-10 19:12:01 +0000 |
| commit | 4b9314c1854c6cb7e72503689b9a7ef23224d93d (patch) | |
| tree | 61b8bbad019d21b1c4a72ab82eefe408e4819923 /www | |
| parent | 2086f4697a336bb1260f54db32f11c450f5707d6 (diff) | |
| download | ports-4b9314c1854c6cb7e72503689b9a7ef23224d93d.tar.gz ports-4b9314c1854c6cb7e72503689b9a7ef23224d93d.zip | |
Use _MAKE_JOBS instead of hard-coding the -j2:
PR: 147907
Submitted by: Andrius Morkunas
Use the USE_TCL knob and rely on the variables set by bsd.tcl.mk
instead of figuring them out ourselves. Switching to USE_TCL makes
this port depend on Tcl-8.5 by default now, hence the PORTREVISION
bump.
Notes
Notes:
svn path=/head/; revision=266002
Diffstat (limited to 'www')
| -rw-r--r-- | www/tclhttpd/Makefile | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile index 29de72e25c08..66833b044cd5 100644 --- a/www/tclhttpd/Makefile +++ b/www/tclhttpd/Makefile @@ -7,7 +7,7 @@ PORTNAME= tclhttpd PORTVERSION= 3.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www tcl MASTER_SITES= ${MASTER_SITE_TCLTK} MASTER_SITE_SUBDIR= httpd @@ -17,33 +17,29 @@ MAINTAINER= mi@aldan.algebra.com COMMENT= An http-server implemented in TCL RUN_DEPENDS= dtplite:${PORTSDIR}/devel/tcllib -LIB_DEPENDS= tcl${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER} USE_RC_SUBR= tclhttpd.sh -TCL_DVER?= 8.4 -TCL_VER= ${TCL_DVER:S/.//} GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl="${LOCALBASE}/lib/tcl${TCL_DVER}" \ - --with-tclinclude="${LOCALBASE}/include/tcl${TCL_DVER}" +CONFIGURE_ARGS= --with-tcl="${TCL_LIBDIR}" \ + --with-tclinclude="${TCL_INCLUDEDIR}" +MAKE_JOBS_SAFE= yes +USE_TCL= 84+ MAN1= tclhttpd.1 .include <bsd.port.pre.mk> + SHLIB_NAME!= ${MAKE} -f "${FILESDIR}/Makefile.lib" -V SHLIB_NAME -PLIST_SUB+= TCL_VER=${TCL_VER} PORTVERSION=${PORTVERSION} \ +PLIST_SUB+= PORTVERSION=${PORTVERSION} \ SHLIB_NAME=${SHLIB_NAME} -MAKE_ENV+= TCLSH_PROG=tclsh${TCL_DVER} -SCRIPTS_ENV+= TCL_DVER=${TCL_DVER} -SUB_LIST+= TCL_DVER=${TCL_DVER} +MAKE_ENV+= TCLSH_PROG=${TCLSH} FILESDIR="${FILESDIR}" TCL_DVER=${TCL_VER} +SCRIPTS_ENV+= TCL_DVER=${TCL_VER} +SUB_LIST+= TCL_DVER=${TCL_VER} do-build: - cd ${WRKSRC} && ${MAKE_ENV} ${MAKE} -j 2 TCL_DVER="${TCL_DVER}" \ - FILESDIR="${FILESDIR}" -f "${FILESDIR}/Makefile.lib" - # - # Note, the ``utime'' command supplied by the tclhttpd's library - # (interface to utimes(2)) has been long obsoleted by TCL's own - # file(n) and is finally removed from this port - # + ${MAKE_ENV} ${MAKE} -C ${WRKSRC} ${MAKE_ARGS} \ + FILESDIR="${FILESDIR}" \ + ${_MAKE_JOBS} -f "${FILESDIR}/Makefile.lib" pre-su-install: ${MKDIR} ${PREFIX}/tclhttpd/custom |