Index: head/Keywords/ldconfig-linux.ucl
===================================================================
--- head/Keywords/ldconfig-linux.ucl
+++ head/Keywords/ldconfig-linux.ucl
@@ -0,0 +1,15 @@
+# $FreeBSD$
+#
+# MAINTAINER: portmgr@FreeBSD.org
+#
+
+post-install: <<EOD
+	if [ -n "$(/sbin/sysctl -q compat.linux.osrelease)" ]; then
+		%@/sbin/ldconfig
+	fi
+EOD
+post-deinstall: <<EOD
+	if [ -n "$(/sbin/sysctl -q compat.linux.osrelease)" ]; then
+		%@/sbin/ldconfig
+	fi
+EOD
Index: head/Keywords/ldconfig.ucl
===================================================================
--- head/Keywords/ldconfig.ucl
+++ head/Keywords/ldconfig.ucl
@@ -0,0 +1,19 @@
+# $FreeBSD$
+#
+# MAINTAINER: portmgr@FreeBSD.org
+#
+
+post-install: <<EOD
+	if ! /usr/sbin/service ldconfig restart >/dev/null; then
+		if [ -z "${INSTALL_AS_USER}" ]; then
+			exit 1
+		fi
+	fi
+EOD
+post-deinstall: <<EOD
+	if ! /usr/sbin/service ldconfig restart >/dev/null; then
+		if [ -z "${INSTALL_AS_USER}" ]; then
+			exit 1
+		fi
+	fi
+EOD
Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -1865,6 +1865,14 @@
 IGNORE=			has USE_LDCONFIG32 set to yes, which is not correct
 .endif
 
+.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
+.if defined(USE_LINUX_PREFIX)
+PLIST_FILES+=	"@ldconfig-linux ${LINUXBASE}"
+.else
+PLIST_FILES+=	"@ldconfig"
+.endif
+.endif
+
 PKG_IGNORE_DEPENDS?=		'this_port_does_not_exist'
 
 .if defined(_DESTDIR_VIA_ENV)
@@ -4454,23 +4462,6 @@
 	@${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST}
 .endfor
 
-.if defined(USE_LINUX_PREFIX)
-.if defined(USE_LDCONFIG)
-	@${ECHO_CMD} '@preexec [ -n "`/sbin/sysctl -q compat.linux.osrelease`" ] || ( echo "Cannot install package: kernel missing Linux support"; exit 1 )' >> ${TMPPLIST}
-	@${ECHO_CMD} "@postexec ${LINUXBASE}/sbin/ldconfig" >> ${TMPPLIST}
-	@${ECHO_CMD} "@postunexec ${LINUXBASE}/sbin/ldconfig" >> ${TMPPLIST}
-.endif
-.else
-.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32)
-.if !defined(INSTALL_AS_USER)
-	@${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/null" >> ${TMPPLIST}
-	@${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev/null" >> ${TMPPLIST}
-.else
-	@${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/null || ${TRUE}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev/null || ${TRUE}" >> ${TMPPLIST}
-.endif
-.endif
-.endif
 .endif
 
 ${TMPPLIST}: