diff options
| author | flz <flz@FreeBSD.org> | 2006-06-26 22:38:56 +0800 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2006-06-26 22:38:56 +0800 |
| commit | 1494deaf57b8e72112c09d3530431d8309bb706f (patch) | |
| tree | b735abd5771f798283a4929456f63e22925a87e9 /misc | |
| parent | 87f836bf6dfe8630001e2a55a21776290d6284e8 (diff) | |
| download | freebsd-ports-gnome-1494deaf57b8e72112c09d3530431d8309bb706f.tar.gz freebsd-ports-gnome-1494deaf57b8e72112c09d3530431d8309bb706f.tar.zst freebsd-ports-gnome-1494deaf57b8e72112c09d3530431d8309bb706f.zip | |
- Re-add LDCONFIG*_DIR to bsd.ldconfig.mk since it causes directories not
being created at install-time (LDCONFIG*_DIR defined in bsd.port.post.mk). [1]
- Update to a more recent version the ldconfig script.
Reported by: fenner [1]
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/ldconfig_compat/Makefile | 3 | ||||
| -rw-r--r-- | misc/ldconfig_compat/bsd.ldconfig.mk | 2 | ||||
| -rw-r--r-- | misc/ldconfig_compat/files/ldconfig_compat.sh.in | 12 |
3 files changed, 14 insertions, 3 deletions
diff --git a/misc/ldconfig_compat/Makefile b/misc/ldconfig_compat/Makefile index 888b5987a359..c6d0cc03207f 100644 --- a/misc/ldconfig_compat/Makefile +++ b/misc/ldconfig_compat/Makefile @@ -7,7 +7,7 @@ PORTNAME= ldconfig_compat PORTVERSION= 1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= misc MASTER_SITES= # none DISTFILES= # none @@ -61,6 +61,7 @@ do-install: .for prefix in ${LOCAL_PREFIXES} @${ECHO_CMD} "@cwd ${prefix}" >> ${TMPPLIST} .for dir in ${LOCAL_DIRS} + echo creating ${prefix}/${dir} @${MKDIR} -p ${prefix}/${dir} @${ECHO_CMD} "@exec mkdir -p %D/${dir}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec rmdir %D/${dir} 2>/dev/null || true" >> ${TMPPLIST} diff --git a/misc/ldconfig_compat/bsd.ldconfig.mk b/misc/ldconfig_compat/bsd.ldconfig.mk index e69de29bb2d1..416f4c5f2e91 100644 --- a/misc/ldconfig_compat/bsd.ldconfig.mk +++ b/misc/ldconfig_compat/bsd.ldconfig.mk @@ -0,0 +1,2 @@ +LDCONFIG_DIR= libdata/ldconfig +LDCONFIG32_DIR= libdata/ldconfig32 diff --git a/misc/ldconfig_compat/files/ldconfig_compat.sh.in b/misc/ldconfig_compat/files/ldconfig_compat.sh.in index 1c6f4a450586..a4899035bc34 100644 --- a/misc/ldconfig_compat/files/ldconfig_compat.sh.in +++ b/misc/ldconfig_compat/files/ldconfig_compat.sh.in @@ -20,6 +20,8 @@ load_rc_config $name ldconfig_start() { + local _files + _ins= ldconfig=${ldconfig_command} checkyesno ldconfig_insecure && _ins="-i" @@ -27,7 +29,10 @@ ldconfig_start() ldconfig_paths="" for i in ${ldconfig_local_dirs}; do if [ -d "${i}" ]; then - ldconfig_paths="${ldconfig_paths} `find ${i} -type f`" + _files=`find ${i} -type f` + if [ -n "${_files}" ]; then + ldconfig_paths="${ldconfig_paths} `cat ${_files} | sort -u`" + fi fi done echo 'Local ldconfig path:' ${ldconfig_paths} @@ -38,7 +43,10 @@ ldconfig_start() ldconfig32_paths="" for i in ${ldconfig_local32_dirs}; do if [ -d "${i}" ]; then - ldconfig32_paths="${ldconfig32_paths} `find ${i} -type f`" + _files=`find ${i} -type f` + if [ -n "${_files}" ]; then + ldconfig32_paths="${ldconfig32_paths} `cat ${_files} | sort -u`" + fi fi done echo 'Local 32-bits ldconfig path:' ${ldconfig32_paths} |