PERFORCE change 101819 for review
Gabor Kovesdan
gabor at FreeBSD.org
Mon Jul 17 23:14:36 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=101819
Change 101819 by gabor at gabor_spitfire on 2006/07/17 23:14:09
Change some texts to reflect that the given port is built with
DESTDIR.
Affected files ...
.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#34 edit
Differences ...
==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#34 (text+ko) ====
@@ -3570,7 +3570,11 @@
done; \
if [ -n "$${conflicts_with}" ]; then \
${ECHO_MSG}; \
- ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \
+ if [ -z "${DESTDIR}" ] ; then \
+ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \
+ else \
+ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s) in ${DESTDIR}: "; \
+ fi; \
for entry in $${conflicts_with}; do \
${ECHO_MSG} " $${entry}"; \
done; \
@@ -3781,17 +3785,19 @@
.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32) || defined(INSTALLS_SHLIB)
.if defined(USE_LDCONFIG)
.if !defined(INSTALL_AS_USER)
+.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig"
-.if !defined(DESTDIR)
${LDCONFIG} -m ${USE_LDCONFIG}
.else
+ @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR}"
${CHROOT} ${DESTDIR} ${LDCONFIG} -m ${USE_LDCONFIG}
.endif
.else
- @${ECHO_MSG} "===> Running ldconfig (errors are ignored)"
.if !defined(DESTDIR)
+ @${ECHO_MSG} "===> Running ldconfig in (errors are ignored)"
-${LDCONFIG} -m ${USE_LDCONFIG}
.else
+ @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR} (errors are ignored)"
${CHROOT} ${DESTDIR} -${LDCONFIG} -m ${USE_LDCONFIG}
.endif
.endif
@@ -3810,17 +3816,19 @@
.endif
.if defined(USE_LDCONFIG32)
.if !defined(INSTALL_AS_USER)
+.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig"
-.if !defined(DESTDIR)
${LDCONFIG} -32 -m ${USE_LDCONFIG32}
.else
+ @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR}"
${CHROOT} ${DESTDIR} ${LDCONFIG} -32 -m ${USE_LDCONFIG32}
.endif
.else
+.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig (errors are ignored)"
-.if !defined(DESTDIR)
-${LDCONFIG} -32 -m ${USE_LDCONFIG32}
.else
+ @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR} (errors are ignored)"
${CHROOT} ${DESTDIR} -${LDCONFIG} -32 -m ${USE_LDCONFIG32}
.endif
.endif
@@ -3838,10 +3846,18 @@
# This can be removed once, all ports have been converted to USE_LDCONFIG.
.if defined(INSTALLS_SHLIB)
.if !defined(INSTALL_AS_USER)
+.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig"
+.else
+ @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR}"
+.endif
${LDCONFIG_CMD}
.else
+.if !defined(DESTDIR)
@${ECHO_MSG} "===> Running ldconfig (errors are ignored)"
+.else
+ @${ECHO_MSG} "===> Running ldconfig in ${DESTDIR} (errors are ignored)"
+.endif
-${LDCONFIG_CMD}
.endif
.endif
@@ -4135,7 +4151,11 @@
build-message:
@${ECHO_MSG} "===> Building for ${PKGNAME}"
install-message:
+.if !defined(DESTDIR)
@${ECHO_MSG} "===> Installing for ${PKGNAME}"
+.else
+ @${ECHO_MSG} "===> Installing for ${PKGNAME} into ${DESTDIR}"
+.endif
package-message:
@${ECHO_MSG} "===> Building package for ${PKGNAME}"
@@ -4228,7 +4248,11 @@
if [ "$${check_name}" = "${PKGBASE}" ]; then \
prfx=`${PKG_INFO} -q -p $${p} 2> /dev/null | ${SED} -ne '1s|^@cwd ||p'`; \
if [ "x${PREFIX}" = "x$${prfx}" ]; then \
- ${ECHO_MSG} "===> Deinstalling $${p}"; \
+ if [ -z "${DESTDIR}" ] ; then \
+ ${ECHO_MSG} "===> Deinstalling $${p}"; \
+ else \
+ ${ECHO_MSG} "===> Deinstalling $${p}from ${DESTDIR}"; \
+ fi; \
${PKG_DELETE} -f $${p}; \
else \
${ECHO_MSG} "===> $${p} has a different PREFIX: $${prfx}, skipping"; \
@@ -4236,7 +4260,11 @@
fi; \
done; \
if [ -z "$${found_names}" ]; then \
- ${ECHO_MSG} "===> ${PKGBASE} not installed, skipping"; \
+ if [ -z "${DESTDIR}" ] ; then \
+ ${ECHO_MSG} "===> ${PKGBASE} not installed, skipping"; \
+ else \
+ ${ECHO_MSG} "===> ${PKGBASE} not installed in ${DESTDIR}, skipping"; \
+ fi; \
fi
@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.endif
@@ -4262,11 +4290,19 @@
@deinstall_names=`${PKG_INFO} -q -O ${PKGORIGIN}`; \
if [ -n "$${deinstall_names}" ]; then \
for d in $${deinstall_names}; do \
- ${ECHO_MSG} "===> Deinstalling $${d}"; \
+ if [ -z "${DESTDIR}" ] ; then \
+ ${ECHO_MSG} "===> Deinstalling $${d}"; \
+ else \
+ ${ECHO_MSG} "===> Deinstalling $${d} from ${DESTDIR}"; \
+ fi; \
${PKG_DELETE} -f $${d}; \
done; \
else \
- ${ECHO_MSG} "===> ${PKGORIGIN} not installed, skipping"; \
+ if [ -z "${DESTDIR}" ] ; then \
+ ${ECHO_MSG} "===> ${PKGORIGIN} not installed, skipping"; \
+ else \
+ ${ECHO_MSG} "===> ${PKGORIGIN} not installed in ${DESTDIR}, skipping"; \
+ fi; \
fi; \
${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.endif
@@ -4698,7 +4734,11 @@
${ECHO_MSG} "Error: ${NONEXISTENT} exists. Please remove it, and restart the build."; \
${FALSE}; \
else \
- ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - found"; \
+ if [ -z "${DESTDIR}" ] ; then \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - found"; \
+ else \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on file in ${DESTDIR}: $$prog - found"; \
+ fi;\
if [ ${_DEPEND_ALWAYS} = 1 ]; then \
${ECHO_MSG} " (but building it anyway)"; \
notfound=1; \
@@ -4707,7 +4747,11 @@
fi; \
fi; \
else \
- ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - not found"; \
+ if [ -z "${PREFIX}" ] ; then \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on file: $$prog - not found"; \
+ else \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on file in ${DESTDIR}: $$prog - not found"; \
+ fi; \
notfound=1; \
fi; \
else \
@@ -4717,7 +4761,11 @@
esac; \
if [ "$$pkg" != "" ]; then \
if ${PKG_INFO} "$$prog" > /dev/null 2>&1 ; then \
- ${ECHO_MSG} "===> ${PKGNAME} depends on package: $$prog - found"; \
+ if [ -z "${DESTDIR}" ] ; then \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on package: $$prog - found"; \
+ else \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on package in ${DESTDIR}: $$prog - found"; \
+ fi; \
if [ ${_DEPEND_ALWAYS} = 1 ]; then \
${ECHO_MSG} " (but building it anyway)"; \
notfound=1; \
@@ -4725,7 +4773,11 @@
notfound=0; \
fi; \
else \
- ${ECHO_MSG} "===> ${PKGNAME} depends on package: $$prog - not found"; \
+ if [ -z "${DESTDIR}" ] ; then \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on package: $$prog - not found"; \
+ else \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on package in ${DESTDIR}: $$prog - not found"; \
+ fi; \
notfound=1; \
fi; \
if [ $$notfound != 0 ]; then \
@@ -4739,7 +4791,11 @@
fi; \
fi; \
elif ${WHICH} "$$prog" > /dev/null 2>&1 ; then \
- ${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - found"; \
+ if [ -z "${PREFIX}" ] ; then \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - found"; \
+ else \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on executable in ${DESTDIR}: $$prog - found"; \
+ fi; \
if [ ${_DEPEND_ALWAYS} = 1 ]; then \
${ECHO_MSG} " (but building it anyway)"; \
notfound=1; \
@@ -4747,7 +4803,11 @@
notfound=0; \
fi; \
else \
- ${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - not found"; \
+ if [ -z "${DESTDIR}" ] ; then \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on executable: $$prog - not found"; \
+ else \
+ ${ECHO_MSG} "===> ${PKGNAME} depends on executable in ${DESTDIR}: $$prog - not found"; \
+ fi;\
notfound=1; \
fi; \
fi; \
@@ -4874,7 +4934,11 @@
(cd $$dir; ${MAKE} $$target $$depends_args) ; \
fi \
done
- @${ECHO_MSG} "===> Returning to build of ${PKGNAME}"
+ @if [ -z "${DESTDIR}" ] ; then \
+ ${ECHO_MSG} "===> Returning to build of ${PKGNAME}"; \
+ else \
+ ${ECHO_MSG} "===> Returning to build of ${PKGNAME} for ${DESTDIR}"; \
+ fi
.endif
.else
@${DO_NADA}
More information about the p4-projects
mailing list