diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 4cb4276d6fff..3542ab17f477 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -42,10 +42,10 @@ pre-configure:
 		${ECHO_MSG} "libobjc.so not found, please update your gcc"; \
 		${FALSE}; \
 	fi; \
-	if test `${LDCONFIG} -r | grep libobjc.so | wc -l` -eq 0; then \
+	if test `${LDCONFIG} -r | ${GREP} libobjc.so | wc -l` -eq 0; then \
 		${ECHO_MSG} "trying to fix ldconfig.hints"; \
 		${LDCONFIG} -f "${WRKDIR}/ldconfig.hints" -m "${TARGLIB}";\
-		if test `${LDCONFIG} -f "${WRKDIR}/ldconfig.hints" -r | grep libobjc.so | wc -l` -eq 0; then \
+		if test `${LDCONFIG} -f "${WRKDIR}/ldconfig.hints" -r | ${GREP} libobjc.so | wc -l` -eq 0; then \
 			${ECHO_MSG} "libobjc.so not in path"; \
 			${FALSE}; \
 		fi; \
diff --git a/x11-toolkits/gnustep-art/Makefile b/x11-toolkits/gnustep-art/Makefile
index 3588c62e67ba..80e1403b6a87 100644
--- a/x11-toolkits/gnustep-art/Makefile
+++ b/x11-toolkits/gnustep-art/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	x11-toolkits
 MAINTAINER=	dinoex@FreeBSD.org
 
 WITH_GNUSTEP_LIBART=	yes
-MASTERDIR?=	${.CURDIR}/../gnustep-back
+MASTERDIR=	${.CURDIR}/../gnustep-back
 
 .if exists(${.CURDIR}/Makefile.local)
 .include "${.CURDIR}/Makefile.local"
diff --git a/x11-toolkits/gnustep-xdps/Makefile b/x11-toolkits/gnustep-xdps/Makefile
index 22eb45c42288..00a69a1ffd4d 100644
--- a/x11-toolkits/gnustep-xdps/Makefile
+++ b/x11-toolkits/gnustep-xdps/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	x11-toolkits
 MAINTAINER=	dinoex@FreeBSD.org
 
 WITH_GNUSTEP_XDPS=	yes
-MASTERDIR?=	${.CURDIR}/../gnustep-back
+MASTERDIR=	${.CURDIR}/../gnustep-back
 
 .if exists(${.CURDIR}/Makefile.local)
 .include "${.CURDIR}/Makefile.local"