1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

- Adding sensible defaults to the startup script so people don't need to

touch /etc/rc.conf anymore.
- Silent @dirrm for ldconfig directories, this ensures a quiet upgrade.
- Fix installation with package, directories weren't created.

Noticed by:	pav
This commit is contained in:
Florent Thoumie 2006-01-12 12:35:03 +00:00
parent 560ea8b361
commit 679b9b10d2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=153346
3 changed files with 10 additions and 16 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= ldconfig_compat
PORTVERSION= 1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= misc
MASTER_SITES= # none
DISTFILES= # none
@ -22,6 +22,9 @@ USE_RC_SUBR= yes
LOCAL_DIRS= ${LDCONFIG_DIR} \
${LDCONFIG32_DIR}
SUB_LIST= LDCONFIG_DIR=${LDCONFIG_DIR} \
LDCONFIG32_DIR=${LDCONFIG32_DIR}
.include <bsd.port.pre.mk>
.include "${.CURDIR}/bsd.ldconfig.mk"
@ -48,11 +51,9 @@ do-install:
@${ECHO_CMD} "@cwd ${prefix}" >> ${TMPPLIST}
.for dir in ${LOCAL_DIRS}
@${MKDIR} ${prefix}/${dir}
@${ECHO_CMD} "@dirrm ${dir}" >> ${TMPPLIST}
@${ECHO_CMD} "@exec mkdir %D/${dir}" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir %D/${dir} 2>/dev/null || true" >> ${TMPPLIST}
.endfor
.endfor
post-install:
${CAT} ${PKGMESSAGE}
.include <bsd.port.post.mk>

View File

@ -14,6 +14,10 @@ ldconfig_command="/sbin/ldconfig"
start_cmd="ldconfig_start"
stop_cmd=":"
load_rc_config $name
: ${ldconfig_local_dirs="%%PREFIX%%/%%LDCONFIG_DIR%% %%X11BASE%%/%%LDCONFIG_DIR%%"}
: ${ldconfig_local32_dirs="%%PREFIX%%/%%LDCONFIG32_DIR%% %%X11BASE%%/%%LDCONFIG32_DIR%%"}
ldconfig_start()
{
_ins=
@ -44,5 +48,4 @@ ldconfig_start()
fi
}
load_rc_config $name
run_rc_command "$1"

View File

@ -1,10 +0,0 @@
-------------------------------------------------------------
For the script to work correctly, you need to add the
following to your /etc/rc.conf file (these lines are only
wrapped to fit console width):
ldconfig_local_dirs="/usr/local/libdata/ldconfig
/usr/X11R6/libdata/ldconfig"
ldconfig_local32_dirs="/usr/local/libdata/ldconfig32
/usr/X11R6/libdata/ldconfig32"
-------------------------------------------------------------