From edwin@mavetju.org  Wed Oct  2 19:35:21 2002
Return-Path: <edwin@mavetju.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id D053137B401; Wed,  2 Oct 2002 19:35:21 -0700 (PDT)
Received: from topaz.mdcc.cx (topaz.mdcc.cx [212.204.230.141])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 3ECAC43E6A; Wed,  2 Oct 2002 19:35:21 -0700 (PDT)
	(envelope-from edwin@mavetju.org)
Received: from k7.mavetju (topaz.mdcc.cx [212.204.230.141])
	by topaz.mdcc.cx (Postfix) with ESMTP
	id D2CF72B739; Thu,  3 Oct 2002 04:35:17 +0200 (CEST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id E6F796A712E; Thu,  3 Oct 2002 12:35:13 +1000 (EST)
Message-Id: <20021003023513.E6F796A712E@k7.mavetju>
Date: Thu,  3 Oct 2002 12:35:13 +1000 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: naiki@bfd.es.hokudai.ac.jp, marcus@FreeBSD.org
Subject: [patch] Fix net/ntimelord and net/netatalk
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         43608
>Category:       ports
>Synopsis:       [patch] Fix net/ntimelord and net/netatalk
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    marcus
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 02 19:40:06 PDT 2002
>Closed-Date:    Sat Oct 05 09:42:01 PDT 2002
>Last-Modified:  Sat Oct 05 09:42:01 PDT 2002
>Originator:     Edwin Groothuis
>Release:        FreeBSD 4.5-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 4.5-RELEASE FreeBSD 4.5-RELEASE #4: Sat Sep 14 10:41:50 EST 2002 edwin@k7.mavetju:/usr/src/sys/compile/k7 i386

$FreeBSD: ports/net/ntimelord/Makefile,v 1.5 2002/05/18 02:09:03 kris Exp $
$FreeBSD: ports/net/netatalk/Makefile,v 1.43 2002/09/09 16:48:10 marcus Exp $

http://bento.freebsd.org/errorlogs/4-full/ntimelord-1.0.log

>Description:

net/ntimelord doesn't compile anymore with the current net/netatalk.
That's why it's marked as broken in the Makefile.

net/netatalk has a working timelord in it, but it's not possible
to enable it.

This patch fixes net/ntimelord to display how to enable it in
net/netatalk and gives net/netatalk a knob to enable it.

>How-To-Repeat:

http://bento.freebsd.org/errorlogs/4-full/ntimelord-1.0.log

>Fix:


For net/ntimelord
=================

Empty net/ntimelord/distfile and remove net/ntimelord/files

---  ports/net/ntimelord/Makefile.old	Thu Oct  3 11:43:48 2002
+++  ports/net/ntimelord/Makefile	Thu Oct  3 12:25:34 2002
@@ -7,23 +7,17 @@
 
 PORTNAME=	ntimelord
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	net
-MASTER_SITES=	ftp://terminator.rs.itd.umich.edu/unix/netatalk/
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITES=	#
 
 MAINTAINER=	naiki@bfd.es.hokudai.ac.jp
 
-BROKEN=		"Does not build"
-
-RUN_DEPENDS=	${LOCALBASE}/libexec/atalkd:${PORTSDIR}/net/netatalk
-
-post-install:
-	@$(ECHO_MSG) "============================================================"
-	@$(ECHO_MSG) " You must edit the file netatalk.sh installed with netatalk"
-	@$(ECHO_MSG) " to start timelord automatically at boot-time."
-	@$(ECHO_MSG) " "
-	@$(ECHO_MSG) " Client program tardis can find in timelord.1.4.shar.Z"
-	@$(ECHO_MSG) " which is in ftp://munnari.OZ.AU/mac/"
-	@$(ECHO_MSG) "============================================================"
+NO_BUILD=       yes
+NO_INSTALL=     yes
+IS_INTERACTIVE= yes
+.if !defined(PACKAGE_BUILDING)
+FORBIDDEN=      'This port is now part of the net/netatalk port. Please install net/netatalk with the WITH_TIMELORD=1 option as in "$$ WITH_TIMELORD=1 make install"'
+.endif
 
 .include <bsd.port.mk>


For net/netatalk
================

Add the knob to the pkg-plist

--- net/netatalk/pkg-plist.old	Thu Oct  3 12:04:42 2002
+++ net/netatalk/pkg-plist	Thu Oct  3 12:12:00 2002
@@ -138,3 +138,4 @@
 share/aclocal/netatalk.m4
 share/netatalk/pagecount.ps
 @dirrm share/netatalk
+%%TIMELORD%%sbin/timelord

Add the knob to the Makefile

--- net/netatalk/Makefile.old	Thu Oct  3 12:03:35 2002
+++ net/netatalk/Makefile	Thu Oct  3 12:15:47 2002
@@ -59,6 +59,12 @@
 CONFIGURE_ARGS+=	--with-did=last
 PLIST_SUB+=	NETATALKCNID="@comment "
 .endif
+.if defined(WITH_TIMELORD)
+CONFIGURE_ARGS+=	--enable-timelord
+PLIST_SUB+=	TIMELORD=""
+.else
+PLIST_SUB+=	TIMELORD="@comment "
+.endif
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
>Release-Note:
>Audit-Trail:

From: Edwin Groothuis <edwin@mavetju.org>
To: freebsd-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/43608: [patch] Fix net/ntimelord and net/netatalk
Date: Thu, 3 Oct 2002 12:46:18 +1000

 Maintainer of net/ntimelord:
     <naiki@bfd.es.hokudai.ac.jp>:
     Sorry, no mailbox here by that name. (#5.1.1)
 
 -- 
 Edwin Groothuis      |            Personal website: http://www.MavEtJu.org
 edwin@mavetju.org    |    Weblog: http://www.mavetju.org/weblog/weblog.php 
 bash$ :(){ :|:&};:   | Interested in MUDs? http://www.FatalDimensions.org/
Responsible-Changed-From-To: freebsd-ports->marcus 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Wed Oct 2 20:01:38 PDT 2002 
Responsible-Changed-Why:  
I'll take this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43608 
State-Changed-From-To: open->closed 
State-Changed-By: marcus 
State-Changed-When: Sat Oct 5 09:41:06 PDT 2002 
State-Changed-Why:  
Committed, thanks.  However, instead of using ntimelord as a pointer to 
netatalk, I simply removed it altogether.  I don't imagine a lot of users 
are using timelord, and the ones that are will figure out the switch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43608 
>Unformatted:
