Attachment 144396 Details for Bug 191235 – rebased diff on top of latest changes

[patch] rebased diff on top of latest changes

ntp-devel-perl.diff (text/plain), 3.94 KB, created by Franco Fichtner on 2014-07-04 08:11:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2014-07-04 08:11:11 UTC

Size: 3.94 KB

patch

obsolete

>diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
>index 5cf276f9..d6066c5 100644
>--- a/net/ntp-devel/Makefile
>+++ b/net/ntp-devel/Makefile
>@@ -17,50 +17,33 @@ GNU_CONFIGURE=	yes
> USE_AUTOTOOLS=	automake
> AUTOMAKE_ARGS=	--add-missing
> OPTIONS_SUB=	yes
>-USES=		pathfix perl5 shebangfix libtool
>+USES=		pathfix shebangfix libtool
> LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
> 
> NTP_SHEBANG_FILES=	sbin/ntp-wait sbin/ntptrace
> 
> .include "Makefile.inc"
> 
>+PERL_USES=		perl5
>+
> SSL_USE=		OPENSSL=yes
>+SSL_CONFIGURE_ON=	--with-openssl-incdir=${OPENSSLINC} \
>+			--with-openssl-libdir=${OPENSSLLIB}
> SSL_CONFIGURE_OFF=	--without-crypto
> 
> IPV6_CONFIGURE_ENABLE=	ipv6
> 
> NTP_SIGND_CONFIGURE_ENABLE=	ntp-signd
> 
>-NTPSNMPD_PLIST_FILES=	sbin/ntpsnmpd
> NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
> NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${PORT_OPTIONS:MSSL}
>-CONFIGURE_ARGS+=	--with-openssl-incdir=${OPENSSLINC} \
>-			--with-openssl-libdir=${OPENSSLLIB}
>-.endif
>-
> .for D in ${NTP_DRIVERS}
>-.if ${PORT_OPTIONS:M${D}}
>-CONFIGURE_ARGS+=	--enable-${D}
>-.endif
>+${D}_CONFIGURE_ON=	--enable-${D}
> .endfor
> 
>-.if ${PORT_OPTIONS:MMX4200}
>-BROKEN=		Fails to compile when MX4200 is enabled.
>-.endif
>- 
> DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}4
> 
>-pre-everything::
>-	@${ECHO}
>-	@${ECHO} If you wish to build this port with SNMP support, please make
>-	@${ECHO} sure that the net-mgmt/net-snmp port is installed before
>-	@${ECHO} building and installing this port.
>-	@${ECHO}
>-
> AUTOTOOLSFILES=	aclocal.m4
> 
> post-patch:
>@@ -77,4 +60,4 @@ post-install:
> 	@cd ${STAGEDIR}${PREFIX}; \
> 		${ECHO_CMD} ${NTP_SHEBANG_FILES} | ${XARGS} ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS}
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff --git a/net/ntp-devel/Makefile.inc b/net/ntp-devel/Makefile.inc
>index 5277958..557ab433 100644
>--- a/net/ntp-devel/Makefile.inc
>+++ b/net/ntp-devel/Makefile.inc
>@@ -26,12 +26,12 @@ OPTIONS_DEFINE=	NTPSNMPD \
>   		JUPITER \
>   		LEITCH \
>   		LOCAL_CLOCK \
>-  		MX4200 \
>   		NEOCLOCK4X \
>   		NMEA \
>   		ONCORE \
>   		PALISADE \
>   		PCF \
>+		PERL \
>   		PST \
>   		RIPENCC \
>   		SHM \
>@@ -56,6 +56,7 @@ OPTIONS_DEFINE=	NTPSNMPD \
> OPTIONS_DEFAULT=	SSL \
> 		NTP_SIGND \
>   		ATOM \
>+		PERL \
>   		NMEA
> 
> NTPSNMPD_DESC=	Build and install ntpsnmpd
>@@ -82,12 +83,12 @@ JJY_DESC=	Enable JJY receiver
> JUPITER_DESC=	Enable Rockwell Jupiter GPS receiver
> LEITCH_DESC=	Enable Leitch CSD 5300 Master Clock
> LOCAL_CLOCK_DESC=	Enable local clock reference
>-MX4200_DESC=	Enable Magnavox MX4200 GPS receiver
> NEOCLOCK4X_DESC=	Enable NeoClock4X DCF77 / TDF receiver
> NMEA_DESC=	Enable NMEA GPS receiver
> ONCORE_DESC=	Enable Motorola VP/UT Oncore GPS receiver
> PALISADE_DESC=	Enable Palisade clock
> PCF_DESC=	Enable Conrad parallel port radio clock
>+PERL_DESC=	Install ntp-wait and ntptrace utilities
> PST_DESC=	Enable PST/Traconex 1020 WWV/WWVH receiver
> RIPENCC_DESC=	Enable RIPENCC specific Trimble driver
> SHM_DESC=	Enable SHM clock attached thru shared memory
>@@ -135,7 +136,6 @@ NTP_DRIVERS= \
>   		JUPITER \
>   		LEITCH \
>   		LOCAL_CLOCK \
>-  		MX4200 \
>   		NEOCLOCK4X \
>   		NMEA \
>   		ONCORE \
>diff --git a/net/ntp-devel/pkg-plist b/net/ntp-devel/pkg-plist
>index 15e7148..e9e7e10 100644
>--- a/net/ntp-devel/pkg-plist
>+++ b/net/ntp-devel/pkg-plist
>@@ -1,23 +1,24 @@
> man/man5/ntp.conf.5.gz
> man/man5/ntp.keys.5.gz
> man/man8/ntp-keygen.8.gz
>-man/man8/ntp-wait.8.gz
>+%%PERL%%man/man8/ntp-wait.8.gz
> man/man8/ntpd.8.gz
> man/man8/ntpdc.8.gz
> man/man8/ntpq.8.gz
>-man/man8/ntptrace.8.gz
>+%%PERL%%man/man8/ntptrace.8.gz
> %%NTPSNMPD%%man/man8/ntpsnmpd.8.gz
> man/man8/sntp.8.gz
> %%SSL%%sbin/ntp-keygen
>-sbin/ntp-wait
>+%%PERL%%sbin/ntp-wait
> sbin/ntpd
> sbin/ntpdate
> sbin/ntpdc
> sbin/ntpq
>+%%NTPSNMPD%%sbin/ntpsnmpd
> sbin/ntptime
>-sbin/ntptrace
>+%%PERL%%sbin/ntptrace
> sbin/sntp
>-share/ntp/lib/NTP/Util.pm
>+%%PERL%%share/ntp/lib/NTP/Util.pm
> %%PORTDOCS%%%%DOCSDIR%%/access.html
> %%PORTDOCS%%%%DOCSDIR%%/accopt.html
> %%PORTDOCS%%%%DOCSDIR%%/assoc.html

Actions: View | Diff

Attachments on bug 191235: 143986 | 144396 | 144405