- 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)
This commit is contained in:
Rong-En Fan 2007-06-22 10:41:01 +00:00
parent 6da7405842
commit 5c12abaec6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=194058

View file

@ -1,13 +1,14 @@
#!/bin/sh #!/bin/sh
MAKE_CONF=/etc/make.conf MAKE_CONF=/etc/make.conf
PORTS_DIR=`/bin/realpath /usr/ports`
if [ "$2" = "POST-INSTALL" ]; then if [ "$2" = "POST-INSTALL" ]; then
echo -n "Spamming ${MAKE_CONF}..." echo -n "Spamming ${MAKE_CONF}..."
cat >> ${MAKE_CONF} << EOF cat >> ${MAKE_CONF} << EOF
# Begin portconf settings # Begin portconf settings
# Do not touch these lines # 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 _PORTCONF!=${PKG_PREFIX}/libexec/portconf
.for i in \${_PORTCONF:S/|/ /g} .for i in \${_PORTCONF:S/|/ /g}
\${i:S/%/ /g} \${i:S/%/ /g}