USE_RC_SUBR'ify.

3 files changed, 31 insertions, 28 deletions

diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile
index ab7fb12e20dd..64f86a7b6fb3 100644
--- a/japanese/vje30/Makefile
+++ b/japanese/vje30/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vje
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese
 MASTER_SITES=	${CD_MOUNTPTS:S,^,file:,:S,$,/freebsd/,} \
 		${CD_MOUNTPTS:S,^,file:,:S,$,/source/delta/:source,} \
@@ -31,6 +31,8 @@ NO_PACKAGE=	"You must purchase a licensed copy from VACS Corporation."
 
 ONLY_FOR_ARCHS=	i386
 
+USE_RC_SUBR=	yes
+
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 
@@ -78,7 +80,8 @@ post-extract:
 post-patch:
 	@cd ${WRKSRC}/vje30/bin && ${RM} swingall.jar
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
-	@${CP} ${FILESDIR}/vje.sh ${WRKSRC}/etc/rc.d/
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' -e 's,%%RC_SUBR%%,${RC_SUBR},g' \
+		${FILESDIR}/vje.sh > ${WRKSRC}/etc/rc.d/vje.sh
 	@${REINPLACE_CMD} 's,/usr/X11R6,${X11BASE},g' ${BUILD_WRKSRC}/${MAKEFILE}
 .if defined(NOPORTDOCS)
 	@cd ${WRKSRC}/vje30 && ${RM} -rf doc README FAQ REQUEST
@@ -88,7 +91,7 @@ post-build:
 	@${CP} ${BUILD_WRKSRC}/vje ${WRKSRC}/vje30/bin/
 
 do-install:
-	@cd ${WRKSRC} && ${TAR} -cf - . | ${TAR} -xf - -C ${PREFIX}
+	@${TAR} -C ${WRKSRC} -cf - . | ${TAR} -C ${PREFIX} -xf -
 .for f in ${BINSTUFF}
 	@${LN} -fs ${PREFIX}/vje30/bin/$f ${PREFIX}/bin/$f
 .endfor
diff --git a/japanese/vje30/files/vje.sh b/japanese/vje30/files/vje.sh
index 8ae895bedb0e..7702ea9dc8b1 100644
--- a/japanese/vje30/files/vje.sh
+++ b/japanese/vje30/files/vje.sh
@@ -2,26 +2,21 @@
 #
 # $FreeBSD$
 
-vjed="/usr/local/vje30/bin/vjed"
+# PROVIDE: vjed
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
 
-case "$1" in
-start)
-	if [ -x $vjed ] ; then
-		echo -n ' vje30:'
-		$vjed &
-	fi
-	;;
-stop)
-	if killall vjed 2>/dev/null; then
-		echo -n ' vje30'
-	else
-		echo -n ' vje30: not running'
- 	fi
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
+. %%RC_SUBR%%
 
-exit 0
+name=vjed
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/vje30/bin/vjed
+
+required_files=%%PREFIX%%/etc/vje30/vje.cfg
+
+[ -z "$vjed_enable" ] && vjed_enable=NO
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/japanese/vje30/pkg-message b/japanese/vje30/pkg-message
index 6f452798ff00..e3016ae3778e 100644
--- a/japanese/vje30/pkg-message
+++ b/japanese/vje30/pkg-message
@@ -1,7 +1,12 @@
-************************************************************
+****************************************************************
+To start vjed automatically on boot, please add the following
+line to /etc/rc.conf:
+
+	vjed_start=YES
+
 To use extra GUI accessories, you need to install JDK and
-JFC from ports (supplied as java/jdk and java/jfc) and set
-the following environment variables:
+JFC from ports (java/jdk11 and java/jfc) and set the following
+environment variables:
 
 B-shells)
 	export JAVA_HOME=${PREFIX}/jdk1.1.8
@@ -11,4 +16,4 @@ C-shells)
 	setenv JAVA_HOME ${PREFIX}/jdk1.1.8
 	setenv SWING_HOME ${PREFIX}/share/java/classes/jfc-1.1.1
 
-************************************************************
+****************************************************************