13 files changed, 26 insertions, 469 deletions

diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
index 095e34a35108..dfcc4574217b 100644
--- a/net/netatalk-devel/Makefile
+++ b/net/netatalk-devel/Makefile
@@ -6,30 +6,43 @@
 #
 
 PORTNAME=	netatalk
-PORTVERSION=	1.5p7
-PORTREVISION=	3
+PORTVERSION=	1.5p8
 CATEGORIES=	net print
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	netatalk
-DISTNAME=	netatalk-1.5pre7
+DISTNAME=	netatalk-1.5pre8
 
 MAINTAINER=	marcus@marcuscom.com
 
 .if defined(WITH_CNID)
 LIB_DEPENDS=	db3.2:${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
 
 CONFIGURE_ARGS+=	--with-tcp-wrappers \
-			--with-pkgconfdir=${PREFIX}/etc
+			--with-pkgconfdir=${PREFIX}/etc \
+#			--disable-ddp
 .if defined(WITH_PAM)
 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
+.endif
+.if defined(WITH_FLOCK_LOCKS)
+# Disable byte locking, and do full file locking.  This _may_ help with some
+# Quark Express save issues.
+.endif
+CONFIGURE_ARGS+=		--with-flock-locks
 .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.
@@ -39,10 +52,11 @@ CONFIGURE_ARGS+=		--enable-cnid-db \
 						--with-db3=/usr/local
 .else
 # This method of DID calculation is not persistent, but has been tested to
-# work with MacOS X (10.0.4) as well as MacOS 7-9.2.1.
+# work with MacOS X (10.0.4 and 10.1) as well as MacOS 7-9.2.1.
 CONFIGURE_ARGS+=		--with-did=last
 .endif
-USE_AUTOCONF=	yes
+USE_AUTOMAKE=	yes
+AUTOMAKE_ARGS=	--add-missing --no-force
 USE_LIBTOOL=	yes
 LIBTOOLFILES=   configure
 USE_GMAKE=	yes
@@ -64,13 +78,14 @@ 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
+	@${RM} -f ${WRKSRC}/missing ${WRKSRC}/mkinstalldirs
 
 post-configure:
 	@${TOUCH} -f ${WRKSRC}/config/Makefile.in
 
 post-install:
 	@${RM} -f ${PREFIX}/bin/nu ${PREFIX}/bin/lp2pap.sh \
-		${PREFIX}/etc/netatalk.pamd.dist ${PREFIX}/bin/test_parse_mtab \
+		${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
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/macusers/macusers \
diff --git a/net/netatalk-devel/distinfo b/net/netatalk-devel/distinfo
index 640f609c812d..4da57e28d744 100644
--- a/net/netatalk-devel/distinfo
+++ b/net/netatalk-devel/distinfo
@@ -1 +1 @@
-MD5 (netatalk-1.5pre7.tar.gz) = d8f93cd5a634497e1cdbe9f78c4f7240
+MD5 (netatalk-1.5pre8.tar.gz) = 5abc43625a4efa19ac4bf1a10bebab69
diff --git a/net/netatalk-devel/files/patch-aa b/net/netatalk-devel/files/patch-aa
deleted file mode 100644
index c440f1393054..000000000000
--- a/net/netatalk-devel/files/patch-aa
+++ /dev/null
@@ -1,177 +0,0 @@
---- libatalk/cnid/cnid_add.c.orig	Thu Aug 16 10:30:29 2001
-+++ libatalk/cnid/cnid_add.c	Sun Sep  2 03:15:54 2001
-@@ -13,6 +13,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#ifdef CNID_DB
- #include <stdio.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-@@ -41,23 +42,27 @@
- {
-   DBT altkey, altdata;
-   DB_TXN *tid;
-+  /* We create rc here because using rc is bad.  Why?  Well, if you 
-+   * use rc once, then call another function which resets it, you're
-+   * screwed. */
-+  int rc = 0;
- 
-   memset(&altkey, 0, sizeof(altkey));
-   memset(&altdata, 0, sizeof(altdata));
-   
- retry:
--  if ((errno = txn_begin(db->dbenv, ptid, &tid,0))) {
--    return errno;
-+  if ((rc = txn_begin(db->dbenv, ptid, &tid,0))) {
-+    return rc;
-   }
- 
-   /* main database */
--  if ((errno = db->db_cnid->put(db->db_cnid, tid,
-+  if ((rc = db->db_cnid->put(db->db_cnid, tid,
- 			        key, data, DB_NOOVERWRITE))) {
-     txn_abort(tid);
--    if (errno == DB_LOCK_DEADLOCK)
-+    if (rc == DB_LOCK_DEADLOCK)
-       goto retry;
- 
--    return errno;
-+    return rc;
-   }
- 
-   /* dev/ino database */
-@@ -65,25 +70,25 @@
-   altkey.size = CNID_DEVINO_LEN;
-   altdata.data = key->data;
-   altdata.size = key->size;
--  if ((errno = db->db_devino->put(db->db_devino, tid,
-+  if ((rc = db->db_devino->put(db->db_devino, tid,
- 				  &altkey, &altdata, 0))) {
-     txn_abort(tid);
--    if (errno == DB_LOCK_DEADLOCK)
-+    if (rc == DB_LOCK_DEADLOCK)
-       goto retry;
- 
--    return errno;
-+    return rc;
-   }
- 
-   /* did/name database */
-   altkey.data = (char *) data->data + CNID_DEVINO_LEN;
-   altkey.size = data->size - CNID_DEVINO_LEN;
--  if ((errno = db->db_didname->put(db->db_didname, tid,
-+  if ((rc = db->db_didname->put(db->db_didname, tid,
- 				   &altkey, &altdata, 0))) {
-     txn_abort(tid);
--    if (errno == DB_LOCK_DEADLOCK)
-+    if (rc == DB_LOCK_DEADLOCK)
-       goto retry;
- 
--    return errno;
-+    return rc;
-   }
- 
-   return txn_commit(tid, 0);
-@@ -100,6 +105,7 @@
-   DBT rootinfo_key, rootinfo_data;
-   DB_TXN *tid;
-   cnid_t id, save;
-+  int rc = 0;
- 
-   int debug = 0;
- 
-@@ -137,8 +143,8 @@
-    * cnid's to the database. */
-   if (ntohl(hint) >= CNID_START) {
-     /* if the key doesn't exist, add it in. don't fiddle with nextID. */
--    errno = add_cnid(db, NULL, &key, &data);
--    switch (errno) {
-+    rc = add_cnid(db, NULL, &key, &data);
-+    switch (rc) {
-     case DB_KEYEXIST: /* need to use RootInfo after all. */
-       break;
-     default:
-@@ -153,14 +159,14 @@
- 
-   /* Abort and retry the modification. */
-   if (0) {
--retry:    if ((errno = txn_abort(tid)) != 0)
--              syslog(LOG_ERR, "cnid_add: txn_begin failed (%d)", errno);
-+retry:    if ((rc = txn_abort(tid)) != 0)
-+              syslog(LOG_ERR, "cnid_add: txn_begin failed (%d)", rc);
-           /* FALLTHROUGH */
-   }
- 
-   /* Begin the transaction. */
--  if ((errno = txn_begin(db->dbenv, NULL, &tid, 0)) != 0) {
--    syslog(LOG_ERR, "cnid_add: txn_begin failed (%d)", errno);
-+  if ((rc = txn_begin(db->dbenv, NULL, &tid, 0)) != 0) {
-+    syslog(LOG_ERR, "cnid_add: txn_begin failed (%d)", rc);
-     goto cleanup_err;
-   }
- 
-@@ -172,7 +178,7 @@
-   rootinfo_key.size = ROOTINFO_KEYLEN;
- 
-   /* Get the key. */
--  switch (errno = db->db_didname->get(db->db_didname, tid, &rootinfo_key, &rootinfo_data, 0)) {
-+  switch (rc = db->db_didname->get(db->db_didname, tid, &rootinfo_key, &rootinfo_data, 0)) {
-   case DB_LOCK_DEADLOCK:
-           goto retry;
-   case 0:
-@@ -186,7 +192,7 @@
-             syslog(LOG_ERR, "cnid_add: using CNID_START for did %d, name %s as %d", did, name, hint);
-           break;
-   default:
--          syslog(LOG_ERR, "cnid_add: unable to lookup rootinfo (%d)", errno);
-+          syslog(LOG_ERR, "cnid_add: unable to lookup rootinfo (%d)", rc);
- 		  goto cleanup_abort;
-  }
- 
-@@ -194,12 +200,12 @@
-    * wrap-around. NOTE: i do it this way so that we can go back and
-    * fill in holes. */
-   save = id = ntohl(hint);
--  while ((errno = add_cnid(db, tid, &key, &data))) {
-+  while ((rc = add_cnid(db, tid, &key, &data))) {
-     /* don't use any of the special CNIDs */
-     if (++id < CNID_START)
-       id = CNID_START;
- 
--    if ((errno != DB_KEYEXIST) || (save == id)) {
-+    if ((rc != DB_KEYEXIST) || (save == id)) {
-       syslog(LOG_ERR, "cnid_add: unable to add CNID(%x)", hint);
-       hint = 0;
-       goto cleanup_abort;
-@@ -211,21 +217,21 @@
-   rootinfo_data.data = &hint;
-   rootinfo_data.size = sizeof(hint);
- 
--  switch (errno = db->db_didname->put(db->db_didname, tid, &rootinfo_key, &rootinfo_data, 0)) {
-+  switch (rc = db->db_didname->put(db->db_didname, tid, &rootinfo_key, &rootinfo_data, 0)) {
-   case DB_LOCK_DEADLOCK:
-           goto retry;
-   case 0:
-           break;
-   default:
--          syslog(LOG_ERR, "cnid_add: unable to update rootinfo (%d)", errno);
-+          syslog(LOG_ERR, "cnid_add: unable to update rootinfo (%d)", rc);
-           goto cleanup_abort;
-   }
- 
- 
- cleanup_commit:
-   /* The transaction finished, commit it. */
--  if ((errno = txn_commit(tid, 0)) != 0) {
--    syslog(LOG_ERR, "cnid_add: txn_commit failed (%d)", errno);
-+  if ((rc = txn_commit(tid, 0)) != 0) {
-+    syslog(LOG_ERR, "cnid_add: txn_commit failed (%d)", rc);
-     goto cleanup_err;
-   }
- 
-@@ -239,3 +245,4 @@
- cleanup_err:
-   return 0;
- }
-+#endif /* CNID_DB */
diff --git a/net/netatalk-devel/files/patch-ab b/net/netatalk-devel/files/patch-ab
deleted file mode 100644
index b21dfca602c7..000000000000
--- a/net/netatalk-devel/files/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
---- libatalk/cnid/cnid_close.c.orig	Fri Aug 17 00:30:29 2001
-+++ libatalk/cnid/cnid_close.c	Wed Aug 29 15:48:45 2001
-@@ -6,6 +6,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#ifdef CNID_DB
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif /* HAVE_UNISTD_H */
-@@ -69,3 +70,4 @@
- 
-   free(db);
- }
-+#endif /* CNID_DB */
-
diff --git a/net/netatalk-devel/files/patch-ac b/net/netatalk-devel/files/patch-ac
deleted file mode 100644
index ac1c15feacd6..000000000000
--- a/net/netatalk-devel/files/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
---- libatalk/cnid/cnid_delete.c.orig	Fri Aug 17 00:30:29 2001
-+++ libatalk/cnid/cnid_delete.c	Wed Aug 29 15:49:49 2001
-@@ -11,6 +11,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#ifdef CNID_DB
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
-@@ -111,3 +112,4 @@
-   syslog(LOG_ERR, "cnid_del: unable to delete CNID(%x)", id);
-   return errno;
- }
-+#endif /* CNID_DB */
-
diff --git a/net/netatalk-devel/files/patch-ad b/net/netatalk-devel/files/patch-ad
deleted file mode 100644
index 7a77d36d9e30..000000000000
--- a/net/netatalk-devel/files/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
---- libatalk/cnid/cnid_get.c.orig	Wed Aug 15 12:16:25 2001
-+++ libatalk/cnid/cnid_get.c	Wed Aug 29 15:49:52 2001
-@@ -6,6 +6,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#ifdef CNID_DB
- #include <stdio.h>
- #include <string.h>
- #include <sys/param.h>
-@@ -57,3 +58,4 @@
-   memcpy(&id, data.data, sizeof(id));
-   return id;
- }
-+#endif /* CNID_DB */
-
diff --git a/net/netatalk-devel/files/patch-ae b/net/netatalk-devel/files/patch-ae
deleted file mode 100644
index 7042d6670e6d..000000000000
--- a/net/netatalk-devel/files/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
---- libatalk/cnid/cnid_lookup.c.orig	Fri Aug 17 00:30:29 2001
-+++ libatalk/cnid/cnid_lookup.c	Wed Aug 29 15:49:55 2001
-@@ -6,6 +6,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#ifdef CNID_DB
- #include <stdio.h>
- #include <string.h>
- #include <sys/param.h>
-@@ -115,3 +116,4 @@
-     syslog(LOG_ERR, "cnid_lookup: looked up did %d, name %s as %d (needed update)", did, name, id);
-   return id;
- }
-+#endif /* CNID_DB */
-
diff --git a/net/netatalk-devel/files/patch-af b/net/netatalk-devel/files/patch-af
deleted file mode 100644
index 01cf664f2bdd..000000000000
--- a/net/netatalk-devel/files/patch-af
+++ /dev/null
@@ -1,18 +0,0 @@
---- libatalk/cnid/cnid_nextid.c.orig	Fri Aug 17 00:30:29 2001
-+++ libatalk/cnid/cnid_nextid.c	Wed Aug 29 15:50:04 2001
-@@ -7,6 +7,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#ifdef CNID_DB
- #include <db.h>
- 
- #include <atalk/adouble.h>
-@@ -29,5 +30,6 @@
-   memcpy(&id, ad_entry(&db->rootinfo, ADEID_DID), sizeof(id));
-   return id;
- }
-+#endif /* CNID_DB */
- #endif
- 
-
diff --git a/net/netatalk-devel/files/patch-ag b/net/netatalk-devel/files/patch-ag
deleted file mode 100644
index 39d8d3cdbd7a..000000000000
--- a/net/netatalk-devel/files/patch-ag
+++ /dev/null
@@ -1,50 +0,0 @@
---- libatalk/cnid/cnid_open.c.orig	Thu Aug 16 10:30:29 2001
-+++ libatalk/cnid/cnid_open.c	Sun Sep  2 03:13:49 2001
-@@ -37,6 +37,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#ifdef CNID_DB
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -83,7 +84,7 @@
- #define DBVERSION        DBVERSION1
- 
- #define DBOPTIONS    (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \
--DB_INIT_LOG | DB_INIT_TXN | DB_TXN_NOSYNC | DB_RECOVER)
-+DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER)
- 
- #define MAXITER     0xFFFF /* maximum number of simultaneously open CNID
- 			    * databases. */
-@@ -100,7 +101,7 @@
- 
- /* sort did's and then names. this is for unix paths.
-  * i.e., did/unixname lookups. */
--static int compare_unix(const DBT *a, const DBT *b)
-+static int compare_unix(DB* db, const DBT *a, const DBT *b)
- {
-   u_int8_t *sa, *sb;
-   int len, ret;
-@@ -214,6 +215,8 @@
-     goto fail_lock;
-   }
- 
-+  /* Check to see if a DBENV already exists.  If it does, join it. */
-+  if (db->dbenv->open(db->dbenv, path, DB_JOINENV, 0666)) {
-   if (db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666)) {
- 
-     /* try with a shared memory pool */
-@@ -229,6 +232,7 @@
-     open_flag = DB_RDONLY;
-     syslog(LOG_INFO, "cnid_open: read-only CNID database");
-   }
-+  }
- 
-   /* did/name reverse mapping. we use a btree for this one. */
-   if (db_create(&db->db_didname, db->dbenv, 0))
-@@ -358,3 +362,4 @@
-   free(db);
-   return NULL;
- }
-+#endif /* CNID_DB */
diff --git a/net/netatalk-devel/files/patch-ah b/net/netatalk-devel/files/patch-ah
deleted file mode 100644
index 445128d39fc5..000000000000
--- a/net/netatalk-devel/files/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
---- libatalk/cnid/cnid_resolve.c.orig	Fri Aug 17 00:30:29 2001
-+++ libatalk/cnid/cnid_resolve.c	Wed Aug 29 15:50:34 2001
-@@ -6,6 +6,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#ifdef CNID_DB
- #include <stdio.h>
- #include <string.h>
- #include <sys/param.h>
-@@ -48,3 +49,4 @@
-   memcpy(id, (char *) data.data + CNID_DEVINO_LEN, sizeof(*id));
-   return (char *) data.data + CNID_HEADER_LEN;
- }
-+#endif /* CNID_DB */
-
diff --git a/net/netatalk-devel/files/patch-ai b/net/netatalk-devel/files/patch-ai
deleted file mode 100644
index bcf728a4193a..000000000000
--- a/net/netatalk-devel/files/patch-ai
+++ /dev/null
@@ -1,15 +0,0 @@
---- libatalk/cnid/cnid_update.c.orig	Fri Aug 17 00:30:30 2001
-+++ libatalk/cnid/cnid_update.c	Wed Aug 29 15:50:39 2001
-@@ -6,6 +6,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#ifdef CNID_DB
- #include <stdio.h>
- #include <string.h>
- #include <sys/param.h>
-@@ -136,3 +137,4 @@
-   syslog(LOG_ERR, "cnid_update: can't update CNID(%x)", id);
-   return -1;
- }
-+#endif /* CNID_DB */
diff --git a/net/netatalk-devel/files/patch-aj b/net/netatalk-devel/files/patch-aj
deleted file mode 100644
index 55fd7d40340c..000000000000
--- a/net/netatalk-devel/files/patch-aj
+++ /dev/null
@@ -1,104 +0,0 @@
---- libatalk/util/getiface.c.orig	Thu Sep 13 00:28:21 2001
-+++ libatalk/util/getiface.c	Thu Sep 13 00:28:30 2001
-@@ -43,13 +43,6 @@
- {
-     /* if we've run out of room, allocate some more. just return
-      * the present list if we can't. */
--     if (*i >= *length) {
--      char **new = realloc(list, sizeof(char **)*(*length + IFACE_NUM));
--       
--      if (!new) /* just break if we can't allocate anything */
--	return -1;
--      *length += IFACE_NUM;
--    }
-      
-     if ((list[*i] = strdup(name)) == NULL)
-       return -1;
-@@ -60,30 +53,32 @@
- }
- 
- 
--static int getifaces(const int sockfd, char **list, int *length)
-+static int getifaces(const int sockfd, char ***list, int *length)
- {
- #ifdef HAVE_IFNAMEINDEX
-       struct if_nameindex *ifstart, *ifs;
-       int i = 0;
-+	  char **new;
-   
--      if (!list || *length < 1) 
--	return 0;
--
-       ifs = ifstart = if_nameindex();
-+
-+	  new = (char **) malloc((sizeof(ifs)/sizeof(struct if_nameindex) + 1) * sizeof(char *));
-       while (ifs && ifs->if_name) {
- 	/* just bail if there's a problem */
--	if (addname(list, &i, length, ifs->if_name) < 0)
-+	if (addname(new, &i, length, ifs->if_name) < 0)
- 	  break;
- 	ifs++;
-       }
- 
-       if_freenameindex(ifstart);
-+	  *list = new;
-       return i;
- 
- #else
-     struct ifconf	ifc;
-     struct ifreq	ifrs[ 64 ], *ifr, *nextifr;
-     int			ifrsize, i = 0;
-+	char **new;
- 
-     if (!list || *length < 1)
-       return 0;
-@@ -96,6 +91,7 @@
- 	return 0;
-     }
- 
-+	new = (char **) malloc((ifc.ifc_len/sizeof(struct ifreq) + 1) * sizeof(char *));
-     for ( ifr = ifc.ifc_req; ifc.ifc_len >= sizeof( struct ifreq );
- 	    ifc.ifc_len -= ifrsize, ifr = nextifr ) {
- #ifdef BSD4_4
-@@ -108,9 +104,10 @@
- 	nextifr = (struct ifreq *)((caddr_t)ifr + ifrsize );
- 
- 	/* just bail if there's a problem */
--	if (addname(list, &i, length, ifr->ifr_name) < 0)
-+	if (addname(new, &i, length, ifr->ifr_name) < 0)
- 	  break;
-     }
-+	*list = new;
-     return i;
- #endif
- }
-@@ -122,17 +119,14 @@
-  */
- char **getifacelist()
- {
--  char **list = (char **) malloc(sizeof(char **)*(IFACE_NUM + 1));
-+  char **list;
-   char **new;
--  int length = IFACE_NUM, i, fd;
-+  int  length, i, fd;
- 
--  if (!list)
--    return NULL;
--      
-   if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0)
-     return NULL;
- 
--  if ((i = getifaces(fd, list, &length)) == 0) {
-+  if ((i = getifaces(fd, &list, &length)) == 0) {
-     free(list);
-     close(fd);
-     return NULL;
-@@ -140,7 +134,7 @@
-   close(fd);
- 
-   if ((i < length) && 
--      (new = (char **) realloc(list, sizeof(char **)*(i + 1))))
-+      (new = (char **) realloc(list, (i + 1) *  sizeof(char *))))
-     return new;
- 
-   return list;
diff --git a/net/netatalk-devel/files/patch-configure.in b/net/netatalk-devel/files/patch-configure.in
index 021e9fe9323f..5e280d8c8cd2 100644
--- a/net/netatalk-devel/files/patch-configure.in
+++ b/net/netatalk-devel/files/patch-configure.in
@@ -1,20 +1,6 @@
---- configure.in.orig	Sat Sep  1 19:32:49 2001
-+++ configure.in	Sat Sep  1 19:34:07 2001
-@@ -262,18 +262,18 @@
- db3_found=no
- for db3dir in "" $trydb3dir /usr /usr /usr/local ; do
- 	if test -f "$db3dir/include/db3/db.h" ; then
--		LDFLAGS="$LDFLAGS -L$db3dir/lib -L$db3dir"
--		CFLAGS="$CFLAGS -I$db3dir/include"
-+		LDFLAGS="$LDFLAGS -L$db3dir/lib"
-+		CFLAGS="$CFLAGS -I$db3dir/include/db3"
- 
- 		dnl If we require DB3, die if we don't have it
- 		if test "x$db3_required" != "xno"; then
--			AC_CHECK_LIB(db, main,
-+			AC_CHECK_LIB(db3, main,
- 				dnl AC_MSG_RESULT([enabling db3 support])
- 				db3_found=yes
+--- configure.in.orig	Fri Oct  5 12:38:18 2001
++++ configure.in	Fri Oct  5 12:38:33 2001
+@@ -273,7 +273,7 @@
  				dnl -- also enable CNID DB when this is found
  				AC_DEFINE(CNID_DB, 1)
  				AC_MSG_RESULT([using persistent cnid database per volume])