From f221d77c60b881fe1ba0ac215057f51d3f63117b Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Tue, 20 Dec 2005 23:40:56 +0000
Subject: - Update to 1.5.1

PR:		ports/90720
Submitted by:	Paul Dlug <paul@aps.org> (maintainer)

- Modernize USE_RC_SUBR usage
---
 sysutils/radmind/Makefile            | 28 ++++++---------------------
 sysutils/radmind/distinfo            |  5 +++--
 sysutils/radmind/files/radmind.sh    | 37 ------------------------------------
 sysutils/radmind/files/radmind.sh.in | 37 ++++++++++++++++++++++++++++++++++++
 sysutils/radmind/pkg-plist           |  2 +-
 5 files changed, 47 insertions(+), 62 deletions(-)
 delete mode 100644 sysutils/radmind/files/radmind.sh
 create mode 100644 sysutils/radmind/files/radmind.sh.in

(limited to 'sysutils/radmind')

diff --git a/sysutils/radmind/Makefile b/sysutils/radmind/Makefile
index 05b4899eeba7..78524ae39087 100644
--- a/sysutils/radmind/Makefile
+++ b/sysutils/radmind/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	radmind
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://rsug.itd.umich.edu/software/radmind/files/
 EXTRACT_SUFX=	.tgz
@@ -15,7 +15,9 @@ MAINTAINER=	paul@aps.org
 COMMENT=	Utility for administering filesystem changes
 
 USE_OPENSSL=	yes
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	radmind.sh
+SUB_LIST=	RADMIND_BASE_DIR=${RADMIND_BASE_DIR}
+PLIST_SUB=	RADMIND_BASE_DIR=${RADMIND_BASE_DIR}
 
 HAS_CONFIGURE=	yes
 
@@ -24,30 +26,12 @@ RADMIND_BASE_DIR?=	/var/radmind
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-radminddir=${RADMIND_BASE_DIR}
 
 MAN1=		fsdiff.1 ktcheck.1 lapply.1 lcksum.1 lcreate.1 lfdiff.1 \
-		lmerge.1 twhich.1
+		lmerge.1 lsort.1 twhich.1 rash.1
 MAN5=		applefile.5
 MAN8=		radmind.8
 DOCS=		COPYRIGHT README SPEC
 
-.include <bsd.port.pre.mk>
-
-RC_SUBR?=				${DESTDIR}/etc/rc.subr
-RC_DIR=					${PREFIX}/etc/rc.d
-RC_SUFX=				.sh
-
-SED_SCRIPT+=		-e 's,%%RC_SUBR%%,${RC_SUBR},g' \
-			-e 's,%%PREFIX%%,${PREFIX},g' \
-			-e 's,%%RADMIND_BASE_DIR%%,${RADMIND_BASE_DIR},g' \
-
-PLIST_SUB+=		RC_DIR=${RC_DIR} \
-				RC_SUFX=${RC_SUFX} \
-				RADMIND_BASE_DIR=${RADMIND_BASE_DIR}
-
-post-build:
-	@${SED} ${SED_SCRIPT} ${FILESDIR}/radmind.sh >${WRKDIR}/radmind.sh
-
 post-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/radmind.sh ${RC_DIR}/radmind${RC_SUFX}
 	# Ugly hack to remove generated man pages
 	${RM} -rf ${WRKSRC}/tmp
 
@@ -56,4 +40,4 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/radmind/distinfo b/sysutils/radmind/distinfo
index 6f8d8071fdca..44751e74b1b1 100644
--- a/sysutils/radmind/distinfo
+++ b/sysutils/radmind/distinfo
@@ -1,2 +1,3 @@
-MD5 (radmind-1.5.0.tgz) = c636f5c27cec2aeb4d0031a14d91aff5
-SIZE (radmind-1.5.0.tgz) = 341574
+MD5 (radmind-1.5.1.tgz) = 6c8d0e9a9e954e89cffcc64421b783f5
+SHA256 (radmind-1.5.1.tgz) = 25341041c0578263393b348ae88e4a856a2c28806aa1994949247da7cec50c78
+SIZE (radmind-1.5.1.tgz) = 353879
diff --git a/sysutils/radmind/files/radmind.sh b/sysutils/radmind/files/radmind.sh
deleted file mode 100644
index c010826a5024..000000000000
--- a/sysutils/radmind/files/radmind.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: radmind
-# REQUIRE: DAEMON
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable radmind:
-#
-#radmind_enable="YES"
-#
-# You may also override the default flags:
-#
-#radmind_flags="-D /var/radmind -m 5 -u 077 -Llocal7 -w 0"
-#
-# See radmind(8) for flags
-#
-
-. %%RC_SUBR%%
-
-name=radmind
-rcvar=`set_rcvar`
-
-command=%%PREFIX%%/sbin/radmind
-command_args=""
-required_files=/var/radmind/config
-
-# set defaults
-
-radmind_enable=${radmind_enable:-"NO"}
-radmind_flags=${radmind_flags:-"-D /var/radmind -m 5 -u 077 -Llocal7 -w 0"}
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/sysutils/radmind/files/radmind.sh.in b/sysutils/radmind/files/radmind.sh.in
new file mode 100644
index 000000000000..d3451cefde46
--- /dev/null
+++ b/sysutils/radmind/files/radmind.sh.in
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: radmind
+# REQUIRE: DAEMON
+# KEYWORD: FreeBSD shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable radmind:
+#
+#radmind_enable="YES"
+#
+# You may also override the default flags:
+#
+#radmind_flags="-D /var/radmind -m 5 -u 077 -Llocal7 -w 0"
+#
+# See radmind(8) for flags
+#
+
+. %%RC_SUBR%%
+
+name=radmind
+rcvar=`set_rcvar`
+
+command=%%PREFIX%%/sbin/radmind
+command_args=""
+required_files=%%RADMIND_BASE_DIR%%/config
+
+# set defaults
+
+radmind_enable=${radmind_enable:-"NO"}
+radmind_flags=${radmind_flags:-"-D %%RADMIND_BASE_DIR%% -m 5 -u 077 -Llocal7 -w 0"}
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/sysutils/radmind/pkg-plist b/sysutils/radmind/pkg-plist
index ac365996419d..e437ca63e14e 100644
--- a/sysutils/radmind/pkg-plist
+++ b/sysutils/radmind/pkg-plist
@@ -5,9 +5,9 @@ bin/lcksum
 bin/lcreate
 bin/lfdiff
 bin/lmerge
+bin/lsort
 bin/ra.sh
 bin/twhich
-etc/rc.d/radmind.sh
 sbin/radmind
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/README
-- 
cgit