Reimport existing netatalk-1.6.2 package in net/netatalk1.

6 files changed, 314 insertions, 0 deletions

diff --git a/net/netatalk1/patches/patch-aa b/net/netatalk1/patches/patch-aa
new file mode 100644
index 00000000000..98ded5ba144
--- /dev/null
+++ b/net/netatalk1/patches/patch-aa
@@ -0,0 +1,158 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
+
+--- configure.orig	Sun Feb 16 12:46:32 2003
++++ configure	Sun Feb 23 16:55:12 2003
+@@ -8084,64 +8084,6 @@
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
+-echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6
+-if test "${ac_cv_lib_crypt_main+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypt  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-
+-int
+-main ()
+-{
+-main ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_crypt_main=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_lib_crypt_main=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_main" >&5
+-echo "${ECHO_T}$ac_cv_lib_crypt_main" >&6
+-if test $ac_cv_lib_crypt_main = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBCRYPT 1
+-_ACEOF
+-
+-  LIBS="-lcrypt $LIBS"
+-
+-fi
+-
+-
+ echo "$as_me:$LINENO: checking for main in -ld" >&5
+ echo $ECHO_N "checking for main in -ld... $ECHO_C" >&6
+ if test "${ac_cv_lib_d_main+set}" = set; then
+@@ -13066,13 +13008,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.  */
+@@ -13118,7 +13060,7 @@
+ 
+ 				bdbfound=yes
+ 				BDB_CFLAGS="-I$bdbdir"
+-				BDB_LIBS="-L$bdblibdir -ldb"
++				BDB_LIBS="-L$bdblibdir -ldb3"
+ 				BDB_BIN=$bdbbindir
+ 				BDB_PATH="`echo $bdbdir | sed 's,include/db3$,,'`"
+ 
+@@ -14552,7 +14494,62 @@
+ 	fi
+ 
+ 
++echo "$as_me:$LINENO: checking for main in -lcrypt" >&5
++echo $ECHO_N "checking for main in -lcrypt... $ECHO_C" >&6
++if test "${ac_cv_lib_crypt_main+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lcrypt  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++
++int
++main ()
++{
++main ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_crypt_main=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_crypt_main=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_main" >&5
++echo "${ECHO_T}$ac_cv_lib_crypt_main" >&6
++if test $ac_cv_lib_crypt_main = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBCRYPT 1
++_ACEOF
++
++  LIBS="-lcrypt $LIBS"
+ 
++fi
+ 
+ 
+ # Check whether --enable-pgp-uam or --disable-pgp-uam was given.
diff --git a/net/netatalk1/patches/patch-ab b/net/netatalk1/patches/patch-ab
new file mode 100644
index 00000000000..89c416ec928
--- /dev/null
+++ b/net/netatalk1/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
+
+--- distrib/initscripts/Makefile.in.orig	Sun Feb 16 12:50:01 2003
++++ distrib/initscripts/Makefile.in	Sun Feb 23 13:18:29 2003
+@@ -125,12 +125,12 @@
+ @USE_SUSE_TRUE@sysvdir = /etc/init.d
+ @USE_COBALT_TRUE@sysvdir = /etc/rc.d/init.d
+ @USE_TRU64_TRUE@sysvdir = /sbin/init.d
+-@USE_NETBSD_TRUE@sysvdir = /etc/rc.d
++@USE_NETBSD_TRUE@sysvdir = ${prefix}/etc/rc.d#	pkgsrc *only*!
+ @USE_REDHAT_TRUE@sysv_SCRIPTS = atalk
+ @USE_SUSE_TRUE@sysv_SCRIPTS = atalk
+ @USE_COBALT_TRUE@sysv_SCRIPTS = atalk
+ @USE_TRU64_TRUE@sysv_SCRIPTS = atalk
+-@USE_NETBSD_TRUE@sysv_SCRIPTS = afp atalk pap timelord
++@USE_NETBSD_TRUE@sysv_SCRIPTS = afpd atalkd papd timelord
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/net/netatalk1/patches/patch-ac b/net/netatalk1/patches/patch-ac
new file mode 100644
index 00000000000..bef1bbe7c91
--- /dev/null
+++ b/net/netatalk1/patches/patch-ac
@@ -0,0 +1,48 @@
+The original commit message for this patch:
+
+    http://mail-index.netbsd.org/source-changes/1999/09/17/0023.html
+
+    Patch from Juergen Hannken-Illjes, which should solve PR#8308 (net 0 is
+    reserved for lo0, it can't be used on other interfaces).
+
+Here is PR #8308:
+
+    http://www.NetBSD.org/cgi-bin/query-pr-single.pl?number=8308
+
+and also the change that exposed the bug:
+
+    http://mail-index.netbsd.org/source-changes/1999/08/24/0035.html
+
+and finally, the discussion referred to in the above change:
+
+    http://mail-index.netbsd.org/tech-net/1999/06/30/0002.html
+    http://mail-index.netbsd.org/tech-net/1999/07/01/0005.html
+    http://mail-index.netbsd.org/tech-net/1999/07/01/0007.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0003.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0016.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0017.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0018.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0020.html
+    http://mail-index.netbsd.org/tech-net/1999/07/02/0022.html
+    http://mail-index.netbsd.org/tech-net/1999/07/03/0004.html
+
+
+$NetBSD: patch-ac,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
+
+--- etc/atalkd/main.c.orig	Sat Oct  5 08:20:13 2002
++++ etc/atalkd/main.c
+@@ -278,12 +278,12 @@ static void as_timer(int sig)
+ 		    LOG(log_info, logtype_atalkd, "config for no router" );
+ 		      
+ 		    if ( iface->i_flags & IFACE_PHASE2 ) {
+-			iface->i_rt->rt_firstnet = 0;
++			iface->i_rt->rt_firstnet = htons(1);
+ 			iface->i_rt->rt_lastnet = htons( STARTUP_LASTNET );
+ 			setaddr( iface, IFACE_PHASE2,
+ 				iface->i_addr.sat_addr.s_net,
+ 				iface->i_addr.sat_addr.s_node,
+-				0, htons( STARTUP_LASTNET ));
++				htons(1), htons( STARTUP_LASTNET ));
+ 		    }
+ 		    if ( looproute( iface, RTMP_ADD ) ) { /* -1 or 1 */
+ 			LOG(log_error, logtype_atalkd,
diff --git a/net/netatalk1/patches/patch-ad b/net/netatalk1/patches/patch-ad
new file mode 100644
index 00000000000..28fc8bb6740
--- /dev/null
+++ b/net/netatalk1/patches/patch-ad
@@ -0,0 +1,40 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
+
+--- include/atalk/paths.h.orig	Wed Sep 25 18:36:24 2002
++++ include/atalk/paths.h
+@@ -16,7 +16,7 @@
+ 
+ /* lock file path. this should be re-organized a bit. */
+ #if ! defined (_PATH_LOCKDIR)
+-#  if defined (FHS_COMPATIBILITY)
++#  if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+ #    define _PATH_LOCKDIR	"/var/run/"
+ #  elif defined (BSD4_4)
+ #    ifdef MACOSX_SERVER
+@@ -51,7 +51,7 @@
+  */
+ #define _PATH_ATALKDEBUG	"/tmp/atalkd.debug"
+ #define _PATH_ATALKDTMP		"atalkd.tmp"
+-#ifdef FHS_COMPATIBILITY
++#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+ #  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
+ #else
+ #  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
+@@ -61,7 +61,7 @@
+  * psorder paths
+  */
+ #define _PATH_TMPPAGEORDER	"/tmp/psorderXXXXXX"
+-#ifdef FHS_COMPATIBILITY
++#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+ #  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
+ #else
+ #  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd")
+@@ -71,7 +71,7 @@
+  * afpd paths
+  */
+ #define _PATH_AFPTKT		"/tmp/AFPtktXXXXXX"
+-#ifdef FHS_COMPATIBILITY
++#if defined (FHS_COMPATIBILITY) || defined (__NetBSD__)
+ #  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
+ #else
+ #  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
diff --git a/net/netatalk1/patches/patch-ae b/net/netatalk1/patches/patch-ae
new file mode 100644
index 00000000000..c0eecfae3c1
--- /dev/null
+++ b/net/netatalk1/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
+
+--- man/man8/psf.8.tmpl.orig	Tue Sep 19 18:13:47 2000
++++ man/man8/psf.8.tmpl
+@@ -93,10 +93,10 @@ laser|lp|LaserWriter Plus on AppleTalk:\
+     :sd=/usr/spool/lpd/laser:\\
+     :lp=/usr/spool/lpd/laser/null:\\
+     :lf=/var/adm/lpd-errs:pw#80:hl:\\
+-    :of=:LIBDIR:/filters/ofpap:\\
+-    :if=:LIBDIR:/filters/ifpaprev:\\
+-    :tf=:LIBDIR:/filters/tfpaprev:\\
+-    :df=:LIBDIR:/filters/dfpaprev:
++    :of=:SBINDIR:/filters/ofpap:\\
++    :if=:SBINDIR:/filters/ifpaprev:\\
++    :tf=:SBINDIR:/filters/tfpaprev:\\
++    :df=:SBINDIR:/filters/dfpaprev:
+ .fi
+ .RE
+ .sp
diff --git a/net/netatalk1/patches/patch-af b/net/netatalk1/patches/patch-af
new file mode 100644
index 00000000000..c803595fadf
--- /dev/null
+++ b/net/netatalk1/patches/patch-af
@@ -0,0 +1,30 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/11/02 11:20:10 markd Exp $
+
+--- etc/psf/etc2ps.sh.orig	Sun Apr 27 15:00:44 2003
++++ etc/psf/etc2ps.sh	Sun Apr 27 19:51:31 2003
+@@ -9,15 +9,12 @@
+ # tag in the case.
+ #
+ 
+-DVIPSPATH=/usr/local/tex/bin
+ DVIPS=/usr/local/tex/bin/dvips
+ DVIPSARGS="-f -q"
+ 
+-TROFF2PS=/usr/local/psroff/troff2/troff2ps
++TROFF2PS="groff -Tps"
+ TROFF2PSARGS="-Z -O-.10"
+ 
+-PATH=/usr/bin:$DVIPSPATH; export PATH
+-
+ case $1 in
+ 
+ #
+@@ -39,7 +36,7 @@
+ # troff2ps is from psroff by Chris Lewis.
+ #
+ tf*)
+-    if [ -x "$TROFF2PS" ]; then
++    if [ -x "/usr/bin/groff" ]; then
+ 	exec $TROFF2PS $TROFF2PSARGS
+     else
+ 	echo "$0: filter troff2ps uninstalled" 1>&2