Unbreak things broken by my previous incomplete commits

Pointy hat:	tobik

8 files changed, 12 insertions, 12 deletions

diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile
index d4c9068b21f1..c32d2d882226 100644
--- a/devel/flex-sdk/Makefile
+++ b/devel/flex-sdk/Makefile
@@ -28,7 +28,7 @@ post-extract:
 
 do-install:
 .for i in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${i}.sh ${STAGEDIR}${PREFIX}/bin/${i}
+	${INSTALL_SCRIPT} ${WRKDIR}/${i}.sh ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 
 	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
diff --git a/devel/flex-sdk35/Makefile b/devel/flex-sdk35/Makefile
index 51b8fcfcb92e..d3f9f9dbb156 100644
--- a/devel/flex-sdk35/Makefile
+++ b/devel/flex-sdk35/Makefile
@@ -31,7 +31,7 @@ post-extract:
 
 do-install:
 .for i in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${i}.sh ${STAGEDIR}${PREFIX}/bin/${i}
+	${INSTALL_SCRIPT} ${WRKDIR}/${i}.sh ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
diff --git a/games/tuxfighter/Makefile b/games/tuxfighter/Makefile
index c91e9d81ec38..2f90200e8ec7 100644
--- a/games/tuxfighter/Makefile
+++ b/games/tuxfighter/Makefile
@@ -52,7 +52,7 @@ do-install:
 
 .for s in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
diff --git a/mail/postfinger/Makefile b/mail/postfinger/Makefile
index f1cf19308afd..5f2b0e124393 100644
--- a/mail/postfinger/Makefile
+++ b/mail/postfinger/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Postfix Configuration Summary Reporter
 
 EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	${WRKDIR}
+EXTRACT_AFTER_ARGS=	${WRKSRC}
 NO_BUILD=		yes
 NO_WRKSUBDIR=		yes
 
diff --git a/mail/vrfy/Makefile b/mail/vrfy/Makefile
index 967ef0bb4516..a11f0d5a752c 100644
--- a/mail/vrfy/Makefile
+++ b/mail/vrfy/Makefile
@@ -16,6 +16,6 @@ NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/vrfy
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/vrfy ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/vrfy ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/misc/amanda-perl-wrapper/Makefile b/misc/amanda-perl-wrapper/Makefile
index 4027e1e107a3..58f29ef85628 100644
--- a/misc/amanda-perl-wrapper/Makefile
+++ b/misc/amanda-perl-wrapper/Makefile
@@ -23,10 +23,10 @@ do-fetch:
 pre-build: apply-slist
 
 do-build:
-	cd ${WRKSRC} && ${CC} -o perl-amanda perl-amanda.c
+	cd ${WRKSRC} && ${CC} -o perl-amanda ${WRKDIR}/perl-amanda.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/perl-amanda ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/perl-amanda ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.pre.mk>
 
diff --git a/misc/nsf/Makefile b/misc/nsf/Makefile
index d01429b98518..137444ffb833 100644
--- a/misc/nsf/Makefile
+++ b/misc/nsf/Makefile
@@ -17,7 +17,7 @@ PLIST_FILES=	bin/nsf man/man1/nsf.1.gz
 ALL_TARGET=
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/nsf ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/nsf.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/nsf ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/nsf.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/tkregexp/Makefile b/misc/tkregexp/Makefile
index 8f72daddbc54..264bccd4b75f 100644
--- a/misc/tkregexp/Makefile
+++ b/misc/tkregexp/Makefile
@@ -20,12 +20,12 @@ NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/tkregexp
 
 post-extract:
-	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
+	${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
 
 post-patch:
-	${REINPLACE_CMD} -e "1s|^\(.*\)|#!${WISH}|; 2d" ${WRKDIR}/visual_regexp-${PORTVERSION}.tcl
+	${REINPLACE_CMD} -e "1s|^\(.*\)|#!${WISH}|; 2d" ${WRKSRC}/visual_regexp-${PORTVERSION}.tcl
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/visual_regexp-${PORTVERSION}.tcl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/visual_regexp-${PORTVERSION}.tcl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>