diff options
| author | Christian Weisgerber <naddy@FreeBSD.org> | 2007-10-02 17:06:05 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@FreeBSD.org> | 2007-10-02 17:06:05 +0000 |
| commit | 602021dfd97c035418333f7599c87c4314df974d (patch) | |
| tree | 157593f88b656e9251a2155645288538208a8562 | |
| parent | A bug in our /bin/sh is making one of the tests fail when looking for a (diff) | |
Use new style of startup script install.
PR: 116772
Submitted by: Alexander Logvinov <ports@logvinov.com>
Notes
Notes:
svn path=/head/; revision=200671
| -rw-r--r-- | net/openntpd/Makefile | 8 | ||||
| -rw-r--r-- | net/openntpd/files/openntpd.in (renamed from net/openntpd/files/openntpd.sh) | 0 | ||||
| -rw-r--r-- | net/openntpd/pkg-plist | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile index 5a6e6abc3a62..dd3a1e9bb92d 100644 --- a/net/openntpd/Makefile +++ b/net/openntpd/Makefile @@ -7,7 +7,7 @@ PORTNAME= openntpd PORTVERSION= 3.9p1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \ @@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \ MAINTAINER= naddy@FreeBSD.org COMMENT= OpenBSD's Network Time Protocol daemon -USE_RC_SUBR= yes +USE_RC_SUBR= openntpd GNU_CONFIGURE= yes MAN5= ntpd.conf.5 @@ -26,9 +26,6 @@ MAN8= ntpd.8 pre-build: ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/ntpd.conf.5 ${WRKSRC}/ntpd.8 - @${SED} -e 's:%%PREFIX%%:${PREFIX}:g' \ - -e 's:%%RC_SUBR%%:${RC_SUBR}:g' \ - ${FILESDIR}/openntpd.sh >${WRKDIR}/openntpd.sh do-install: @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -37,7 +34,6 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${PREFIX}/man/man8 @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/ntpd.conf ${EXAMPLESDIR} - ${INSTALL_SCRIPT} ${WRKDIR}/openntpd.sh ${PREFIX}/etc/rc.d @if [ ! -f ${PREFIX}/etc/ntpd.conf ]; then \ ${CP} -p ${EXAMPLESDIR}/ntpd.conf ${PREFIX}/etc; \ fi diff --git a/net/openntpd/files/openntpd.sh b/net/openntpd/files/openntpd.in index 0563632209c7..0563632209c7 100644 --- a/net/openntpd/files/openntpd.sh +++ b/net/openntpd/files/openntpd.in diff --git a/net/openntpd/pkg-plist b/net/openntpd/pkg-plist index af9ebf66bffd..0dc7324fa854 100644 --- a/net/openntpd/pkg-plist +++ b/net/openntpd/pkg-plist @@ -1,5 +1,4 @@ @comment $FreeBSD$ -etc/rc.d/openntpd.sh sbin/ntpd @unexec if cmp -s %D/etc/ntpd.conf %D/%%EXAMPLESDIR%%/ntpd.conf; then rm -f %D/etc/ntpd.conf; fi %%EXAMPLESDIR%%/ntpd.conf |