diff --git a/japanese/vje30-trial/Makefile b/japanese/vje30-trial/Makefile
index e2041cf2105d..28efc6e0bb93 100644
--- a/japanese/vje30-trial/Makefile
+++ b/japanese/vje30-trial/Makefile
@@ -21,7 +21,7 @@ NO_BUILD=	yes
 
 ONLY_FOR_ARCHS=	i386
 
-PLIST_SUB=	X11BASE="${X11BASE}" BINSTUFF="${BINSTUFF}"
+PLIST_SUB=	BINSTUFF="${BINSTUFF}"
 
 WRKSRC=		${WRKDIR}/usr/local
 
@@ -47,12 +47,13 @@ BINSTUFF=	vje	\
 		vjeacc
 
 post-patch:
-	@cd ${WRKSRC}/vje30/bin && ${RM} swingall.jar *.orig
+	@cd ${WRKSRC}/vje30/bin && ${RM} swingall.jar
+	@find ${WRKSRC} -name '*.orig' -delete
 
 do-install:
 	@cd ${WRKSRC} && tar cf - . | tar xf - -C ${PREFIX}
 .for f in ${BINSTUFF}
-	@${LN} -fs ${PREFIX}/vje30/bin/$f ${X11BASE}/bin/$f
+	@${LN} -fs ${PREFIX}/vje30/bin/$f ${PREFIX}/bin/$f
 .endfor
 	@${CHMOD} a+x ${PREFIX}/etc/rc.d/vje.sh
 	@${CHMOD} a+w ${PREFIX}/vje30/dic/vjed95m.dic
diff --git a/japanese/vje30-trial/pkg-plist b/japanese/vje30-trial/pkg-plist
index 59b47359ae0d..9598b9b23e96 100644
--- a/japanese/vje30-trial/pkg-plist
+++ b/japanese/vje30-trial/pkg-plist
@@ -1,4 +1,4 @@
-@unexec for f in %%BINSTUFF%%; do rm %%X11BASE%%/bin/$f; done
+@unexec for f in %%BINSTUFF%%; do rm %D/bin/$f; done
 etc/rc.d/vje.sh
 etc/vje30/vje.cfg
 vje30/acc/default.kig
@@ -229,7 +229,7 @@ vje30/bin/vjeacc.jar
 @dirrm vje30/env
 @dirrm vje30/lib
 @dirrm vje30
-@exec for f in %%BINSTUFF%%; do ln -fs %D/vje30/bin/$f %%X11BASE%%/bin/$f; done
+@exec for f in %%BINSTUFF%%; do ln -fs %D/vje30/bin/$f %D/bin/$f; done
 @exec chmod a+w %D/vje30/dic/vjed95m.dic
 @exec chmod a+x %D/etc/rc.d/vje.sh
 @unexec cp -Pp /etc/services /etc/services.bak ; grep -vw '^vjed' /etc/services.bak > /etc/services
diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile
index fc807aa98b7a..3848882c8333 100644
--- a/japanese/vje30/Makefile
+++ b/japanese/vje30/Makefile
@@ -23,7 +23,7 @@ NO_PACKAGE=	"You must purchase a licensed copy from VACS Corporation."
 
 ONLY_FOR_ARCHS=	i386
 
-PLIST_SUB=	X11BASE="${X11BASE}" BINSTUFF="${BINSTUFF}"
+PLIST_SUB=	BINSTUFF="${BINSTUFF}"
 
 WRKSRC=		${WRKDIR}/usr/local
 
@@ -68,12 +68,13 @@ post-extract:
 	@${RM} ${DISTDIR}/${DISTFILES}
 
 post-patch:
-	@cd ${WRKSRC}/vje30/bin && ${RM} swingall.jar *.orig
+	@cd ${WRKSRC}/vje30/bin && ${RM} swingall.jar
+	@find ${WRKSRC} -name '*.orig' -delete
 
 do-install:
 	@cd ${WRKSRC} && tar cf - . | tar xf - -C ${PREFIX}
 .for f in ${BINSTUFF}
-	@${LN} -fs ${PREFIX}/vje30/bin/$f ${X11BASE}/bin/$f
+	@${LN} -fs ${PREFIX}/vje30/bin/$f ${PREFIX}/bin/$f
 .endfor
 	@${CHMOD} a+x ${PREFIX}/etc/rc.d/vje.sh
 	@${CHMOD} a+w ${PREFIX}/vje30/dic/vjed95m.dic
diff --git a/japanese/vje30/pkg-plist b/japanese/vje30/pkg-plist
index e0af38f9a342..1458823f1d68 100644
--- a/japanese/vje30/pkg-plist
+++ b/japanese/vje30/pkg-plist
@@ -1,4 +1,4 @@
-@unexec for f in %%BINSTUFF%%; do rm %%X11BASE%%/bin/$f; done
+@unexec for f in %%BINSTUFF%%; do rm %D/bin/$f; done
 etc/rc.d/vje.sh
 etc/vje30/vje.cfg
 vje30/acc/default.kig
@@ -236,7 +236,7 @@ vje30/bin/vjeacc.jar
 @dirrm vje30/env
 @dirrm vje30/lib
 @dirrm vje30
-@exec for f in %%BINSTUFF%%; do ln -fs %D/vje30/bin/$f %%X11BASE%%/bin/$f; done
+@exec for f in %%BINSTUFF%%; do ln -fs %D/vje30/bin/$f %D/bin/$f; done
 @exec chmod a+w %D/vje30/dic/vjed95m.dic
 @exec chmod a+x %D/etc/rc.d/vje.sh
 @unexec cp -Pp /etc/services /etc/services.bak ; grep -vw '^vjed' /etc/services.bak > /etc/services