diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile
index b989b257eac7..3474afee0163 100644
--- a/astro/boinc-astropulse/Makefile
+++ b/astro/boinc-astropulse/Makefile
@@ -35,9 +35,9 @@ CFLAGS+=	-march=${CPUTYPE}
 .endif
 
 # these must match settings in ${PORTSDIR}/net/boinc-client/Makefile
-BOINC_USER?=	boinc
-BOINC_GROUP?=	nobody
-BOINC_HOME?=	/var/db/boinc
+BOINC_CLIENT_USER?=	boinc
+BOINC_CLIENT_GROUP?=	nobody
+BOINC_CLIENT_HOME?=	/var/db/boinc
 
 #OPTIONS=	X11		"Build screensaver (requires net/boinc-client with X11)" on
 
@@ -84,25 +84,25 @@ SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	AP_BINARY=${AP_BINARY} \
 		AP_VERSION=${PORTVERSION:S/.//} \
 		SETI_SITE=${SETI_SITE} \
-		BOINC_HOME=${BOINC_HOME} \
-		BOINC_USER=${BOINC_USER} \
-		BOINC_GROUP=${BOINC_GROUP}
+		BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \
+		BOINC_CLIENT_USER=${BOINC_CLIENT_USER} \
+		BOINC_CLIENT_GROUP=${BOINC_CLIENT_GROUP}
 PLIST_SUB+=	AP_BINARY=${AP_BINARY} \
 		SETI_SITE=${SETI_SITE} \
-		BOINC_HOME=${BOINC_HOME}
+		BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME}
 
 pre-configure:
 	(cd ${WRKSRC} ; ./_autosetup)
 
 do-install:
-	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects
-	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} \
-	    ${BOINC_HOME}/projects/${SETI_SITE}
-	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} \
-	    ${WRKSRC}/${AP_BINARY} ${BOINC_HOME}/projects/${SETI_SITE}/
+	${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} ${BOINC_CLIENT_HOME}/projects
+	${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
+	    ${BOINC_CLIENT_HOME}/projects/${SETI_SITE}
+	${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
+	    ${WRKSRC}/${AP_BINARY} ${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
 .if !defined(WITHOUT_X11)
-	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} \
-	    ${WRKSRC}/ap_graphics ${BOINC_HOME}/projects/${SETI_SITE}/
+	${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
+	    ${WRKSRC}/ap_graphics ${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
 .endif
 
 post-install:
diff --git a/astro/boinc-astropulse/files/pkg-deinstall.in b/astro/boinc-astropulse/files/pkg-deinstall.in
index eea6751836ca..b6ee2e66ab23 100644
--- a/astro/boinc-astropulse/files/pkg-deinstall.in
+++ b/astro/boinc-astropulse/files/pkg-deinstall.in
@@ -6,7 +6,7 @@ if [ "$2" != "POST-DEINSTALL" ]; then
     exit 0
 fi
 
-F=%%BOINC_HOME%%/projects/%%SETI_SITE%%/app_info.xml
+F=%%BOINC_CLIENT_HOME%%/projects/%%SETI_SITE%%/app_info.xml
 echo Removing astropulse_v6 lines from $F
 
 l=`grep -n "<name>astropulse_v6</name>" $F | cut -f 1 -d :`
diff --git a/astro/boinc-astropulse/files/pkg-install.in b/astro/boinc-astropulse/files/pkg-install.in
index 58f14f9ee5d6..c0cf7074d23c 100644
--- a/astro/boinc-astropulse/files/pkg-install.in
+++ b/astro/boinc-astropulse/files/pkg-install.in
@@ -6,13 +6,13 @@ if [ "$2" != "POST-INSTALL" ]; then
     exit 0
 fi
 
-F=%%BOINC_HOME%%/projects/%%SETI_SITE%%/app_info.xml
+F=%%BOINC_CLIENT_HOME%%/projects/%%SETI_SITE%%/app_info.xml
 
 if [ ! -f $F ]; then
     echo Creating new $F
     echo "<app_info>" > $F
     echo "</app_info>" >> $F
-    chown %%BOINC_USER%%:%%BOINC_GROUP%% $F
+    chown %%BOINC_CLIENT_USER%%:%%BOINC_CLIENT_GROUP%% $F
 fi
 
 echo Adding astropulse_v6 lines to $F
diff --git a/astro/boinc-astropulse/files/pkg-message.in b/astro/boinc-astropulse/files/pkg-message.in
index bd1753e985c5..050aa6363e8a 100644
--- a/astro/boinc-astropulse/files/pkg-message.in
+++ b/astro/boinc-astropulse/files/pkg-message.in
@@ -11,6 +11,6 @@ MANUAL INSTALLATION
  *) Or get your account key at http://%%SETI_SITE%%/get_passwd.php
 
  *) Attach to the project:
-    cd %%BOINC_HOME%%
+    cd %%BOINC_CLIENT_HOME%%
     boinc_cmd --project_attach %%SETI_SITE%% <account key>
 *****************************************************************************
diff --git a/astro/boinc-astropulse/pkg-plist b/astro/boinc-astropulse/pkg-plist
index 188fb432ff79..fafb23628d52 100644
--- a/astro/boinc-astropulse/pkg-plist
+++ b/astro/boinc-astropulse/pkg-plist
@@ -1,4 +1,4 @@
-@cwd %%BOINC_HOME%%/projects
+@cwd %%BOINC_CLIENT_HOME%%/projects
 %%SETI_SITE%%/%%AP_BINARY%%
 %%X11%%%%SETI_SITE%%/ap_graphics
 @dirrmtry %%SETI_SITE%%
diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile
index cf9539dcc621..c9bcd434a6a8 100644
--- a/astro/boinc-setiathome-enhanced/Makefile
+++ b/astro/boinc-setiathome-enhanced/Makefile
@@ -34,9 +34,9 @@ CFLAGS+=	-march=${CPUTYPE}
 .endif
 
 # these must match settings in ${PORTSDIR}/net/boinc-client/Makefile
-BOINC_USER?=	boinc
-BOINC_GROUP?=	nobody
-BOINC_HOME?=	/var/db/boinc
+BOINC_CLIENT_USER?=	boinc
+BOINC_CLIENT_GROUP?=	nobody
+BOINC_CLIENT_HOME?=	/var/db/boinc
 
 OPTIONS=	X11		"Build screensaver (requires net/boinc-client with X11)" off
 
@@ -77,10 +77,10 @@ SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	SETI_BINARY=${SETI_BINARY} \
 		SETI_SITE=${SETI_SITE} \
 		SETI_VERSION=${PORTVERSION:S/.//} \
-		BOINC_HOME=${BOINC_HOME}
+		BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME}
 PLIST_SUB+=	SETI_BINARY=${SETI_BINARY} \
 		SETI_SITE=${SETI_SITE} \
-		BOINC_HOME=${BOINC_HOME} \
+		BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME} \
 		PREFIX=${PREFIX}
 
 # str_replace.h is included in newer versions of net/boinc-client,
@@ -97,14 +97,14 @@ pre-configure:
 	(cd ${WRKSRC} ; ./_autosetup)
 
 do-install:
-	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects
-	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} \
-	    ${BOINC_HOME}/projects/${SETI_SITE}
-	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} \
-	    ${WRKSRC}/client/${SETI_BINARY} ${BOINC_HOME}/projects/${SETI_SITE}/
+	${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} ${BOINC_CLIENT_HOME}/projects
+	${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
+	    ${BOINC_CLIENT_HOME}/projects/${SETI_SITE}
+	${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
+	    ${WRKSRC}/client/${SETI_BINARY} ${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
 .if !defined(WITHOUT_X11)
-	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} \
-	    ${WRKSRC}/client/seti_graphics ${BOINC_HOME}/projects/${SETI_SITE}/
+	${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} \
+	    ${WRKSRC}/client/seti_graphics ${BOINC_CLIENT_HOME}/projects/${SETI_SITE}/
 .endif
 
 post-install:
diff --git a/astro/boinc-setiathome-enhanced/files/pkg-deinstall.in b/astro/boinc-setiathome-enhanced/files/pkg-deinstall.in
index 3540fc7711b3..ac5c9d90b114 100644
--- a/astro/boinc-setiathome-enhanced/files/pkg-deinstall.in
+++ b/astro/boinc-setiathome-enhanced/files/pkg-deinstall.in
@@ -6,7 +6,7 @@ if [ "$2" != "POST-DEINSTALL" ]; then
     exit 0
 fi
 
-F=%%BOINC_HOME%%/projects/%%SETI_SITE%%/app_info.xml
+F=%%BOINC_CLIENT_HOME%%/projects/%%SETI_SITE%%/app_info.xml
 echo Removing setiathome_enhanced lines from $F
 
 l=`grep -n "<name>setiathome_enhanced</name>" $F | cut -f 1 -d :`
diff --git a/astro/boinc-setiathome-enhanced/files/pkg-install.in b/astro/boinc-setiathome-enhanced/files/pkg-install.in
index c96bfdb2aace..295f6e12d188 100644
--- a/astro/boinc-setiathome-enhanced/files/pkg-install.in
+++ b/astro/boinc-setiathome-enhanced/files/pkg-install.in
@@ -6,7 +6,7 @@ if [ "$2" != "POST-INSTALL" ]; then
     exit 0
 fi
 
-F=%%BOINC_HOME%%/projects/%%SETI_SITE%%/app_info.xml
+F=%%BOINC_CLIENT_HOME%%/projects/%%SETI_SITE%%/app_info.xml
 
 if [ ! -f $F ]; then
     echo Creating new $F
diff --git a/astro/boinc-setiathome-enhanced/files/pkg-message.in b/astro/boinc-setiathome-enhanced/files/pkg-message.in
index bd1753e985c5..050aa6363e8a 100644
--- a/astro/boinc-setiathome-enhanced/files/pkg-message.in
+++ b/astro/boinc-setiathome-enhanced/files/pkg-message.in
@@ -11,6 +11,6 @@ MANUAL INSTALLATION
  *) Or get your account key at http://%%SETI_SITE%%/get_passwd.php
 
  *) Attach to the project:
-    cd %%BOINC_HOME%%
+    cd %%BOINC_CLIENT_HOME%%
     boinc_cmd --project_attach %%SETI_SITE%% <account key>
 *****************************************************************************
diff --git a/astro/boinc-setiathome-enhanced/pkg-plist b/astro/boinc-setiathome-enhanced/pkg-plist
index 28bdcdbc2542..fd0a6eb5970f 100644
--- a/astro/boinc-setiathome-enhanced/pkg-plist
+++ b/astro/boinc-setiathome-enhanced/pkg-plist
@@ -1,4 +1,4 @@
-@cwd %%BOINC_HOME%%/projects
+@cwd %%BOINC_CLIENT_HOME%%/projects
 %%SETI_SITE%%/%%SETI_BINARY%%
 %%X11%%%%SETI_SITE%%/seti_graphics
 @dirrmtry %%SETI_SITE%%
diff --git a/biology/boinc-simap/Makefile b/biology/boinc-simap/Makefile
index 2abacd172636..756366c51054 100644
--- a/biology/boinc-simap/Makefile
+++ b/biology/boinc-simap/Makefile
@@ -22,9 +22,9 @@ NO_WRKSUBDIR=	yes
 STRIP=		#
 
 # these must match settings in ${PORTSDIR}/net/boinc-client/Makefile
-BOINC_USER?=	boinc
-BOINC_GROUP?=	nobody
-BOINC_HOME?=	/var/db/boinc
+BOINC_CLIENT_USER?=	boinc
+BOINC_CLIENT_GROUP?=	nobody
+BOINC_CLIENT_HOME?=	/var/db/boinc
 
 SIMAP_SITE=	boinc.bio.wzw.tum.de_boincsimap
 SIMAP_URL=	boinc.bio.wzw.tum.de/boincsimap
@@ -34,7 +34,7 @@ HMMER_BINARY=	hmmer_${HMMER_VERSION}_${MACH}-pc-freebsd
 HMMER_VERSION=	5.09
 
 PLIST_SUB=	SIMAP_BINARY=${SIMAP_BINARY} HMMER_BINARY=${HMMER_BINARY} SIMAP_SITE=${SIMAP_SITE} \
-		BOINC_HOME=${BOINC_HOME}
+		BOINC_CLIENT_HOME=${BOINC_CLIENT_HOME}
 
 ONLY_FOR_ARCHS=	i386 amd64
 
@@ -76,11 +76,11 @@ do-extract:
 	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${HMMER_BINARY} ${EXTRACT_AFTER_ARGS})
 
 do-install:
-	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects
-	${INSTALL} -d -o ${BOINC_USER} -g ${BOINC_GROUP} ${BOINC_HOME}/projects/${SIMAP_SITE}
-	${INSTALL_DATA} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/app_info.xml ${BOINC_HOME}/projects/${SIMAP_SITE}
+	${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} ${BOINC_CLIENT_HOME}/projects
+	${INSTALL} -d -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} ${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE}
+	${INSTALL_DATA} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} ${WRKDIR}/app_info.xml ${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE}
 .for APP in ${DISTNAME}
-	${INSTALL_PROGRAM} -o ${BOINC_USER} -g ${BOINC_GROUP} ${WRKDIR}/${APP} ${BOINC_HOME}/projects/${SIMAP_SITE}
+	${INSTALL_PROGRAM} -o ${BOINC_CLIENT_USER} -g ${BOINC_CLIENT_GROUP} ${WRKDIR}/${APP} ${BOINC_CLIENT_HOME}/projects/${SIMAP_SITE}
 .endfor
 
 post-install:
diff --git a/biology/boinc-simap/pkg-plist b/biology/boinc-simap/pkg-plist
index 8cf630ad2965..8b17e9ed000c 100644
--- a/biology/boinc-simap/pkg-plist
+++ b/biology/boinc-simap/pkg-plist
@@ -1,4 +1,4 @@
-@cwd %%BOINC_HOME%%
+@cwd %%BOINC_CLIENT_HOME%%
 projects/%%SIMAP_SITE%%/app_info.xml
 projects/%%SIMAP_SITE%%/%%SIMAP_BINARY%%
 projects/%%SIMAP_SITE%%/%%HMMER_BINARY%%