Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Oct 2013 15:30:44 +0000 (UTC)
From:      Christian Weisgerber <naddy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329324 - head/net/openntpd
Message-ID:  <201310041530.r94FUik9048889@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: naddy
Date: Fri Oct  4 15:30:43 2013
New Revision: 329324
URL: http://svnweb.freebsd.org/changeset/ports/329324

Log:
  Support staging.

Modified:
  head/net/openntpd/Makefile
  head/net/openntpd/pkg-plist

Modified: head/net/openntpd/Makefile
==============================================================================
--- head/net/openntpd/Makefile	Fri Oct  4 15:21:09 2013	(r329323)
+++ head/net/openntpd/Makefile	Fri Oct  4 15:30:43 2013	(r329324)
@@ -19,27 +19,18 @@ USE_RC_SUBR=	openntpd
 
 WRKSRC=		${WRKDIR}/ntpd
 
-MAN5=		ntpd.conf.5
-MAN8=		ntpd.8
-
-NO_STAGE=	yes
 post-extract:
-.for i in compat.h adjfreq.c
-	@${CP} ${FILESDIR}/$i ${WRKSRC}
-.endfor
+	@${CP} ${FILESDIR}/compat.h ${FILESDIR}/adjfreq.c ${WRKSRC}
 
 pre-build:
 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
 	    ${WRKSRC}/ntpd.h ${WRKSRC}/ntpd.conf.5 ${WRKSRC}/ntpd.8
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${PREFIX}/man/man8
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${FILESDIR}/ntpd.conf ${EXAMPLESDIR}
-	@if [ ! -f ${PREFIX}/etc/ntpd.conf ]; then \
-	    ${CP} ${EXAMPLESDIR}/ntpd.conf ${PREFIX}/etc; \
-	fi
+	${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${STAGEDIR}${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${STAGEDIR}${PREFIX}/man/man8
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/ntpd.conf ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/net/openntpd/pkg-plist
==============================================================================
--- head/net/openntpd/pkg-plist	Fri Oct  4 15:21:09 2013	(r329323)
+++ head/net/openntpd/pkg-plist	Fri Oct  4 15:30:43 2013	(r329324)
@@ -1,4 +1,6 @@
 @comment $FreeBSD$
+man/man5/ntpd.conf.5.gz
+man/man8/ntpd.8.gz
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310041530.r94FUik9048889>