diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /misc/ldconfig_compat | |
parent | Update to version 2.2.6 (diff) |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'misc/ldconfig_compat')
-rw-r--r-- | misc/ldconfig_compat/Makefile | 2 | ||||
-rw-r--r-- | misc/ldconfig_compat/files/ldconfig_compat.sh.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/ldconfig_compat/Makefile b/misc/ldconfig_compat/Makefile index fac7b43dd5b2..740054c1284f 100644 --- a/misc/ldconfig_compat/Makefile +++ b/misc/ldconfig_compat/Makefile @@ -26,7 +26,7 @@ SUB_LIST= LDCONFIG_DIR=${LDCONFIG_DIR} \ LDCONFIG32_DIR=${LDCONFIG32_DIR} .if !defined(WITHOUT_X11) -LOCAL_PREFIXES= ${PREFIX} ${X11BASE} +LOCAL_PREFIXES= ${PREFIX} ${LOCALBASE} .else LOCAL_PREFIXES= ${PREFIX} .endif diff --git a/misc/ldconfig_compat/files/ldconfig_compat.sh.in b/misc/ldconfig_compat/files/ldconfig_compat.sh.in index a4899035bc34..1c3fe81701c3 100644 --- a/misc/ldconfig_compat/files/ldconfig_compat.sh.in +++ b/misc/ldconfig_compat/files/ldconfig_compat.sh.in @@ -15,8 +15,8 @@ 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_local_dirs="%%PREFIX%%/%%LDCONFIG_DIR%% %%LOCALBASE%%/%%LDCONFIG_DIR%%"} +: ${ldconfig_local32_dirs="%%PREFIX%%/%%LDCONFIG32_DIR%% %%LOCALBASE%%/%%LDCONFIG32_DIR%%"} ldconfig_start() { |