Index: head/net/netatalk/Makefile
===================================================================
--- head/net/netatalk/Makefile	(revision 67363)
+++ head/net/netatalk/Makefile	(revision 67364)
@@ -1,102 +1,108 @@
 # Ports collection makefile for:    netatalk
 # Date created:         23 Jul 1997
 # Whom:                 stb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	netatalk
 PORTVERSION=	1.5.5
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	netatalk
 
 MAINTAINER=	marcus@FreeBSD.org
 
 .if defined(WITH_CNID)
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
 .endif
 .if defined(WITH_SRVLOC)
 LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
 .endif
 .if !exists(/usr/include/tcpd.h)
 LIB_DEPENDS+=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
 USE_BZIP2=	yes
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-pkgconfdir=${PREFIX}/etc
 .if defined(WITH_PAM)
 CONFIGURE_ARGS+=	--with-pam=/etc/pam.d
 PLIST_SUB+=	NETATALKPAM=""
 .else
 CONFIGURE_ARGS+=	--without-pam
 PLIST_SUB+=	NETATALKPAM="@comment "
 .endif
 .if defined(WITH_SRVLOC)
 # Enable Service Location Protocol support.  This allows MacOS X < 10.1 to
 # pickup afpd servers in the network.
 CONFIGURE_ARGS+=	--enable-srvloc=${LOCALBASE}
 .endif
 .if defined(WITH_FLOCK_LOCKS)
 # Disable byte locking, and do full file locking.  This _may_ help with some
 # Quark Express save issues.
 CONFIGURE_ARGS+=	--with-flock-locks
 .endif
 .if defined(WITH_CNID)
 # Configure EXPERIMENTAL CNID DID support.  This is an attmept to make
 # DIDs more persistent by using a Berkeley database to store the DID values.
 # This should hopefully allow aliases to work between restarts of afpd.
 # This has been tested on MacOS 9.2.x and OS X.
 CONFIGURE_ARGS+=	--with-did=cnid \
 			--with-db3=${LOCALBASE}
 PLIST_SUB+=	NETATALKCNID=""
 .else
 # This method of DID calculation is not persistent, but has been tested to
 # work with MacOS X (10.0.3-10.1.3) as well as MacOS 7-9.2.2.
 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
 CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_PERL5=	yes
 FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
 		atalkd.conf papd.conf
 LINKS=		unbin unhex unsingle hqx2bin single2bin macbinary \
 		binheader nadheader
 MAN1=		achfile.1 aecho.1 afile.1 afppasswd.1 getzones.1 \
 		megatron.1 nbp.1 pap.1 psorder.1 hqx2bin.1 macbinary.1 \
 		nbplkup.1 nbprgstr.1 nbpunrgstr.1 papstatus.1 \
 		single2bin.1 unbin.1 unhex.1 unsingle.1 acleandir.1 \
 		netatalk-config.1 timeout.1 apple_cp.1 apple_mv.1 \
 		apple_rm.1
 MAN3=		atalk_aton.3 nbp_name.3
 MAN4=		atalk.4
 MAN5=		AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \
 		netatalk.conf.5 papd.conf.5
 MAN8=		afpd.8 atalkd.8 pap.8 papd.8 papstatus.8 psf.8 timelord.8
 
 post-extract:
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/netatalk.sh \
 		> ${WRKSRC}/netatalk.sh
 
 post-install:
 	@${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap.sh \
 		${PREFIX}/bin/test_parse_mtab \
 		${PREFIX}/bin/afpd-mtab.pl ${PREFIX}/etc/netatalk.conf.dist
 	${INSTALL_SCRIPT} ${WRKSRC}/netatalk.sh \
 		${PREFIX}/etc/rc.d/netatalk.sh.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
 		${PREFIX}/bin/macusers
 .for i in ${FILES}
 	[ -f ${PREFIX}/etc/${i} ] || \
 		${INSTALL_DATA} -c ${PREFIX}/etc/${i}.dist ${PREFIX}/etc/${i}
 .endfor
 .for i in ${LINKS}
 	( cd ${PREFIX}/bin && ${LN} -sf megatron ${i} )
 .endfor
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Property changes on: head/net/netatalk/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.44
\ No newline at end of property
+1.45
\ No newline at end of property
Index: head/net/netatalk/pkg-plist
===================================================================
--- head/net/netatalk/pkg-plist	(revision 67363)
+++ head/net/netatalk/pkg-plist	(revision 67364)
@@ -1,140 +1,141 @@
 bin/achfile
 bin/acleandir.rc
 bin/add_netatalk_printer
 bin/adv1tov2
 bin/aecho
 bin/afile
 bin/afppasswd
 bin/apple_cp
 bin/apple_mv
 bin/apple_rm
 bin/cleanappledouble.pl
 bin/getzones
 bin/macusers
 bin/makecode
 bin/megatron
 @unexec rm -f %B/unbin
 @unexec rm -f %B/unhex
 @unexec rm -f %B/unsingle
 @unexec rm -f %B/hqx2bin
 @unexec rm -f %B/single2bin
 @unexec rm -f %B/macbinary
 @unexec rm -f %B/binheader
 @unexec rm -f %B/nadheader
 @exec cd %B && ln -s megatron unbin
 @exec cd %B && ln -s megatron unhex
 @exec cd %B && ln -s megatron unsingle
 @exec cd %B && ln -s megatron hqx2bin
 @exec cd %B && ln -s megatron single2bin
 @exec cd %B && ln -s megatron macbinary
 @exec cd %B && ln -s megatron binheader
 @exec cd %B && ln -s megatron nadheader
 %%NETATALKCNID%%bin/cnid_maint
 bin/nbplkup
 bin/nbprgstr
 bin/nbpunrgstr
 bin/netatalk-config
 bin/netatalkshorternamelinks.pl
 bin/pap
 bin/papstatus
 bin/parsecode
 bin/psorder
 bin/timeout
 sbin/afpd
 sbin/atalkd
 sbin/ifmpap
 sbin/ifmpaprev
 sbin/ifpap
 sbin/ifpaprev
 sbin/ifwmpap
 sbin/ifwmpaprev
 sbin/ifwpap
 sbin/ifwpaprev
 sbin/ofmpap
 sbin/ofpap
 sbin/ofwmpap
 sbin/ofwpap
 sbin/papd
 sbin/psa
 sbin/psf
 sbin/tfmpap
 sbin/tfmpaprev
 sbin/tfpap
 sbin/tfpaprev
 sbin/tfwmpap
 sbin/tfwmpaprev
 sbin/tfwpap
 sbin/tfwpaprev
+%%TIMELORD%%sbin/timelord
 @unexec if cmp -s %D/etc/AppleVolumes.default %D/etc/AppleVolumes.default.dist; then rm -f %D/etc/AppleVolumes.default; fi
 etc/AppleVolumes.default.dist
 @exec [ ! -f %B/AppleVolumes.default ] && cp %B/%f %B/AppleVolumes.default
 @unexec if cmp -s %D/etc/AppleVolumes.system %D/etc/AppleVolumes.system.dist; then rm -f %D/etc/AppleVolumes.system; fi
 etc/AppleVolumes.system.dist
 @exec [ ! -f %B/AppleVolumes.system ] && cp %B/%f %B/AppleVolumes.system
 @unexec if cmp -s %D/etc/afpd.conf %D/etc/afpd.conf.dist; then rm -f %D/etc/afpd.conf; fi
 etc/afpd.conf.dist
 @exec [ ! -f %B/afpd.conf ] && cp %B/%f %B/afpd.conf
 @unexec if cmp -s %D/etc/atalkd.conf %D/etc/atalkd.conf.dist; then rm -f %D/etc/atalkd.conf; fi
 etc/atalkd.conf.dist
 @exec [ ! -f %B/atalkd.conf ] && cp %B/%f %B/atalkd.conf
 @unexec if cmp -s %D/etc/papd.conf %D/etc/papd.conf.dist; then rm -f %D/etc/papd.conf; fi
 etc/papd.conf.dist
 @exec [ ! -f %B/papd.conf ] && cp %B/%f %B/papd.conf
 etc/nls/maccode.437
 etc/nls/maccode.850
 etc/nls/maccode.iso8859-1
 etc/nls/maccode.iso8859-1.adapted
 etc/rc.d/netatalk.sh.sample
 etc/uams/uams_clrtxt.so
 etc/uams/uams_dhx.so
 %%NETATALKPAM%%etc/uams/uams_dhx_pam.so
 %%NETATALKPAM%%etc/uams/uams_dhx_pam.a
 etc/uams/uams_dhx_passwd.so
 etc/uams/uams_dhx_passwd.a
 etc/uams/uams_guest.so
 etc/uams/uams_guest.a
 %%NETATALKPAM%%etc/uams/uams_pam.so
 %%NETATALKPAM%%etc/uams/uams_pam.a
 etc/uams/uams_passwd.so
 etc/uams/uams_passwd.a
 etc/uams/uams_randnum.so
 etc/uams/uams_randnum.a
 @dirrm etc/nls
 @dirrm etc/uams
 include/atalk/adouble.h
 include/atalk/aep.h
 include/atalk/afp.h
 include/atalk/asp.h
 include/atalk/atp.h
 include/atalk/cnid.h
 include/atalk/compat.h
 include/atalk/ddp.h
 include/atalk/dsi.h
 include/atalk/nbp.h
 include/atalk/netddp.h
 include/atalk/pap.h
 include/atalk/paths.h
 include/atalk/rtmp.h
 include/atalk/server_child.h
 include/atalk/uam.h
 include/atalk/util.h
 include/atalk/zip.h
 include/netatalk/aarp.c
 include/netatalk/aarp.h
 include/netatalk/at.h
 include/netatalk/at_control.c
 include/netatalk/at_proto.c
 include/netatalk/at_var.h
 include/netatalk/ddp.h
 include/netatalk/endian.h
 include/netatalk/ddp_var.h
 include/netatalk/ddp_input.c
 include/netatalk/ddp_output.c
 include/netatalk/ddp_usrreq.c
 include/netatalk/phase2.h
 @dirrm include/atalk
 @dirrm include/netatalk
 lib/libatalk.a
 share/aclocal/netatalk.m4
 share/netatalk/pagecount.ps
 @dirrm share/netatalk

Property changes on: head/net/netatalk/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property
Index: head/net/netatalk-devel/Makefile
===================================================================
--- head/net/netatalk-devel/Makefile	(revision 67363)
+++ head/net/netatalk-devel/Makefile	(revision 67364)
@@ -1,102 +1,108 @@
 # Ports collection makefile for:    netatalk
 # Date created:         23 Jul 1997
 # Whom:                 stb
 #
 # $FreeBSD$
 #
 
 PORTNAME=	netatalk
 PORTVERSION=	1.5.5
 PORTEPOCH=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	netatalk
 
 MAINTAINER=	marcus@FreeBSD.org
 
 .if defined(WITH_CNID)
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
 .endif
 .if defined(WITH_SRVLOC)
 LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
 .endif
 .if !exists(/usr/include/tcpd.h)
 LIB_DEPENDS+=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
 USE_BZIP2=	yes
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-pkgconfdir=${PREFIX}/etc
 .if defined(WITH_PAM)
 CONFIGURE_ARGS+=	--with-pam=/etc/pam.d
 PLIST_SUB+=	NETATALKPAM=""
 .else
 CONFIGURE_ARGS+=	--without-pam
 PLIST_SUB+=	NETATALKPAM="@comment "
 .endif
 .if defined(WITH_SRVLOC)
 # Enable Service Location Protocol support.  This allows MacOS X < 10.1 to
 # pickup afpd servers in the network.
 CONFIGURE_ARGS+=	--enable-srvloc=${LOCALBASE}
 .endif
 .if defined(WITH_FLOCK_LOCKS)
 # Disable byte locking, and do full file locking.  This _may_ help with some
 # Quark Express save issues.
 CONFIGURE_ARGS+=	--with-flock-locks
 .endif
 .if defined(WITH_CNID)
 # Configure EXPERIMENTAL CNID DID support.  This is an attmept to make
 # DIDs more persistent by using a Berkeley database to store the DID values.
 # This should hopefully allow aliases to work between restarts of afpd.
 # This has been tested on MacOS 9.2.x and OS X.
 CONFIGURE_ARGS+=	--with-did=cnid \
 			--with-db3=${LOCALBASE}
 PLIST_SUB+=	NETATALKCNID=""
 .else
 # This method of DID calculation is not persistent, but has been tested to
 # work with MacOS X (10.0.3-10.1.3) as well as MacOS 7-9.2.2.
 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
 CONFIGURE_TARGET=       --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_PERL5=	yes
 FILES=		AppleVolumes.default AppleVolumes.system afpd.conf \
 		atalkd.conf papd.conf
 LINKS=		unbin unhex unsingle hqx2bin single2bin macbinary \
 		binheader nadheader
 MAN1=		achfile.1 aecho.1 afile.1 afppasswd.1 getzones.1 \
 		megatron.1 nbp.1 pap.1 psorder.1 hqx2bin.1 macbinary.1 \
 		nbplkup.1 nbprgstr.1 nbpunrgstr.1 papstatus.1 \
 		single2bin.1 unbin.1 unhex.1 unsingle.1 acleandir.1 \
 		netatalk-config.1 timeout.1 apple_cp.1 apple_mv.1 \
 		apple_rm.1
 MAN3=		atalk_aton.3 nbp_name.3
 MAN4=		atalk.4
 MAN5=		AppleVolumes.default.5 afpd.conf.5 atalkd.conf.5 \
 		netatalk.conf.5 papd.conf.5
 MAN8=		afpd.8 atalkd.8 pap.8 papd.8 papstatus.8 psf.8 timelord.8
 
 post-extract:
 	@${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/netatalk.sh \
 		> ${WRKSRC}/netatalk.sh
 
 post-install:
 	@${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap.sh \
 		${PREFIX}/bin/test_parse_mtab \
 		${PREFIX}/bin/afpd-mtab.pl ${PREFIX}/etc/netatalk.conf.dist
 	${INSTALL_SCRIPT} ${WRKSRC}/netatalk.sh \
 		${PREFIX}/etc/rc.d/netatalk.sh.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
 		${PREFIX}/bin/macusers
 .for i in ${FILES}
 	[ -f ${PREFIX}/etc/${i} ] || \
 		${INSTALL_DATA} -c ${PREFIX}/etc/${i}.dist ${PREFIX}/etc/${i}
 .endfor
 .for i in ${LINKS}
 	( cd ${PREFIX}/bin && ${LN} -sf megatron ${i} )
 .endfor
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>

Property changes on: head/net/netatalk-devel/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.44
\ No newline at end of property
+1.45
\ No newline at end of property
Index: head/net/netatalk-devel/pkg-plist
===================================================================
--- head/net/netatalk-devel/pkg-plist	(revision 67363)
+++ head/net/netatalk-devel/pkg-plist	(revision 67364)
@@ -1,140 +1,141 @@
 bin/achfile
 bin/acleandir.rc
 bin/add_netatalk_printer
 bin/adv1tov2
 bin/aecho
 bin/afile
 bin/afppasswd
 bin/apple_cp
 bin/apple_mv
 bin/apple_rm
 bin/cleanappledouble.pl
 bin/getzones
 bin/macusers
 bin/makecode
 bin/megatron
 @unexec rm -f %B/unbin
 @unexec rm -f %B/unhex
 @unexec rm -f %B/unsingle
 @unexec rm -f %B/hqx2bin
 @unexec rm -f %B/single2bin
 @unexec rm -f %B/macbinary
 @unexec rm -f %B/binheader
 @unexec rm -f %B/nadheader
 @exec cd %B && ln -s megatron unbin
 @exec cd %B && ln -s megatron unhex
 @exec cd %B && ln -s megatron unsingle
 @exec cd %B && ln -s megatron hqx2bin
 @exec cd %B && ln -s megatron single2bin
 @exec cd %B && ln -s megatron macbinary
 @exec cd %B && ln -s megatron binheader
 @exec cd %B && ln -s megatron nadheader
 %%NETATALKCNID%%bin/cnid_maint
 bin/nbplkup
 bin/nbprgstr
 bin/nbpunrgstr
 bin/netatalk-config
 bin/netatalkshorternamelinks.pl
 bin/pap
 bin/papstatus
 bin/parsecode
 bin/psorder
 bin/timeout
 sbin/afpd
 sbin/atalkd
 sbin/ifmpap
 sbin/ifmpaprev
 sbin/ifpap
 sbin/ifpaprev
 sbin/ifwmpap
 sbin/ifwmpaprev
 sbin/ifwpap
 sbin/ifwpaprev
 sbin/ofmpap
 sbin/ofpap
 sbin/ofwmpap
 sbin/ofwpap
 sbin/papd
 sbin/psa
 sbin/psf
 sbin/tfmpap
 sbin/tfmpaprev
 sbin/tfpap
 sbin/tfpaprev
 sbin/tfwmpap
 sbin/tfwmpaprev
 sbin/tfwpap
 sbin/tfwpaprev
+%%TIMELORD%%sbin/timelord
 @unexec if cmp -s %D/etc/AppleVolumes.default %D/etc/AppleVolumes.default.dist; then rm -f %D/etc/AppleVolumes.default; fi
 etc/AppleVolumes.default.dist
 @exec [ ! -f %B/AppleVolumes.default ] && cp %B/%f %B/AppleVolumes.default
 @unexec if cmp -s %D/etc/AppleVolumes.system %D/etc/AppleVolumes.system.dist; then rm -f %D/etc/AppleVolumes.system; fi
 etc/AppleVolumes.system.dist
 @exec [ ! -f %B/AppleVolumes.system ] && cp %B/%f %B/AppleVolumes.system
 @unexec if cmp -s %D/etc/afpd.conf %D/etc/afpd.conf.dist; then rm -f %D/etc/afpd.conf; fi
 etc/afpd.conf.dist
 @exec [ ! -f %B/afpd.conf ] && cp %B/%f %B/afpd.conf
 @unexec if cmp -s %D/etc/atalkd.conf %D/etc/atalkd.conf.dist; then rm -f %D/etc/atalkd.conf; fi
 etc/atalkd.conf.dist
 @exec [ ! -f %B/atalkd.conf ] && cp %B/%f %B/atalkd.conf
 @unexec if cmp -s %D/etc/papd.conf %D/etc/papd.conf.dist; then rm -f %D/etc/papd.conf; fi
 etc/papd.conf.dist
 @exec [ ! -f %B/papd.conf ] && cp %B/%f %B/papd.conf
 etc/nls/maccode.437
 etc/nls/maccode.850
 etc/nls/maccode.iso8859-1
 etc/nls/maccode.iso8859-1.adapted
 etc/rc.d/netatalk.sh.sample
 etc/uams/uams_clrtxt.so
 etc/uams/uams_dhx.so
 %%NETATALKPAM%%etc/uams/uams_dhx_pam.so
 %%NETATALKPAM%%etc/uams/uams_dhx_pam.a
 etc/uams/uams_dhx_passwd.so
 etc/uams/uams_dhx_passwd.a
 etc/uams/uams_guest.so
 etc/uams/uams_guest.a
 %%NETATALKPAM%%etc/uams/uams_pam.so
 %%NETATALKPAM%%etc/uams/uams_pam.a
 etc/uams/uams_passwd.so
 etc/uams/uams_passwd.a
 etc/uams/uams_randnum.so
 etc/uams/uams_randnum.a
 @dirrm etc/nls
 @dirrm etc/uams
 include/atalk/adouble.h
 include/atalk/aep.h
 include/atalk/afp.h
 include/atalk/asp.h
 include/atalk/atp.h
 include/atalk/cnid.h
 include/atalk/compat.h
 include/atalk/ddp.h
 include/atalk/dsi.h
 include/atalk/nbp.h
 include/atalk/netddp.h
 include/atalk/pap.h
 include/atalk/paths.h
 include/atalk/rtmp.h
 include/atalk/server_child.h
 include/atalk/uam.h
 include/atalk/util.h
 include/atalk/zip.h
 include/netatalk/aarp.c
 include/netatalk/aarp.h
 include/netatalk/at.h
 include/netatalk/at_control.c
 include/netatalk/at_proto.c
 include/netatalk/at_var.h
 include/netatalk/ddp.h
 include/netatalk/endian.h
 include/netatalk/ddp_var.h
 include/netatalk/ddp_input.c
 include/netatalk/ddp_output.c
 include/netatalk/ddp_usrreq.c
 include/netatalk/phase2.h
 @dirrm include/atalk
 @dirrm include/netatalk
 lib/libatalk.a
 share/aclocal/netatalk.m4
 share/netatalk/pagecount.ps
 @dirrm share/netatalk

Property changes on: head/net/netatalk-devel/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.15
\ No newline at end of property
+1.16
\ No newline at end of property