Date: Thu, 22 Jun 2006 16:15:04 GMT From: Gabor Kovesdan <gabor@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 99818 for review Message-ID: <200606221615.k5MGF45b077499@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=99818 Change 99818 by gabor@spitfire on 2006/06/22 16:14:09 Only use pkg_info for checking if the given port is already installed when DESTDIR is not set. Check PKG_DBDIR otherwise. Affected files ... .. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#7 edit Differences ... ==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#7 (text+ko) ==== @@ -3629,13 +3629,12 @@ # Utility targets follow -### FIXME: pkg_info in DESTDIR - .if !target(check-already-installed) check-already-installed: .if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) @${ECHO_MSG} "===> Checking if ${PKGORIGIN} already installed" @${MKDIR} ${PKG_DBDIR} +.if !defined(DESTDIR) @already_installed=`${PKG_INFO} -q -O ${PKGORIGIN}`; \ if [ -n "$${already_installed}" ]; then \ for p in $${already_installed}; do \ @@ -3648,8 +3647,9 @@ fi; \ fi; \ done; \ - fi; \ - if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \ + fi; +.else + @if [ -d ${PKG_DBDIR}/${PKGNAME} -o -n "$${found_package}" ]; then \ if [ -d ${PKG_DBDIR}/${PKGNAME} ]; then \ ${ECHO_CMD} "===> ${PKGNAME} is already installed"; \ else \ @@ -3662,6 +3662,7 @@ ${ECHO_CMD} " in your environment or the \"make install\" command line."; \ exit 1; \ fi +.endif .else @${DO_NADA} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606221615.k5MGF45b077499>