PERFORCE change 101202 for review
Gabor Kovesdan
gabor at FreeBSD.org
Mon Jul 10 13:28:38 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=101202
Change 101202 by gabor at gabor_spitfire on 2006/07/10 13:28:25
If DESTDIR set, tell where package gets installed in the
===> Registering installation for misc/foo
line.
Affected files ...
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#17 edit
Differences ...
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#17 (text+ko) ====
@@ -5421,9 +5421,13 @@
fi
@${RM} -rf ${PKG_DBDIR}/${PKGNAME}
.endif
- @if [ ! -d ${PKG_DBDIR}/${PKGNAME} ]; then \
- ${ECHO_MSG} "===> Registering installation for ${PKGNAME}"; \
- ${MKDIR} ${PKG_DBDIR}/${PKGNAME}; \
+.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}; \
${PKG_CMD} ${PKG_ARGS} -O ${PKGFILE} > ${PKG_DBDIR}/${PKGNAME}/+CONTENTS; \
${CP} ${DESCR} ${PKG_DBDIR}/${PKGNAME}/+DESC; \
${ECHO_CMD} ${COMMENT:Q} > ${PKG_DBDIR}/${PKGNAME}/+COMMENT; \
@@ -5446,8 +5450,8 @@
${ECHO_CMD} ${PKGNAME} >> ${PKG_DBDIR}/$$dep/+REQUIRED_BY; \
fi; \
fi; \
- done; \
- fi
+ done
+.endif
.if !defined(NO_MTREE)
@if [ -f ${MTREE_FILE} ]; then \
${CP} ${MTREE_FILE} ${PKG_DBDIR}/${PKGNAME}/+MTREE_DIRS; \
More information about the p4-projects
mailing list