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, 16 insertions, 17 deletions

diff --git a/graphics/fujiplay/Makefile b/graphics/fujiplay/Makefile
index 5cbb488c59f7..592def15286a 100644
--- a/graphics/fujiplay/Makefile
+++ b/graphics/fujiplay/Makefile
@@ -23,10 +23,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^\(CC[^g]*\)gcc$$|\1${CC}|' ${WRKSRC}/Makefile
 
 do-install:
-	(cd ${WRKDIR}; ${INSTALL_PROGRAM} fujiplay yycc2ppm ${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC}; ${INSTALL_PROGRAM} fujiplay yycc2ppm ${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/fujiplay
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKDIR}/${f} ${STAGEDIR}${PREFIX}/share/doc/fujiplay
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/share/doc/fujiplay
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/geoapi/Makefile b/graphics/geoapi/Makefile
index 7b8978409486..47bdf602a557 100644
--- a/graphics/geoapi/Makefile
+++ b/graphics/geoapi/Makefile
@@ -23,12 +23,12 @@ OPTIONS_DEFINE=	DOCS
 
 do-install:
 .for jar in ${JARFILES}
-	${INSTALL_DATA} ${WRKDIR}/${jar}.jar ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${WRKSRC}/${jar}.jar ${STAGEDIR}${JAVAJARDIR}
 .endfor
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKDIR}/javadoc \
+	cd ${WRKSRC}/javadoc \
 		&& ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; \
 		&& ${FIND} . -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DOCSDIR}/\{} \;
 
diff --git a/graphics/gimp-jagged-border-script/Makefile b/graphics/gimp-jagged-border-script/Makefile
index 0cee437e8100..5c7869d26bc8 100644
--- a/graphics/gimp-jagged-border-script/Makefile
+++ b/graphics/gimp-jagged-border-script/Makefile
@@ -33,6 +33,6 @@ post-extract:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${GIMP_SCRIPTS_DIR}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${STAGEDIR}${PREFIX}/${GIMP_SCRIPTS_DIR}/
+	${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/${GIMP_SCRIPTS_DIR}/
 
 .include <bsd.port.mk>
diff --git a/graphics/mapyrus/Makefile b/graphics/mapyrus/Makefile
index c21ac4e01ad6..6ba0e20d8366 100644
--- a/graphics/mapyrus/Makefile
+++ b/graphics/mapyrus/Makefile
@@ -32,12 +32,12 @@ USE_JAVA=	yes
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSJAR} ${STAGEDIR}${DATADIR}/${MAPYRUSJAR}
+	${INSTALL_DATA} ${WRKSRC}/${MAPYRUSJAR} ${STAGEDIR}${DATADIR}/${MAPYRUSJAR}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${MAPYRUSDOCS} ${STAGEDIR}${DOCSDIR}/${MAPYRUSDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${MAPYRUSDOCS} ${STAGEDIR}${DOCSDIR}/${MAPYRUSDOCS}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${WRKDIR}/userdoc && \
+	cd ${WRKSRC}/userdoc && \
 	${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} \
 		"-type f -not -iname copying -and -not -iname *\.tex"
 
diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile
index d05fb4224334..db053b3f67d3 100644
--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@@ -44,7 +44,6 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 USES=		zip
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS
 PLUS_REV=	4164
 
diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile
index a8d0be3e928a..179dc2e3ec44 100644
--- a/graphics/pstoepsi/Makefile
+++ b/graphics/pstoepsi/Makefile
@@ -19,17 +19,17 @@ USES=		ghostscript:run
 NO_WRKSUBDIR=	yes
 
 pre-patch:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/pstoepsi ${WRKDIR}/pstoepsi.prefix
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/README.this-site ${WRKDIR}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/pstoepsi ${WRKSRC}/pstoepsi.prefix
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/README.this-site ${WRKSRC}
 
 do-build:
-	${SED} -e "s+%%PREFIX%%+${PREFIX}+g" ${WRKDIR}/pstoepsi.prefix > \
-						${WRKDIR}/pstoepsi
-	${GZIP_CMD} ${WRKDIR}/README.this-site
+	${SED} -e "s+%%PREFIX%%+${PREFIX}+g" ${WRKSRC}/pstoepsi.prefix > \
+						${WRKSRC}/pstoepsi
+	${GZIP_CMD} ${WRKSRC}/README.this-site
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/pstoepsi ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/pstoepsi ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/README.this-site.gz ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.this-site.gz ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/springgraph/Makefile b/graphics/springgraph/Makefile
index 58c9269a241e..d4f80d9e87c2 100644
--- a/graphics/springgraph/Makefile
+++ b/graphics/springgraph/Makefile
@@ -19,7 +19,7 @@ CONFLICTS_INSTALL=signing-party-[0-9]*
 PLIST_FILES=	bin/springgraph
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	${WRKDIR}
+EXTRACT_AFTER_ARGS=	${WRKSRC}
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USES=		shebangfix perl5