From fc1167741da78150c06a1fb7744f874dd3df0358 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sat, 25 May 2013 17:26:48 +0200 Subject: [PATCH 1/4] Remove ancient compatibility warning. This was there as the original location did not follow hier(1). --- portmaster | 8 -------- 1 file changed, 8 deletions(-) diff --git a/portmaster b/portmaster index 0f02f750..fe33f7ab 100755 --- a/portmaster +++ b/portmaster @@ -19,14 +19,6 @@ if [ -z "$PM_PARENT_PID" ]; then [ -n "$CCACHE_PATH" -a -z "$NOCCACHE" ] && PATH="/usr/local/libexec/ccache:$PATH" export PM_PARENT_PID TMPDIR UPGRADE_TOOL PATH - if [ -r /etc/portmaster.rc ]; then - echo '' ; echo "===>>> WARNING" - echo ' Your portmaster.rc is in /etc, however support for the file in this' - echo ' location has been removed.' - echo '' ; echo ' The proper location for this file is /usr/local/etc' - exit 1 - fi - set -o allexport # Read a global rc file first [ -s /usr/local/etc/portmaster.rc ] && . /usr/local/etc/portmaster.rc From 201b2309b1822f0b19d23178d189a3562c886c78 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sat, 25 May 2013 17:34:00 +0200 Subject: [PATCH 2/4] Simplify check for root UID. The ps one is confusing and atypical. --- portmaster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portmaster b/portmaster index fe33f7ab..73d2d869 100755 --- a/portmaster +++ b/portmaster @@ -33,7 +33,7 @@ if [ -z "$PM_PARENT_PID" ]; then my_environment=`set` # If we are already root, unset this to avoid potential conflict - [ `ps -o uid= $$` -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE + [ `id -g` -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE fi #=============== Begin functions we always want to have =============== From 4d8e693c38149fccd8967e284e36e1e0264a6e04 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sat, 25 May 2013 17:40:20 +0200 Subject: [PATCH 3/4] /usr/X11R6 is not used any longer --- portmaster | 1 - 1 file changed, 1 deletion(-) diff --git a/portmaster b/portmaster index 73d2d869..5023bf96 100755 --- a/portmaster +++ b/portmaster @@ -15,7 +15,6 @@ if [ -z "$PM_PARENT_PID" ]; then # /usr/local is needed in the path for make PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin - [ -e /usr/X11R6 ] && [ ! -L /usr/X11R6 ] && PATH=$PATH:/usr/X11R6/bin [ -n "$CCACHE_PATH" -a -z "$NOCCACHE" ] && PATH="/usr/local/libexec/ccache:$PATH" export PM_PARENT_PID TMPDIR UPGRADE_TOOL PATH From 536745104ac82a45a2c68d74c4aa32bf7af896a5 Mon Sep 17 00:00:00 2001 From: Eitan Adler Date: Sat, 25 May 2013 17:41:03 +0200 Subject: [PATCH 4/4] Modify version string so I know which version I am running. --- portmaster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/portmaster b/portmaster index 5023bf96..62a3c3dc 100755 --- a/portmaster +++ b/portmaster @@ -38,7 +38,7 @@ fi #=============== Begin functions we always want to have =============== version () { - echo '' ; echo "===>>> Version 3.16" + echo '' ; echo "===>>> Version 3.16-git" #svn='$FreeBSD: user/dougb/portmaster/portmaster 241090 2012-10-01 08:32:05Z dougb $' }