Bug 133256

 Cheers,
 Cy Schubert <Cy.Schubert@komquats.com>
 FreeBSD UNIX:  <cy@FreeBSD.org>   Web:  http://www.FreeBSD.org
 
 			e**(i*pi)+1=0
 
 Subject: Re: ports/125453: net/ntp should no longer use mlockall() (fwd) 
 In-Reply-To: Message from Travis Mikalson <bofh@terranova.net> 
    of "Thu, 26 Mar 2009 15:04:14 EDT." <49CBD1AE.9090508@terranova.net> 
 Mime-Version: 1.0
 Content-Type: text/plain; charset=us-ascii
 --------
 In message <49CBD1AE.9090508@terranova.net>, Travis Mikalson writes:
 > Cy Schubert wrote:
 > > In message <49CBCE13.4080003@terranova.net>, Travis Mikalson writes:
 > >> Cy Schubert wrote:
 > >>> Travis,
 > >>>
 > >>> I discovered this but have no reply from you (email issues with my ISP 
 > >>> during that period of time). Did the patch work?
 > >> Ah, well here is the response you must have missed. Basically the bit of
 > >> code you intended to patch worked fine, but the Makefile-related .if
 > >> ${ARCH} == "amd64" bit still did not work even after fixing the sed comman
 > d.
 > >>
 > >> Cy Schubert wrote:
 > >>>> # make
 > >>>> "Makefile", line 48: Malformed conditional (${ARCH} == "amd64")
 > >>>> "Makefile", line 51: if-less endif
 > >>>> make: fatal errors encountered -- cannot continue
 > >>> My bad. Put a slash at the end of the sed statement just before the
 > >> double quote.
 > >>
 > >> The sed command works and fixes the mlockall() error when ntpd starts,
 > >> but for some reason that is still beyond me your .if ${ARCH} == "amd64"
 > >> bit generates that make error.
 > > 
 > > I'll look into it on one of my AMD64 machines.
 > > 
 > > IIRC, you're running stable/7, not current, right?
 > 
 > Correct, the box I'm testing on is 7.1-RELEASE-p4 amd64.
 
 Can you try the following patch? This one should work.
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/net/ntp-devel/Makefile,v
 retrieving revision 1.59
 diff -u -r1.59 Makefile
 --- Makefile	30 Jan 2009 19:56:05 -0000	1.59
 +++ Makefile	31 Mar 2009 23:11:17 -0000
 @@ -7,6 +7,7 @@
  
  PORTNAME=	ntp
  PORTVERSION=	4.2.5p158
 +PORTREVISION=	1
  CATEGORIES=	net ipv6
  MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-dev/ \
  		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
 @@ -52,6 +53,11 @@
  
  .include <bsd.port.pre.mk>
  
 +.if ${ARCH} == "amd64"
 +post-patch:
 +	${REINPLACE_CMD} -e "s/if (mlockall(MCL_CURRENT|MCL_FUTURE) < 0)/if (mlockall(MCL_CURRENT) < 0)" ${WRKSRC}/ntpd/ntpd.c
 +.endif
 +
  .if exists(${LOCALBASE}/bin/net-snmp-config)
  # NTP autodects net-snmp and if found builds and installs a binary that
  # uses it. If detected, modify dependencies and package list.