Date: Tue, 15 Jul 2014 13:13:03 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361917 - head/Mk Message-ID: <201407151313.s6FDD3CR063118@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Jul 15 13:13:03 2014 New Revision: 361917 URL: http://svnweb.freebsd.org/changeset/ports/361917 QAT: https://qat.redports.org/buildarchive/r361917/ Log: Fix simple condition in making directories Phabric: D101 PR: 164351 Submitted by: yaneurabeya@gmail.com Reviewed by: swills Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Jul 15 13:08:09 2014 (r361916) +++ head/Mk/bsd.port.mk Tue Jul 15 13:13:03 2014 (r361917) @@ -1184,8 +1184,7 @@ STRIPBIN= ${STRIP_CMD} # ${FILEDIR}/patch-* files from them. .if !target(makepatch) -makepatch: - @${MKDIR} ${FILESDIR} +makepatch: ${FILESDIR} @(cd ${PATCH_WRKSRC}; \ for i in `find . -type f -name '*.orig'`; do \ ORG=$$i; \ @@ -3255,6 +3254,8 @@ options-message: @${ECHO_MSG} "===> Found saved configuration for ${_OPTIONS_READ}" .endif +${_DISTDIR} ${FILESDIR} ${PKG_DBDIR} ${PREFIX} ${WRKDIR} ${WRKSRC}: + @${MKDIR} ${.TARGET} # Warn user about deprecated packages. Advisory only. @@ -3327,8 +3328,7 @@ DISTINFO_DATA?= if [ \( -n "${DISABLE_SI # Fetch .if !target(do-fetch) -do-fetch: - @${MKDIR} ${_DISTDIR} +do-fetch: ${_DISTDIR} @cd ${_DISTDIR};\ ${_MASTER_SITES_ENV} ; \ for _file in ${DISTFILES}; do \ @@ -3485,10 +3485,11 @@ do-fetch: # Extract -.if !target(do-extract) -do-extract: +clean-wrkdir: @${RM} -rf ${WRKDIR} - @${MKDIR} ${WRKDIR} + +.if !target(do-extract) +do-extract: clean-wrkdir ${WRKDIR} @for file in ${EXTRACT_ONLY}; do \ if ! (cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS});\ then \ @@ -3909,9 +3910,8 @@ install-package: .if !target(check-already-installed) .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) -check-already-installed: ${TMPPLIST_SORT} +check-already-installed: ${TMPPLIST_SORT} ${PKG_DBDIR} @${ECHO_MSG} "===> Checking if ${PKGORIGIN} already installed"; \ - ${MKDIR} ${PKG_DBDIR}; \ already_installed=`${PKG_INFO} -q -O ${PKGORIGIN}`; \ if [ -n "$${already_installed}" ]; then \ for p in $${already_installed}; do \ @@ -3951,8 +3951,7 @@ check-umask: .endif .if !target(install-mtree) -install-mtree: - @${MKDIR} ${PREFIX} +install-mtree: ${PREFIX} @if [ ${UID} != 0 ]; then \ if [ -w ${PREFIX}/ ]; then \ ${ECHO_MSG} "Warning: not superuser, you may get some errors during installation."; \ @@ -4202,7 +4201,7 @@ fix-plist-sequence: ${TMPPLIST} .if !defined(DISABLE_SECURITY_CHECK) .if !target(security-check) -security-check: +security-check: ${TMPPLIST} # Scan PLIST for: # 1. setugid files # 2. accept()/recvfrom() which indicates network listening capability @@ -4466,8 +4465,7 @@ delete-distfiles-list: # Prints out a list of files to fetch (useful to do a batch fetch) .if !target(fetch-list) -fetch-list: - @${MKDIR} ${_DISTDIR} +fetch-list: ${_DISTDIR} @(cd ${_DISTDIR}; \ ${_MASTER_SITES_ENV} ; \ for _file in ${DISTFILES}; do \ @@ -4540,8 +4538,7 @@ fetch-list: .endif .if !target(fetch-url-list-int) -fetch-url-list-int: - @${MKDIR} ${_DISTDIR} +fetch-url-list-int: ${_DISTDIR} @(cd ${_DISTDIR}; \ ${_MASTER_SITES_ENV}; \ for _file in ${DISTFILES}; do \ @@ -5499,7 +5496,7 @@ ${i:S/-//:tu}= ${WRKDIR}/${SUB_FILES:M${ # files exist. .if !target(generate-plist) -generate-plist: +generate-plist: ${WRKDIR} @${ECHO_MSG} "===> Generating temporary packing list" @${MKDIR} `${DIRNAME} ${TMPPLIST}` @if [ ! -f ${DESCR} ]; then ${ECHO_MSG} "** Missing pkg-descr for ${PKGNAME}."; exit 1; fi @@ -6423,7 +6420,7 @@ _FETCH_SEQ= fetch-depends pre-fetch pre do-fetch fetch-specials post-fetch post-fetch-script _EXTRACT_DEP= fetch _EXTRACT_SEQ= check-build-conflicts extract-message checksum extract-depends \ - pre-extract pre-extract-script do-extract \ + pre-extract pre-extract-script clean-wrkdir do-extract \ post-extract post-extract-script _PATCH_DEP= extract _PATCH_SEQ= ask-license patch-message patch-depends pathfix dos2unix fix-shebang \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407151313.s6FDD3CR063118>