Fix ports that confused the meaning of WRKDIR and WRKSRC.

PR:		204056
Submitted by:	mat
Reviewed by:	bapt
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D2735

7 files changed, 23 insertions, 23 deletions

diff --git a/misc/amfm/Makefile b/misc/amfm/Makefile
index 13ce7330b6dc..7d68bbbd08eb 100644
--- a/misc/amfm/Makefile
+++ b/misc/amfm/Makefile
@@ -18,7 +18,7 @@ NO_WRKSUBDIR=   yes
 
 EXTRACT_CMD=            ${CP}
 EXTRACT_BEFORE_ARGS=    -p
-EXTRACT_AFTER_ARGS=     ${WRKDIR}
+EXTRACT_AFTER_ARGS=     ${WRKSRC}
 
 do-install:
 	@${INSTALL} ${WRKSRC}/amfm ${STAGEDIR}${PREFIX}/bin/amfm
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 75e5d16dab58..f47932dbc437 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -46,11 +46,11 @@ MAKE_ARGS=	-DX11
 .endif
 
 post-extract:
-	${RM} ${WRKDIR}/swe[a-z]*
+	${RM} ${WRKSRC}/swe[a-z]*
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/astrolog
-	cd ${WRKDIR} && \
+	cd ${WRKSRC} && \
 		${INSTALL_DATA} fixstars.ast *.se1 ${STAGEDIR}${PREFIX}/lib/astrolog
 	cd ${WRKSRC}; \
 		${INSTALL_DATA} astrolog.dat ${STAGEDIR}${PREFIX}/lib/astrolog/astrolog.dat-dist
diff --git a/misc/colwide/Makefile b/misc/colwide/Makefile
index aaec53f46729..255bd76fc7dd 100644
--- a/misc/colwide/Makefile
+++ b/misc/colwide/Makefile
@@ -22,9 +22,9 @@ SHEBANG_FILES=	colwide
 PLIST_FILES=	bin/${PORTNAME}
 
 do-extract:
-	${CP} ${DISTDIR}/colwide-${PORTVERSION} ${WRKDIR}/colwide
+	${CP} ${DISTDIR}/colwide-${PORTVERSION} ${WRKSRC}/colwide
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/colwide ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/colwide ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/misc/figlet-fonts/Makefile b/misc/figlet-fonts/Makefile
index 36a6fe99e1a9..0933f11a275b 100644
--- a/misc/figlet-fonts/Makefile
+++ b/misc/figlet-fonts/Makefile
@@ -20,27 +20,27 @@ DATADIR=	${PREFIX}/share/figlet
 PLIST_SUB=	DATADIR=${DATADIR:S|^${PREFIX}/||}
 
 post-extract:
-	@cd ${WRKDIR}/contributed && \
-		${TAR} xf Obanner-canon.tgz -C ${WRKDIR}/contributed/ && \
-		${MV} ./Obanner-canon/* ${WRKDIR}/contributed/ && \
+	@cd ${WRKSRC}/contributed && \
+		${TAR} xf Obanner-canon.tgz -C ${WRKSRC}/contributed/ && \
+		${MV} ./Obanner-canon/* ${WRKSRC}/contributed/ && \
 		${RMDIR} ./Obanner-canon && \
 		${RM} -f Obanner-canon.tgz && \
-		${TAR} xf Obanner.tgz -C ${WRKDIR}/contributed/ && \
-		${MV} ./Obanner/* ${WRKDIR}/contributed/ && \
+		${TAR} xf Obanner.tgz -C ${WRKSRC}/contributed/ && \
+		${MV} ./Obanner/* ${WRKSRC}/contributed/ && \
 		${RMDIR} ./Obanner && \
 		${RM} -f Obanner.tgz && \
-		${MV} ./C64-fonts/* ${WRKDIR}/contributed/ && \
+		${MV} ./C64-fonts/* ${WRKSRC}/contributed/ && \
 		${RMDIR} ./C64-fonts && \
-		${MV} ./bdffonts/* ${WRKDIR}/contributed/ && \
+		${MV} ./bdffonts/* ${WRKSRC}/contributed/ && \
 		${RMDIR} ./bdffonts
-	@cd ${WRKDIR}/international && \
-		${TAR} xf cjkfonts.tar.gz -C ${WRKDIR}/international/ && \
+	@cd ${WRKSRC}/international && \
+		${TAR} xf cjkfonts.tar.gz -C ${WRKSRC}/international/ && \
 		${RM} -f cjkfonts.tar.gz
-	@${RM} -f ${WRKDIR}/contributed/banner.flf
+	@${RM} -f ${WRKSRC}/contributed/banner.flf
 
 do-install:
 .for f in contributed international
-	@cd ${WRKDIR}/${f} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+	@cd ${WRKSRC}/${f} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/misc/kenny/Makefile b/misc/kenny/Makefile
index 48d326121eee..32fd136ef934 100644
--- a/misc/kenny/Makefile
+++ b/misc/kenny/Makefile
@@ -21,7 +21,7 @@ USES=		perl5
 USE_PERL5=	extract build run
 EXTRACT_CMD=	${GZCAT}
 EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	> ${WRKDIR}/${PORTNAME}
+EXTRACT_AFTER_ARGS=	> ${WRKSRC}/${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
@@ -33,10 +33,10 @@ POD2MAN?=	${LOCALBASE}/bin/pod2man
 
 post-extract:
 	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/${PORTNAME}
-	@${POD2MAN} ${WRKDIR}/${PORTNAME} > ${WRKDIR}/${PORTNAME}.1
+	@${POD2MAN} ${WRKSRC}/${PORTNAME} > ${WRKSRC}/${PORTNAME}.1
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/metalink-editor/Makefile b/misc/metalink-editor/Makefile
index f98b9420693c..c7c98d4332fe 100644
--- a/misc/metalink-editor/Makefile
+++ b/misc/metalink-editor/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI editor to create and edit metalinks
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKDIR}/license.txt
+LICENSE_FILE=	${WRKSRC}/license.txt
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/misc/umodunpack/Makefile b/misc/umodunpack/Makefile
index 7dc633cda45a..387569c82a4e 100644
--- a/misc/umodunpack/Makefile
+++ b/misc/umodunpack/Makefile
@@ -21,9 +21,9 @@ NO_BUILD=	yes
 PLIST_FILES=	bin/${DISTNAME}
 
 post-extract:
-	${CP} ${DISTDIR}/${DISTNAME} ${WRKDIR}
+	${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}  ${STAGEDIR}${PREFIX}/bin/${DISTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME}  ${STAGEDIR}${PREFIX}/bin/${DISTNAME}
 
 .include <bsd.port.mk>