aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authorrafan <rafan@FreeBSD.org>2007-06-22 18:41:01 +0800
committerrafan <rafan@FreeBSD.org>2007-06-22 18:41:01 +0800
commitc113cd7be22aa4c2cf683a104f7342a33ec2cbce (patch)
tree852cb2ed14c50a649a857921d1e24f4a34a6440d /ports-mgmt
parent310457fe531792577672e15c96f52d1c7f87ee8b (diff)
downloadfreebsd-ports-gnome-c113cd7be22aa4c2cf683a104f7342a33ec2cbce.tar.gz
freebsd-ports-gnome-c113cd7be22aa4c2cf683a104f7342a33ec2cbce.tar.zst
freebsd-ports-gnome-c113cd7be22aa4c2cf683a104f7342a33ec2cbce.zip
- 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)
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/portconf/pkg-install3
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}