diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2007-06-22 10:41:01 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2007-06-22 10:41:01 +0000 |
| commit | 5c12abaec6beafdf820a327a5bfa78a3da95f093 (patch) | |
| tree | c8369c95ce2d7ea2e2e1286290ee2b1d83c32026 | |
| parent | Update to the 20070618 snapshot of GCC 4.1.3. (diff) | |
- Make portconf work when /usr/ports is a symlink. When the link is changed,
you have to reinstall portconf to get make.conf right.
As this does not affect most people, PORTREVISION is not bumped.
The patch in the PR does not work: we can not use variable in substitution.
So, the only way to do is to detect the real path of /usr/ports at
installation time.
PR: ports/104838
Submitted by: rafan
Approved by: maintainer timeout (8 months)
Notes
Notes:
svn path=/head/; revision=194058
| -rw-r--r-- | ports-mgmt/portconf/pkg-install | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ports-mgmt/portconf/pkg-install b/ports-mgmt/portconf/pkg-install index 7c3938211b01..8ff3f06e37ef 100644 --- a/ports-mgmt/portconf/pkg-install +++ b/ports-mgmt/portconf/pkg-install @@ -1,13 +1,14 @@ #!/bin/sh MAKE_CONF=/etc/make.conf +PORTS_DIR=`/bin/realpath /usr/ports` if [ "$2" = "POST-INSTALL" ]; then echo -n "Spamming ${MAKE_CONF}..." cat >> ${MAKE_CONF} << EOF # Begin portconf settings # Do not touch these lines -.if !empty(.CURDIR:M/usr/ports*) && exists(${PKG_PREFIX}/libexec/portconf) +.if !empty(.CURDIR:M${PORTS_DIR}*) && exists(${PKG_PREFIX}/libexec/portconf) _PORTCONF!=${PKG_PREFIX}/libexec/portconf .for i in \${_PORTCONF:S/|/ /g} \${i:S/%/ /g} |