Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.534
diff -u -r1.534 bsd.port.mk
--- bsd.port.mk	16 Jun 2006 04:53:43 -0000	1.534
+++ bsd.port.mk	26 Jun 2006 14:23:06 -0000
@@ -1150,6 +1150,9 @@
 # where 'make config' records user configuration options
 PORT_DBDIR?=	/var/db/ports
 
+LDCONFIG_DIR=	libdata/ldconfig
+LDCONFIG32_DIR=	libdata/ldconfig32
+
 .if defined(LATEST_LINK)
 UNIQUENAME?=	${LATEST_LINK}
 .else
@@ -1609,14 +1612,12 @@
 .endif
 .endif
 
-LDCONFIG_DIR=	libdata/ldconfig
-LDCONFIG32_DIR=	libdata/ldconfig32
-
 .if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
 .if ${OSVERSION} < 504105 || \
 		(${OSVERSION} >= 700000 && ${OSVERSION} < 700012) || \
 		(${OSVERSION} >= 600000 && ${OSVERSION} < 600104)
 RUN_DEPENDS+=	${LOCALBASE}/${LDCONFIG_DIR}:${PORTSDIR}/misc/ldconfig_compat
+NO_LDCONFIG_MTREE=	yes
 .endif
 .if defined(USE_LDCONFIG) && ${USE_LDCONFIG:L} == "yes"
 USE_LDCONFIG=	${PREFIX}/lib
@@ -3663,9 +3664,15 @@
 .endif
 .if ${USE_LDCONFIG:L} != "${PREFIX}/lib"
 	@${ECHO_MSG} "===>   Installing ldconfig configuration file"
+.if defined(NO_LDCONFIG_MTREE)
+	@${MKDIR} ${LDCONFIG_DIR}
+.endif
 	@${ECHO_CMD} ${USE_LDCONFIG} | ${TR} ' ' '\n' \
 		> ${PREFIX}/${LDCONFIG_DIR}/${UNIQUENAME}
 	@${ECHO_CMD} ${LDCONFIG_DIR}/${UNIQUENAME} >> ${TMPPLIST}
+.if defined(NO_LDCONFIG_MTREE)
+	@${ECHO_CMD} "@unexec rmdir ${LDCONFIG_DIR} >/dev/null 2>&1" >> ${TMPPLIST}
+.endif
 .endif
 .endif
 .if defined(USE_LDCONFIG32)
@@ -3677,9 +3684,15 @@
 	-${LDCONFIG} -32 -m ${USE_LDCONFIG32}
 .endif
 	@${ECHO_MSG} "===>   Installing 32-bit ldconfig configuration file"
+.if defined(NO_LDCONFIG_MTREE)
+	@${MKDIR} ${LDCONFIG_32DIR}
+.endif
 	@${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \
 		> ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME}
 	@${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST}
+.if defined(NO_LDCONFIG_MTREE)
+	@${ECHO_CMD} "@unexec rmdir ${LDCONFIG32_DIR} >/dev/null 2>&1" >> ${TMPPLIST}
+.endif
 .endif
 # This can be removed once, all ports have been converted to USE_LDCONFIG.
 .if defined(INSTALLS_SHLIB)