Add netatalk-devel after a repo-copy from netatalk. Netatalk-devel is the beta

version of netatalk 2.0 that includes better support for OS X.

9 files changed, 155 insertions, 127 deletions

diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 81bc965992e9..9f34778e9889 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	1.6.4
-PORTREVISION=	1
-PORTEPOCH=	1
+PORTVERSION=	2.0.b1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	netatalk
+DISTNAME=	${PORTNAME}-2.0-beta1
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	File and print server for AppleTalk networks
 
-.if !defined(WITHOUT_CNID)
-LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
-.endif
+LIB_DEPENDS=	db41.1:${PORTSDIR}/databases/db41
 .if defined(WITH_SRVLOC)
 LIB_DEPENDS+=	slp.1:${PORTSDIR}/net/openslp
 .endif
 
+NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
 			--with-pkgconfdir=${PREFIX}/etc
@@ -38,29 +36,13 @@ PLIST_SUB+=		NETATALKPAM="@comment "
 # pickup afpd servers in the network.
 CONFIGURE_ARGS+=	--enable-srvloc=${LOCALBASE}
 .endif
-.if defined(WITHOUT_CNID)
-# Configure old LAST DID support.  By default, the new CNID persistent DID
-# calculation scheme is used.  However, if you wish to revert back to the old
-# 1.5.x default scheme, specify WITHOUT_CNID
-CONFIGURE_ARGS+=	--with-did=last
-PLIST_SUB+=		NETATALKCNID="@comment "
-.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=cnid \
-			--with-bdb=${LOCALBASE}
-PLIST_SUB+=		NETATALKCNID=""
-.endif
+CONFIGURE_ARGS+=	--with-bdb=${LOCALBASE}
 .if defined (WITH_TIMELORD)
 CONFIGURE_ARGS+=	--enable-timelord
 PLIST_SUB+=		TIMELORD=""
 .else
 PLIST_SUB+=		TIMELORD="@comment "
 .endif
-.if defined (WITH_MANGLING) && !defined (WITHOUT_CNID)
-# Enable long file name mangling support (requires CNID).
-CONFIGURE_ARGS+=	--with-mangling
-.endif
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
@@ -79,18 +61,17 @@ 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 papd.8 papstatus.8 psf.8 timelord.8
+MAN8=		afpd.8 atalkd.8 cnid_dbd.8 cnid_metad.8 papd.8 papstatus.8 \
+		psf.8 timelord.8
 
-CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.*
+CONFLICTS=	bigloo-2.* cap-6.0.* tct-1.* netatalk-1*
 
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Netatalk has the following tunable options:"
-	@${ECHO_MSG} "		WITHOUT_CNID=yes	Turns off CNID persistent DID support"
 	@${ECHO_MSG} "		WITH_SRVLOC=yes		Enable Service Location Protocol support"
 	@${ECHO_MSG} "		WITH_PAM=yes		Enable PAM support"
 	@${ECHO_MSG} "		WITH_TIMELORD=yes	Enable Timelord network time service"
-	@${ECHO_MSG} "		WITH_MANGLING=yes	Enable long file name mangling support (requires CNID)"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "See Netatalk's Makefile for more details on some of these options."
 	@${ECHO_MSG} ""
diff --git a/net/netatalk-devel/distinfo b/net/netatalk-devel/distinfo
index 962b01b6d35c..2e5f6c876f1a 100644
--- a/net/netatalk-devel/distinfo
+++ b/net/netatalk-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (netatalk-1.6.4.tar.bz2) = 8bed0582d51deef7a31da1b6ae5df2e6
-SIZE (netatalk-1.6.4.tar.bz2) = 720436
+MD5 (netatalk-2.0-beta1.tar.bz2) = 4f6ecf84cb11d5f99d0b1f9699f6c60d
+SIZE (netatalk-2.0-beta1.tar.bz2) = 1212578
diff --git a/net/netatalk-devel/files/netatalk.sh b/net/netatalk-devel/files/netatalk.sh
index 1ea9a2d094dc..d5409ee58ac2 100644
--- a/net/netatalk-devel/files/netatalk.sh
+++ b/net/netatalk-devel/files/netatalk.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net/netatalk-devel/files/Attic/netatalk.sh,v 1.1 2001-05-18 20:00:29 dinoex Exp $
+# $FreeBSD: /tmp/pcvs/ports/net/netatalk-devel/files/Attic/netatalk.sh,v 1.2 2004-06-06 02:25:46 marcus Exp $
 #
 # AppleTalk daemons. Make sure not to start atalkd in the background:
 # its data structures must have time to stablize before running the
@@ -18,11 +18,15 @@ start)
 	%%PREFIX%%/bin/nbprgstr -p 4 ${HOSTNAME}:Workstation &
 	%%PREFIX%%/bin/nbprgstr -p 4 ${HOSTNAME}:netatalk &
 	%%PREFIX%%/sbin/papd
+	%%PREFIX%%/sbin/cnid_metad
 	%%PREFIX%%/sbin/afpd -s %%PREFIX%%/etc/AppleVolumes.system \
 		-f %%PREFIX%%/etc/AppleVolumes.default
+	[ -x %%PREFIX%%/sbin/timelord ] && %%PREFIX%%/sbin/timelord
 	;;
 stop)
+	killall timelord
 	killall afpd
+	killall cnid_metad
 	killall papd
 	killall atalkd
 	;;
diff --git a/net/netatalk-devel/files/patch-config_Makefile.in b/net/netatalk-devel/files/patch-config_Makefile.in
index 54f7d74bb764..eb71290a3725 100644
--- a/net/netatalk-devel/files/patch-config_Makefile.in
+++ b/net/netatalk-devel/files/patch-config_Makefile.in
@@ -1,6 +1,6 @@
---- config/Makefile.in.orig	Tue Dec  2 15:19:05 2003
-+++ config/Makefile.in	Sun Dec  7 13:29:53 2003
-@@ -378,23 +378,11 @@
+--- config/Makefile.in.orig	Mon Mar 22 19:22:45 2004
++++ config/Makefile.in	Sat Jun  5 22:08:04 2004
+@@ -386,22 +386,11 @@
  install-config-files: $(CONFFILES) $(GENFILES)
  	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
  	for f in $(CONFFILES) $(GENFILES); do \
@@ -17,12 +17,11 @@
  @USE_PAM_TRUE@install-data-local: install-config-files $(PAMFILES)
 -@USE_PAM_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pamdir)
 -@USE_PAM_TRUE@	if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pamdir)/netatalk; then \
--@USE_PAM_TRUE@		echo "$(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk"; \
--@USE_PAM_TRUE@		$(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk || \
--@USE_PAM_TRUE@		echo "WARNING: Can't install PAM file";            \
+-@USE_PAM_TRUE@	    echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pamdir)/netatalk"; \
+-@USE_PAM_TRUE@	    $(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk || echo "WARNING: Can't install PAM files";		\
 -@USE_PAM_TRUE@	else \
--@USE_PAM_TRUE@		echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \
--@USE_PAM_TRUE@	fi;
+-@USE_PAM_TRUE@	    echo "not overwriting $(DESTDIR)$(pamdir)/netatalk"; \
+-@USE_PAM_TRUE@	fi; 
  
  @USE_PAM_FALSE@install-data-local: install-config-files
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/net/netatalk-devel/files/patch-configure b/net/netatalk-devel/files/patch-configure
index 713d43ec0079..4c9f83c7ad7e 100644
--- a/net/netatalk-devel/files/patch-configure
+++ b/net/netatalk-devel/files/patch-configure
@@ -1,28 +1,52 @@
---- configure.orig	Mon Jun  9 11:55:15 2003
-+++ configure	Fri Jun 20 00:05:06 2003
-@@ -13327,13 +13327,13 @@
- 			savedldflags="$LDFLAGS"
- 			CFLAGS="$CFLAGS -I$bdbdir"
- 			LDFLAGS="-L$bdblibdir $LDFLAGS"
--			echo "$as_me:$LINENO: checking for main in -ldb" >&5
--echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6
-+			echo "$as_me:$LINENO: checking for main in -ldb3" >&5
-+echo $ECHO_N "checking for main in -ldb3... $ECHO_C" >&6
- if test "${ac_cv_lib_db_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldb  $LIBS"
-+LIBS="-ldb3  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -13384,7 +13384,7 @@
- 				if test "$bdblibdir" != "/usr/lib"; then
- 				    BDB_LIBS="-L$bdblibdir"
+--- configure.orig	Mon Mar 22 19:23:09 2004
++++ configure	Sat Jun  5 21:58:37 2004
+@@ -14156,7 +14156,7 @@
+ 
+ 	trybdbdir=""
+ 	dobdbsearch=yes
+-	bdb_search_dirs="/usr/local/include/db4 /usr/local/include /usr/include/db4 /usr/include"
++	bdb_search_dirs="/usr/local/include/db41 /usr/local/include /usr/include/db4 /usr/include"
+ 
+ 
+ 
+@@ -14168,7 +14168,7 @@
+ 		elif test "x$withval" = "xyes"; then
+ 			dobdbsearch=yes
+ 		else
+-			bdb_search_dirs="$withval/include/db4 $withval/include $withval"
++			bdb_search_dirs="$withval/include/db41 $withval/include $withval"
+ 		fi
+ 
+ fi;
+@@ -14181,9 +14181,9 @@
+ 		if test -f "$bdbdir/db.h" ; then
+ 			echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-			bdblibdir="`echo $bdbdir | sed 's/include\/db4$/lib/'`"
++			bdblibdir="`echo $bdbdir | sed 's/include\/db41$/lib/'`"
+ 			bdblibdir="`echo $bdblibdir | sed 's/include$/lib/'`"
+-			bdbbindir="`echo $bdbdir | sed 's/include\/db4$/bin/'`"
++			bdbbindir="`echo $bdbdir | sed 's/include\/db41$/bin/'`"
+ 			bdbbindir="`echo $bdbbindir | sed 's/include$/bin/'`"
+ 
+ 			savedcflags="$CFLAGS"
+@@ -14196,8 +14196,8 @@
+ 
+ 
+ 			bdbfound=yes
+-			LIBS="$LIBS -ldb"
+-			BDB_LIBS="-ldb"
++			LIBS="$LIBS -ldb41"
++			BDB_LIBS="-ldb41"
+ 
+ 
+ 			if test "x$bdbfound" = "xyes"; then
+@@ -14448,7 +14448,7 @@
+ 				    BDB_LIBS="-L$bdblibdir $BDB_LIBS"
  				fi
--				BDB_LIBS="$BDB_LIBS -ldb"
-+				BDB_LIBS="$BDB_LIBS -ldb3"
  				BDB_BIN=$bdbbindir
- 				BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
+-				BDB_PATH="`echo $bdbdir | sed 's,include\/db4$,,'`"
++				BDB_PATH="`echo $bdbdir | sed 's,include\/db41$,,'`"
  				BDB_PATH="`echo $BDB_PATH | sed 's,include$,,'`"
+ 			fi
+ 			CFLAGS="$savedcflags"
diff --git a/net/netatalk-devel/files/patch-etc_afpd_quota.c b/net/netatalk-devel/files/patch-etc_afpd_quota.c
new file mode 100644
index 000000000000..699b4739aaf4
--- /dev/null
+++ b/net/netatalk-devel/files/patch-etc_afpd_quota.c
@@ -0,0 +1,34 @@
+--- etc/afpd/quota.c.orig	Sat Jun  5 22:03:39 2004
++++ etc/afpd/quota.c	Sat Jun  5 22:05:20 2004
+@@ -57,6 +57,8 @@
+ }
+ #endif /* NEED_QUOTACTL_WRAPPER */
+ 
++static int overquota( struct dqblk *);
++
+ #ifdef linux
+ 
+ #ifdef HAVE_LINUX_XQM_H
+@@ -74,7 +76,6 @@
+ 
+ static int get_linux_xfs_quota(int, char*, uid_t, struct dqblk *);
+ static int get_linux_fs_quota(int, char*, uid_t, struct dqblk *);
+-static int overquota( struct dqblk *);
+ 
+ /* format supported by current kernel */
+ static int kernel_iface = IFACE_UNSET;
+@@ -524,12 +525,12 @@
+     if( 
+         /* if overquota, free space is 0 otherwise hard-current */
+         ( overquota( dq ) ? 0 : ( dq->dqb_bhardlimit ? dq->dqb_bhardlimit - 
+-                                  dq->dqb_curblocks : ~((qsize_t) 0) ) )
++				   dq->dqb_curblocks : ~((u_int64_t) 0) ) )
+ 
+       >
+         
+         ( overquota( &dqg ) ? 0 : ( dqg.dqb_bhardlimit ? dqg.dqb_bhardlimit - 
+-                                    dqg.dqb_curblocks : ~((qsize_t) 0) ) )
++				    dqg.dqb_curblocks : ~((u_int64_t) 0) ) )
+ 
+       ) /* if */
+     {
diff --git a/net/netatalk-devel/files/patch-etc_afpd_unix.h b/net/netatalk-devel/files/patch-etc_afpd_unix.h
deleted file mode 100644
index cfc566530256..000000000000
--- a/net/netatalk-devel/files/patch-etc_afpd_unix.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- etc/afpd/unix.h.orig	Sun Sep  8 23:45:56 2002
-+++ etc/afpd/unix.h	Mon Sep  9 00:03:58 2002
-@@ -30,7 +30,8 @@
- #if defined(TRU64)
- #define f_frsize f_fsize
- #else /* TRU64 */
--#if defined(HAVE_SYS_STATVFS_H) || defined(__svr4__)
-+#if (defined(HAVE_SYS_STATVFS_H) || defined(__svr4__)) && \
-+    !defined(__FreeBSD__)
- #include <sys/statvfs.h>
- #define statfs statvfs
- #else /* HAVE_SYS_STATVFS || __svr4__ */
diff --git a/net/netatalk-devel/files/patch-ltmain.sh b/net/netatalk-devel/files/patch-ltmain.sh
index 786e33b951ac..1e42429a224c 100644
--- a/net/netatalk-devel/files/patch-ltmain.sh
+++ b/net/netatalk-devel/files/patch-ltmain.sh
@@ -1,25 +1,25 @@
---- ltmain.sh.orig	Sat Nov 29 08:54:27 2003
-+++ ltmain.sh	Sun Dec  7 13:32:36 2003
-@@ -1286,7 +1286,7 @@
+--- ltmain.sh.orig	Mon Mar 22 19:21:52 2004
++++ ltmain.sh	Sat Jun  5 21:54:11 2004
+@@ -1061,7 +1061,7 @@
  	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
 -	 *-*-openbsd* | *-*-freebsd*)
 +	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1913,6 +1913,9 @@
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    fi
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2372,6 +2372,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=""
  	    ;;
 +	  *-*-freebsd*)
 +	    # FreeBSD doesn't need this...
 +	    ;;
  	  *)
- 	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ 	    verstring="0.0"
  	    ;;
-@@ -5474,10 +5477,12 @@
+@@ -4302,10 +4305,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/net/netatalk-devel/pkg-plist b/net/netatalk-devel/pkg-plist
index d6ee6d5924e9..33926f32feec 100644
--- a/net/netatalk-devel/pkg-plist
+++ b/net/netatalk-devel/pkg-plist
@@ -9,9 +9,10 @@ bin/apple_cp
 bin/apple_mv
 bin/apple_rm
 bin/cleanappledouble.pl
+bin/cnid2_create
+bin/cnid_maint
 bin/getzones
 bin/macusers
-bin/makecode
 bin/megatron
 @unexec rm -f %B/unbin
 @unexec rm -f %B/unhex
@@ -29,7 +30,6 @@ bin/megatron
 @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
@@ -37,36 +37,9 @@ bin/netatalk-config
 bin/netatalkshorternamelinks.pl
 bin/pap
 bin/papstatus
-bin/parsecode
 bin/psorder
 bin/timeout
-sbin/afpd
-sbin/atalkd
-sbin/etc2ps.sh
-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
+bin/uniconv
 @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
@@ -82,11 +55,6 @@ etc/atalkd.conf.dist
 @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/nls/maccode.koi8-r
 etc/rc.d/netatalk.sh.sample
 etc/uams/uams_clrtxt.so
 etc/uams/uams_dhx.so
@@ -102,8 +70,6 @@ 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
@@ -114,6 +80,7 @@ include/atalk/cnid.h
 include/atalk/compat.h
 include/atalk/ddp.h
 include/atalk/dsi.h
+include/atalk/list.h
 include/atalk/logger.h
 include/atalk/nbp.h
 include/atalk/netddp.h
@@ -121,6 +88,7 @@ include/atalk/pap.h
 include/atalk/paths.h
 include/atalk/rtmp.h
 include/atalk/server_child.h
+include/atalk/tdb.h
 include/atalk/uam.h
 include/atalk/util.h
 include/atalk/zip.h
@@ -137,9 +105,39 @@ 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
+libexec/etc2ps.sh
+libexec/ifmpap
+libexec/ifmpaprev
+libexec/ifpap
+libexec/ifpaprev
+libexec/ifwmpap
+libexec/ifwmpaprev
+libexec/ifwpap
+libexec/ifwpaprev
+libexec/ofmpap
+libexec/ofpap
+libexec/ofwmpap
+libexec/ofwpap
+libexec/psa
+libexec/psf
+libexec/tfmpap
+libexec/tfmpaprev
+libexec/tfpap
+libexec/tfpaprev
+libexec/tfwmpap
+libexec/tfwmpaprev
+libexec/tfwpap
+libexec/tfwpaprev
+sbin/afpd
+sbin/atalkd
+sbin/cnid_dbd
+sbin/cnid_metad
+sbin/papd
+%%TIMELORD%%sbin/timelord
 share/aclocal/netatalk.m4
 share/netatalk/pagecount.ps
 @dirrm share/netatalk
+@dirrm include/netatalk
+@dirrm include/atalk
+@dirrm etc/uams