- Fix rc script and use modern USE_RC_SUBR infrastructure

PR:		ports/83946 (inspired by)
Approved by:	maintainer timeout (se; 4 months)

3 files changed, 9 insertions, 15 deletions

diff --git a/dns/ez-ipupdate/Makefile b/dns/ez-ipupdate/Makefile
index 34873001c18a..05eb9753ad56 100644
--- a/dns/ez-ipupdate/Makefile
+++ b/dns/ez-ipupdate/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ez-ipupdate
 PORTVERSION=	3.0.11b8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://dyn.pl/client/UNIX/ez-ipupdate/ \
 		http://www.yi.org/help/software/ \
@@ -16,14 +16,9 @@ MASTER_SITES=	http://dyn.pl/client/UNIX/ez-ipupdate/ \
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Update your host name on any dynamic DNS service
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	ez-ipupdate.sh
 GNU_CONFIGURE=	yes
 
-post-build:
-	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
-		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-		${FILESDIR}/${PORTNAME}.sh >${WRKDIR}/${PORTNAME}.sh
-
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
 	for f in ${WRKSRC}/example-*.conf; \
@@ -32,6 +27,5 @@ post-install:
 	done
 	${INSTALL_DATA} ${WRKSRC}/example.conf \
 			${PREFIX}/etc/${PORTNAME}.conf.sample
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/etc/rc.d/
 
 .include <bsd.port.mk>
diff --git a/dns/ez-ipupdate/files/ez-ipupdate.sh b/dns/ez-ipupdate/files/ez-ipupdate.sh.in
index 33e3a99997a2..763d026c35ec 100644
--- a/dns/ez-ipupdate/files/ez-ipupdate.sh
+++ b/dns/ez-ipupdate/files/ez-ipupdate.sh.in
@@ -13,20 +13,21 @@
 #ez_ipupdate_enable="YES"
 #
 
-: ${ez_ipupdate_enable="NO"}
-: ${ez_ipupdate_pidfile="/var/run/ez-ipupdate.pid"}
-: ${ez_ipupdate_configfile="%%PREFIX%%/etc/ez-ipupdate.conf"}
-: ${ez_ipupdate_flags="-d -c $ez_ipupdate_configfile -F $ez_ipupdate_pidfile"}
-
 . %%RC_SUBR%%
 
 name=ez_ipupdate
 rcvar=`set_rcvar`
 
+load_rc_config $name
+
+: ${ez_ipupdate_enable="NO"}
+: ${ez_ipupdate_pidfile="/var/run/ez-ipupdate.pid"}
+: ${ez_ipupdate_configfile="%%PREFIX%%/etc/ez-ipupdate.conf"}
+: ${ez_ipupdate_flags="-d -c $ez_ipupdate_configfile -F $ez_ipupdate_pidfile"}
+
 command=%%PREFIX%%/bin/ez-ipupdate
 pidfile=$ez_ipupdate_pidfile
 required_files=$ez_ipupdate_configfile
 sig_stop=QUIT
 
-load_rc_config $name
 run_rc_command "$1"
diff --git a/dns/ez-ipupdate/pkg-plist b/dns/ez-ipupdate/pkg-plist
index 4ba2fab1fcdf..218cc8411137 100644
--- a/dns/ez-ipupdate/pkg-plist
+++ b/dns/ez-ipupdate/pkg-plist
@@ -1,6 +1,5 @@
 bin/ez-ipupdate
 etc/ez-ipupdate.conf.sample
-etc/rc.d/ez-ipupdate.sh
 share/examples/ez-ipupdate/example-dhs.conf
 share/examples/ez-ipupdate/example-dyndns.conf
 share/examples/ez-ipupdate/example-dyns.conf