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

6 files changed, 26 insertions, 26 deletions

diff --git a/textproc/clit/Makefile b/textproc/clit/Makefile
index 0bac6efdb9f9..3f093de53a87 100644
--- a/textproc/clit/Makefile
+++ b/textproc/clit/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	clit${MAJ_VER}${MIN_VER}src.zip
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Microsoft Lit to HTML and Open eBooks converter
 
-PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}${MAJ_VER}${MIN_VER}
+PATCH_WRKSRC=	${WRKSRC}/${PORTNAME}${MAJ_VER}${MIN_VER}
 NO_WRKSUBDIR=	yes
 
 MAJ_VER=	1
@@ -25,18 +25,18 @@ PLIST_FILES=	bin/clit
 USES=	dos2unix gmake zip
 
 post-extract:
-	cd ${WRKDIR} && ${BZIP2_CMD} -dc "${DISTDIR}/ltm-0.33.tar.bz2" | \
+	cd ${WRKSRC} && ${BZIP2_CMD} -dc "${DISTDIR}/ltm-0.33.tar.bz2" | \
 		${TAR} -xf -
 
 do-build:
-	cd ${WRKDIR}/libtommath-0.33 && \
+	cd ${WRKSRC}/libtommath-0.33 && \
 	${SETENV} ${MAKE_ENV} ${MAKE} -f makefile  libtommath.a
-	cd ${WRKDIR}/lib &&  ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile all
-	cd ${WRKDIR}/${PORTNAME}${MAJ_VER}${MIN_VER} &&  \
+	cd ${WRKSRC}/lib &&  ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile all
+	cd ${WRKSRC}/${PORTNAME}${MAJ_VER}${MIN_VER} &&  \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} -f Makefile all
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME}${MAJ_VER}${MIN_VER}/clit \
+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}${MAJ_VER}${MIN_VER}/clit \
 		${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/textproc/diffsplit/Makefile b/textproc/diffsplit/Makefile
index f2ecd683cecf..d244ad435372 100644
--- a/textproc/diffsplit/Makefile
+++ b/textproc/diffsplit/Makefile
@@ -19,10 +19,10 @@ USES=		shebangfix perl5
 SHEBANG_FILES=	diffsplit
 
 do-extract:
-	@${MKDIR} ${WRKDIR}
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/diffsplit ${WRKDIR}
+	@${MKDIR} ${WRKSRC}
+	@${CP} ${DISTDIR}/${DIST_SUBDIR}/diffsplit ${WRKSRC}
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/diffsplit ${STAGEDIR}${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/diffsplit ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/textproc/foiltex/Makefile b/textproc/foiltex/Makefile
index 96a3a3e9b1c7..a8412feebc90 100644
--- a/textproc/foiltex/Makefile
+++ b/textproc/foiltex/Makefile
@@ -29,12 +29,12 @@ PORTEXAMPLES=	sampfoil.tex
 PLIST_FILES=	${FOIL_FILES:S,^,${FOIL_DIR}/,}
 
 do-extract:
-	${MKDIR} ${WRKDIR}
-	${CP} ${DISTDIR}/foiltex.ins ${WRKDIR}/foiltex.ins
-	${CP} ${DISTDIR}/foiltex.dtx ${WRKDIR}/foiltex.dtx
+	${MKDIR} ${WRKSRC}
+	${CP} ${DISTDIR}/foiltex.ins ${WRKSRC}/foiltex.ins
+	${CP} ${DISTDIR}/foiltex.dtx ${WRKSRC}/foiltex.dtx
 
 do-build:
-	@cd ${WRKDIR} && ${LATEX_CMD} foiltex.ins && \
+	@cd ${WRKSRC} && ${LATEX_CMD} foiltex.ins && \
 		${LATEX_CMD} foiltex.dtx && \
 		${LATEX_CMD} foiltex.dtx && \
 		${LATEX_CMD} foiltex.dtx
diff --git a/textproc/jarnal/Makefile b/textproc/jarnal/Makefile
index 40b09e956274..0698969f3381 100644
--- a/textproc/jarnal/Makefile
+++ b/textproc/jarnal/Makefile
@@ -25,16 +25,16 @@ SCRIPTS=	jarnal.sh jarnalannotate.sh jarnal-open-file.sh
 LIBFILES=	lbouncy_license.html lib-ver.txt jarnal-readme.txt
 
 pre-configure:
-	${MV} ${WRKDIR}/lib/readme.txt ${WRKDIR}/lib/jarnal-readme.txt
+	${MV} ${WRKSRC}/lib/readme.txt ${WRKSRC}/lib/jarnal-readme.txt
 	${REINPLACE_CMD} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|'	\
-		-e 's|%%DATADIR%%|${DATADIR}|' ${SCRIPTS:S|^|${WRKDIR}/|}
+		-e 's|%%DATADIR%%|${DATADIR}|' ${SCRIPTS:S|^|${WRKSRC}/|}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/lib ${STAGEDIR}${DATADIR}/templates
-	${INSTALL_DATA} ${PORTNAME:S|^|${WRKDIR}/|:S|$|.jar|} ${STAGEDIR}${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKDIR}/lib/*.jar ${STAGEDIR}${JAVAJARDIR}/lib/
-	${INSTALL_DATA} ${LIBFILES:S|^|${WRKDIR}/lib/|} ${STAGEDIR}${JAVAJARDIR}/lib/
-	${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKDIR}/|} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKDIR}/templates/* ${STAGEDIR}${DATADIR}/templates/
+	${INSTALL_DATA} ${PORTNAME:S|^|${WRKSRC}/|:S|$|.jar|} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/*.jar ${STAGEDIR}${JAVAJARDIR}/lib/
+	${INSTALL_DATA} ${LIBFILES:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${JAVAJARDIR}/lib/
+	${INSTALL_SCRIPT} ${SCRIPTS:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/templates/* ${STAGEDIR}${DATADIR}/templates/
 
 .include <bsd.port.mk>
diff --git a/textproc/ppower4/Makefile b/textproc/ppower4/Makefile
index dc1bc8c9c378..c793af476c29 100644
--- a/textproc/ppower4/Makefile
+++ b/textproc/ppower4/Makefile
@@ -22,11 +22,11 @@ NO_WRKSUBDIR=	yes
 
 JAR_DIR=	${JAVASHAREDIR}/${PORTNAME}
 STY_DIR=	${PREFIX}/share/texmf/tex/latex/${PORTNAME}
-STY_FILES=	${WRKDIR}/pause.sty ${WRKDIR}/background.sty \
-		${WRKDIR}/pp4link.sty ${WRKDIR}/mpmulti.sty
-EXAMPLE_FILES=	${WRKDIR}/leveldemo.tex
+STY_FILES=	${WRKSRC}/pause.sty ${WRKSRC}/background.sty \
+		${WRKSRC}/pp4link.sty ${WRKSRC}/mpmulti.sty
+EXAMPLE_FILES=	${WRKSRC}/leveldemo.tex
 .for i in 1 2 3 4 5 6 7
-EXAMPLE_FILES+=	${WRKDIR}/example.${i}
+EXAMPLE_FILES+=	${WRKSRC}/example.${i}
 .endfor
 PLIST_SUB=	STY_DIR="${STY_DIR:S,^${PREFIX}/,,}" \
 		JAR_DIR="${JAR_DIR:S,^${PREFIX}/,,}"
diff --git a/textproc/saxon-devel/Makefile b/textproc/saxon-devel/Makefile
index d1a79e8499ee..ce300c35e73c 100644
--- a/textproc/saxon-devel/Makefile
+++ b/textproc/saxon-devel/Makefile
@@ -75,14 +75,14 @@ do-install:
 	@${ECHO_MSG} -n ">> Installing scripts in ${PREFIX}/bin..."
 .for scriptfile in saxon saxon-xquery
 	@${ECHO_MSG} -n " ${scriptfile}"
-	${INSTALL_SCRIPT} ${WRKSRC}/saxon.sh ${STAGEDIR}${PREFIX}/bin/${scriptfile}
+	${INSTALL_SCRIPT} ${WRKDIR}/saxon.sh ${STAGEDIR}${PREFIX}/bin/${scriptfile}
 .endfor
 	@${ECHO_MSG} " [ DONE ]"
 
 .if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${FIND} -s ${WRKSRC}/samples -not -type d | \
-		${SED} -ne 's,^${WRKSRC}/samples,${EXAMPLESDIR:S,${PREFIX}/,,},p' >> ${TMPPLIST}
+		${SED} -ne 's|^${WRKSRC}/samples|${EXAMPLESDIR:S,${PREFIX}/,,}|p' >> ${TMPPLIST}
 .endif
 
 .include <bsd.port.mk>