From owner-svn-ports-all@FreeBSD.ORG Fri Mar 14 19:21:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6DBF91F; Fri, 14 Mar 2014 19:21:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C74C6315; Fri, 14 Mar 2014 19:21:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2EJLuS9046991; Fri, 14 Mar 2014 19:21:56 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2EJLtGW046984; Fri, 14 Mar 2014 19:21:55 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201403141921.s2EJLtGW046984@svn.freebsd.org> From: Cy Schubert Date: Fri, 14 Mar 2014 19:21:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348275 - in head/net: ntp ntp-devel ntp-rc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Mar 2014 19:21:57 -0000 Author: cy Date: Fri Mar 14 19:21:55 2014 New Revision: 348275 URL: http://svnweb.freebsd.org/changeset/ports/348275 QAT: https://qat.redports.org/buildarchive/r348275/ Log: Support staging. Modified: head/net/ntp-devel/Makefile head/net/ntp-devel/pkg-plist head/net/ntp-rc/Makefile head/net/ntp-rc/pkg-plist head/net/ntp/Makefile head/net/ntp/pkg-plist Modified: head/net/ntp-devel/Makefile ============================================================================== --- head/net/ntp-devel/Makefile Fri Mar 14 17:40:43 2014 (r348274) +++ head/net/ntp-devel/Makefile Fri Mar 14 19:21:55 2014 (r348275) @@ -17,13 +17,9 @@ COMMENT= The Network Time Protocol Distr GNU_CONFIGURE= yes USE_AUTOTOOLS= automake libtool AUTOMAKE_ARGS= --add-missing -USES= pathfix -LIB_DEPENDS= event-2.0:${PORTSDIR}/devel/libevent2 +USES= pathfix +LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 -MAN5= ntp.conf.5 ntp.keys.5 -MAN8= ntp-keygen.8 ntpd.8 ntpdc.8 ntpq.8 sntp.8 - -NO_STAGE= yes .include "Makefile.inc" .include @@ -48,12 +44,13 @@ CONFIGURE_ARGS+= --enable-ntp-signd .if ${PORT_OPTIONS:MNTPSNMPD} PLIST_FILES+= sbin/ntpsnmpd -MAN8+= ntpsnmpd.8 +PLIST_SUB+= NTPSNMPD="" BUILD_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp -LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp +LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp RUN_DEPENDS+= ${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp .else CONFIGURE_ARGS+= --without-ntpsnmpd +PLIST_SUB+= NTPSNMPD="@comment " .endif .for D in ${NTP_DRIVERS} @@ -84,13 +81,13 @@ post-patch: ${WRKSRC}/aclocal.m4 post-install: - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ - ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${DOCSDIR} + ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} .endif .include Modified: head/net/ntp-devel/pkg-plist ============================================================================== --- head/net/ntp-devel/pkg-plist Fri Mar 14 17:40:43 2014 (r348274) +++ head/net/ntp-devel/pkg-plist Fri Mar 14 19:21:55 2014 (r348275) @@ -1,3 +1,11 @@ +man/man5/ntp.conf.5.gz +man/man5/ntp.keys.5.gz +man/man8/ntp-keygen.8.gz +man/man8/ntpd.8.gz +man/man8/ntpdc.8.gz +man/man8/ntpq.8.gz +%%NTPSNMPD%%man/man8/ntpsnmpd.8.gz +man/man8/sntp.8.gz %%SSL%%sbin/ntp-keygen sbin/ntp-wait sbin/ntpd Modified: head/net/ntp-rc/Makefile ============================================================================== --- head/net/ntp-rc/Makefile Fri Mar 14 17:40:43 2014 (r348274) +++ head/net/ntp-rc/Makefile Fri Mar 14 19:21:55 2014 (r348275) @@ -19,14 +19,6 @@ IGNORE= RC branch not currently active GNU_CONFIGURE= yes USE_AUTOTOOLS= automake libtool -MAN1= sntp.1 \ - ntpd.1 \ - ntpdc.1 \ - ntpq.1 \ - ntpsnmpd.1 \ - ntp-keygen.1 \ - -NO_STAGE= yes .include "Makefile.inc" .include @@ -64,13 +56,13 @@ CONFIGURE_ARGS+= --enable-${D} .endfor post-install: - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ - ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${DOCSDIR} + ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} .endif .include Modified: head/net/ntp-rc/pkg-plist ============================================================================== --- head/net/ntp-rc/pkg-plist Fri Mar 14 17:40:43 2014 (r348274) +++ head/net/ntp-rc/pkg-plist Fri Mar 14 19:21:55 2014 (r348275) @@ -8,6 +8,12 @@ bin/ntptime bin/ntptrace bin/sntp bin/tickadj +man/man1/sntp.1.gz +man/man1/ntpd.1.gz +man/man1/ntpdc.1.gz +man/man1/ntpq.1.gz +man/man1/ntpsnmpd.1.gz +man/man1/ntp-keygen.1.gz %%PORTDOCS%%%%DOCSDIR%%/accopt.html %%PORTDOCS%%%%DOCSDIR%%/assoc.html %%PORTDOCS%%%%DOCSDIR%%/audio.html Modified: head/net/ntp/Makefile ============================================================================== --- head/net/ntp/Makefile Fri Mar 14 17:40:43 2014 (r348274) +++ head/net/ntp/Makefile Fri Mar 14 19:21:55 2014 (r348275) @@ -27,7 +27,6 @@ MAN1= sntp.1 \ ntpsnmpd.1 \ ntp-keygen.1 \ -NO_STAGE= yes .include "Makefile.inc" .include @@ -71,13 +70,13 @@ post-patch: ${WRKSRC}/aclocal.m4 post-install: - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} @cd ${WRKSRC}/html && ${FIND} . -print | \ - ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${DOCSDIR} + ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} .endif .include Modified: head/net/ntp/pkg-plist ============================================================================== --- head/net/ntp/pkg-plist Fri Mar 14 17:40:43 2014 (r348274) +++ head/net/ntp/pkg-plist Fri Mar 14 19:21:55 2014 (r348275) @@ -8,6 +8,12 @@ bin/ntptime bin/ntptrace bin/sntp bin/tickadj +man/man1/sntp.1.gz +man/man1/ntpd.1.gz +man/man1/ntpdc.1.gz +man/man1/ntpq.1.gz +man/man1/ntpsnmpd.1.gz +man/man1/ntp-keygen.1.gz %%PORTDOCS%%%%DOCSDIR%%/accopt.html %%PORTDOCS%%%%DOCSDIR%%/assoc.html %%PORTDOCS%%%%DOCSDIR%%/audio.html