summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorClive Lin <clive@FreeBSD.org>2004-08-29 07:08:03 +0000
committerClive Lin <clive@FreeBSD.org>2004-08-29 07:08:03 +0000
commit3745885086fc28f30681b8b2d75506d6f7729c7c (patch)
tree9cbdc798c19fe10816f362554dcf8b693879d51c /net
parentinkbox.h is specific to PX-G900. (diff)
+ Embrace rcNG. (1)
+ Only install default configuration file if it does not exist. (2) PR: ports/70390 (2) Submitted by: Andy Miller via MAINTAINER <dd at FreeBSD dot org> (1) Dryice Liu <dryice at liu dot com dot cn> (2) Approved by: MAINTAINER timeout.
Notes
Notes: svn path=/head/; revision=117550
Diffstat (limited to 'net')
-rw-r--r--net/dictd/Makefile6
-rw-r--r--net/dictd/files/dictd.sh54
-rw-r--r--net/dictd/pkg-plist4
3 files changed, 22 insertions, 42 deletions
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index 21dfcc9c63ba..e61b4b8f6285 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -8,7 +8,7 @@
PORTNAME= dictd
PORTVERSION= 1.9.11
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES+= net textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= dict
@@ -20,6 +20,7 @@ MAN1= dictzip.1
MAN8= dictd.8
USE_LIBLTDL= yes
+USE_RC_SUBR= yes
USE_REINPLACE= yes
USE_BISON= yes
USE_LIBTOOL_VER=13
@@ -47,7 +48,8 @@ post-install:
.for i in example.conf example.dictrc example.site example2.conf example3.conf
${INSTALL_DATA} ${WRKSRC}/$i ${DATADIR}
.endfor
- @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/${PORTNAME}.conf > ${PREFIX}/etc/${PORTNAME}.conf
+ @${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/${PORTNAME}.conf > ${PREFIX}/etc/${PORTNAME}.conf.sample
+ @[ -f ${PREFIX}/etc/${PORTNAME}.conf ] || ${CP} ${PREFIX}/etc/${PORTNAME}.conf.sample ${PREFIX}/etc/${PORTNAME}.conf
@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${FILESDIR}/${PORTNAME}.sh > ${PREFIX}/etc/rc.d/${PORTNAME}.sh
@${CHMOD} +x ${PREFIX}/etc/rc.d/${PORTNAME}.sh
@${SED} "s|%%PREFIX%%|${PREFIX}|g" < ${PKGMESSAGE}
diff --git a/net/dictd/files/dictd.sh b/net/dictd/files/dictd.sh
index 42097ca39cc3..0e9bfb98eb51 100644
--- a/net/dictd/files/dictd.sh
+++ b/net/dictd/files/dictd.sh
@@ -1,44 +1,20 @@
#!/bin/sh
# $FreeBSD$
+#
+# PROVIDE: dictd
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD
+#
+# Add the following line to /etc/rc.conf to enable dictd:
+#
+# dictd_enable="YES"
+#
-SOCKSTAT=/usr/bin/sockstat
-GREP=/usr/bin/grep
-AWK=/usr/bin/awk
-ECHO=/bin/echo
-CAT=/bin/cat
-KILL=/bin/kill
-RM=/bin/rm
+. /etc/rc.subr
-DICTD=%%PREFIX%%/sbin/dictd
+name=dictd
+rcvar=`set_rcvar`
+command=%%PREFIX%%/sbin/dictd
-# DICTD_OPTIONS="-put -command_line -options -for -dictd -here"
-DICTD_OPTIONS=""
-
-DICTD_PID_FILE=/var/run/dictd.pid
-
-case "$1" in
- start)
- if [ -x $DICTD ]; then
- ${ECHO} -n " dictd"
- $DICTD $DICTD_OPTIONS
- ${ECHO} `${SOCKSTAT} | ${GREP} dictd | ${AWK} '{print $3}'` > ${DICTD_PID_FILE}
- else
- ${ECHO} "dictd.sh: cannot find $DICTD or it's not executable"
- fi
- ;;
-
- stop)
- if [ ! -f $DICTD_PID_FILE ]; then
- exit 0
- fi
- dictdpid=`${CAT} $DICTD_PID_FILE`
- if [ "$dictdpid" -gt 0 ]; then
- ${ECHO} -n " dictd"
- ${KILL} -15 $dictdpid 2>&1 > /dev/null
- fi
- ${RM} -f $DICTD_PID_FILE
- ;;
- *)
- echo "Usage: dictd.sh { start | stop }"
- ;;
-esac
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/dictd/pkg-plist b/net/dictd/pkg-plist
index 7d02f0805995..6f952cb88bb2 100644
--- a/net/dictd/pkg-plist
+++ b/net/dictd/pkg-plist
@@ -5,6 +5,8 @@ share/dictd/example.dictrc
share/dictd/example.site
share/dictd/example2.conf
share/dictd/example3.conf
-etc/dictd.conf
+@unexec if cmp -s %D/etc/dictd.conf %D/etc/dictd.conf.sample; then rm -f %D/etc/dictd.conf; fi
+etc/dictd.conf.sample
+@exec [ -f %B/dictd.conf ] || cp %B/%f %B/dictd.conf
etc/rc.d/dictd.sh
@dirrm share/dictd