- Make portlint happy

- Use USE_RC_SUBR facility
- Rename patch-a* files
- Remove one uneeded patch and use REINPLACE_CMD instead
- Take maintainership

6 files changed, 10 insertions, 26 deletions

diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile
index 3029ccfed82f..f4aaccb6793d 100644
--- a/net/rinetd/Makefile
+++ b/net/rinetd/Makefile
@@ -11,25 +11,23 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.boutell.com/rinetd/http/
 DISTNAME=	rinetd
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	garga@FreeBSD.org
 COMMENT=	A simple TCP port redirector
 
 WRKSRC=		${WRKDIR}/rinetd/
 
 MAN8=		rinetd.8
 PORTDOCS=	index.html
-PLIST_FILES=	etc/rc.d/rinetd.sh sbin/rinetd
+PLIST_FILES=	sbin/rinetd
 
-
-USE_RC_SUBR=	yes
-RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+USE_RC_SUBR=	rinetd.sh
+USE_REINPLACE=	yes
 
 post-patch:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${FILESDIR}/rinetd.sh > ${WRKDIR}/rinetd.sh
+	@${REINPLACE_CMD} -E "s,(/etc/rinetd.conf),${PREFIX}\1," \
+		${WRKSRC}/rinetd.c
 
 post-install:
-	${INSTALL_SCRIPT} -m 751 ${WRKDIR}/rinetd.sh ${PREFIX}/etc/rc.d/rinetd.sh
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
diff --git a/net/rinetd/files/patch-aa b/net/rinetd/files/patch-Makefile
index 1e285ade8b5c..1e285ade8b5c 100644
--- a/net/rinetd/files/patch-aa
+++ b/net/rinetd/files/patch-Makefile
diff --git a/net/rinetd/files/patch-ab b/net/rinetd/files/patch-ab
deleted file mode 100644
index 084433fff3a2..000000000000
--- a/net/rinetd/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u ../rinetd.orig/rinetd.c ./rinetd.c
---- ../rinetd.orig/rinetd.c	Mon Mar  1 13:43:35 1999
-+++ rinetd.c	Fri Jun 11 19:40:05 1999
-@@ -214,7 +214,7 @@
- };
- 
- RinetdOptions options = {
--	"/etc/rinetd.conf"
-+	"/usr/local/etc/rinetd.conf"
- };
- 
- int readArgs (int argc,
diff --git a/net/rinetd/files/patch-ac b/net/rinetd/files/patch-rinetd.c
index c7797d5978ce..c7797d5978ce 100644
--- a/net/rinetd/files/patch-ac
+++ b/net/rinetd/files/patch-rinetd.c
diff --git a/net/rinetd/files/rinetd.sh b/net/rinetd/files/rinetd.sh.in
index dc86c53b79ea..dc86c53b79ea 100644
--- a/net/rinetd/files/rinetd.sh
+++ b/net/rinetd/files/rinetd.sh.in
diff --git a/net/rinetd/pkg-message b/net/rinetd/pkg-message
index 81a5e478c2b4..eec133947b11 100644
--- a/net/rinetd/pkg-message
+++ b/net/rinetd/pkg-message
@@ -1,10 +1,8 @@
-         ***********************************
-         * !!!!!!!!!!! WARNING !!!!!!!!!!! *
-         ***********************************
-Since 0.62_1, rinetd startup script is now enabled/disabled via
-rc.subr.
-Available variables:
+#
+# You can use the following parameters on /etc/rc.conf:
+#
 # rinetd_enable (bool): Set to "NO" by default.
 #                       Set it to "YES" to enable rinetd
 # rinetd_flags (str):   Set to "" by default.
 #                       Extra flags passed to start command
+#