- USE_RC_SUBR != yes

- PLIST_FILES
- portlint cleanups

5 files changed, 47 insertions, 28 deletions

diff --git a/sysutils/doinkd/Makefile b/sysutils/doinkd/Makefile
index 0b7ba084e654..b43ae3b8c841 100644
--- a/sysutils/doinkd/Makefile
+++ b/sysutils/doinkd/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	idled
 PORTVERSION=	1.16
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.netsw.org/system/tools/process/
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A daemon that logs out idle users and those users hogging resources
 
@@ -18,25 +19,14 @@ MANCOMPRESSED=	yes
 MAN5=		idled.cf.5
 MAN8=		idled.8
 
-SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g'
+USE_RC_SUBR=	${PORTNAME}
 
-USE_RC_SUBR=	yes
-RC_DIR=		${PREFIX}/etc/rc.d
-RC_SUFX=	.sh
-SED_SCRIPT+=	-e 's|%%RC_SUBR%%|${RC_SUBR}|g' \
-		-e 's|%%RC_DIR%%|${RC_DIR}|g' \
-		-e 's|%%RC_SUFX%%|${RC_SUFX}|g'
-PLIST_SUB+=     RC_DIR=${RC_DIR} \
-		RC_SUFX=${RC_SUFX}
+PLIST_FILES=	etc/idled.cf.template libexec/idled
 
 post-extract:
 	(cd ${WRKSRC}; make clean)
 
-post-build:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/idled.sh >${WRKDIR}/idled.sh
-
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/idled.sh ${RC_DIR}/idled${RC_SUFX}
 	@${STRIP_CMD} ${PREFIX}/libexec/idled
 
 .include <bsd.port.mk>
diff --git a/sysutils/doinkd/files/idled.sh b/sysutils/doinkd/files/doinkd.in
index 7f6a13dfa1c6..7f6a13dfa1c6 100644
--- a/sysutils/doinkd/files/idled.sh
+++ b/sysutils/doinkd/files/doinkd.in
diff --git a/sysutils/doinkd/files/idled.in b/sysutils/doinkd/files/idled.in
new file mode 100644
index 000000000000..d9df48775a34
--- /dev/null
+++ b/sysutils/doinkd/files/idled.in
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# $FreeBSD: /tmp/pcvs/ports/sysutils/doinkd/files/Attic/idled.in,v 1.1 2009-07-15 05:09:46 pgollucci Exp $
+#
+
+# PROVIDE: idled
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable idled:
+#
+#idled_enable="YES"
+#
+# See idled(8) for flags
+#
+
+. %%RC_SUBR%%
+
+name=idled
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/libexec/idled
+required_files=%%PREFIX%%/etc/idled.cf
+
+# set defaults
+
+idled_enable=${idled_enable:-"NO"}
+idled_flags=${idled_flags:-""}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/sysutils/doinkd/files/patch-aa b/sysutils/doinkd/files/patch-Makefile
index 47238ce4d40f..d480b04b339f 100644
--- a/sysutils/doinkd/files/patch-aa
+++ b/sysutils/doinkd/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Thu May 16 18:05:28 1996
-+++ Makefile	Sat Jan 20 16:22:59 2001
+--- ./Makefile.orig	1996-05-16 18:05:28.000000000 -0400
++++ ./Makefile	2009-07-15 01:05:40.560278401 -0400
 @@ -2,8 +2,8 @@
  #
  
@@ -59,23 +59,22 @@
 -DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
 -SPECLIBS = 
 -INSTTYPE = install3
--
--DEST    = /usr/local/bin
--CFDEST  = /usr/local/lib
--MDEST   = /usr/local/man
--LOGDEST = /var/log
 +#DEFS += -DSYSV -DHAVE_PROC_FS -DUTMPPID -DHAVE_SETSID -DHAVE_UTMPX -DUTMPHOST -DRUDEKILL
 +#SPECLIBS = 
 +#INSTTYPE = install3
  
--OWNER   = root
--CFOWNER = root
--MOWNER  = root
+-DEST    = /usr/local/bin
+-CFDEST  = /usr/local/lib
+-MDEST   = /usr/local/man
+-LOGDEST = /var/log
 +#DEST    = /usr/local/bin
 +#CFDEST  = /usr/local/lib
 +#MDEST   = /usr/local/man
 +#LOGDEST = /var/log
-+
+ 
+-OWNER   = root
+-CFOWNER = root
+-MOWNER  = root
 +#OWNER   = root
 +#CFOWNER = root
 +#MOWNER  = root
diff --git a/sysutils/doinkd/pkg-plist b/sysutils/doinkd/pkg-plist
deleted file mode 100644
index 84c49d6599ef..000000000000
--- a/sysutils/doinkd/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/idled.cf.template
-etc/rc.d/idled%%RC_SUFX%%
-libexec/idled