8 files changed, 21 insertions, 21 deletions

diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index 41b454899e9f..24d21bfaa1c3 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -42,7 +42,7 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/scookie.ini ${JDIR}/cookiefile.sample
 	@${INSTALL_DATA} ${WRKSRC}/sforward.ini ${JDIR}/forwardfile.sample
 	@${INSTALL_DATA} ${WRKSRC}/strust.ini ${JDIR}/trustfile.sample
-	@$(INSTALL_MAN) ${WRKSRC}/junkbuster.1 $(PREFIX)/man/man1/
+	@${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${PREFIX}/man/man1/
 
 	@${INSTALL_SCRIPT} ${WRKDIR}/junkbuster.sh \
 	    ${PREFIX}/etc/rc.d/junkbuster.sh
diff --git a/www/linux-flashplugin7/Makefile b/www/linux-flashplugin7/Makefile
index 3526ec8de352..171635bdbc28 100644
--- a/www/linux-flashplugin7/Makefile
+++ b/www/linux-flashplugin7/Makefile
@@ -37,10 +37,10 @@ OPTIONS=	NSPLUG "Install nspluginwrapper (for native browser use)" on
 .include "${PORTSDIR}/www/linux-mplayer-plugin/Makefile.npapi"
 
 .if defined (WITH_NSPLUG)
-RUN_DEPENDS+=	nspluginwrapper:$(PORTSDIR)/www/nspluginwrapper
+RUN_DEPENDS+=	nspluginwrapper:${PORTSDIR}/www/nspluginwrapper
 .endif
 
 post-patch:
-	(cd $(WRKDIR)/fp7_archive/r70 && ${TAR} -xzf install_flash_player_7_linux_r70.tar.gz)
+	(cd ${WRKDIR}/fp7_archive/r70 && ${TAR} -xzf install_flash_player_7_linux_r70.tar.gz)
 
 .include <bsd.port.post.mk>
diff --git a/www/py-albatross/Makefile b/www/py-albatross/Makefile
index cea30cf91599..e65af97eea44 100644
--- a/www/py-albatross/Makefile
+++ b/www/py-albatross/Makefile
@@ -22,7 +22,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR} ${EXAMPLESDIR} ${DOCSDIR}/html
 	@${TAR} -cf - -C ${WRKSRC}/doc . | ${TAR} -xf - -C ${DOCSDIR}
-	@${TAR} -cf - -C ${WRKDIR}/albatross-html-$(PORTVERSION) . | ${TAR} -xf - -C ${DOCSDIR}/html
+	@${TAR} -cf - -C ${WRKDIR}/albatross-html-${PORTVERSION} . | ${TAR} -xf - -C ${DOCSDIR}/html
 	@${TAR} -cf - -C ${WRKSRC}/samples . | ${TAR} -xf - -C ${EXAMPLESDIR}
 .endif
 
diff --git a/www/rt32/Makefile b/www/rt32/Makefile
index ff6e6797661d..ff513cda0ea7 100644
--- a/www/rt32/Makefile
+++ b/www/rt32/Makefile
@@ -153,9 +153,9 @@ post-install:
 .if !defined(INITIAL_INSTALL)
 .if defined(UPGRADE_RT30)
 .for version in 3.1.0 3.1.15 3.1.17
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
 .endfor
 	@${ECHO} ""
 	@${ECHO} "Upgrade of RT3 complete."
@@ -175,8 +175,8 @@ post-install:
 	@${ECHO} ""
 .endif
 .else
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
 	@${SED} s!%%RT_PATH%%!${RT_PATH}!g ${PKGMESSAGE}
 .endif
 
diff --git a/www/rt34/Makefile b/www/rt34/Makefile
index 741c9e67f721..5d627824d565 100644
--- a/www/rt34/Makefile
+++ b/www/rt34/Makefile
@@ -179,9 +179,9 @@ post-install:
 .if !defined(INITIAL_INSTALL)
 .if defined(UPGRADES)
 .for version in ${UPGRADES}
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
 .endfor
 	@${ECHO} ""
 	@${ECHO} "Upgrade of RT3 complete."
@@ -203,8 +203,8 @@ post-install:
 	@${ECHO} ""
 .endif
 .else
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
 	@${SED} s!%%RT_PATH%%!${RT_PATH}!g ${PKGMESSAGE}
 .endif
 
diff --git a/www/rt36/Makefile b/www/rt36/Makefile
index 6088e709bf67..10d4c9a06272 100644
--- a/www/rt36/Makefile
+++ b/www/rt36/Makefile
@@ -190,9 +190,9 @@ post-install:
 .if !defined(INITIAL_INSTALL)
 .if defined(UPGRADES)
 .for version in ${UPGRADES}
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action schema --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action acl --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --action insert --datadir ${WRKSRC}/etc/upgrade/${version} --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
 .endfor
 	@${ECHO} ""
 	@${ECHO} "Upgrade of RT3 complete."
@@ -217,8 +217,8 @@ post-install:
 	@${ECHO} ""
 .endif
 .else
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
-	-@${PERL} $(RT_PATH)/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action drop --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
+	-@${PERL} ${RT_PATH}/sbin/rt-setup-database --force --action init --dba '${DB_DBA_USER}' --dba-password '${DB_DBA_PASSWORD}'
 	@${SED} s!%%RT_PATH%%!${RT_PATH}!g ${PKGMESSAGE}
 .endif
 
diff --git a/www/sidplug/Makefile b/www/sidplug/Makefile
index 9be0dffe754c..449d9c1552d9 100644
--- a/www/sidplug/Makefile
+++ b/www/sidplug/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A Commodore 64 psid audio plugin for Mozilla or Opera
 RUN_DEPENDS=	xsidplay:${PORTSDIR}/audio/xsidplay
 
 USE_X_PREFIX=	yes
-MAKE_ARGS=	CC="${CC}" OPTIMIZER="${CFLAGS} -I$(X11BASE)/include"
+MAKE_ARGS=	CC="${CC}" OPTIMIZER="${CFLAGS} -I${X11BASE}/include"
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index 878ae0151bfb..0d8f0772f05d 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	swfdec-0.5.2:${PORTSDIR}/graphics/swfdec
 
 USE_GETOPT_LONG=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--with-plugin-dir="$(PREFIX)/lib/browser_plugins"
+CONFIGURE_ARGS=	--with-plugin-dir="${PREFIX}/lib/browser_plugins"
 
 USE_LDCONFIG=	yes