Support staging.

6 files changed, 37 insertions, 29 deletions

diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 89e50023088d..6476ec8f622f 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -17,13 +17,9 @@ COMMENT=	The Network Time Protocol Distribution
 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 <bsd.port.options.mk>
@@ -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 <bsd.port.post.mk>
diff --git a/net/ntp-devel/pkg-plist b/net/ntp-devel/pkg-plist
index 610ba26898dc..2be818a62577 100644
--- a/net/ntp-devel/pkg-plist
+++ b/net/ntp-devel/pkg-plist
@@ -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
diff --git a/net/ntp-rc/Makefile b/net/ntp-rc/Makefile
index c37944e55bc8..5fb9753e6de9 100644
--- a/net/ntp-rc/Makefile
+++ b/net/ntp-rc/Makefile
@@ -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 <bsd.port.options.mk>
@@ -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 <bsd.port.mk>
diff --git a/net/ntp-rc/pkg-plist b/net/ntp-rc/pkg-plist
index 3ffecd805b5a..91e715a6fb13 100644
--- a/net/ntp-rc/pkg-plist
+++ b/net/ntp-rc/pkg-plist
@@ -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
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 0e00d30a089f..5b8da1afceb2 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -27,7 +27,6 @@ MAN1=		sntp.1 \
 		ntpsnmpd.1 \
 		ntp-keygen.1 \
 
-NO_STAGE=	yes
 .include "Makefile.inc"
 
 .include <bsd.port.options.mk>
@@ -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 <bsd.port.mk>
diff --git a/net/ntp/pkg-plist b/net/ntp/pkg-plist
index 3ffecd805b5a..91e715a6fb13 100644
--- a/net/ntp/pkg-plist
+++ b/net/ntp/pkg-plist
@@ -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