svn commit: r398831 - head/Mk
Dmitry Marakasov
amdmi3 at FreeBSD.org
Thu Oct 8 14:57:30 UTC 2015
Author: amdmi3
Date: Thu Oct 8 14:57:29 2015
New Revision: 398831
URL: https://svnweb.freebsd.org/changeset/ports/398831
Log:
Add LOCALBASE-based ldconfig dir to plist for non-default PREFIX
ldconfig file is always installed into LOCALBASE-based directory
(${LOCALBASE}/${LDCONFIG_DIR}) which is first created. When a port
redefines PREFIX (PREFIX != LOCALBASE), this directory needs to be
mentioned in pkg-plist.
Add the directory to the plist. While here, add identation to nested
make conditions and loops to improve readability and simplify one
empty .if body.
This fixes stage-qa for biology/emboss and cad/brlcad
Approved by: portmgr (bapt)
Differential Revision: D3815
Modified:
head/Mk/bsd.port.mk
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Thu Oct 8 14:48:57 2015 (r398830)
+++ head/Mk/bsd.port.mk Thu Oct 8 14:57:29 2015 (r398831)
@@ -3626,33 +3626,38 @@ install-mtree:
.if !target(install-ldconfig-file)
install-ldconfig-file:
-.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
-.if defined(USE_LDCONFIG)
-.if defined(USE_LINUX_PREFIX)
-.else
-.if ${USE_LDCONFIG} != "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER)
+. if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
+. if defined(USE_LDCONFIG)
+. if !defined(USE_LINUX_PREFIX)
+. if ${USE_LDCONFIG} != "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER)
@${ECHO_MSG} "===> Installing ldconfig configuration file"
-.if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE}
+. if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE}
@${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}
-.endif
+. endif
@${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \
> ${STAGEDIR}${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE}
@${ECHO_CMD} ${LOCALBASE}/${LDCONFIG_DIR}/${PKGBASE} >> ${TMPPLIST}
-.endif
-.endif
-.endif
-.if defined(USE_LDCONFIG32)
-.if !defined(INSTALL_AS_USER)
+. if ${PREFIX} != ${LOCALBASE}
+ @${ECHO_CMD} "@dir ${LOCALBASE}/${LDCONFIG_DIR}" >> ${TMPPLIST}
+. endif
+. endif
+. endif
+. endif
+. if defined(USE_LDCONFIG32)
+. if !defined(INSTALL_AS_USER)
@${ECHO_MSG} "===> Installing 32-bit ldconfig configuration file"
-.if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE}
+. if defined(NO_MTREE) || ${PREFIX} != ${LOCALBASE}
@${MKDIR} ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}
-.endif
+. endif
@${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \
> ${STAGEDIR}${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE}
@${ECHO_CMD} ${LOCALBASE}/${LDCONFIG32_DIR}/${PKGBASE} >> ${TMPPLIST}
-.endif
-.endif
-.endif
+. if ${PREFIX} != ${LOCALBASE}
+ @${ECHO_CMD} "@dir ${LOCALBASE}/${LDCONFIG32_DIR}" >> ${TMPPLIST}
+. endif
+. endif
+. endif
+. endif
.endif
.if !target(create-users-groups)
More information about the svn-ports-head
mailing list