Cleanup $() variables in ports Makefiles.

Mostly replace with ${}, but sometime, replace with $$() because it is
what was intended in the first place. (I think.)

Sponsored by:	Absolight

67 files changed, 105 insertions, 105 deletions

diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index ca891949062f..4a049411bc38 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -155,7 +155,7 @@ post-patch:
 		-e 's/default-character-set/character-set-server/'\
 		-e 's/default-collation/collation-server/'  ${WRKSRC}/MySQL/my.tt
 # table_open_cache was known as table_cache in MySQL 5.1.2 and earlier
-	@if [ "$(MYSQL_VER)" != "50" ] ; then \
+	@if [ "${MYSQL_VER}" != "50" ] ; then \
 		${REINPLACE_CMD} \
 			-e 's/table_cache/table_open_cache/' ${WRKSRC}/MySQL/my.tt ;\
 	fi
diff --git a/biology/ariadne/Makefile b/biology/ariadne/Makefile
index 09092dcfe03e..ed721afb8791 100644
--- a/biology/ariadne/Makefile
+++ b/biology/ariadne/Makefile
@@ -22,7 +22,7 @@ MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS =|CFLAGS +=| ; \
-		s|-c $(OPTIMISE)|-c $(CFLAGS) $(OPTIMIZE)|g' \
+		s|-c $$(OPTIMISE)|-c ${CFLAGS} ${OPTIMIZE}|g' \
 		${WRKSRC}/Makefile
 
 do-install:
diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile
index 191433fbdf30..95d993077546 100644
--- a/comms/linrad/Makefile
+++ b/comms/linrad/Makefile
@@ -61,7 +61,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/help.lir ${STAGEDIR}${DATADIR}/help.lir
 	${INSTALL_SCRIPT} -m0555 ${FILESDIR}/linrad ${STAGEDIR}${PREFIX}/bin/linrad
 # Some day we may want the svga version as well.
-#	${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${PORTNAME} $(STAGEDIR}${PREFIX}/bin/${PORTNAME}.svga
+#	${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.svga
 	${INSTALL_PROGRAM} -m0555 ${WRKSRC}/${BINFILE} ${STAGEDIR}${PREFIX}/bin/x${PORTNAME}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${LINRAD_DOCFILES}
diff --git a/converters/tuc/Makefile b/converters/tuc/Makefile
index 33f40579b297..7f6909db4c20 100644
--- a/converters/tuc/Makefile
+++ b/converters/tuc/Makefile
@@ -16,6 +16,6 @@ PLIST_FILES=	bin/tuc \
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tuc ${STAGEDIR}${PREFIX}/bin
-	$(INSTALL_MAN) ${WRKSRC}/tuc.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/tuc.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile
index 3c7ef2a692b1..7bd08788b348 100644
--- a/databases/postgresql91-docs/Makefile
+++ b/databases/postgresql91-docs/Makefile
@@ -32,7 +32,7 @@ do-build:
 	${MAKE_CMD} -C ${WRKSRC} html
 
 do-install:
-	@ $(MKDIR) ${STAGEDIR}${PGDOCSDIR}
+	@ ${MKDIR} ${STAGEDIR}${PGDOCSDIR}
 	( cd ${WRKSRC}/doc/src/sgml/html && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} )
 
diff --git a/devel/arduino-mk/Makefile b/devel/arduino-mk/Makefile
index d87d1bb89e44..909ed6c0243a 100644
--- a/devel/arduino-mk/Makefile
+++ b/devel/arduino-mk/Makefile
@@ -34,7 +34,7 @@ NEW_BOARDS_TXT=	${PREFIX}/arduino/hardware/arduino/boards.txt
 INSLIST=	AnalogInOutSerial Blink BlinkWithoutDelay Fade HelloWorld \
 		WebServer master_reader toneMelody
 post-patch:
-	@ARDUINO="`$(ARDUINO_CMD)`" && \
+	@ARDUINO="`${ARDUINO_CMD}`" && \
 	    ${REINPLACE_CMD} -e "s|%%ARDUINO%%|$${ARDUINO}|g" \
 	    ${WRKSRC}/arduino-mk/Arduino.mk
 	@${REINPLACE_CMD} -e "s|'${OLD_BOARDS_TXT}'|'${NEW_BOARDS_TXT}'|g" \
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index c0b6be342612..463478797729 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -14,7 +14,7 @@ CONFLICTS=	cutils-[0-9]*
 USES=		readline
 USE_CSTD=	c89
 ALL_TARGET=	${PORTNAME}
-MAKE_ENV+=	STAGEDIR=$(STAGEDIR)
+MAKE_ENV+=	STAGEDIR=${STAGEDIR}
 
 PLIST_FILES=	bin/cdecl bin/c++decl man/man1/cdecl.1.gz man/man1/c++decl.1.gz
 PORTDOCS=	testset testset++
diff --git a/devel/dwarves/Makefile b/devel/dwarves/Makefile
index bd2aae5f6e90..ec0daf9c046e 100644
--- a/devel/dwarves/Makefile
+++ b/devel/dwarves/Makefile
@@ -14,13 +14,13 @@ MAINTAINER=	cem@FreeBSD.org
 COMMENT=	Debugging Information Manipulation Tools
 
 LICENSE=	GPLv2
-LICENSE_FILE_GPLv2=	$(WRKSRC)/COPYING
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libdw.so:devel/elfutils
 PATCH_DEPENDS=	gnulib>=0:devel/gnulib
 
-WRKSRC=		$(WRKDIR)/dwarves-b52386d
+WRKSRC=		${WRKDIR}/dwarves-b52386d
 
 USES=		cmake:outsource localbase tar:bzip2
 USE_LDCONFIG=	yes
@@ -29,11 +29,11 @@ CMAKE_VERBOSE=	1
 
 post-patch:
 	@${CP} -a \
-	    $(LOCALBASE)/share/gnulib/lib/gettext.h \
-	    $(LOCALBASE)/share/gnulib/lib/obstack.c \
-	    $(LOCALBASE)/share/gnulib/lib/obstack.h \
-	    $(WRKSRC)/
+	    ${LOCALBASE}/share/gnulib/lib/gettext.h \
+	    ${LOCALBASE}/share/gnulib/lib/obstack.c \
+	    ${LOCALBASE}/share/gnulib/lib/obstack.h \
+	    ${WRKSRC}/
 	@${REINPLACE_CMD} -e 's|_GL_ATTRIBUTE_PURE|__attribute__((__pure__))|g' \
-	    $(WRKSRC)/obstack.h $(WRKSRC)/obstack.c
+	    ${WRKSRC}/obstack.h ${WRKSRC}/obstack.c
 
 .include <bsd.port.mk>
diff --git a/devel/libfastjson/Makefile b/devel/libfastjson/Makefile
index 0f01605974b9..0070fc2be165 100644
--- a/devel/libfastjson/Makefile
+++ b/devel/libfastjson/Makefile
@@ -19,7 +19,7 @@ USES=		autoreconf libtool pkgconfig
 INSTALL_TARGET=	install-strip
 
 post-patch:
-	${REINPLACE_CMD} -e 's|$(libdir)/pkgconfig|$(libdir)data/pkgconfig|' \
+	${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(libdir)data/pkgconfig|' \
 		${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/devel/xorg-macros/Makefile b/devel/xorg-macros/Makefile
index c9c9ae02e8a4..49a320b3d3b4 100644
--- a/devel/xorg-macros/Makefile
+++ b/devel/xorg-macros/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	xorg-macros
 PORTVERSION=	1.19.0
 CATEGORIES=	devel x11
-DISTNAME=	util-macros-$(PORTVERSION)
+DISTNAME=	util-macros-${PORTVERSION}
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org development aclocal macros
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index c7843a3ec0e6..c6c067d95860 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -16,7 +16,7 @@ MAKEFILE=	Makefile.FreeBSD
 USES=		alias tar:bzip2
 USE_GNOME=	gtk12
 
-MAKE_ARGS=	STAGEDIR="$(STAGEDIR)"
+MAKE_ARGS=	STAGEDIR="${STAGEDIR}"
 
 pre-configure:
 	@${CP} ${FILESDIR}/mntent* ${WRKSRC}
diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile
index 258c2f4500a8..d3f13da7493f 100644
--- a/editors/thoteditor/Makefile
+++ b/editors/thoteditor/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Structured document editor, offering a graphical WYSIWYG interface
 
 THOT_SUBDIR=	Target
 USES=		gmake motif
-WRKSRC=		$(WRKDIR)/Thot/$(THOT_SUBDIR)
+WRKSRC=		${WRKDIR}/Thot/${THOT_SUBDIR}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-thot --enable-plugin --without-insure --without-amaya \
 		--disable-java --disable-intr --disable-jit --disable-math \
@@ -37,7 +37,7 @@ post-patch:
 		${WRKDIR}/Thot/thotlib/include/sysdep.h
 
 do-configure:
-	(cd $(WRKSRC);../configure $(CONFIGURE_ARGS))
+	(cd ${WRKSRC};../configure ${CONFIGURE_ARGS})
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/thot/doc
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index cb03e2027c50..394cc10cbc14 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -73,10 +73,10 @@ CONSOLE_PLIST_SUB=	GUI="@comment "
 CSCOPE_MAKE_ARGS=	CONF_OPT_CSCOPE=--enable-cscope
 CSCOPE_RUN_DEPENDS=	cscope:devel/cscope
 EXUBERANT_CTAGS_RUN_DEPENDS=	exctags:devel/ctags
-GNOME_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt"
+GNOME_MAKE_ARGS=	CONF_OPT_GUI=--enable-gui=gnome2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
 GNOME_PLIST_SUB=	GUI=""
 GNOME_USE=		GNOME=libgnomeui XORG=glproto,xpm,xt
-GTK2_MAKE_ARGS=		CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$(X_LIBS) -lX11 -lXpm -lXt"
+GTK2_MAKE_ARGS=		CONF_OPT_GUI=--enable-gui=gtk2 X_LIBS="$$(X_LIBS) -lX11 -lXpm -lXt"
 GTK2_PLIST_SUB=		GUI=""
 GTK2_USE=		GNOME=gtk20 XORG=xpm,xt
 LUA_MAKE_ARGS=		CONF_OPT_LUA=--enable-luainterp=dynamic CONF_OPT_LUA_PREFIX=--with-lua-prefix=${LOCALBASE}
@@ -94,7 +94,7 @@ RUBY_MAKE_ARGS=		CONF_OPT_RUBY=--enable-rubyinterp
 RUBY_USE=		RUBY=yes
 TCL_MAKE_ARGS=		CONF_OPT_TCL="--enable-tclinterp --with-tclsh=tclsh${TCL_VER}"
 TCL_USES=		tcl:85+
-X11_MAKE_ARGS=		CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$(X_LIBS) -lX11 -lXt"
+X11_MAKE_ARGS=		CONF_OPT_GUI="--enable-gui=no --with-x" X_LIBS="$$(X_LIBS) -lX11 -lXt"
 X11_PLIST_SUB=		GUI="@comment "
 X11_USE=		XORG=x11,xt
 
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index ab991a755811..e76ae1e0fdab 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -34,6 +34,6 @@ post-patch:
 			 s/strstream\.h/strstream/; \
 			 s/fstream\.h/fstream/' \{\} \;
 	@${FIND} ${WRKSRC} -name Makefile -exec \
-		${REINPLACE_CMD} -e 's/make/$(MAKE)/' \{\} \;
+		${REINPLACE_CMD} -e 's/make/${MAKE}/' \{\} \;
 
 .include <bsd.port.mk>
diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile
index 3d73896b46bb..efad4cbc6c18 100644
--- a/emulators/virtualbox-ose/Makefile
+++ b/emulators/virtualbox-ose/Makefile
@@ -257,7 +257,7 @@ post-patch:
 	@${ECHO} 'VBOX_PATH_GSOAP = ${PREFIX}/lib/gsoap' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_PATH_GSOAP_BIN = ${PREFIX}/bin' >> ${WRKSRC}/LocalConfig.kmk
 	@${ECHO} 'VBOX_PATH_GSOAP_IMPORT = ${PREFIX}/share/gsoap/import' >> ${WRKSRC}/LocalConfig.kmk
-	@${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk
+	@${ECHO} 'VBOX_GCC_PEDANTIC_CXX = -Wshadow $$(VBOX_GCC_WARN) -Wno-long-long' >> ${WRKSRC}/LocalConfig.kmk
 .endif
 .if ${PORT_OPTIONS:MR0LOGGING}
 	@${ECHO} 'VBOX_WITH_R0_LOGGING = 1' >> ${WRKSRC}/LocalConfig.kmk
diff --git a/finance/beanie/Makefile b/finance/beanie/Makefile
index f4737caac255..43fa1529b135 100644
--- a/finance/beanie/Makefile
+++ b/finance/beanie/Makefile
@@ -19,7 +19,7 @@ LATE_INSTALL_ARGS=	BEANIEROOT="${STAGEDIR}${PREFIX}/beanie"
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
-	@${CP} ${WRKSRC}/beanie.mk.sample $(WRKSRC)/beanie.mk
+	@${CP} ${WRKSRC}/beanie.mk.sample ${WRKSRC}/beanie.mk
 	@${CP} ${WRKSRC}/tmac/lhead.sample.r ${WRKSRC}/tmac/lhead.r
 
 .include <bsd.port.mk>
diff --git a/games/blockrage/Makefile b/games/blockrage/Makefile
index 0acc519991b4..2c19e4b2213f 100644
--- a/games/blockrage/Makefile
+++ b/games/blockrage/Makefile
@@ -37,7 +37,7 @@ post-patch:
 		's|prefix=/usr/local|prefix=${PREFIX}|; \
 		s|MYCC=gcc|MYCC?=${CC}|; \
 		s|-s -O2 -Wall||; \
-		s|sdl-config|$(SDL_CONFIG)|; \
+		s|sdl-config|${SDL_CONFIG}|; \
 		s|MAKE=make|MAKE=${MAKE}|' \
 			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|gcc -s|${CC}|' \
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index ba5bb6c4e74c..a11146a7394c 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -29,10 +29,10 @@ DESKTOP_ENTRIES="Gem Drop X" "" "${PORTNAME}" \
 
 post-patch:
 	@${REINPLACE_CMD} \
-	-e 's|sdl-config|$(SDL_CONFIG)| ; \
+	-e 's|sdl-config|${SDL_CONFIG}| ; \
 	s|CC=gcc|CC?=${CC}| ; \
 	s|CXX=gcc|CXX?=${CC}| ; \
-	s|CFLAGS=-Wall $(SDL_CFLAGS)|CFLAGS+=-w $(SDL_CFLAGS)|' \
+	s|CFLAGS=-Wall ${SDL_CFLAGS}|CFLAGS+=-w ${SDL_CFLAGS}|' \
 		${WRKSRC}/Makefile
 	@${FIND} ${WRKDIR} -name .xvpics | ${XARGS} ${RM} -rf
 
diff --git a/games/legend-of-edgar/Makefile b/games/legend-of-edgar/Makefile
index 69ccba1883c4..935712d29316 100644
--- a/games/legend-of-edgar/Makefile
+++ b/games/legend-of-edgar/Makefile
@@ -38,7 +38,7 @@ post-patch:
 		s|/share/games/edgar/|/share/edgar/|; \
 		s|/share/man/|/man/|; \
 		s|-Wall ||; \
-		s|sdl-config|$(SDL_CONFIG)|; \
+		s|sdl-config|${SDL_CONFIG}|; \
 		s|-s ||' \
 		${WRKSRC}/makefile
 	@${REINPLACE_CMD} -e 's|SDL/SDL|${LOCALBASE}/include/SDL/SDL|g' \
diff --git a/games/miscom/Makefile b/games/miscom/Makefile
index a905dc3753aa..b783c274d841 100644
--- a/games/miscom/Makefile
+++ b/games/miscom/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
-CFLAGS+=	-DSOUNDSDIR='\"$(DATADIR)\"' -DSOUND_SUPPORT -DMORE_SOUNDBUF
+CFLAGS+=	-DSOUNDSDIR='\"${DATADIR}\"' -DSOUND_SUPPORT -DMORE_SOUNDBUF
 .endif
 
 do-install:
diff --git a/games/netwalk/Makefile b/games/netwalk/Makefile
index 00fe1737c256..1bfaa7781f84 100644
--- a/games/netwalk/Makefile
+++ b/games/netwalk/Makefile
@@ -35,7 +35,7 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 	's|CC = gcc|CC = ${CC}|; \
 	 s|CFLAGS=-Wall -O2 -fomit-frame-pointer|CFLAGS+= -fomit-frame-pointer|; \
-	 s|sdl-config|$(SDL_CONFIG)|; \
+	 s|sdl-config|${SDL_CONFIG}|; \
 	 s|PREFIX = /usr|PREFIX = ${PREFIX}|' \
 		${WRKSRC}/Makefile
 
diff --git a/games/openbor/Makefile b/games/openbor/Makefile
index ad25f2e31226..2d037ccd11ae 100644
--- a/games/openbor/Makefile
+++ b/games/openbor/Makefile
@@ -21,7 +21,7 @@ MAKE_ENV=	BUILD_LINUX=1 SDKPATH="${LOCALBASE}" \
 		GCC_TARGET="${CONFIGURE_TARGET:S/amd64/x86_64/}"
 MAKE_ARGS=	CC="${CC}" LIBRARIES="${LOCALBASE}/lib" \
 		TARGET_ARCH=${ARCH:S/i386/x86/} ARCHFLAGS="" \
-		TARGET_FINAL='$(TARGET)' BUILD_MMX=""
+		TARGET_FINAL='${TARGET}' BUILD_MMX=""
 LDFLAGS+=	-Wl,--as-needed
 PLIST_FILES=	bin/${PORTNAME} \
 		share/pixmaps/${PORTNAME}.png
diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile
index 20f604ac7856..097234a23e8b 100644
--- a/games/ufoai/Makefile
+++ b/games/ufoai/Makefile
@@ -97,7 +97,7 @@ post-extract:
 
 post-build:
 	@cd ${WRKSRC} && ${MAKE_CMD} lang
-.if $(PORT_OPTIONS:MUFORADIANT)
+.if ${PORT_OPTIONS:MUFORADIANT}
 	@cd ${WRKSRC} && ${MAKE_CMD} uforadiant
 .endif
 
diff --git a/games/vodovod/Makefile b/games/vodovod/Makefile
index ab66352bd53f..8ab97147e308 100644
--- a/games/vodovod/Makefile
+++ b/games/vodovod/Makefile
@@ -42,7 +42,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|PREFIX=/usr|PREFIX=${PREFIX}|' \
 		-e 's|CC = g++|CC ?= g++|' \
 		-e 's|CC|CXX|' \
-		-e 's|sdl-config|$(SDL_CONFIG)|' \
+		-e 's|sdl-config|${SDL_CONFIG}|' \
 		-e '/^MY_CFLAGS/ s| = | = ${CXXFLAGS} |' \
 		${WRKSRC}/Makefile
 
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 7a6c2cf2a93b..64cd2b149ef8 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -20,7 +20,7 @@ LICENSE_NAME=	Rayshade license
 LICENSE_FILE=	${WRKSRC}/Doc/Copyright
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:graphics/urt
+BUILD_DEPENDS=	${LOCALBASE}/lib/librle.a:graphics/urt
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION:R}
 
diff --git a/graphics/sane-epkowa/Makefile b/graphics/sane-epkowa/Makefile
index 9d0562e452d2..ddcf2e198e44 100644
--- a/graphics/sane-epkowa/Makefile
+++ b/graphics/sane-epkowa/Makefile
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=--prefix=${PREFIX} LDFLAGS="-L${PREFIX}/lib -lgetline" CPPFLAGS=
 
 .include <bsd.port.pre.mk>
 
-.if $(PORTVERSION) != "2.15.0"
+.if ${PORTVERSION} != "2.15.0"
 do-patch:	# nothing to do
 
 do-build:
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 6dfb5e35e81a..afdcd779ef7f 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -32,23 +32,23 @@ WNN6_DESC=		Wnn6 support
 WNN6_LIB_DEPENDS=	libwnn6.so:japanese/Wnn6-lib
 WNN6_CONF=		'\#define UseWnn' \
 			'\#define UseWnn6' \
-			WNNINCDIR=$(LOCALBASE)/include/wnn6/wnn \
-			WNNLIB="-L$(LOCALBASE)/lib -lwnn6 -lcrypt"
+			WNNINCDIR=${LOCALBASE}/include/wnn6/wnn \
+			WNNLIB="-L${LOCALBASE}/lib -lwnn6 -lcrypt"
 WNN6_PLIST_FILES=	${WNN_PLIST_FILES}
 
 WNN7_DESC=		Wnn7 support
 WNN7_LIB_DEPENDS=	libwnn7.so:japanese/Wnn7-lib
 WNN7_CONF=		'\#define UseWnn' \
 			'\#define UseWnn6' \
-			WNNINCDIR=$(LOCALBASE)/include/wnn7/wnn \
-			WNNLIB="-L$(LOCALBASE)/lib -lwnn7 -lcrypt"
+			WNNINCDIR=${LOCALBASE}/include/wnn7/wnn \
+			WNNLIB="-L${LOCALBASE}/lib -lwnn7 -lcrypt"
 WNN7_PLIST_FILES=	${WNN_PLIST_FILES}
 
 FREEWNN_DESC=		FreeWnn support
 FREEWNN_LIB_DEPENDS=	libwnn.so:japanese/FreeWnn-lib
 FREEWNN_CONF=		'\#define UseWnn' \
-			WNNINCDIR=$(LOCALBASE)/include/wnn \
-			WNNLIB="-L$(LOCALBASE)/lib -lwnn -lcrypt"
+			WNNINCDIR=${LOCALBASE}/include/wnn \
+			WNNLIB="-L${LOCALBASE}/lib -lwnn -lcrypt"
 FREEWNN_PLIST_FILES=	${WNN_PLIST_FILES}
 
 SJ3_DESC=		SJ3 support
diff --git a/japanese/xtr/Makefile b/japanese/xtr/Makefile
index bfde14b68430..d641811f8584 100644
--- a/japanese/xtr/Makefile
+++ b/japanese/xtr/Makefile
@@ -23,7 +23,7 @@ OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${ECHO_MSG} "===>  Converting Kanji code for ${DISTNAME}"
-	@(cd ${WRKSRC} && $(SH) EUCsetup )
+	@(cd ${WRKSRC} && ${SH} EUCsetup )
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xtr ${STAGEDIR}${PREFIX}/bin/xtr
diff --git a/multimedia/libsmacker/Makefile b/multimedia/libsmacker/Makefile
index 8ca3c5af08e0..16f7c909db19 100644
--- a/multimedia/libsmacker/Makefile
+++ b/multimedia/libsmacker/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	libsmacker
 PORTVERSION=	1.0
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/${PORTNAME}/$(DISTNAME)/
+MASTER_SITES=	SF/${PORTNAME}/${DISTNAME}/
 
 MAINTAINER=	kennedy.greg@gmail.com
 COMMENT=	C library for decoding .smk Smacker Video files
diff --git a/multimedia/mpeg4ip/Makefile b/multimedia/mpeg4ip/Makefile
index 164d5eb7379b..2889d2bad347 100644
--- a/multimedia/mpeg4ip/Makefile
+++ b/multimedia/mpeg4ip/Makefile
@@ -97,7 +97,7 @@ pre-configure:
 		${WRKSRC}/lib/Makefile.in
 	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
-		's|-I$(top_srcdir)/lib/mp4v2||; \
+		's|-I$$(top_srcdir)/lib/mp4v2||; \
 		s|$$(top_builddir)/lib/mp4v2/libmp4v2.la||; \
 		s|$$(top_srcdir)/lib/mp4v2/libmp4v2.la||; \
 		s|@LIBS@|@LIBS@ -lmp4v2|; \
diff --git a/multimedia/mplayer-skins/Makefile b/multimedia/mplayer-skins/Makefile
index cc08180e9789..87706f6bea24 100644
--- a/multimedia/mplayer-skins/Makefile
+++ b/multimedia/mplayer-skins/Makefile
@@ -49,7 +49,7 @@ PORT_OPTIONS+=	${ALLSKINS}
 post-build-script:
 DISTFILES+=	${DEFAULT_FILE}${EXTRACT_SUFX}
 .for f in ${ALLSKINS}
-.if $(PORT_OPTIONS:M${f})
+.if ${PORT_OPTIONS:M${f}}
 PLIST_SUB+=	${f}="" WITHOUT_SKIN_${f}="@comment "
 DISTFILES+=	${${f}_FILE}${EXTRACT_SUFX}
 .else
diff --git a/multimedia/vdr-plugin-epgsearch/Makefile b/multimedia/vdr-plugin-epgsearch/Makefile
index 98594bcb86d3..dbbd8d7536a8 100644
--- a/multimedia/vdr-plugin-epgsearch/Makefile
+++ b/multimedia/vdr-plugin-epgsearch/Makefile
@@ -19,7 +19,7 @@ USES=		pkgconfig tar:bzip2
 PATCH_STRIP=	-p1
 PORTDOCS=	COPYING README HISTORY
 WRKSRC=		${WRKDIR}/vdr-plugin-${PLUGIN}
-MAKE_ARGS+=	INCLUDES="-I$(LOCALBASE)/include -I$(LOCALBASE)/include/vdr -I${WRKSRC}"
+MAKE_ARGS+=	INCLUDES="-I${LOCALBASE}/include -I${LOCALBASE}/include/vdr -I${WRKSRC}"
 
 .include	"${.CURDIR}/../vdr/Makefile.plugins"
 
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index 8c4b71e344c6..8440231a5e70 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -30,12 +30,12 @@ CPE_VENDOR=	tvdr
 SHEBANG_FILES=	svdrpsend
 DIST_SUBDIR=	vdr
 PORTDOCS=	COPYING INSTALL MANUAL README HISTORY
-CONFDIR=	$(ETCDIR)
+CONFDIR=	${ETCDIR}
 USE_CSTD=	gnu89
 MAKE_ARGS+=	CC="${CC}"
 MAKE_ARGS+=	CXX="${CXX}"
 MAKE_ARGS+=	VDR_USER=${VDR_USER}
-MAKE_ARGS+=	CONFDIR=$(CONFDIR)
+MAKE_ARGS+=	CONFDIR=${CONFDIR}
 MAKE_ARGS+=	OSTYPE=FreeBSD
 MAKE_ARGS+=	LIRC_DEVICE=/var/run/lirc/lircd
 MAKE_ARGS+=	LIBDIR=../../lib
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index ecd1c0028d3d..fad5f2abb058 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -102,7 +102,7 @@ post-patch:
 		's|locale, LOCALEDIR)|locale)|' \
 		${WRKSRC}/jabberd/lib/messages.cc
 	@${REINPLACE_CMD} -e \
-		's|"$(localedir)|"$$(DESTDIR)$(localedir)|' \
+		's|"$$(localedir)|"$$(DESTDIR)$$(localedir)|' \
 		${WRKSRC}/po/Makefile.in
 	@${LN} -s jabberd.8.in ${WRKSRC}/man/jabberd14.8.in
 
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index a1d74df40208..96a481cd62e7 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -69,7 +69,7 @@ LIB_DEPENDS+=	libnetsnmp.so:net-mgmt/net-snmp
 post-patch:
 	${REINPLACE_CMD} -e 's|web-build client|web-build|' ${WRKSRC}/build/Makefile.rules
 	${REINPLACE_CMD} -e 's|install-docs install-client|install-docs|' ${WRKSRC}/build/Makefile.rules
-	${REINPLACE_CMD} -e 's|$(INSTALLETCDIR)/protocols.cfg|$(INSTALLETCDIR)/protocols.cfg.DIST|' ${WRKSRC}/xymonnet/Makefile
+	${REINPLACE_CMD} -e 's|$$(INSTALLETCDIR)/protocols.cfg|$$(INSTALLETCDIR)/protocols.cfg.DIST|' ${WRKSRC}/xymonnet/Makefile
 	${REINPLACE_CMD} -e 's|TRACEROUTE="traceroute"|TRACEROUTE="mtr -c 2 -n --report"|' ${WRKSRC}/xymond/etcfiles/xymonserver.cfg.DIST
 	${RM} ${WRKSRC}/docs/manpages/man1/xymonping.1.html
 	${RM} ${WRKSRC}/xymonnet/xymonping.1
diff --git a/net/crtmpserver/Makefile b/net/crtmpserver/Makefile
index 41b95718f3a1..3c448cf1ee6b 100644
--- a/net/crtmpserver/Makefile
+++ b/net/crtmpserver/Makefile
@@ -36,8 +36,8 @@ post-patch:
 .endif
 
 pre-install:
-	@${SH} $(WRKSRC)/fixConfFile.sh "${WRKSRC}/builders/cmake/crtmpserver/crtmpserver.lua" "${PREFIX}" "${WRKSRC}"
-	@${SH} $(WRKSRC)/fixConfFile.sh "${WRKSRC}/builders/cmake/crtmpserver/all.debug.lua" "${PREFIX}" "${WRKSRC}"
+	@${SH} ${WRKSRC}/fixConfFile.sh "${WRKSRC}/builders/cmake/crtmpserver/crtmpserver.lua" "${PREFIX}" "${WRKSRC}"
+	@${SH} ${WRKSRC}/fixConfFile.sh "${WRKSRC}/builders/cmake/crtmpserver/all.debug.lua" "${PREFIX}" "${WRKSRC}"
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/var/log/crtmpserver
diff --git a/net/dgd/Makefile b/net/dgd/Makefile
index 2a6047397fb2..ad4ae8971126 100644
--- a/net/dgd/Makefile
+++ b/net/dgd/Makefile
@@ -26,7 +26,7 @@ WRKSRC=		${BASE_WRKSRC}/src
 PATCH_WRKSRC=	${BASE_WRKSRC}
 ALL_TARGET=	install
 MAKE_JOBS_UNSAFE=	yes
-MAKE_ENV+=	EXTRA_DEFINES="$(EXTRA_DEFINES)"
+MAKE_ENV+=	EXTRA_DEFINES="${EXTRA_DEFINES}"
 
 PORTDOCS=	*
 
diff --git a/net/samba42/Makefile b/net/samba42/Makefile
index b1fc59962670..18392f2bc8e6 100644
--- a/net/samba42/Makefile
+++ b/net/samba42/Makefile
@@ -477,7 +477,7 @@ pre-configure:
 
 # XXX: Gross hack to allow build newer Samba while old one is installed.
 # This implies that LINKFLAGS_PYEMBED contains flags which are already
-# used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread
+# used in other parts of LINKFLAGS, namely -L${LOCALBASE}/lib and -pthread
 post-configure:
 	-${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \
 		${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py
diff --git a/net/samba43/Makefile b/net/samba43/Makefile
index b96f0e51feb8..99fadc28619e 100644
--- a/net/samba43/Makefile
+++ b/net/samba43/Makefile
@@ -477,7 +477,7 @@ pre-configure:
 
 # XXX: Gross hack to allow build newer Samba while old one is installed.
 # This implies that LINKFLAGS_PYEMBED contains flags which are already
-# used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread
+# used in other parts of LINKFLAGS, namely -L${LOCALBASE}/lib and -pthread
 post-configure:
 	-${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \
 		${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py
diff --git a/net/samba44/Makefile b/net/samba44/Makefile
index e017657f3eb7..0b50f31c7b31 100644
--- a/net/samba44/Makefile
+++ b/net/samba44/Makefile
@@ -463,7 +463,7 @@ pre-configure:
 
 # XXX: Gross hack to allow build newer Samba while old one is installed.
 # This implies that LINKFLAGS_PYEMBED contains flags which are already
-# used in other parts of LINKFLAGS, namely -L$(LOCALBASE)/lib and -pthread
+# used in other parts of LINKFLAGS, namely -L${LOCALBASE}/lib and -pthread
 post-configure:
 	-${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \
 		${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py
diff --git a/net/tiny-network-utilities/Makefile b/net/tiny-network-utilities/Makefile
index cf71004b2d58..7ff77903d147 100644
--- a/net/tiny-network-utilities/Makefile
+++ b/net/tiny-network-utilities/Makefile
@@ -23,7 +23,7 @@ NO_ARCH=	yes
 
 FILES_EXEC=	tiny-dhcp-server tiny-udp-proxy tiny-udp-anti-nat
 FILES_LIB=	net_checksums tiny_utils
-PLIST_FILES=	$(FILES_EXEC:%=bin/%) $(FILES_LIB:%=${PYTHON_SITELIBDIR}/%.py)
+PLIST_FILES=	${FILES_EXEC:%=bin/%} ${FILES_LIB:%=${PYTHON_SITELIBDIR}/%.py}
 
 .include <bsd.port.pre.mk>
 
diff --git a/print/asprint/Makefile b/print/asprint/Makefile
index 9ba1b914d0de..46e8e38a9b1e 100644
--- a/print/asprint/Makefile
+++ b/print/asprint/Makefile
@@ -17,6 +17,6 @@ ALL_TARGET=	asprint
 MAKEFILE=	makefile
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKSRC)/asprint ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/asprint ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/print/splix/Makefile b/print/splix/Makefile
index fbf555ebc98d..030d4f39406d 100644
--- a/print/splix/Makefile
+++ b/print/splix/Makefile
@@ -69,8 +69,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}${BIN_DEST_DIR}
 .for MODEL in ${MODELS}
 	${MKDIR} ${STAGEDIR}${DEST_DIR_${MODEL}}
-.for PPD in $(PPD_${MODEL})
-	${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd ${STAGEDIR}$(DEST_DIR_${MODEL})
+.for PPD in ${PPD_${MODEL}}
+	${INSTALL_DATA} ${WRKSRC}/ppd/${PPD}.ppd ${STAGEDIR}${DEST_DIR_${MODEL}}
 .endfor
 .endfor
 
diff --git a/russian/ircd-hybrid/Makefile b/russian/ircd-hybrid/Makefile
index 2e9a8d07d877..30f95f63d8a8 100644
--- a/russian/ircd-hybrid/Makefile
+++ b/russian/ircd-hybrid/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/ircd-hybrid-ru
 
 USERS=		ircdru
 GROUPS=		ircdru
-PLIST_SUB=     USR=$(USERS) GRP=$(GROUPS)
+PLIST_SUB=     USR=${USERS} GRP=${GROUPS}
 
 .if defined(WITH_SMALL_NET)
 CONFIGURE_ARGS+=-enable-small-net
diff --git a/security/calife/Makefile b/security/calife/Makefile
index ccea78d19121..e3ab89d100fc 100644
--- a/security/calife/Makefile
+++ b/security/calife/Makefile
@@ -20,10 +20,10 @@ CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc
 CONFIGURE_ARGS+=	--with-pam
 
 do-install:
-	$(INSTALL_PROGRAM) ${WRKSRC}/calife ${STAGEDIR}${PREFIX}/bin/calife
-	$(INSTALL_MAN) ${WRKSRC}/calife.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	$(INSTALL_MAN) ${WRKSRC}/calife.auth.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
-	$(INSTALL_DATA) ${WRKSRC}/calife.auth-dist ${STAGEDIR}${PREFIX}/etc/calife.auth.sample
+	${INSTALL_PROGRAM} ${WRKSRC}/calife ${STAGEDIR}${PREFIX}/bin/calife
+	${INSTALL_MAN} ${WRKSRC}/calife.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/calife.auth.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
+	${INSTALL_DATA} ${WRKSRC}/calife.auth-dist ${STAGEDIR}${PREFIX}/etc/calife.auth.sample
 	${INSTALL_DATA} ${WRKSRC}/pam/freebsd9 ${STAGEDIR}${PREFIX}/etc/pam.d/calife.sample
 
 .include <bsd.port.mk>
diff --git a/security/luasec/Makefile b/security/luasec/Makefile
index 7c7160dc8c26..5788e06a6fff 100644
--- a/security/luasec/Makefile
+++ b/security/luasec/Makefile
@@ -16,7 +16,7 @@ GH_ACCOUNT=	brunoos
 ALL_TARGET=	bsd
 LIBDIR=		-L${LUA_LIBDIR} -L${WRKSRC}/src/luasocket
 MAKE_ENV+=	INCDIR="-I${LUA_INCDIR} -I${WRKSRC}/src" LUAPATH=${LUA_MODSHAREDIR} \
-		CPATH=${LUA_MODLIBDIR} LD=$(CC)
+		CPATH=${LUA_MODLIBDIR} LD=${CC}
 USES=		lua:51
 USE_OPENSSL=	yes
 CFLAGS+=	-DOPENSSL_NO_SSL3
diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile
index 6ddb5a65ab81..70f8c1d38863 100644
--- a/security/openssl-devel/Makefile
+++ b/security/openssl-devel/Makefile
@@ -118,13 +118,13 @@ post-patch:
 post-configure:
 	${REINPLACE_CMD} \
 		-e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \
-		-e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \
-		-e 's|$$(SHLIB_MAJOR).$$(SHLIB_MINOR)|$(OPENSSL_SHLIBVER)|g' \
+		-e 's|LIBVERSION=[^ ]* |LIBVERSION=${OPENSSL_SHLIBVER} |' \
+		-e 's|$$(SHLIB_MAJOR).$$(SHLIB_MINOR)|${OPENSSL_SHLIBVER}|g' \
 		-e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
 		-e 's| install_html_docs$$||' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} \
-		-e 's|^LIBVERSION=$$|LIBVERSION=$(OPENSSL_SHLIBVER) |' \
+		-e 's|^LIBVERSION=$$|LIBVERSION=${OPENSSL_SHLIBVER} |' \
 		${WRKSRC}/Makefile.shared
 
 post-install-SHARED-on:
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index ccf6c51209fd..45b8f7dc81be 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -216,7 +216,7 @@ do-configure:
 	${REINPLACE_CMD} \
 		-e 's|^MANDIR=.*$$|MANDIR=$$(PREFIX)/man|' \
 		-e 's|$$(LIBDIR)/pkgconfig|libdata/pkgconfig|g' \
-		-e 's|LIBVERSION=[^ ]* |LIBVERSION=$(OPENSSL_SHLIBVER) |' \
+		-e 's|LIBVERSION=[^ ]* |LIBVERSION=${OPENSSL_SHLIBVER} |' \
 		${WRKSRC}/Makefile
 
 post-install:
diff --git a/security/putty/Makefile b/security/putty/Makefile
index 852ecb87982a..472f5f4bfad3 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -44,7 +44,7 @@ MAKE_ARGS+=	GTK_CONFIG=:
 .if ${PORT_OPTIONS:MGSSAPI}
 _COMPAT=		-DSTATIC_GSSAPI
 USES+=		gssapi:base,flags
-MAKE_ARGS+=	KRB5CONFIG=$(KRB5CONFIG)
+MAKE_ARGS+=	KRB5CONFIG=${KRB5CONFIG}
 .else
 _COMPAT=		-DNO_GSSAPI
 .endif
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 13b62796f208..1c2624d6aa8a 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -139,7 +139,7 @@ make-pkg-install:
 	@ ${ECHO_CMD} 'esac' >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} PACKAGE_INSTALLER=yes >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} POLICYSRC=/tmp/$$$$.tmp >> ${PKGPOSTINSTALL}
-	@ ${ECHO_CMD} PREFIX="$(PREFIX)" >> ${PKGPOSTINSTALL}
+	@ ${ECHO_CMD} PREFIX="${PREFIX}" >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} DO_NOT_CONFIG=yes >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} TW_CLOBBER="false" >> ${PKGPOSTINSTALL}
 	@ ${ECHO_CMD} TW_PROMPT="false" >> ${PKGPOSTINSTALL}
diff --git a/security/yubico-piv-tool/Makefile b/security/yubico-piv-tool/Makefile
index fc8b2a8956d6..f19d50562dd2 100644
--- a/security/yubico-piv-tool/Makefile
+++ b/security/yubico-piv-tool/Makefile
@@ -18,9 +18,9 @@ USES=		libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	OPENSSL_CFLAGS="$(OPENSSL_CFLAGS)" \
-		OPENSSL_LIBS="-L$(OPENSSLLIB) -lcrypto"
-OPENSSL_CFLAGS=	-I$(OPENSSLINC)
+CONFIGURE_ENV=	OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
+OPENSSL_CFLAGS=	-I${OPENSSLINC}
 
 PLIST_FILES=	bin/yubico-piv-tool \
 		include/ykcs11/ykcs11-version.h \
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index ace71399ad91..073a32d3a18b 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -18,6 +18,6 @@ OPTIONS_DEFINE=	READLINE
 
 READLINE_USES=		readline
 READLINE_CONFIGURE_WITH=--with-readline
-READLINE_MAKE_ARGS_OFF=	CFLAGS="$(CFLAGS) -static"
+READLINE_MAKE_ARGS_OFF=	CFLAGS="${CFLAGS} -static"
 
 .include <bsd.port.mk>
diff --git a/sysutils/bbcp/Makefile b/sysutils/bbcp/Makefile
index 509c4590c222..ee749c966efb 100644
--- a/sysutils/bbcp/Makefile
+++ b/sysutils/bbcp/Makefile
@@ -22,7 +22,7 @@ BUILD_WRKSRC=	${WRKSRC}/src
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|g++|$(CXX)|' -e 's|gcc|$(CC)|' \
+	@${REINPLACE_CMD} -e 's|g++|${CXX}|' -e 's|gcc|${CC}|' \
 		${WRKSRC}/src/Makefile
 
 do-install:
diff --git a/sysutils/eventlog/Makefile b/sysutils/eventlog/Makefile
index 72735d572ea0..a58532538445 100644
--- a/sysutils/eventlog/Makefile
+++ b/sysutils/eventlog/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	0.2.12
 PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/3.2.2/source/
-DISTFILES=	$(PORTNAME)_$(PORTVERSION).tar.gz
+DISTFILES=	${PORTNAME}_${PORTVERSION}.tar.gz
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Replacement of the simple syslog() API providing structure to messages
diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile
index 69f8fbef3125..c91a8d1a4182 100644
--- a/sysutils/file/Makefile
+++ b/sysutils/file/Makefile
@@ -25,7 +25,7 @@ check regression-test test: build
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|$(datadir)/misc|$(datadir)/${PORTNAME}|g' \
+	@${REINPLACE_CMD} -e 's|$$(datadir)/misc|$$(datadir)/${PORTNAME}|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 7db1992e9a0b..c7518e5a7520 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -50,7 +50,7 @@ PORTDOCS=	COPYRIGHT CREDITS README Themes.html
 
 ALL_TARGET=	freebsd
 
-MAKE_ENV+=	INSTALLROOT=${PREFIX} INSTALL_PREFIX=$(STAGEDIR) \
+MAKE_ENV+=	INSTALLROOT=${PREFIX} INSTALL_PREFIX=${STAGEDIR} \
 		PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
 		SINSTALLDIR=${PREFIX}/sbin \
 		MANDIR=${MAN1PREFIX}/man/man1 SMANDIR=${MANPREFIX}/man/man8 \
diff --git a/sysutils/py-stdiff/Makefile b/sysutils/py-stdiff/Makefile
index 2cb8aaf06136..2a4a5a598144 100644
--- a/sysutils/py-stdiff/Makefile
+++ b/sysutils/py-stdiff/Makefile
@@ -17,7 +17,7 @@ PORTDOCS=	*
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	$(INSTALL_MAN) ${WRKSRC}/INSTALL.txt ${STAGEDIR}/${DOCSDIR}/
-	$(INSTALL_MAN) ${WRKSRC}/LICENSE.txt ${STAGEDIR}/${DOCSDIR}/
+	${INSTALL_MAN} ${WRKSRC}/INSTALL.txt ${STAGEDIR}/${DOCSDIR}/
+	${INSTALL_MAN} ${WRKSRC}/LICENSE.txt ${STAGEDIR}/${DOCSDIR}/
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}/)
 .include <bsd.port.mk>
diff --git a/sysutils/sd-agent/Makefile b/sysutils/sd-agent/Makefile
index 0f28ac47b683..c1d9e25ae84a 100644
--- a/sysutils/sd-agent/Makefile
+++ b/sysutils/sd-agent/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Server Density Agent for FreeBSD
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	$(LOCALBASE)/sbin/sysinfo:sysutils/sysinfo
+RUN_DEPENDS=	${LOCALBASE}/sbin/sysinfo:sysutils/sysinfo
 
 USERS=		sd-agent
 GROUPS=		sd-agent
@@ -20,23 +20,23 @@ GH_ACCOUNT=	serverdensity
 USES=		python shebangfix
 SHEBANG_FILES=	agent.py
 
-USE_RC_SUBR=	$(PORTNAME)
-SUB_LIST+=	RCNAME=$(PORTNAME:S/-/_/g)
+USE_RC_SUBR=	${PORTNAME}
+SUB_LIST+=	RCNAME=${PORTNAME:S/-/_/g}
 
 NO_ARCH=	yes
 
-INSTALLDIR=	$(STAGEDIR)$(PREFIX)/libexec/$(PORTNAME)
+INSTALLDIR=	${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 FLIST=		agent.py checks.py daemon.py logtail.py minjson.py pep8.sh plugins.py sd-deploy.py
 
 do-build::
-	$(SED) -i .bak 's,%%PREFIX%%,$(PREFIX),' $(WRKSRC)/agent.py
+	${SED} -i .bak 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/agent.py
 
 do-install::
-	$(MKDIR) $(INSTALLDIR)/plugins
-.for f in $(FLIST)
-	$(INSTALL_SCRIPT) $(WRKSRC)/$f $(INSTALLDIR)
+	${MKDIR} ${INSTALLDIR}/plugins
+.for f in ${FLIST}
+	${INSTALL_SCRIPT} ${WRKSRC}/$f ${INSTALLDIR}
 .endfor
-	$(MKDIR) $(STAGEDIR)$(ETCDIR)
-	$(INSTALL_DATA) $(WRKSRC)/config.cfg $(STAGEDIR)$(ETCDIR)/config.cfg.sample
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/config.cfg ${STAGEDIR}${ETCDIR}/config.cfg.sample
 
 .include <bsd.port.mk>
diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 18fb756d3ad4..06b1d44d0509 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	3.7.3
 PORTREVISION=	1
 PKGNAMESUFFIX=	-devel
 CATEGORIES=	sysutils
-DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
+DISTVERSION=	${PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/}
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
 
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libevtlog.so:sysutils/eventlog \
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
 		syslog-ng-devel-[0-9]*
-WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON
diff --git a/sysutils/syslog-ng-incubator/Makefile b/sysutils/syslog-ng-incubator/Makefile
index 24df89c52e40..c5f99db0f3d9 100644
--- a/sysutils/syslog-ng-incubator/Makefile
+++ b/sysutils/syslog-ng-incubator/Makefile
@@ -12,7 +12,7 @@ DISTFILES=	syslog-ng-incubator-${PORTVERSION}.tar.xz
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The syslog-ng module incubator
 
-WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(PORTVERSION)
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/sysutils/syslog-ng36/Makefile b/sysutils/syslog-ng36/Makefile
index c16aac6c46e9..8e85b075b4cd 100644
--- a/sysutils/syslog-ng36/Makefile
+++ b/sysutils/syslog-ng36/Makefile
@@ -7,7 +7,7 @@ PORTVERSION=	3.6.4
 PKGNAMESUFFIX=	36
 .endif
 CATEGORIES=	sysutils
-DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
+DISTVERSION=	${PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/}
 DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 MASTER_SITES=	https://github.com/balabit/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ \
 		http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${DISTVERSION}/source/ \
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libevtlog.so:sysutils/eventlog \
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
 		syslog-ng-devel-[0-9]*
-WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS OPENSSL
diff --git a/sysutils/syslog-ng37/Makefile b/sysutils/syslog-ng37/Makefile
index f1729e30af90..822a6becf91f 100644
--- a/sysutils/syslog-ng37/Makefile
+++ b/sysutils/syslog-ng37/Makefile
@@ -8,7 +8,7 @@ PORTREVISION=	4
 PKGNAMESUFFIX=	37
 .endif
 CATEGORIES=	sysutils
-DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
+DISTVERSION=	${PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/}
 #DISTFILES=	syslog-ng-${DISTVERSION}.tar.gz
 #MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
 DISTFILES=      syslog-ng-${DISTVERSION}_with_man.tar.gz
@@ -26,7 +26,7 @@ BUILD_DEPENDS=		xsltproc:textproc/libxslt \
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng[0-9][0-9]-[0-9]* \
 		syslog-ng-devel-[0-9]*
-WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON
diff --git a/www/mod_clamav/Makefile b/www/mod_clamav/Makefile
index 21e3ee024b24..f000b829675b 100644
--- a/www/mod_clamav/Makefile
+++ b/www/mod_clamav/Makefile
@@ -38,7 +38,7 @@ post-patch:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
-	$(APXS) -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
+	${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
 		-i -n 'clamav' ${WRKSRC}/.libs/mod_clamav.so
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 
diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile
index 7f332f9421c0..ebd622f9d430 100644
--- a/www/mod_encoding/Makefile
+++ b/www/mod_encoding/Makefile
@@ -48,7 +48,7 @@ CONFIGURE_ENV+=	ac_cv_lib_iconv_iconv=no \
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}
-	$(APXS) -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
+	${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} \
 		-i -n ${MODULENAME} ${WRKSRC}/${MODULENAME}.la
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/${MODULENAME}.so
 
diff --git a/www/vdr-plugin-live/Makefile b/www/vdr-plugin-live/Makefile
index c0000c740e00..9f255a51646c 100644
--- a/www/vdr-plugin-live/Makefile
+++ b/www/vdr-plugin-live/Makefile
@@ -20,7 +20,7 @@ PATCH_STRIP=	-p1
 PORTDOCS=	COPYING README HISTORY
 WRKSRC=		${WRKDIR}/${PLUGIN}-${PORTVERSION}
 VDR_PLUGIN_MAKEFILES=	${WRKSRC}/httpd/Makefile ${WRKSRC}/pages/Makefile
-MAKE_ARGS+=	INCLUDES="-I$(LOCALBASE)/include -I${WRKSRC}"
+MAKE_ARGS+=	INCLUDES="-I${LOCALBASE}/include -I${WRKSRC}"
 MAKE_ARGS+=	PREFIX="${PREFIX}"
 USES=		compiler:features
 
diff --git a/x11-fonts/urwfonts/Makefile b/x11-fonts/urwfonts/Makefile
index eb134f8f0d05..7ed797385375 100644
--- a/x11-fonts/urwfonts/Makefile
+++ b/x11-fonts/urwfonts/Makefile
@@ -19,7 +19,7 @@ SUB_FILES=	pkg-message
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for FILE in Fontmap
-	${INSTALL_DATA} ${WRKSRC}/$(FILE) ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${FONTSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/*.pfb ${STAGEDIR}${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.afm ${STAGEDIR}${FONTSDIR}
diff --git a/x11-wm/larswm/Makefile b/x11-wm/larswm/Makefile
index 2b6d8fbe55d1..c48db9a77fac 100644
--- a/x11-wm/larswm/Makefile
+++ b/x11-wm/larswm/Makefile
@@ -22,7 +22,7 @@ PLIST_FILES=	bin/larsclock bin/larsmenu bin/larsremote bin/larswm \
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ${PORTDOCS}
-	${INSTALL_DATA} $(WRKSRC)/${file} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>