[pkgsrc/trunk]: pkgsrc/security/dirmngr Complying with request from Jeremy C....

[shannonjr <shannonjr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/02f51ac21e8b
branches:  trunk
changeset: 493314:02f51ac21e8b
user:      shannonjr <shannonjr%pkgsrc.org@localhost>
date:      Mon May 02 22:33:37 2005 +0000

description:
Complying with request from Jeremy C. Reed, "Can you remove the
INSTALL_SCRIPT step and set RCD_SCRIPTS=dirmngr instead?"

diffstat:

 security/dirmngr/Makefile         |   6 +-
 security/dirmngr/PLIST            |   3 +-
 security/dirmngr/files/dirmngr    |  72 ---------------------------------------
 security/dirmngr/files/dirmngr.sh |  72 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 76 insertions(+), 77 deletions(-)

diffs (193 lines):

diff -r 281bc98576ad -r 02f51ac21e8b security/dirmngr/Makefile
--- a/security/dirmngr/Makefile Mon May 02 21:21:29 2005 +0000
+++ b/security/dirmngr/Makefile Mon May 02 22:33:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/25 09:54:04 shannonjr Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/02 22:33:37 shannonjr Exp $
 #
 
 DISTNAME=              dirmngr-0.9.1
@@ -22,6 +22,8 @@
 USE_GNU_TOOLS+=                awk
 USE_PKGINSTALL=                yes
 USE_PKGLOCALEDIR=      yes
+RCD_SCRIPTS=           dirmngr
+PKG_RCD_SCRIPTS=       yes
 
 CONFIGURE_ARGS+=       --localstatedir="${VARBASE}"
 CONFIGURE_ARGS+=       --sharedstatedir="${VARBASE}"
@@ -54,8 +56,6 @@
        ${CHOWN} -R ${DIRMNGR_USER}:${DIRMNGR_GROUP} ${PREFIX}/libdata/dirmngr
 
 post-install:
-       @${SED} ${FILES_SUBST_SED} ${FILESDIR}/dirmngr > ${WRKDIR}/dirmngr
-       ${INSTALL_SCRIPT} ${WRKDIR}/dirmngr ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/dirmngr
        ${INSTALL_PROGRAM} ${WRKDIR}/runDirmngr ${PREFIX}/sbin
 
 INFO_FILES=            dirmngr.info
diff -r 281bc98576ad -r 02f51ac21e8b security/dirmngr/PLIST
--- a/security/dirmngr/PLIST    Mon May 02 21:21:29 2005 +0000
+++ b/security/dirmngr/PLIST    Mon May 02 22:33:37 2005 +0000
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2005/01/04 13:40:38 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/05/02 22:33:37 shannonjr Exp $
 bin/dirmngr
 bin/dirmngr-client
 libexec/dirmngr_ldap
 sbin/runDirmngr
-share/examples/rc.d/dirmngr
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/dirmngr.mo
 @exec ${MKDIR} %D/libdata/dirmngr/extra-certs
 @dirrm libdata/dirmngr/extra-certs
diff -r 281bc98576ad -r 02f51ac21e8b security/dirmngr/files/dirmngr
--- a/security/dirmngr/files/dirmngr    Mon May 02 21:21:29 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dirmngr,v 1.1 2005/01/04 13:40:38 shannonjr Exp $
-#
-# PROVIDE: dirmngr
-# REQUIRE: DAEMON
-#
-
-if [ -f @PKG_SYSCONFDIR@/rc.subr ]; then
-       . @PKG_SYSCONFDIR@/rc.subr
-fi
-
-name="dirmngr"
-rcvar="${name}"
-dirmngr_user="dirmngr"
-dirmngr_group="dirmngr"
-dirmngr_flags="--daemon"
-dirmngr_command="@PREFIX@/sbin/runDirmngr"
-start_precmd="dirmngr_precmd"
-start_cmd="dirmngr_start"
-start_postcmd="dirmngr_postcmd"
-stop_cmd="dirmngr_stop"
-required_dirs="@PKG_SYSCONFDIR@/dirmngr"
-required_files="@PKG_SYSCONFDIR@/dirmngr/ldapservers.conf"
-
-dirmngr_precmd()
-{
-       mkdir -p @VARBASE@/run/dirmngr
-       chgrp dirmngr @VARBASE@/run/dirmngr
-       chmod 775 @VARBASE@/run/dirmngr
-       mkdir -p /tmp/dirmngr
-       chgrp dirmngr /tmp/dirmngr
-       chmod 755 /tmp/dirmngr
-}
-
-dirmngr_start()
-{
-       for _f in $required_dirs; do
-               if [ ! -d "${_f}/." ]; then
-                       warn "${_f} is not a directory."
-                       if [ -z $rc_force ]; then
-                               return 1
-                       fi
-               fi
-       done
-       for _f in $required_files; do
-               if [ ! -r "${_f}" ]; then
-                       warn "${_f} is not readable."
-                       if [ -z $rc_force ]; then
-                               return 1
-                       fi
-               fi
-       done
-       eval `${dirmngr_command} ${rc_flags}`
-}
-
-dirmngr_postcmd()
-{
-       echo ${DIRMNGR_INFO} >/tmp/dirmngr/dirmngr.info
-       chmod 644 /tmp/dirmngr/dirmngr.info
-       dirmngr_pid=`cut -f 2 -d ':' /tmp/dirmngr/dirmngr.info`
-}
-
-dirmngr_stop()
-{
-       if [ -f /tmp/dirmngr/dirmngr.info ] ; then
-               kill `cut -f 2 -d ':' /tmp/dirmngr/dirmngr.info`
-       fi
-}
-
-load_rc_config $name
-run_rc_command "$1"
diff -r 281bc98576ad -r 02f51ac21e8b security/dirmngr/files/dirmngr.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/dirmngr/files/dirmngr.sh Mon May 02 22:33:37 2005 +0000
@@ -0,0 +1,72 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dirmngr.sh,v 1.1 2005/05/02 22:33:37 shannonjr Exp $
+#
+# PROVIDE: dirmngr
+# REQUIRE: DAEMON
+#
+
+if [ -f @PKG_SYSCONFDIR@/rc.subr ]; then
+       . @PKG_SYSCONFDIR@/rc.subr
+fi
+
+name="dirmngr"
+rcvar="${name}"
+dirmngr_user="dirmngr"
+dirmngr_group="dirmngr"
+dirmngr_flags="--daemon"
+dirmngr_command="@PREFIX@/sbin/runDirmngr"
+start_precmd="dirmngr_precmd"
+start_cmd="dirmngr_start"
+start_postcmd="dirmngr_postcmd"
+stop_cmd="dirmngr_stop"
+required_dirs="@PKG_SYSCONFDIR@/dirmngr"
+required_files="@PKG_SYSCONFDIR@/dirmngr/ldapservers.conf"
+
+dirmngr_precmd()
+{
+       mkdir -p @VARBASE@/run/dirmngr
+       chgrp dirmngr @VARBASE@/run/dirmngr
+       chmod 775 @VARBASE@/run/dirmngr
+       mkdir -p /tmp/dirmngr
+       chgrp dirmngr /tmp/dirmngr
+       chmod 755 /tmp/dirmngr
+}
+
+dirmngr_start()
+{
+       for _f in $required_dirs; do
+               if [ ! -d "${_f}/." ]; then
+                       warn "${_f} is not a directory."
+                       if [ -z $rc_force ]; then
+                               return 1
+                       fi
+               fi
+       done
+       for _f in $required_files; do
+               if [ ! -r "${_f}" ]; then
+                       warn "${_f} is not readable."
+                       if [ -z $rc_force ]; then
+                               return 1
+                       fi
+               fi
+       done
+       eval `${dirmngr_command} ${rc_flags}`
+}
+
+dirmngr_postcmd()
+{
+       echo ${DIRMNGR_INFO} >/tmp/dirmngr/dirmngr.info
+       chmod 644 /tmp/dirmngr/dirmngr.info
+       dirmngr_pid=`cut -f 2 -d ':' /tmp/dirmngr/dirmngr.info`
+}
+
+dirmngr_stop()
+{
+       if [ -f /tmp/dirmngr/dirmngr.info ] ; then
+               kill `cut -f 2 -d ':' /tmp/dirmngr/dirmngr.info`
+       fi
+}
+
+load_rc_config $name
+run_rc_command "$1"