Date: Tue, 8 Aug 2006 10:58:30 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 103435 for review Message-ID: <200608081058.k78AwTcX076293@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=103435 Change 103435 by gabor@gabor_spitfire on 2006/08/08 10:58:11 Fix errors when FORCE_PKG_REGISTER is set when doing make package. Reported by: lofi Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#75 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#75 (text+ko) ==== @@ -5162,13 +5162,13 @@ fi @${RM} -rf ${PKG_DBDIR}/${PKGNAME} .endif -.if !exists(${PKG_DBDIR}/${PKGNAME}) -.if !defined(DESTDIR) - @${ECHO_MSG} "===> Registering installation for ${PKGNAME}" -.else - @${ECHO_MSG} "===> Registering installation for ${PKGNAME} in ${DESTDIR}" -.endif - @${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \ + @if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \ + if [ -z "${DESTDIR}" ] ; then \ + ${ECHO_CMD} "===> Registering installation for ${PKGNAME}"; \ + else \ + ${ECHO_MSG} "===> Registering installation for ${PKGNAME} in ${DESTDIR}"; \ + fi; \ + ${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \ ${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \ ${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \ ${ECHO_CMD} ${COMMENT:Q} > ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \ @@ -5191,8 +5191,8 @@ ${ECHO_CMD} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \ fi; \ fi; \ - done -.endif + done; \ + fi .if !defined(NO_MTREE) @if [ -f ${MTREE_FILE} ]; then \ ${CP} ${MTREE_FILE} ${PKG_DBDIR}/${PKGNAME}/+MTREE_DIRS; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608081058.k78AwTcX076293>