summaryrefslogtreecommitdiff
path: root/net/netatalk-devel
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>2001-09-16 01:02:46 +0000
committercvs2svn <cvs2svn@FreeBSD.org>2001-09-16 01:02:46 +0000
commitdb3dca6dbd32fe6ea3d51bc037e6f9cdc66c343b (patch)
tree29d590ca0bc9e66d81bc3218a0684c2daf9d4a68 /net/netatalk-devel
parentFix compilation problems. (diff)
This commit was manufactured by cvs2svn to create tag 'RELEASE_4_4_0'.release/4.4.0
Diffstat (limited to 'net/netatalk-devel')
-rw-r--r--net/netatalk-devel/Makefile87
-rw-r--r--net/netatalk-devel/distinfo1
-rw-r--r--net/netatalk-devel/files/netatalk.sh33
-rw-r--r--net/netatalk-devel/files/patch-Makefile.in18
-rw-r--r--net/netatalk-devel/files/patch-aa177
-rw-r--r--net/netatalk-devel/files/patch-ab16
-rw-r--r--net/netatalk-devel/files/patch-ac16
-rw-r--r--net/netatalk-devel/files/patch-ad16
-rw-r--r--net/netatalk-devel/files/patch-ae16
-rw-r--r--net/netatalk-devel/files/patch-af18
-rw-r--r--net/netatalk-devel/files/patch-ag50
-rw-r--r--net/netatalk-devel/files/patch-ah16
-rw-r--r--net/netatalk-devel/files/patch-ai15
-rw-r--r--net/netatalk-devel/files/patch-configure.in25
-rw-r--r--net/netatalk-devel/files/patch-macusers54
-rw-r--r--net/netatalk-devel/pkg-comment1
-rw-r--r--net/netatalk-devel/pkg-descr24
-rw-r--r--net/netatalk-devel/pkg-message9
-rw-r--r--net/netatalk-devel/pkg-plist144
19 files changed, 0 insertions, 736 deletions
diff --git a/net/netatalk-devel/Makefile b/net/netatalk-devel/Makefile
deleted file mode 100644
index b4e51a07dc1b..000000000000
--- a/net/netatalk-devel/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Ports collection makefile for: netatalk
-# Date created: 23 Jul 1997
-# Whom: stb
-#
-# $FreeBSD$
-#
-
-PORTNAME= netatalk
-PORTVERSION= 1.5p7
-PORTREVISION= 2
-CATEGORIES= net print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= netatalk
-DISTNAME= netatalk-1.5pre7
-
-MAINTAINER= marcus@marcuscom.com
-
-.if defined(WITH_CNID)
-LIB_DEPENDS= db3.2:${PORTSDIR}/databases/db3
-.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
-.if defined(WITH_PAM)
-PLIST_SUB+= NETATALKPAM=""
-.else
-CONFIGURE_ARGS+= --without-pam
-PLIST_SUB+= NETATALKPAM="@comment "
-.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.1. I have not gotten working on OS X.
-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.
-CONFIGURE_ARGS+= --with-did=last
-.endif
-USE_AUTOCONF= yes
-USE_LIBTOOL= yes
-LIBTOOLFILES= configure
-USE_GMAKE= 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
-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
-
-post-extract:
- @${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${FILESDIR}/netatalk.sh \
- > ${WRKSRC}/netatalk.sh
-
-post-configure:
- @${TOUCH} ${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/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 \
- ${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>
diff --git a/net/netatalk-devel/distinfo b/net/netatalk-devel/distinfo
deleted file mode 100644
index 640f609c812d..000000000000
--- a/net/netatalk-devel/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (netatalk-1.5pre7.tar.gz) = d8f93cd5a634497e1cdbe9f78c4f7240
diff --git a/net/netatalk-devel/files/netatalk.sh b/net/netatalk-devel/files/netatalk.sh
deleted file mode 100644
index 1ea9a2d094dc..000000000000
--- a/net/netatalk-devel/files/netatalk.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/net/netatalk-devel/files/Attic/netatalk.sh,v 1.1 2001-05-18 20:00:29 dinoex Exp $
-#
-# AppleTalk daemons. Make sure not to start atalkd in the background:
-# its data structures must have time to stablize before running the
-# other processes.
-#
-if ! test -x %%PREFIX%%/sbin/atalkd
-then
-# exit 0
-fi
-HOSTNAME=`hostname|sed 's/\..*$//'`
-case $1 in
-start)
- echo -n ' netatalk'
- %%PREFIX%%/sbin/atalkd
- %%PREFIX%%/bin/nbprgstr -p 4 ${HOSTNAME}:Workstation &
- %%PREFIX%%/bin/nbprgstr -p 4 ${HOSTNAME}:netatalk &
- %%PREFIX%%/sbin/papd
- %%PREFIX%%/sbin/afpd -s %%PREFIX%%/etc/AppleVolumes.system \
- -f %%PREFIX%%/etc/AppleVolumes.default
- ;;
-stop)
- killall afpd
- killall papd
- killall atalkd
- ;;
-*)
- echo "Usage: $0: [ start | stop ]" 2>&1
- exit 65
- ;;
-esac
diff --git a/net/netatalk-devel/files/patch-Makefile.in b/net/netatalk-devel/files/patch-Makefile.in
deleted file mode 100644
index 15d4d58e6a76..000000000000
--- a/net/netatalk-devel/files/patch-Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- config/Makefile.in.orig Thu Aug 30 12:02:31 2001
-+++ config/Makefile.in Thu Aug 30 12:03:21 2001
-@@ -136,11 +136,11 @@
- $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
- @list='$(pkgconf_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
-- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfdir)/$$p"; \
-- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfdir)/$$p; \
-+ echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfdir)/$$p.dist"; \
-+ $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfdir)/$$p.dist; \
- else if test -f $$p; then \
-- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfdir)/$$p"; \
-- $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfdir)/$$p; \
-+ echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfdir)/$$p.dist"; \
-+ $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfdir)/$$p.dist; \
- fi; fi; \
- done
-
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-configure.in b/net/netatalk-devel/files/patch-configure.in
deleted file mode 100644
index 021e9fe9323f..000000000000
--- a/net/netatalk-devel/files/patch-configure.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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
- dnl -- also enable CNID DB when this is found
- AC_DEFINE(CNID_DB, 1)
- AC_MSG_RESULT([using persistent cnid database per volume])
-- LIBS="$LIBS -ldb",
-+ LIBS="$LIBS -ldb3",
- dnl Not Found
- AC_MSG_ERROR([Berkeley DB3 library not found!])
- )
diff --git a/net/netatalk-devel/files/patch-macusers b/net/netatalk-devel/files/patch-macusers
deleted file mode 100644
index 763e5ec339af..000000000000
--- a/net/netatalk-devel/files/patch-macusers
+++ /dev/null
@@ -1,54 +0,0 @@
---- contrib/macusers/macusers.orig Wed Aug 29 12:20:32 2001
-+++ contrib/macusers/macusers Sun Jun 17 01:47:44 2001
-@@ -1,8 +1,8 @@
- #!/usr/bin/perl
--# $Id: macusers,v 1.4 2001/06/29 14:14:46 rufustfirefly Exp $
-
- use strict;
--use vars qw($MAC_PROCESS $PS_STR $MATCH_STR $ASIP_PORT $LSOF);
-+use Socket;
-+use vars qw($MAC_PROCESS $PS_STR $MATCH_STR $ASIP_PORT_NO $ASIP_PORT $LSOF);
-
- # Written for linux; may have to be modified for your brand of Unix.
-
-@@ -25,10 +25,11 @@
- $PS_STR = "-ef";
- $MATCH_STR = '\s*(\w+)\s+(\d+)\s+(\d+)\s+\d+\s+([\d\w:]+)';
- }
--$ASIP_PORT = "afpovertcp";
-+$ASIP_PORT = "afpovertcp";
-+$ASIP_PORT_NO = 548;
-
- # Change to 0 if you don't have lsof
--$LSOF = 1;
-+$LSOF = 0;
- my %mac = ();
-
- if ( $LSOF == 1 ) {
-@@ -43,8 +44,25 @@
- ($host) = ( $host =~ /(^[\w\d\-]+)/ );
- $mac{$pid} = $host;
- }
--
-+ print
-+"PID UID Username Name Logintime Mac\n";
- close(LSOF);
-+}
-+elsif ( $^O eq "freebsd" ) {
-+ open( SOCKSTAT, "sockstat -4 | grep $MAC_PROCESS | grep -v grep |" );
-+
-+ while (<SOCKSTAT>) {
-+ next if ( $_ !~ /$MAC_PROCESS/ );
-+ $_ =~
-+ /\S+\s+\S+\s+(\d+)\s+\d+\s+[\w\d]+\s+[\d\.:]+\s+([\d\.]+)/;
-+ my ( $pid, $addr, $host );
-+ $pid = $1;
-+ $addr = $2;
-+ $host =
-+ gethostbyaddr( pack( 'C4', split ( /\./, $addr ) ), AF_INET );
-+ ($host) = ( $host =~ /(^[\w\d\-]+)/ );
-+ $mac{$pid} = $host;
-+ }
- print
- "PID UID Username Name Logintime Mac\n";
- }
diff --git a/net/netatalk-devel/pkg-comment b/net/netatalk-devel/pkg-comment
deleted file mode 100644
index 4eb541bac506..000000000000
--- a/net/netatalk-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File and print server for AppleTalk networks
diff --git a/net/netatalk-devel/pkg-descr b/net/netatalk-devel/pkg-descr
deleted file mode 100644
index 6d49d2583a0b..000000000000
--- a/net/netatalk-devel/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-netatalk - File and Print Server for AppleTalk networks
-
-Netatalk features include:
-o Access to the UNIX file system for Macintosh and other systems with
- AppleShare client software.
-o Spool PostScript print jobs to the lpd(8) spool system via Printer Access
- Protocol (PAP).
-o Output PostScript print jobs from the lpd(8) spool system via Printer
- Access Protocol (PAP).
-o Filter PostScript, ASCII, and various other formats to PostScript,
- including banner pages and page reversal.
-o Route AppleTalk between multiple Ethernet interfaces.
-
-This version includes Adrian Sun's improvements:
-o Access to the file server via AFP-over-TCP.
-o Support for volumes larger that 2GB.
-o Randnum- and 2-Way Randnum authentication methods (courtesy S. Hirsch)
-o Support for Apple II ProDOS.
-o A number of bug fixes.
-
-Many other new features and bug fixes have also been integrated.
-Requires AppleTalk support in the kernel (FreeBSD 2.2 or newer).
-
-WWW: http://netatalk.sourceforge.net/
diff --git a/net/netatalk-devel/pkg-message b/net/netatalk-devel/pkg-message
deleted file mode 100644
index 23d91dbf7b03..000000000000
--- a/net/netatalk-devel/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-###
-If you compiled WITH_PAM support, you need to edit /etc/pam.conf to add
-support for netatalk. To do so, add the following three lines to this
-file:
-
-netatalk auth required pam_unix.so try_first_pass
-netatalk account required pam_unix.so try_first_pass
-netatalk session required pam_permit.so
-###
diff --git a/net/netatalk-devel/pkg-plist b/net/netatalk-devel/pkg-plist
deleted file mode 100644
index 7e6ea5543c66..000000000000
--- a/net/netatalk-devel/pkg-plist
+++ /dev/null
@@ -1,144 +0,0 @@
-bin/achfile
-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
-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
-@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
-etc/uams/uams_clrtxt.so
-etc/uams/uams_dhx.so
-%%NETATALKPAM%%etc/uams/uams_dhx_pam.so
-%%NETATALKPAM%%etc/uams/uams_dhx_pam.a
-%%NETATALKPAM%%etc/uams/uams_dhx_pam.la
-etc/uams/uams_dhx_passwd.so
-etc/uams/uams_dhx_passwd.a
-etc/uams/uams_dhx_passwd.la
-etc/uams/uams_guest.so
-etc/uams/uams_guest.a
-etc/uams/uams_guest.la
-%%NETATALKPAM%%etc/uams/uams_pam.so
-%%NETATALKPAM%%etc/uams/uams_pam.a
-%%NETATALKPAM%%etc/uams/uams_pam.la
-etc/uams/uams_passwd.so
-etc/uams/uams_passwd.a
-etc/uams/uams_passwd.la
-etc/uams/uams_randnum.so
-etc/uams/uams_randnum.a
-etc/uams/uams_randnum.la
-@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
-lib/libatalk.la
-share/aclocal/netatalk.m4
-share/netatalk/pagecount.ps