diff options
| author | Sergey Matveychuk <sem@FreeBSD.org> | 2006-07-12 05:50:42 +0000 |
|---|---|---|
| committer | Sergey Matveychuk <sem@FreeBSD.org> | 2006-07-12 05:50:42 +0000 |
| commit | c2de988e108898d00b9431b7526f50181de28512 (patch) | |
| tree | e1c6c1382befc84601cf5397bcb9c3b25864c59f /security/xinetd | |
| parent | 65af27dcbecc2932ae82c51931dba5b9c0f5bf35 (diff) | |
| download | ports-c2de988e108898d00b9431b7526f50181de28512.tar.gz ports-c2de988e108898d00b9431b7526f50181de28512.zip | |
- Fix PROVIDE: line in a startup script
- New style of startup script install
PR: ports/100139
Submitted by: Alexander Logvinov <user_at_blg.akavia.ru>
Notes
Notes:
svn path=/head/; revision=167567
Diffstat (limited to 'security/xinetd')
| -rw-r--r-- | security/xinetd/Makefile | 13 | ||||
| -rw-r--r-- | security/xinetd/files/xinetd.sh.tmpl | 24 | ||||
| -rw-r--r-- | security/xinetd/pkg-plist | 1 |
3 files changed, 2 insertions, 36 deletions
diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile index 610a8cedd621..45d86fae8c2e 100644 --- a/security/xinetd/Makefile +++ b/security/xinetd/Makefile @@ -7,7 +7,7 @@ PORTNAME= xinetd PORTVERSION= 2.3.14 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= security ipv6 MASTER_SITES= http://www.xinetd.org/ @@ -16,11 +16,9 @@ COMMENT= Replacement for inetd with better control and logging USE_GMAKE= yes GNU_CONFIGURE= yes -USE_RC_SUBR= yes +USE_RC_SUBR= xinetd ALL_TARGET= build CONFIGURE_ARGS+= --with-loadavg --with-libwrap --with-ipv6 -STARTUP_FILE= ${PREFIX}/etc/rc.d/xinetd.sh -RC_SCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR} MAN5= xinetd.conf.5 MAN8= xconv.8 xinetd.8 xinetd.log.8 @@ -30,14 +28,7 @@ post-patch: ${REINPLACE_CMD} -e 's!\@INSTALL\@!/bin/cp!; s!-m 640!!' @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/xinetd/xconfig.h -pre-install: - -@[ -f ${STARTUP_FILE} ] && \ - (${ECHO} "Remove old ${STARTUP_FILE} before install." && exit 1) - post-install: - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/xinetd.sh.tmpl > ${STARTUP_FILE} - @${CHMOD} 755 ${STARTUP_FILE} @${STRIP_CMD} ${PREFIX}/sbin/xinetd .include <bsd.port.mk> diff --git a/security/xinetd/files/xinetd.sh.tmpl b/security/xinetd/files/xinetd.sh.tmpl deleted file mode 100644 index 45aa60dc7a93..000000000000 --- a/security/xinetd/files/xinetd.sh.tmpl +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# PROVIDE: snmpd -# REQUIRE: DAEMON -# -# Add the following line to /etc/rc.conf to enable xinetd: -# -# xinetd_enable="YES" -# - -. %%RC_SUBR%% - -name=xinetd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/xinetd > /dev/null 2>&1 - -xinetd_enable=${xinetd_enable:-"NO"} -xinetd_flags=${xinetd_flags:-"-f %%PREFIX%%/etc/xinetd.conf"} - -load_rc_config $name -run_rc_command "$1" diff --git a/security/xinetd/pkg-plist b/security/xinetd/pkg-plist index ce7c946a1f6c..fb8e32299793 100644 --- a/security/xinetd/pkg-plist +++ b/security/xinetd/pkg-plist @@ -1,3 +1,2 @@ bin/xconv -etc/rc.d/xinetd.sh sbin/xinetd |