summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rw-r--r--misc/amanda32-client/Makefile20
-rw-r--r--misc/amanda32-server/Makefile227
-rw-r--r--misc/amanda32-server/distinfo2
-rw-r--r--misc/amanda32-server/files/extra-patch-application-src::amzfs-sendrecv.pl52
-rw-r--r--misc/amanda32-server/files/extra-patch-sendbackup-dump.c23
-rw-r--r--misc/amanda32-server/files/patch-ad14
-rw-r--r--misc/amanda32-server/files/patch-amandad-src::Makefile.in11
-rw-r--r--misc/amanda32-server/files/patch-amar-src::Makefile.in12
-rw-r--r--misc/amanda32-server/files/patch-common-src::Makefile.in11
-rw-r--r--misc/amanda32-server/files/patch-man::Makefile.in10
-rw-r--r--misc/amanda32-server/files/patch-ndmp-src::Makefile.in15
-rw-r--r--misc/amanda32-server/files/patch-perl::Amanda::Process.pm11
-rw-r--r--misc/amanda32-server/files/patch-perl::Makefile.in39
-rw-r--r--misc/amanda32-server/files/patch-perl::amglue::Makefile.in10
-rw-r--r--misc/amanda32-server/files/patch-xfer-src::Makefile.in11
-rw-r--r--misc/amanda32-server/files/pkg-deinstall.in9
-rw-r--r--misc/amanda32-server/files/pkg-install.in9
-rw-r--r--misc/amanda32-server/files/pkg-message.in3
-rw-r--r--misc/amanda32-server/pkg-descr22
-rw-r--r--misc/amanda32-server/pkg-plist114
-rw-r--r--misc/amanda32-server/pkg-plist.client167
-rw-r--r--misc/compat8x/Makefile52
-rw-r--r--misc/compat8x/distinfo9
-rw-r--r--misc/compat8x/pkg-descr12
-rw-r--r--misc/compat8x/pkg-message9
-rw-r--r--misc/compat8x/pkg-plist.amd64228
-rw-r--r--misc/compat8x/pkg-plist.i386117
-rw-r--r--misc/compat8x/pkg-plist.sparc64113
-rw-r--r--misc/dahdi-kmod/Makefile110
-rw-r--r--misc/dahdi-kmod/distinfo24
-rw-r--r--misc/dahdi-kmod/files/dahdi.in81
-rw-r--r--misc/dahdi-kmod/files/patch-bchan170
-rw-r--r--misc/dahdi-kmod/files/patch-freebsd-include-dahdi-compat-bsd.h14
-rw-r--r--misc/dahdi-kmod/files/patch-oslec29
-rw-r--r--misc/dahdi-kmod/files/patch-tools-Makefile24
-rw-r--r--misc/dahdi-kmod/files/patch-zaphfc883
-rw-r--r--misc/dahdi-kmod/pkg-descr5
-rw-r--r--misc/dahdi-kmod/pkg-plist52
-rw-r--r--misc/freecode-submit/Makefile33
-rw-r--r--misc/freecode-submit/distinfo2
-rw-r--r--misc/freecode-submit/pkg-descr7
-rw-r--r--misc/krecipes-kde4/Makefile53
-rw-r--r--misc/krecipes-kde4/distinfo3
-rw-r--r--misc/krecipes-kde4/pkg-descr8
-rw-r--r--misc/krecipes-kde4/pkg-plist262
-rw-r--r--misc/logsurfer+/Makefile35
-rw-r--r--misc/logsurfer+/distinfo3
-rw-r--r--misc/logsurfer+/files/patch-ac10
-rw-r--r--misc/logsurfer+/pkg-descr6
-rw-r--r--misc/logsurfer+/pkg-plist6
50 files changed, 0 insertions, 3152 deletions
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
deleted file mode 100644
index 36380db280cf..000000000000
--- a/misc/amanda32-client/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# New ports collection makefile for: amanda
-# Date created: 28th Feb 1995
-# Whom: gpalmer
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX= -client
-PORTREVISION= 0
-
-COMMENT= The Advanced Maryland Automatic Network Disk Archiver (client)
-
-MASTERDIR= ${.CURDIR}/../amanda-server
-PKGINSTALL= mustnotexist
-
-PLIST= ${PKGDIR}/pkg-plist.client
-
-CLIENT_ONLY= yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
deleted file mode 100644
index 4b9a3979689c..000000000000
--- a/misc/amanda32-server/Makefile
+++ /dev/null
@@ -1,227 +0,0 @@
-# New ports collection makefile for: amanda
-# Date created: 28th Feb 1995
-# Whom: gpalmer
-#
-# $FreeBSD$
-#
-
-PORTNAME= amanda
-PORTVERSION= 3.2.1
-PORTEPOCH= 1
-CATEGORIES= misc
-MASTER_SITES= SF/amanda/amanda%20-%20stable/${PORTVERSION}
-PKGNAMESUFFIX?= -server
-
-MAINTAINER= kuriyama@FreeBSD.org
-COMMENT?= The Advanced Maryland Automatic Network Disk Archiver (server)
-
-RUN_DEPENDS= perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
-BUILD_DEPENDS= perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
-
-WRKSRC= ${WRKDIR}/amanda-${PORTVERSION}
-SLAVEDIRS= misc/amanda-client
-
-LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX}
-GNU_CONFIGURE= yes
-USE_GNOME= pkgconfig glib20
-USE_GMAKE= yes
-USE_OPENSSL= yes
-USE_LDCONFIG= yes
-USE_PERL5= yes
-CONFIGURE_ARGS= --libexecdir=${PREFIX}/libexec/amanda \
- --without-amlibexecdir \
- --with-amandahosts --with-fqdn \
- --with-dump-honor-nodump \
- --prefix=${PREFIX} \
- --disable-glibtest \
- --with-user=${USERS} --with-group=${GROUPS} \
- --with-bsdtcp-security --with-bsdudp-security \
- --with-ssh-security
-CONFIGURE_ENV= PERL=${LOCALBASE}/bin/perl-amanda
-PKG_MESSAGE= ${WRKDIR}/pkg-message
-SUB_FILES= pkg-message
-SUB_LIST= PORTSDIR=${PORTSDIR}
-
-OPTIONS= GNUTAR "use GNU tar" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(AMANDA_USER)
-USERS= ${AMANDA_USER}
-.else
-USERS?= amanda
-.endif
-.if defined(AMANDA_GROUP)
-GROUPS= ${AMANDA_GROUP}
-.else
-GROUPS?= amanda
-.endif
-AMANDA_GNUTAR_LISTDIR?= ${PREFIX}/var/amanda/gnutar-lists
-AMANDA_DATES?= ${PREFIX}/var/amanda/amandates
-PLIST_SUB= SHLIBVER=${PORTVERSION} AMANDA_DATES=${AMANDA_DATES}
-
-# amanda-server/amanda-client common part
-.if defined (AMANDA_SERVER)
-CONFIGURE_ARGS+= --with-index-server=${AMANDA_SERVER}
-CONFIGURE_ARGS+= --with-tape-server=${AMANDA_SERVER}
-.endif
-
-.if !defined(WITHOUT_GNUTAR)
-CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
- --with-gnutar=${LOCALBASE}/bin/gtar
-BUILD_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar
-RUN_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar
-.endif
-
-# amanda-server part
-.if !defined(CLIENT_ONLY)
-
-SUB_FILES+= pkg-install pkg-deinstall
-SUB_LIST+= PERL=${PERL} SITE_PERL_REL=${SITE_PERL_REL}
-
-pre-everything::
-.if defined(AMANDA_TAPE)
- @${ECHO} "Use of \$AMANDA_TAPE is deprecated. Specify it in amanda.conf."
- exit 1
-.endif
-.if defined(AMANDA_CONFIG)
- @${ECHO} "Use of \$AMANDA_CONFIG is deprecated. Specify it in amanda.conf."
- exit 1
-.endif
-
-pre-fetch:
- @${ECHO} ""
- @${ECHO} "You may use the following build options:"
- @${ECHO} ""
- @${ECHO} " AMANDA_SERVER=server to specify a server name"
- @${ECHO} " The default is `uname -n`"
- @${ECHO} " AMANDA_USER=user to specify the default user"
- @${ECHO} " The default is amanda"
- @${ECHO} " AMANDA_GROUP=group to specify the default group"
- @${ECHO} " The default is amanda"
- @${ECHO} " AMANDA_DATES=path to client amandates file"
- @${ECHO} ""
-
-CONFLICTS= amanda-server-2.5.* amanda-server-2.6.*
-
-BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
-RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
-
-CONFIGURE_ARGS+=--without-client
-
-MAN5= disklist.5 \
- tapelist.5
-MAN7= amanda-changers.7 \
- amanda-compatibility.7 \
- amanda-devices.7 \
- amanda-taperscan.7
-MAN8= amaddclient.8 amadmin.8 amaespipe.8 amcheck.8 \
- amcheckdb.8 amcheckdump.8 amcleanup.8 \
- amcrypt.8 amcryptsimple.8 amcrypt-ossl-asym.8 amcrypt-ossl.8 \
- amdevcheck.8 \
- amdump.8 amfetchdump.8 amflush.8 amgetconf.8 amgpgcrypt.8 \
- amlabel.8 \
- amoverview.8 amreport.8 amrestore.8 amrmtape.8 \
- amserverconfig.8 amservice.8 amstatus.8 \
- amtape.8 amtoc.8 amtapetype.8 \
- amvault.8
-
-OPTIONS+= PLOT "enable ploting, requires X11 libraries" off\
- SAMBA "enable the use of smbclient" off \
- S3 "enable Amazon S3 device support" off
-
-.if defined (WITH_PLOT)
-BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
-RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
-MAN8+= amplot.8
-PLIST_SUB+= PLOT=''
-CONFIGURE_ARGS+= --with-gnuplot=${LOCALBASE}/bin/gnuplot
-.else
-PLIST_SUB+= PLOT='@comment '
-CONFIGURE_ARGS+= --without-gnuplot
-.endif
-
-.if defined (WITH_SAMBA)
-SAMBA_PORT?= samba34
-BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/${SAMBA_PORT}
-RUN_DEPENDS+= smbclient:${PORTSDIR}/net/${SAMBA_PORT}
-CONFIGURE_ARGS+= --with-smbclient=${PREFIX}/bin/smbclient
-.endif
-
-# If configure founds libcurl, automatically enabled it (with plist change).
-.if defined(WITH_S3)
-LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+= --enable-s3-device
-PLIST_SUB+= S3DEVICE=''
-.else
-CONFIGURE_ARGS+= --disable-s3-device
-PLIST_SUB+= S3DEVICE='@comment '
-.endif
-
-post-install:
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
- @${CAT} ${PKGMESSAGE}
-
-# amanda-client part
-.else
-
-pre-everything::
-.if defined(AMANDA_CONFIG)
- @${ECHO} "Use of \$AMANDA_CONFIG is deprecated. Specify it in amanda.conf."
- exit 1
-.endif
-
-pre-fetch:
- @${ECHO} ""
- @${ECHO} "You may use the following build options:"
- @${ECHO} ""
- @${ECHO} " AMANDA_SERVER=server to specify a server name"
- @${ECHO} " The default is `uname -n`"
- @${ECHO} " AMANDA_GNUTAR_LISTDIR=dir to specify the directory that"
- @${ECHO} " the gnutar index files should live in"
- @${ECHO} " The default is ${PREFIX}/var/amanda/gnutar-lists"
- @${ECHO} " AMANDA_USER=user to specify the default user"
- @${ECHO} " The default is amanda"
- @${ECHO} " AMANDA_GROUP=group to specify the default group"
- @${ECHO} " The default is amanda"
- @${ECHO} " AMANDA_DATES=path to client amandates file"
- @${ECHO} ""
-
-CONFLICTS= amanda-client-2.5.* amanda-client-2.6.*
-CONFIGURE_ARGS+=--without-server --with-amandates=${AMANDA_DATES}
-
-MAN5= amanda-archive-format.5 \
- amanda-client.conf.5 \
- amanda.conf.5
-MAN7= amanda-applications.7 \
- amanda-auth.7 \
- amanda-match.7 \
- amanda-scripts.7
-MAN8= amanda.8 \
- amarchiver.8 \
- amgtar.8 \
- ampgsql.8 \
- amraw.8 \
- amrecover.8 \
- amsamba.8 \
- amstar.8 \
- amsuntar.8 \
- amzfs-sendrecv.8 \
- amzfs-snapshot.8 \
- script-email.8
-
-post-install:
- ${MKDIR} ${AMANDA_GNUTAR_LISTDIR}
- ${CHOWN} ${USERS}:${GROUPS} ${AMANDA_GNUTAR_LISTDIR}
- ${TOUCH} ${AMANDA_DATES}
- ${CHOWN} ${USERS}:${GROUPS} ${AMANDA_DATES}
- ${CAT} ${PKGMESSAGE}
-
-.endif
-
-# MEMO:
-# Prefix @WANT_SERVER_TRUE@ for server only files.
-# Prefix @WANT_CLIENT_TRUE@ for client only files.
-# For debugging: dbprintf(_("getcmd: %s\n"), line);
-
-.include <bsd.port.post.mk>
diff --git a/misc/amanda32-server/distinfo b/misc/amanda32-server/distinfo
deleted file mode 100644
index 7776e7c4bf8d..000000000000
--- a/misc/amanda32-server/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (amanda-3.2.1.tar.gz) = 187b4ccc32af03b4ca6a9658f2d6a7884a934c7864730b0bb5bc5e82457b486f
-SIZE (amanda-3.2.1.tar.gz) = 4116514
diff --git a/misc/amanda32-server/files/extra-patch-application-src::amzfs-sendrecv.pl b/misc/amanda32-server/files/extra-patch-application-src::amzfs-sendrecv.pl
deleted file mode 100644
index 0a19153747d9..000000000000
--- a/misc/amanda32-server/files/extra-patch-application-src::amzfs-sendrecv.pl
+++ /dev/null
@@ -1,52 +0,0 @@
---- application-src/amzfs-sendrecv.pl.orig 2009-01-22 02:35:38.000000000 +0100
-+++ application-src/amzfs-sendrecv.pl 2009-01-31 10:37:59.495534563 +0100
-@@ -235,13 +235,48 @@
- } elsif (defined $errmsg) {
- $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);
- } else {
-- $self->print_to_server_and_die($action, "cannot estimate snapshot '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
-+ $self->print_to_server_and_die($action, "cannot estimate snapshot '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
- }
- }
-+ if ($level == 0) {
-+ my $compratio = $self->get_compratio();
-+ $msg *= int $compratio;
-+ }
-
- return $msg;
- }
-
-+sub get_compratio
-+{
-+ my $self = shift;
-+ my $action = shift;
-+
-+ my $cmd;
-+ $cmd = "$self->{pfexec_cmd} $self->{zfs_path} get -Hp -o value compressratio $self->{filesystem}\@$self->{snapshot}";
-+ debug "running (get-compression): $cmd";
-+ my($wtr, $rdr, $err, $pid);
-+ $err = Symbol::gensym;
-+ $pid = open3($wtr, $rdr, $err, $cmd);
-+ close $wtr;
-+ my ($msg) = <$rdr>;
-+ my ($errmsg) = <$err>;
-+ waitpid $pid, 0;
-+ close $rdr;
-+ close $err;
-+ if ($? != 0) {
-+ if (defined $msg && defined $errmsg) {
-+ $self->print_to_server_and_die($action, "$msg, $errmsg", $Amanda::Script_App::ERROR);
-+ } elsif (defined $msg) {
-+ $self->print_to_server_and_die($action, $msg, $Amanda::Script_App::ERROR);
-+ } elsif (defined $errmsg) {
-+ $self->print_to_server_and_die($action, $errmsg, $Amanda::Script_App::ERROR);
-+ } else {
-+ $self->print_to_server_and_die($action, "cannot read compression ratio '$self->{snapshot}\@$self->{snapshot}': unknown reason", $Amanda::Script_App::ERROR);
-+ }
-+ }
-+ return $msg
-+}
-+
- sub command_index_from_output {
- }
-
diff --git a/misc/amanda32-server/files/extra-patch-sendbackup-dump.c b/misc/amanda32-server/files/extra-patch-sendbackup-dump.c
deleted file mode 100644
index 3a232d1a8f25..000000000000
--- a/misc/amanda32-server/files/extra-patch-sendbackup-dump.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- client-src/sendbackup-dump.c.orig 2008-12-13 04:18:11.000000000 +0900
-+++ client-src/sendbackup-dump.c 2009-01-27 07:30:40.000000000 +0900
-@@ -35,6 +35,10 @@
- #include "clock.h"
- #include "version.h"
-
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#endif
-+
- #define LEAF_AND_DIRS "sed -e \'\ns/^leaf[ \t]*[0-9]*[ \t]*\\.//\nt\n/^dir[ \t]/ {\ns/^dir[ \t]*[0-9]*[ \t]*\\.//\ns%$%/%\nt\n}\nd\n\'"
-
- static amregex_t re_table[] = {
-@@ -310,6 +314,9 @@
- cmdX, config,
- "vxdump",
- dumpkeys,
-+#ifdef __FreeBSD__
-+ "64",
-+#endif
- "1048576",
- "-",
- device,
diff --git a/misc/amanda32-server/files/patch-ad b/misc/amanda32-server/files/patch-ad
deleted file mode 100644
index 3fff9c551c52..000000000000
--- a/misc/amanda32-server/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- client-src/calcsize.c.orig 2008-01-18 09:31:16.000000000 +0900
-+++ client-src/calcsize.c 2008-08-30 20:11:59.000000000 +0900
-@@ -160,7 +160,11 @@
- dump_total += (ST_BLOCKS(finfo) + (off_t)1) / (off_t)2 + (off_t)1;
- gtar_total += ROUND(4,(ST_BLOCKS(finfo) + (off_t)1));
- }
-+#ifdef GNUTAR
-+ g_printf(" GNUTAR dump\n");
-+#else
- g_printf(" gtar dump\n");
-+#endif
- g_printf("total %-9lu %-9lu\n",gtar_total,dump_total);
- return 0;
- #else
diff --git a/misc/amanda32-server/files/patch-amandad-src::Makefile.in b/misc/amanda32-server/files/patch-amandad-src::Makefile.in
deleted file mode 100644
index 0e3a9389165b..000000000000
--- a/misc/amanda32-server/files/patch-amandad-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- amandad-src/Makefile.in.orig 2010-10-16 18:41:37.735202558 +0900
-+++ amandad-src/Makefile.in 2010-10-16 18:42:00.351165593 +0900
-@@ -1171,7 +1171,7 @@
- AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
- LINT = $(AMLINT)
- LINTFLAGS = $(AMLINTFLAGS)
--amlib_LTLIBRARIES = libamandad.la
-+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamandad.la
- libamandad_la_SOURCES = amandad_util.c
- libamandad_la_LDFLAGS = -release $(VERSION)
- libamandad_la_LIBADD = ../common-src/libamanda.la
diff --git a/misc/amanda32-server/files/patch-amar-src::Makefile.in b/misc/amanda32-server/files/patch-amar-src::Makefile.in
deleted file mode 100644
index c7941f44904e..000000000000
--- a/misc/amanda32-server/files/patch-amar-src::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- amar-src/Makefile.in.orig 2009-01-27 14:01:04.000000000 +0900
-+++ amar-src/Makefile.in 2009-01-27 14:01:36.000000000 +0900
-@@ -856,7 +856,8 @@
- AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
- LINT = @AMLINT@
- LINTFLAGS = @AMLINTFLAGS@
--amlib_LTLIBRARIES = libamar.la
-+@WANT_SERVER_TRUE@amlib_LTLIBRARIES =
-+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamar.la
- libamar_la_SOURCES = amar.c
- libamar_la_LDFLAGS = -release $(VERSION)
- libamar_la_LIBADD = ../common-src/libamanda.la
diff --git a/misc/amanda32-server/files/patch-common-src::Makefile.in b/misc/amanda32-server/files/patch-common-src::Makefile.in
deleted file mode 100644
index 16be032af49a..000000000000
--- a/misc/amanda32-server/files/patch-common-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- common-src/Makefile.in.orig 2010-10-16 18:21:52.890010063 +0900
-+++ common-src/Makefile.in 2010-10-16 18:22:26.842453745 +0900
-@@ -1346,7 +1346,7 @@
- INCLUDES = -I$(top_srcdir)/gnulib
- AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
- AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
--amlib_LTLIBRARIES = libamanda.la
-+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamanda.la
- LINT = $(AMLINT)
- LINTFLAGS = $(AMLINTFLAGS)
- libamanda_la_SOURCES = alloc.c amfeatures.c amflock.c ipc-binary.c \
diff --git a/misc/amanda32-server/files/patch-man::Makefile.in b/misc/amanda32-server/files/patch-man::Makefile.in
deleted file mode 100644
index daeea0759ce8..000000000000
--- a/misc/amanda32-server/files/patch-man::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- man/Makefile.in.orig 2009-01-22 22:51:25.000000000 +0900
-+++ man/Makefile.in 2009-01-27 07:27:10.000000000 +0900
-@@ -640,6 +640,7 @@
- amanda-auth.7 \
- amarchiver.8 \
- script-email.8
-+@WANT_SERVER_TRUE@COMMON_MAN_PAGES =
-
- CLIENT_MAN_PAGES = \
- amanda-applications.7 \
diff --git a/misc/amanda32-server/files/patch-ndmp-src::Makefile.in b/misc/amanda32-server/files/patch-ndmp-src::Makefile.in
deleted file mode 100644
index 2dd3f4b9f32d..000000000000
--- a/misc/amanda32-server/files/patch-ndmp-src::Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- ndmp-src/Makefile.in.orig 2010-10-16 18:45:40.253086014 +0900
-+++ ndmp-src/Makefile.in 2010-10-16 18:46:36.949487552 +0900
-@@ -1289,9 +1289,9 @@
- # Divide the library up into the library side and down (libndmlib.la),
- # and the full set of rules, agents, and so on required to build ndmjob
- # (libndmjob.la).
--amlib_LTLIBRARIES = \
-- libndmlib.la \
-- libndmjob.la
-+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = \
-+@WANT_CLIENT_TRUE@ libndmlib.la \
-+@WANT_CLIENT_TRUE@ libndmjob.la
-
- libndmjla = \
- ndma_comm_job.c \
diff --git a/misc/amanda32-server/files/patch-perl::Amanda::Process.pm b/misc/amanda32-server/files/patch-perl::Amanda::Process.pm
deleted file mode 100644
index 806659b3f979..000000000000
--- a/misc/amanda32-server/files/patch-perl::Amanda::Process.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- perl/Amanda/Process.pm.orig 2009-01-28 13:57:55.000000000 +0900
-+++ perl/Amanda/Process.pm 2009-01-28 13:58:19.000000000 +0900
-@@ -155,7 +155,7 @@
- $self->{ppid} = ();
- my $ps_argument = $Amanda::Constants::PS_ARGUMENT;
- if ($ps_argument eq "CYGWIN") {
-- open(PSTABLE, "-|", "ps -ef") || die("ps -ef: $!");
-+ open(PSTABLE, "-|", "ps -f") || die("ps -f: $!");
- my $psline = <PSTABLE>; #header line
- while($psline = <PSTABLE>) {
- chomp $psline;
diff --git a/misc/amanda32-server/files/patch-perl::Makefile.in b/misc/amanda32-server/files/patch-perl::Makefile.in
deleted file mode 100644
index a2bed44a04be..000000000000
--- a/misc/amanda32-server/files/patch-perl::Makefile.in
+++ /dev/null
@@ -1,39 +0,0 @@
---- perl/Makefile.in.orig 2010-10-07 03:58:28.000000000 +0900
-+++ perl/Makefile.in 2010-10-16 21:16:31.327136585 +0900
-@@ -1541,13 +1541,15 @@
- # PACKAGE: Amanda::Script_App
-
- # PACKAGE: Amanda::Script
-+@WANT_CLIENT_TRUE@am__append_xfer = Amanda/Xfer.pm
-+@WANT_CLIENT_TRUE@am__append_const = Amanda/Constants.pm
- Amanda_DATA = Amanda/Archive.pm Amanda/Process.pm $(am__append_4) \
- Amanda/Feature.pm $(am__append_6) Amanda/ClientService.pm \
-- $(am__append_7) Amanda/Xfer.pm $(am__append_10) \
-+ $(am__append_7) $(am__append_xfer) $(am__append_10) \
- $(am__append_13) Amanda/BigIntCompat.pm Amanda/Debug.pm \
- Amanda/Config.pm Amanda/Util.pm Amanda/Header.pm \
- Amanda/Tests.pm Amanda/MainLoop.pm Amanda/Paths.pm \
-- Amanda/Constants.pm Amanda/Script_App.pm $(am__append_16) \
-+ $(am__append_const) Amanda/Script_App.pm $(am__append_16) \
- $(am__append_17) Amanda/Script.pm
-
- # PACKAGE: Amanda::Archive
-@@ -1670,12 +1672,12 @@
- @WANT_SERVER_TRUE@Amanda_DB_DATA = Amanda/DB/Catalog.pm
-
- # PACKAGE: Amanda::Xfer
--libXferdir = $(amperldir)/auto/Amanda/Xfer
--libXfer_LTLIBRARIES = libXfer.la
--libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
--libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
--libXfer_la_LIBADD = amglue/libamglue.la \
-- $(top_builddir)/xfer-src/libamxfer.la
-+@WANT_CLIENT_TRUE@libXferdir = $(amperldir)/auto/Amanda/Xfer
-+@WANT_CLIENT_TRUE@libXfer_LTLIBRARIES = libXfer.la
-+@WANT_CLIENT_TRUE@libXfer_la_SOURCES = Amanda/Xfer.c $(AMGLUE_SWG)
-+@WANT_CLIENT_TRUE@libXfer_la_LDFLAGS = $(PERL_EXT_LDFLAGS)
-+@WANT_CLIENT_TRUE@libXfer_la_LIBADD = amglue/libamglue.la \
-+@WANT_CLIENT_TRUE@ $(top_builddir)/xfer-src/libamxfer.la
-
-
- # PACKAGE: Amanda::NDMP
diff --git a/misc/amanda32-server/files/patch-perl::amglue::Makefile.in b/misc/amanda32-server/files/patch-perl::amglue::Makefile.in
deleted file mode 100644
index 96d2bc290602..000000000000
--- a/misc/amanda32-server/files/patch-perl::amglue::Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- perl/amglue/Makefile.in 2010-10-16 19:29:45.554806332 +0900
-+++ perl/amglue/Makefile.in.orig 2010-10-07 03:58:28.000000000 +0900
-@@ -1212,6 +1212,7 @@
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
-+@WANT_CLIENT_FALSE@ list2=; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(amlibdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(amlibdir)"; \
diff --git a/misc/amanda32-server/files/patch-xfer-src::Makefile.in b/misc/amanda32-server/files/patch-xfer-src::Makefile.in
deleted file mode 100644
index e9c3e7838a30..000000000000
--- a/misc/amanda32-server/files/patch-xfer-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- xfer-src/Makefile.in.orig 2010-10-16 14:38:56.304820189 +0900
-+++ xfer-src/Makefile.in 2010-10-16 14:40:42.063983713 +0900
-@@ -1176,7 +1176,7 @@
-
- AM_CFLAGS = $(AMANDA_WARNING_CFLAGS)
- AM_LDFLAGS = $(AMANDA_STATIC_LDFLAGS)
--amlib_LTLIBRARIES = libamxfer.la
-+@WANT_CLIENT_TRUE@amlib_LTLIBRARIES = libamxfer.la
- LINT = $(AMLINT)
- LINTFLAGS = $(AMLINTFLAGS)
- libamxfer_la_SOURCES = \
diff --git a/misc/amanda32-server/files/pkg-deinstall.in b/misc/amanda32-server/files/pkg-deinstall.in
deleted file mode 100644
index dc962ad302fc..000000000000
--- a/misc/amanda32-server/files/pkg-deinstall.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-if [ "$2" != "DEINSTALL" ]; then
- exit 0
-fi
-
-%%PERL%% -i -pe "s|\" server restore client amrecover ndmp\"|\" client amrecover ndmp\"|" ${PKG_PREFIX}/%%SITE_PERL_REL%%/Amanda/Constants.pm
diff --git a/misc/amanda32-server/files/pkg-install.in b/misc/amanda32-server/files/pkg-install.in
deleted file mode 100644
index 6405b2dce989..000000000000
--- a/misc/amanda32-server/files/pkg-install.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-
-if [ "$2" != "POST-INSTALL" ]; then
- exit 0
-fi
-
-%%PERL%% -i -pe "s|\" client amrecover ndmp\"|\" server restore client amrecover ndmp\"|" ${PKG_PREFIX}/%%SITE_PERL_REL%%/Amanda/Constants.pm
diff --git a/misc/amanda32-server/files/pkg-message.in b/misc/amanda32-server/files/pkg-message.in
deleted file mode 100644
index 95ecbc36ae0f..000000000000
--- a/misc/amanda32-server/files/pkg-message.in
+++ /dev/null
@@ -1,3 +0,0 @@
-Please install these ports (they are only on-demand runtime dependencies):
- - %%PORTSDIR%%/misc/mtx if you want chg-robot changer.
- - %%PORTSDIR%%/security/aespipe if you want amcrypt(8).
diff --git a/misc/amanda32-server/pkg-descr b/misc/amanda32-server/pkg-descr
deleted file mode 100644
index 054161f6aeb2..000000000000
--- a/misc/amanda32-server/pkg-descr
+++ /dev/null
@@ -1,22 +0,0 @@
-WHAT IS AMANDA?
----------------
-
-This is a release of Amanda, the Advanced Maryland Automatic
-Network Disk Archiver. Amanda is a backup system designed to archive many
-computers on a network to a single large-capacity tape drive.
-
-Here are some features of Amanda:
-
- * written in C, freely distributable.
- * built on top of standard backup software: Unix dump/restore, and
- later GNU Tar and others.
- * will back up multiple machines in parallel to a holding disk, blasting
- finished dumps one by one to tape as fast as we can write files to
- tape. For example, a ~2 Gb 8mm tape on a ~240K/s interface to a host
- with a large holding disk can be filled by Amanda in under 4 hours.
- * does simple tape management: will not overwrite the wrong tape.
-
-WWW: http://sourceforge.net/projects/amanda/
-
-- Jim
-jeh@FreeBSD.org
diff --git a/misc/amanda32-server/pkg-plist b/misc/amanda32-server/pkg-plist
deleted file mode 100644
index 447d05ac893a..000000000000
--- a/misc/amanda32-server/pkg-plist
+++ /dev/null
@@ -1,114 +0,0 @@
-lib/amanda/libamdevice-%%SHLIBVER%%.so
-lib/amanda/libamdevice.a
-lib/amanda/libamdevice.la
-lib/amanda/libamdevice.so
-lib/amanda/libamserver-%%SHLIBVER%%.so
-lib/amanda/libamserver.a
-lib/amanda/libamserver.la
-lib/amanda/libamserver.so
-%%SITE_PERL%%/Amanda/Changer.pm
-%%SITE_PERL%%/Amanda/Changer/compat.pm
-%%SITE_PERL%%/Amanda/Changer/disk.pm
-%%SITE_PERL%%/Amanda/Changer/multi.pm
-%%SITE_PERL%%/Amanda/Changer/ndmp.pm
-%%SITE_PERL%%/Amanda/Changer/null.pm
-%%SITE_PERL%%/Amanda/Changer/rait.pm
-%%SITE_PERL%%/Amanda/Changer/robot.pm
-%%SITE_PERL%%/Amanda/Changer/single.pm
-%%SITE_PERL%%/Amanda/Cmdline.pm
-%%SITE_PERL%%/Amanda/Curinfo.pm
-%%SITE_PERL%%/Amanda/Curinfo/Info.pm
-%%SITE_PERL%%/Amanda/DB/Catalog.pm
-%%SITE_PERL%%/Amanda/Device.pm
-%%SITE_PERL%%/Amanda/Disklist.pm
-%%SITE_PERL%%/Amanda/Holding.pm
-%%SITE_PERL%%/Amanda/Interactive.pm
-%%SITE_PERL%%/Amanda/Interactive/stdin.pm
-%%SITE_PERL%%/Amanda/Logfile.pm
-%%SITE_PERL%%/Amanda/Recovery/Clerk.pm
-%%SITE_PERL%%/Amanda/Recovery/Planner.pm
-%%SITE_PERL%%/Amanda/Recovery/Scan.pm
-%%SITE_PERL%%/Amanda/Report.pm
-%%SITE_PERL%%/Amanda/Report/human.pm
-%%SITE_PERL%%/Amanda/Report/postscript.pm
-%%SITE_PERL%%/Amanda/Report/xml.pm
-%%SITE_PERL%%/Amanda/Tapelist.pm
-%%SITE_PERL%%/Amanda/Taper/Controller.pm
-%%SITE_PERL%%/Amanda/Taper/Protocol.pm
-%%SITE_PERL%%/Amanda/Taper/Scan.pm
-%%SITE_PERL%%/Amanda/Taper/Scan/traditional.pm
-%%SITE_PERL%%/Amanda/Taper/Scribe.pm
-%%SITE_PERL%%/Amanda/Taper/Worker.pm
-%%SITE_PERL%%/Amanda/XferServer.pm
-%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.la
-%%SITE_PERL%%/auto/Amanda/Cmdline/libCmdline.so
-%%SITE_PERL%%/auto/Amanda/Device/libDevice.la
-%%SITE_PERL%%/auto/Amanda/Device/libDevice.so
-%%SITE_PERL%%/auto/Amanda/Disklist/libDisklist.la
-%%SITE_PERL%%/auto/Amanda/Disklist/libDisklist.so
-%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.la
-%%SITE_PERL%%/auto/Amanda/Logfile/libLogfile.so
-%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.la
-%%SITE_PERL%%/auto/Amanda/Tapelist/libTapelist.so
-%%SITE_PERL%%/auto/Amanda/XferServer/libXferServer.la
-%%SITE_PERL%%/auto/Amanda/XferServer/libXferServer.so
-%%PLOT%%libexec/amanda/amcat.awk
-libexec/amanda/amcheck-device
-libexec/amanda/amcleanupdisk
-libexec/amanda/amindexd
-libexec/amanda/amlogroll
-%%PLOT%%libexec/amanda/amplot.awk
-%%PLOT%%libexec/amanda/amplot.g
-%%PLOT%%libexec/amanda/amplot.gp
-libexec/amanda/amtrmidx
-libexec/amanda/amtrmlog
-libexec/amanda/chg-disk
-libexec/amanda/chg-lib.sh
-libexec/amanda/chg-manual
-libexec/amanda/chg-multi
-libexec/amanda/chg-zd-mtx
-libexec/amanda/chunker
-libexec/amanda/amidxtaped
-libexec/amanda/driver
-libexec/amanda/dumper
-libexec/amanda/planner
-libexec/amanda/taper
-%%S3DEVICE%%sbin/activate-devpay
-sbin/amaddclient
-sbin/amadmin
-sbin/amcheck
-sbin/amcheckdb
-sbin/amcheckdump
-sbin/amcleanup
-sbin/amdevcheck
-sbin/amdump
-sbin/amfetchdump
-sbin/amflush
-sbin/amlabel
-sbin/amoverview
-%%PLOT%%sbin/amplot
-sbin/amreport
-sbin/amrestore
-sbin/amrmtape
-sbin/amserverconfig
-sbin/amservice
-sbin/amstatus
-sbin/amtape
-sbin/amtapetype
-sbin/amtoc
-sbin/amvault
-@dirrm %%SITE_PERL%%/auto/Amanda/XferServer
-@dirrm %%SITE_PERL%%/auto/Amanda/Tapelist
-@dirrm %%SITE_PERL%%/auto/Amanda/Logfile
-@dirrm %%SITE_PERL%%/auto/Amanda/Disklist
-@dirrm %%SITE_PERL%%/auto/Amanda/Device
-@dirrm %%SITE_PERL%%/auto/Amanda/Cmdline
-@dirrm %%SITE_PERL%%/Amanda/Taper/Scan
-@dirrm %%SITE_PERL%%/Amanda/Taper
-@dirrm %%SITE_PERL%%/Amanda/Report
-@dirrm %%SITE_PERL%%/Amanda/Recovery
-@dirrm %%SITE_PERL%%/Amanda/Interactive
-@dirrm %%SITE_PERL%%/Amanda/DB
-@dirrm %%SITE_PERL%%/Amanda/Curinfo
-@dirrm %%SITE_PERL%%/Amanda/Changer
-@dirrm include/amanda
diff --git a/misc/amanda32-server/pkg-plist.client b/misc/amanda32-server/pkg-plist.client
deleted file mode 100644
index 4eb7901b5d01..000000000000
--- a/misc/amanda32-server/pkg-plist.client
+++ /dev/null
@@ -1,167 +0,0 @@
-lib/amanda/libamanda-%%SHLIBVER%%.so
-lib/amanda/libamanda.a
-lib/amanda/libamanda.la
-lib/amanda/libamanda.so
-lib/amanda/libamandad-%%SHLIBVER%%.so
-lib/amanda/libamandad.a
-lib/amanda/libamandad.la
-lib/amanda/libamandad.so
-lib/amanda/libamar-%%SHLIBVER%%.so
-lib/amanda/libamar.a
-lib/amanda/libamar.la
-lib/amanda/libamar.so
-lib/amanda/libamclient-%%SHLIBVER%%.so
-lib/amanda/libamclient.a
-lib/amanda/libamclient.la
-lib/amanda/libamclient.so
-lib/amanda/libamglue-%%SHLIBVER%%.so
-lib/amanda/libamglue.a
-lib/amanda/libamglue.la
-lib/amanda/libamglue.so
-lib/amanda/libamxfer-%%SHLIBVER%%.so
-lib/amanda/libamxfer.a
-lib/amanda/libamxfer.la
-lib/amanda/libamxfer.so
-lib/amanda/libndmjob-%%SHLIBVER%%.so
-lib/amanda/libndmjob.a
-lib/amanda/libndmjob.la
-lib/amanda/libndmjob.so
-lib/amanda/libndmlib-%%SHLIBVER%%.so
-lib/amanda/libndmlib.a
-lib/amanda/libndmlib.la
-lib/amanda/libndmlib.so
-libexec/amanda/amanda-sh-lib.sh
-libexec/amanda/amandad
-libexec/amanda/amndmjob
-libexec/amanda/application/amgtar
-libexec/amanda/application/amlog-script
-libexec/amanda/application/ampgsql
-libexec/amanda/application/amraw
-libexec/amanda/application/amsamba
-libexec/amanda/application/amstar
-libexec/amanda/application/amsuntar
-libexec/amanda/application/amzfs-sendrecv
-libexec/amanda/application/amzfs-snapshot
-libexec/amanda/application/script-email
-libexec/amanda/calcsize
-libexec/amanda/killpgrp
-libexec/amanda/ndmjob
-libexec/amanda/noop
-libexec/amanda/patch-system
-libexec/amanda/rundump
-libexec/amanda/runtar
-libexec/amanda/selfcheck
-libexec/amanda/sendbackup
-libexec/amanda/sendsize
-libexec/amanda/teecount
-%%SITE_PERL%%/Amanda/Application.pm
-%%SITE_PERL%%/Amanda/Application/Zfs.pm
-%%SITE_PERL%%/Amanda/Archive.pm
-%%SITE_PERL%%/Amanda/BigIntCompat.pm
-%%SITE_PERL%%/Amanda/ClientService.pm
-%%SITE_PERL%%/Amanda/Config.pm
-%%SITE_PERL%%/Amanda/Config/FoldingHash.pm
-%%SITE_PERL%%/Amanda/Constants.pm
-%%SITE_PERL%%/Amanda/Debug.pm
-%%SITE_PERL%%/Amanda/Feature.pm
-%%SITE_PERL%%/Amanda/Header.pm
-%%SITE_PERL%%/Amanda/IPC/Binary.pm
-%%SITE_PERL%%/Amanda/IPC/LineProtocol.pm
-%%SITE_PERL%%/Amanda/MainLoop.pm
-%%SITE_PERL%%/Amanda/NDMP.pm
-%%SITE_PERL%%/Amanda/Paths.pm
-%%SITE_PERL%%/Amanda/Process.pm
-%%SITE_PERL%%/Amanda/Script.pm
-%%SITE_PERL%%/Amanda/Script_App.pm
-%%SITE_PERL%%/Amanda/Tests.pm
-%%SITE_PERL%%/Amanda/Util.pm
-%%SITE_PERL%%/Amanda/Xfer.pm
-%%SITE_PERL%%/auto/Amanda/Application/libApplication.la
-%%SITE_PERL%%/auto/Amanda/Application/libApplication.so
-%%SITE_PERL%%/auto/Amanda/Archive/libArchive.la
-%%SITE_PERL%%/auto/Amanda/Archive/libArchive.so
-%%SITE_PERL%%/auto/Amanda/Config/libConfig.la
-%%SITE_PERL%%/auto/Amanda/Config/libConfig.so
-%%SITE_PERL%%/auto/Amanda/Debug/libDebug.la
-%%SITE_PERL%%/auto/Amanda/Debug/libDebug.so
-%%SITE_PERL%%/auto/Amanda/Feature/libFeature.la
-%%SITE_PERL%%/auto/Amanda/Feature/libFeature.so
-%%SITE_PERL%%/auto/Amanda/Header/libHeader.la
-%%SITE_PERL%%/auto/Amanda/Header/libHeader.so
-%%SITE_PERL%%/auto/Amanda/IPC/Binary/libBinary.la
-%%SITE_PERL%%/auto/Amanda/IPC/Binary/libBinary.so
-%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.la
-%%SITE_PERL%%/auto/Amanda/MainLoop/libMainLoop.so
-%%SITE_PERL%%/auto/Amanda/NDMP/libNDMP.la
-%%SITE_PERL%%/auto/Amanda/NDMP/libNDMP.so
-%%SITE_PERL%%/auto/Amanda/Tests/libTests.la
-%%SITE_PERL%%/auto/Amanda/Tests/libTests.so
-%%SITE_PERL%%/auto/Amanda/Util/libUtil.la
-%%SITE_PERL%%/auto/Amanda/Util/libUtil.so
-%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.la
-%%SITE_PERL%%/auto/Amanda/Xfer/libXfer.so
-sbin/amaespipe
-sbin/amarchiver
-sbin/amcrypt
-sbin/amcrypt-ossl
-sbin/amcrypt-ossl-asym
-sbin/amcryptsimple
-sbin/amgetconf
-sbin/amgpgcrypt
-sbin/amoldrecover
-sbin/amrecover
-%%DATADIR%%/COPYRIGHT
-%%DATADIR%%/ChangeLog
-%%DATADIR%%/NEWS
-%%DATADIR%%/ReleaseNotes
-%%DATADIR%%/example/amanda-client-postgresql.conf
-%%DATADIR%%/example/amanda-client.conf
-%%DATADIR%%/example/amanda.conf
-%%DATADIR%%/example/chg-multi.conf
-%%DATADIR%%/example/chg-scsi.conf
-%%DATADIR%%/example/disklist
-%%DATADIR%%/example/inetd.conf.amandaclient
-%%DATADIR%%/example/inetd.conf.amandaserver
-%%DATADIR%%/example/label-templates/3hole.ps
-%%DATADIR%%/example/label-templates/8.5x11.ps
-%%DATADIR%%/example/label-templates/DIN-A4.ps
-%%DATADIR%%/example/label-templates/DLT-A4.ps
-%%DATADIR%%/example/label-templates/DLT.ps
-%%DATADIR%%/example/label-templates/EXB-8500.ps
-%%DATADIR%%/example/label-templates/HP-DAT.ps
-%%DATADIR%%/example/xinetd.amandaclient
-%%DATADIR%%/example/xinetd.amandaserver
-%%DATADIR%%/template.d/advanced.conf
-%%DATADIR%%/template.d/amanda-harddisk.conf
-%%DATADIR%%/template.d/amanda-single-tape.conf
-%%DATADIR%%/template.d/amanda-tape-changer.conf
-%%DATADIR%%/template.d/amanda-S3.conf
-%%DATADIR%%/template.d/dumptypes
-%%DATADIR%%/template.d/tapetypes
-%%DATADIR%%/template.d/README
-%%DATADIR%%/template.d/chg-manual.conf
-@dirrm %%SITE_PERL%%/auto/Amanda/Xfer
-@dirrm %%SITE_PERL%%/auto/Amanda/Util
-@dirrm %%SITE_PERL%%/auto/Amanda/Tests
-@dirrm %%SITE_PERL%%/auto/Amanda/NDMP
-@dirrm %%SITE_PERL%%/auto/Amanda/MainLoop
-@dirrm %%SITE_PERL%%/auto/Amanda/IPC/Binary
-@dirrm %%SITE_PERL%%/auto/Amanda/IPC
-@dirrm %%SITE_PERL%%/auto/Amanda/Header
-@dirrm %%SITE_PERL%%/auto/Amanda/Feature
-@dirrm %%SITE_PERL%%/auto/Amanda/Debug
-@dirrm %%SITE_PERL%%/auto/Amanda/Config
-@dirrm %%SITE_PERL%%/auto/Amanda/Archive
-@dirrm %%SITE_PERL%%/auto/Amanda/Application
-@dirrm %%SITE_PERL%%/auto/Amanda
-@dirrm %%SITE_PERL%%/Amanda/IPC
-@dirrm %%SITE_PERL%%/Amanda/Config
-@dirrm %%SITE_PERL%%/Amanda/Application
-@dirrm %%SITE_PERL%%/Amanda
-@dirrm %%DATADIR%%/template.d
-@dirrm %%DATADIR%%/example/label-templates
-@dirrm %%DATADIR%%/example
-@dirrm %%DATADIR%%
-@dirrm libexec/amanda/application
-@dirrm libexec/amanda
-@dirrm lib/amanda
diff --git a/misc/compat8x/Makefile b/misc/compat8x/Makefile
deleted file mode 100644
index 4349314f7c98..000000000000
--- a/misc/compat8x/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# New ports collection makefile for: compat7x
-# Date created: 18 Aug 2009
-# Whom: garga
-#
-# $FreeBSD$
-#
-
-PORTNAME= compat7x
-PORTVERSION= 7.3.703000.201008
-PORTREVISION= 1
-CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= garga/compat
-PKGNAMESUFFIX= -${ARCH}
-DISTNAME= ${PORTNAME}-${ARCH}-${PORTVERSION}
-
-MAINTAINER= garga@FreeBSD.org
-COMMENT= A convenience package to install the compat7x libraries
-
-USE_BZIP2= yes
-NO_BUILD= yes
-ONLY_FOR_ARCHS= i386 amd64 sparc64
-PLIST= ${PKGDIR}/pkg-plist.${ARCH}
-TARGET_DIR= ${PREFIX}/lib/compat
-TARGET32_DIR= ${PREFIX}/lib32/compat
-USE_LDCONFIG= ${TARGET_DIR}
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800105
-IGNORE= is for FreeBSD 8.x and newer
-.endif
-
-.if ${ARCH} == amd64
-PLIST_SUB+= LDCONFIG_LIB32="${LDCONFIG} -32"
-USE_LDCONFIG32= ${TARGET32_DIR}
-.endif
-
-do-install:
- @${MKDIR} -m 0755 ${TARGET_DIR}
- (cd ${WRKSRC}/lib && ${INSTALL_DATA} *.so.* ${TARGET_DIR})
- (cd ${TARGET_DIR} && ${LN} -sf /lib/libthr.so.3 libkse.so.3)
-.if ${ARCH} == amd64
- @${MKDIR} ${TARGET32_DIR}
- (cd ${TARGET32_DIR} && ${LN} -sf /usr/lib32/libthr.so.3 libkse.so.3)
- (cd ${WRKSRC}/lib32 && ${INSTALL_DATA} *.so.* ${TARGET32_DIR})
-.endif
-
-post-install:
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/misc/compat8x/distinfo b/misc/compat8x/distinfo
deleted file mode 100644
index 22bc770e3068..000000000000
--- a/misc/compat8x/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 (compat7x-amd64-7.3.703000.201008.tar.bz2) = a90a861ca2a0049c1791c4fa933a72f7
-SHA256 (compat7x-amd64-7.3.703000.201008.tar.bz2) = 31f43a6d82e352bb64cc0c15a03c9439d1e4bca249962e1293b2fc635f524f76
-SIZE (compat7x-amd64-7.3.703000.201008.tar.bz2) = 6564918
-MD5 (compat7x-i386-7.3.703000.201008.tar.bz2) = 96a3f518dcf96af508198c6174227a40
-SHA256 (compat7x-i386-7.3.703000.201008.tar.bz2) = cc3084e9efcde7e5b04df065a371e9b846f46e2ffc8f12ac5401d820090f7b66
-SIZE (compat7x-i386-7.3.703000.201008.tar.bz2) = 3303520
-MD5 (compat7x-sparc64-7.3.703000.201008.tar.bz2) = 2664b2bcdb85a0a5437638df77c49348
-SHA256 (compat7x-sparc64-7.3.703000.201008.tar.bz2) = 5b5a753cf5a93a7a69b6a1a28dde26df056d3b40b6e07331e470bab17d33c4f8
-SIZE (compat7x-sparc64-7.3.703000.201008.tar.bz2) = 3225728
diff --git a/misc/compat8x/pkg-descr b/misc/compat8x/pkg-descr
deleted file mode 100644
index c618eca5c087..000000000000
--- a/misc/compat8x/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This package allows you to install the compat7x libraries on your
-system, so you can use legacy binaries that depend on them.
-
-Ports usage example:
-
---
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800105
-LIB_DEPENDS+= alias.6:${PORTSDIR}/misc/compat7x
-.endif
---
diff --git a/misc/compat8x/pkg-message b/misc/compat8x/pkg-message
deleted file mode 100644
index 36093bb801ea..000000000000
--- a/misc/compat8x/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-*******************************************************************************
-* *
-* Do not forget to add COMPAT_FREEBSD7 into *
-* your kernel configuration (enabled by default). *
-* *
-* To configure and recompile your kernel see: *
-* http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig.html *
-* *
-*******************************************************************************
diff --git a/misc/compat8x/pkg-plist.amd64 b/misc/compat8x/pkg-plist.amd64
deleted file mode 100644
index db45390a7bf3..000000000000
--- a/misc/compat8x/pkg-plist.amd64
+++ /dev/null
@@ -1,228 +0,0 @@
-lib/compat/libalias.so.6
-lib/compat/libarchive.so.4
-lib/compat/libasn1.so.9
-lib/compat/libavl.so.1
-lib/compat/libbegemot.so.3
-lib/compat/libbluetooth.so.3
-lib/compat/libbsdxml.so.3
-lib/compat/libbsm.so.2
-lib/compat/libbsnmp.so.4
-lib/compat/libbz2.so.3
-lib/compat/libcalendar.so.4
-lib/compat/libcam.so.4
-lib/compat/libcom_err.so.4
-lib/compat/libcrypt.so.4
-lib/compat/libcrypto.so.5
-lib/compat/libctf.so.1
-lib/compat/libdevinfo.so.4
-lib/compat/libdevstat.so.6
-lib/compat/libdialog.so.6
-lib/compat/libdtrace.so.1
-lib/compat/libdwarf.so.1
-lib/compat/libedit.so.6
-lib/compat/libfetch.so.5
-lib/compat/libform.so.4
-lib/compat/libformw.so.4
-lib/compat/libftpio.so.7
-lib/compat/libgeom.so.4
-lib/compat/libgnuregex.so.4
-lib/compat/libgpib.so.2
-lib/compat/libgssapi.so.9
-lib/compat/libgssapi_krb5.so.9
-lib/compat/libhdb.so.9
-lib/compat/libhistory.so.7
-lib/compat/libipsec.so.3
-lib/compat/libipx.so.4
-lib/compat/libkadm5clnt.so.9
-lib/compat/libkadm5srv.so.9
-lib/compat/libkafs5.so.9
-lib/compat/libkiconv.so.3
-lib/compat/libkrb5.so.9
-lib/compat/libkse.so.3
-lib/compat/libkvm.so.4
-lib/compat/liblwres.so.30
-lib/compat/libmagic.so.3
-lib/compat/libmd.so.4
-lib/compat/libmemstat.so.2
-lib/compat/libmenu.so.4
-lib/compat/libmenuw.so.4
-lib/compat/libmilter.so.4
-lib/compat/libmp.so.6
-lib/compat/libncp.so.3
-lib/compat/libncurses.so.7
-lib/compat/libncursesw.so.7
-lib/compat/libnetgraph.so.3
-lib/compat/libngatm.so.3
-lib/compat/libnvpair.so.1
-lib/compat/libobjc.so.3
-lib/compat/libopie.so.5
-lib/compat/libpam.so.4
-lib/compat/libpanel.so.4
-lib/compat/libpanelw.so.4
-lib/compat/libpcap.so.5
-lib/compat/libpmc.so.4
-lib/compat/libproc.so.1
-lib/compat/libradius.so.3
-lib/compat/libreadline.so.7
-lib/compat/libroken.so.9
-lib/compat/librpcsvc.so.4
-lib/compat/libsbuf.so.4
-lib/compat/libsdp.so.3
-lib/compat/libsmb.so.3
-lib/compat/libssh.so.4
-lib/compat/libssl.so.5
-lib/compat/libtacplus.so.3
-lib/compat/libufs.so.4
-lib/compat/libugidfw.so.3
-lib/compat/libumem.so.1
-lib/compat/libusbhid.so.3
-lib/compat/libutil.so.7
-lib/compat/libuutil.so.1
-lib/compat/libwrap.so.5
-lib/compat/libypclnt.so.3
-lib/compat/libz.so.4
-lib/compat/libzfs.so.1
-lib/compat/libzpool.so.1
-lib/compat/pam_chroot.so.4
-lib/compat/pam_deny.so.4
-lib/compat/pam_echo.so.4
-lib/compat/pam_exec.so.4
-lib/compat/pam_ftpusers.so.4
-lib/compat/pam_group.so.4
-lib/compat/pam_guest.so.4
-lib/compat/pam_krb5.so.4
-lib/compat/pam_ksu.so.4
-lib/compat/pam_lastlog.so.4
-lib/compat/pam_login_access.so.4
-lib/compat/pam_nologin.so.4
-lib/compat/pam_opie.so.4
-lib/compat/pam_opieaccess.so.4
-lib/compat/pam_passwdqc.so.4
-lib/compat/pam_permit.so.4
-lib/compat/pam_radius.so.4
-lib/compat/pam_rhosts.so.4
-lib/compat/pam_rootok.so.4
-lib/compat/pam_securetty.so.4
-lib/compat/pam_self.so.4
-lib/compat/pam_ssh.so.4
-lib/compat/pam_tacplus.so.4
-lib/compat/pam_unix.so.4
-lib/compat/snmp_atm.so.5
-lib/compat/snmp_bridge.so.5
-lib/compat/snmp_hostres.so.5
-lib/compat/snmp_mibII.so.5
-lib/compat/snmp_netgraph.so.5
-lib/compat/snmp_pf.so.5
-lib32/compat/libalias.so.6
-lib32/compat/libarchive.so.4
-lib32/compat/libasn1.so.9
-lib32/compat/libavl.so.1
-lib32/compat/libbegemot.so.3
-lib32/compat/libbluetooth.so.3
-lib32/compat/libbsdxml.so.3
-lib32/compat/libbsm.so.2
-lib32/compat/libbsnmp.so.4
-lib32/compat/libbz2.so.3
-lib32/compat/libcalendar.so.4
-lib32/compat/libcam.so.4
-lib32/compat/libcom_err.so.4
-lib32/compat/libcrypt.so.4
-lib32/compat/libcrypto.so.5
-lib32/compat/libctf.so.1
-lib32/compat/libdevinfo.so.4
-lib32/compat/libdevstat.so.6
-lib32/compat/libdialog.so.6
-lib32/compat/libdtrace.so.1
-lib32/compat/libdwarf.so.1
-lib32/compat/libedit.so.6
-lib32/compat/libfetch.so.5
-lib32/compat/libform.so.4
-lib32/compat/libformw.so.4
-lib32/compat/libftpio.so.7
-lib32/compat/libgeom.so.4
-lib32/compat/libgnuregex.so.4
-lib32/compat/libgpib.so.2
-lib32/compat/libgssapi.so.9
-lib32/compat/libgssapi_krb5.so.9
-lib32/compat/libhdb.so.9
-lib32/compat/libhistory.so.7
-lib32/compat/libipsec.so.3
-lib32/compat/libipx.so.4
-lib32/compat/libkadm5clnt.so.9
-lib32/compat/libkadm5srv.so.9
-lib32/compat/libkafs5.so.9
-lib32/compat/libkiconv.so.3
-lib32/compat/libkrb5.so.9
-lib32/compat/libkse.so.3
-lib32/compat/libkvm.so.4
-lib32/compat/libmagic.so.3
-lib32/compat/libmd.so.4
-lib32/compat/libmemstat.so.2
-lib32/compat/libmenu.so.4
-lib32/compat/libmenuw.so.4
-lib32/compat/libmilter.so.4
-lib32/compat/libmp.so.6
-lib32/compat/libncp.so.3
-lib32/compat/libncurses.so.7
-lib32/compat/libncursesw.so.7
-lib32/compat/libnetgraph.so.3
-lib32/compat/libngatm.so.3
-lib32/compat/libnvpair.so.1
-lib32/compat/libobjc.so.3
-lib32/compat/libopie.so.5
-lib32/compat/libpam.so.4
-lib32/compat/libpanel.so.4
-lib32/compat/libpanelw.so.4
-lib32/compat/libpcap.so.5
-lib32/compat/libpmc.so.4
-lib32/compat/libproc.so.1
-lib32/compat/libradius.so.3
-lib32/compat/libreadline.so.7
-lib32/compat/libroken.so.9
-lib32/compat/librpcsvc.so.4
-lib32/compat/libsbuf.so.4
-lib32/compat/libsdp.so.3
-lib32/compat/libsmb.so.3
-lib32/compat/libssh.so.4
-lib32/compat/libssl.so.5
-lib32/compat/libtacplus.so.3
-lib32/compat/libufs.so.4
-lib32/compat/libugidfw.so.3
-lib32/compat/libumem.so.1
-lib32/compat/libusbhid.so.3
-lib32/compat/libutil.so.7
-lib32/compat/libuutil.so.1
-lib32/compat/libvgl.so.5
-lib32/compat/libwrap.so.5
-lib32/compat/libypclnt.so.3
-lib32/compat/libz.so.4
-lib32/compat/libzfs.so.1
-lib32/compat/libzpool.so.1
-lib32/compat/pam_chroot.so.4
-lib32/compat/pam_deny.so.4
-lib32/compat/pam_echo.so.4
-lib32/compat/pam_exec.so.4
-lib32/compat/pam_ftpusers.so.4
-lib32/compat/pam_group.so.4
-lib32/compat/pam_guest.so.4
-lib32/compat/pam_krb5.so.4
-lib32/compat/pam_ksu.so.4
-lib32/compat/pam_lastlog.so.4
-lib32/compat/pam_login_access.so.4
-lib32/compat/pam_nologin.so.4
-lib32/compat/pam_opie.so.4
-lib32/compat/pam_opieaccess.so.4
-lib32/compat/pam_passwdqc.so.4
-lib32/compat/pam_permit.so.4
-lib32/compat/pam_radius.so.4
-lib32/compat/pam_rhosts.so.4
-lib32/compat/pam_rootok.so.4
-lib32/compat/pam_securetty.so.4
-lib32/compat/pam_self.so.4
-lib32/compat/pam_ssh.so.4
-lib32/compat/pam_tacplus.so.4
-lib32/compat/pam_unix.so.4
-@dirrmtry lib/compat
-@dirrmtry lib32/compat
-@dirrmtry lib32
-@exec %%LDCONFIG_LIB32%% -m %D/lib32/compat
diff --git a/misc/compat8x/pkg-plist.i386 b/misc/compat8x/pkg-plist.i386
deleted file mode 100644
index eef0f57526d6..000000000000
--- a/misc/compat8x/pkg-plist.i386
+++ /dev/null
@@ -1,117 +0,0 @@
-lib/compat/libalias.so.6
-lib/compat/libarchive.so.4
-lib/compat/libasn1.so.9
-lib/compat/libavl.so.1
-lib/compat/libbegemot.so.3
-lib/compat/libbluetooth.so.3
-lib/compat/libbsdxml.so.3
-lib/compat/libbsm.so.2
-lib/compat/libbsnmp.so.4
-lib/compat/libbz2.so.3
-lib/compat/libcalendar.so.4
-lib/compat/libcam.so.4
-lib/compat/libcom_err.so.4
-lib/compat/libcrypt.so.4
-lib/compat/libcrypto.so.5
-lib/compat/libctf.so.1
-lib/compat/libdevinfo.so.4
-lib/compat/libdevstat.so.6
-lib/compat/libdialog.so.6
-lib/compat/libdtrace.so.1
-lib/compat/libdwarf.so.1
-lib/compat/libedit.so.6
-lib/compat/libfetch.so.5
-lib/compat/libform.so.4
-lib/compat/libformw.so.4
-lib/compat/libftpio.so.7
-lib/compat/libgeom.so.4
-lib/compat/libgnuregex.so.4
-lib/compat/libgpib.so.2
-lib/compat/libgssapi.so.9
-lib/compat/libgssapi_krb5.so.9
-lib/compat/libhdb.so.9
-lib/compat/libhistory.so.7
-lib/compat/libipsec.so.3
-lib/compat/libipx.so.4
-lib/compat/libkadm5clnt.so.9
-lib/compat/libkadm5srv.so.9
-lib/compat/libkafs5.so.9
-lib/compat/libkiconv.so.3
-lib/compat/libkrb5.so.9
-lib/compat/libkse.so.3
-lib/compat/libkvm.so.4
-lib/compat/liblwres.so.30
-lib/compat/libmagic.so.3
-lib/compat/libmd.so.4
-lib/compat/libmemstat.so.2
-lib/compat/libmenu.so.4
-lib/compat/libmenuw.so.4
-lib/compat/libmilter.so.4
-lib/compat/libmp.so.6
-lib/compat/libncp.so.3
-lib/compat/libncurses.so.7
-lib/compat/libncursesw.so.7
-lib/compat/libnetgraph.so.3
-lib/compat/libngatm.so.3
-lib/compat/libnvpair.so.1
-lib/compat/libobjc.so.3
-lib/compat/libopie.so.5
-lib/compat/libpam.so.4
-lib/compat/libpanel.so.4
-lib/compat/libpanelw.so.4
-lib/compat/libpcap.so.5
-lib/compat/libpmc.so.4
-lib/compat/libproc.so.1
-lib/compat/libradius.so.3
-lib/compat/libreadline.so.7
-lib/compat/libroken.so.9
-lib/compat/librpcsvc.so.4
-lib/compat/libsbuf.so.4
-lib/compat/libsdp.so.3
-lib/compat/libsmb.so.3
-lib/compat/libssh.so.4
-lib/compat/libssl.so.5
-lib/compat/libtacplus.so.3
-lib/compat/libufs.so.4
-lib/compat/libugidfw.so.3
-lib/compat/libumem.so.1
-lib/compat/libusbhid.so.3
-lib/compat/libutil.so.7
-lib/compat/libuutil.so.1
-lib/compat/libvgl.so.5
-lib/compat/libwrap.so.5
-lib/compat/libypclnt.so.3
-lib/compat/libz.so.4
-lib/compat/libzfs.so.1
-lib/compat/libzpool.so.1
-lib/compat/pam_chroot.so.4
-lib/compat/pam_deny.so.4
-lib/compat/pam_echo.so.4
-lib/compat/pam_exec.so.4
-lib/compat/pam_ftpusers.so.4
-lib/compat/pam_group.so.4
-lib/compat/pam_guest.so.4
-lib/compat/pam_krb5.so.4
-lib/compat/pam_ksu.so.4
-lib/compat/pam_lastlog.so.4
-lib/compat/pam_login_access.so.4
-lib/compat/pam_nologin.so.4
-lib/compat/pam_opie.so.4
-lib/compat/pam_opieaccess.so.4
-lib/compat/pam_passwdqc.so.4
-lib/compat/pam_permit.so.4
-lib/compat/pam_radius.so.4
-lib/compat/pam_rhosts.so.4
-lib/compat/pam_rootok.so.4
-lib/compat/pam_securetty.so.4
-lib/compat/pam_self.so.4
-lib/compat/pam_ssh.so.4
-lib/compat/pam_tacplus.so.4
-lib/compat/pam_unix.so.4
-lib/compat/snmp_atm.so.5
-lib/compat/snmp_bridge.so.5
-lib/compat/snmp_hostres.so.5
-lib/compat/snmp_mibII.so.5
-lib/compat/snmp_netgraph.so.5
-lib/compat/snmp_pf.so.5
-@dirrmtry lib/compat
diff --git a/misc/compat8x/pkg-plist.sparc64 b/misc/compat8x/pkg-plist.sparc64
deleted file mode 100644
index 9d3b9b51eeac..000000000000
--- a/misc/compat8x/pkg-plist.sparc64
+++ /dev/null
@@ -1,113 +0,0 @@
-lib/compat/libalias.so.6
-lib/compat/libarchive.so.4
-lib/compat/libasn1.so.9
-lib/compat/libavl.so.1
-lib/compat/libbegemot.so.3
-lib/compat/libbluetooth.so.3
-lib/compat/libbsdxml.so.3
-lib/compat/libbsm.so.2
-lib/compat/libbsnmp.so.4
-lib/compat/libbz2.so.3
-lib/compat/libcalendar.so.4
-lib/compat/libcam.so.4
-lib/compat/libcom_err.so.4
-lib/compat/libcrypt.so.4
-lib/compat/libcrypto.so.5
-lib/compat/libctf.so.1
-lib/compat/libdevinfo.so.4
-lib/compat/libdevstat.so.6
-lib/compat/libdialog.so.6
-lib/compat/libdtrace.so.1
-lib/compat/libdwarf.so.1
-lib/compat/libedit.so.6
-lib/compat/libfetch.so.5
-lib/compat/libform.so.4
-lib/compat/libformw.so.4
-lib/compat/libftpio.so.7
-lib/compat/libgeom.so.4
-lib/compat/libgnuregex.so.4
-lib/compat/libgpib.so.2
-lib/compat/libgssapi.so.9
-lib/compat/libgssapi_krb5.so.9
-lib/compat/libhdb.so.9
-lib/compat/libhistory.so.7
-lib/compat/libipsec.so.3
-lib/compat/libipx.so.4
-lib/compat/libkadm5clnt.so.9
-lib/compat/libkadm5srv.so.9
-lib/compat/libkafs5.so.9
-lib/compat/libkiconv.so.3
-lib/compat/libkrb5.so.9
-lib/compat/libkse.so.3
-lib/compat/libkvm.so.4
-lib/compat/libmagic.so.3
-lib/compat/libmd.so.4
-lib/compat/libmemstat.so.2
-lib/compat/libmenu.so.4
-lib/compat/libmenuw.so.4
-lib/compat/libmilter.so.4
-lib/compat/libmp.so.6
-lib/compat/libncurses.so.7
-lib/compat/libncursesw.so.7
-lib/compat/libnetgraph.so.3
-lib/compat/libngatm.so.3
-lib/compat/libnvpair.so.1
-lib/compat/libobjc.so.3
-lib/compat/libopie.so.5
-lib/compat/libpam.so.4
-lib/compat/libpanel.so.4
-lib/compat/libpanelw.so.4
-lib/compat/libpcap.so.5
-lib/compat/libpmc.so.4
-lib/compat/libproc.so.1
-lib/compat/libradius.so.3
-lib/compat/libreadline.so.7
-lib/compat/libroken.so.9
-lib/compat/librpcsvc.so.4
-lib/compat/libsbuf.so.4
-lib/compat/libsdp.so.3
-lib/compat/libssh.so.4
-lib/compat/libssl.so.5
-lib/compat/libtacplus.so.3
-lib/compat/libufs.so.4
-lib/compat/libugidfw.so.3
-lib/compat/libumem.so.1
-lib/compat/libusbhid.so.3
-lib/compat/libutil.so.7
-lib/compat/libuutil.so.1
-lib/compat/libwrap.so.5
-lib/compat/libypclnt.so.3
-lib/compat/libz.so.4
-lib/compat/libzfs.so.1
-lib/compat/libzpool.so.1
-lib/compat/pam_chroot.so.4
-lib/compat/pam_deny.so.4
-lib/compat/pam_echo.so.4
-lib/compat/pam_exec.so.4
-lib/compat/pam_ftpusers.so.4
-lib/compat/pam_group.so.4
-lib/compat/pam_guest.so.4
-lib/compat/pam_krb5.so.4
-lib/compat/pam_ksu.so.4
-lib/compat/pam_lastlog.so.4
-lib/compat/pam_login_access.so.4
-lib/compat/pam_nologin.so.4
-lib/compat/pam_opie.so.4
-lib/compat/pam_opieaccess.so.4
-lib/compat/pam_passwdqc.so.4
-lib/compat/pam_permit.so.4
-lib/compat/pam_radius.so.4
-lib/compat/pam_rhosts.so.4
-lib/compat/pam_rootok.so.4
-lib/compat/pam_securetty.so.4
-lib/compat/pam_self.so.4
-lib/compat/pam_ssh.so.4
-lib/compat/pam_tacplus.so.4
-lib/compat/pam_unix.so.4
-lib/compat/snmp_atm.so.5
-lib/compat/snmp_bridge.so.5
-lib/compat/snmp_hostres.so.5
-lib/compat/snmp_mibII.so.5
-lib/compat/snmp_netgraph.so.5
-lib/compat/snmp_pf.so.5
-@dirrmtry lib/compat
diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
deleted file mode 100644
index 1104fda4a577..000000000000
--- a/misc/dahdi-kmod/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-# Ports collection makefile for: dahdi
-# Date created: 3 Mar 2010
-# Whom: Maxim Khon <fjoe@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= dahdi
-PORTVERSION= ${DAHDI_VERSION:S/-//g}
-PORTREVISION= 4
-CATEGORIES= misc kld
-MASTER_SITES= ${MASTER_SITE_LOCAL}\
- http://downloads.digium.com/pub/telephony/firmware/releases/:firmware
-MASTER_SITE_SUBDIR= fjoe
-DISTNAME= ${PORTNAME}-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}\
- oslec-linux-${OSLEC_VERSION}${EXTRACT_SUFX}\
- zaphfc-${ZAPHFC_VERSION}${EXTRACT_SUFX}
-
-MAINTAINER= fjoe@FreeBSD.org
-COMMENT= Digium/Asterisk Hardware Device Interface
-
-BUILD_DEPENDS= gmake:${PORTSDIR}/devel/gmake
-LIB_DEPENDS= newt.52:${PORTSDIR}/devel/newt
-
-DAHDI_VERSION= 2.4.0-rc5
-DAHDI_TOOLS_VERSION= 2.4.0-rc1
-OSLEC_VERSION= 2.6.35.4
-ZAPHFC_VERSION= r5
-
-FIRMWARES= OCT6114_064 OCT6114_128 TC400M HX8 ${_vpmadt032}
-OCT6114_064_VERSION= 1.05.01
-OCT6114_128_VERSION= 1.05.01
-TC400M_VERSION= MR6.12
-HX8_VERSION= 2.06
-VPMADT032_NAME= dahdi-fwload-vpmadt032
-VPMADT032_DIR= dahdi_vpmadt032_loader
-VPMADT032_VERSION= 1.25.0
-
-EXTRA_PATCHES= ${WRKDIR}/zaphfc-${ZAPHFC_VERSION}
-NO_PACKAGE= Should be in sync with the kernel to work correctly
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-dahdi=../freebsd --sysconfdir=${PREFIX}/etc --with-newt=${LOCALBASE}
-CONFIGURE_ENV= WGET=/usr/bin/fetch
-USE_LDCONFIG= yes
-USE_RC_SUBR= dahdi
-MAKE_ARGS= ADDITIONAL_DRIVERS="wcb1xxp" NO_FETCH=yes
-GROUPS= dahdi
-
-ONLY_FOR_ARCHS= i386 amd64 sparc64
-CONFLICTS= zaptel-[0-9]*
-
-MAN8= dahdi_cfg.8\
- dahdi_monitor.8\
- dahdi_scan.8\
- dahdi_test.8\
- dahdi_tool.8\
- fxotune.8
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 703000 || (${OSVERSION} >= 800000 && ${OSVERSION} < 800108)
-IGNORE= requires firmware(9) support for kernel modules with hyphens
-.endif
-
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
-PLIST_SUB+= X86=""
-_vpmadt032= VPMADT032
-.else
-PLIST_SUB+= X86="@comment "
-.endif
-
-.for _f in ${FIRMWARES}
-${_f}_NAME?= dahdi-fw-${_f:L:S/_/-/g}
-${_f}_DIR?= ${${_f}_NAME}.bin
-${_f}_DISTFILE= ${${_f}_NAME}-${${_f}_VERSION}.tar.gz
-DISTFILES+= ${${_f}_DISTFILE}:firmware
-.endfor
-
-pre-everything::
- @if [ ! -f /usr/src/sys/Makefile ]; then \
- ${ECHO_MSG} ">> The dahdi port needs FreeBSD kernel source code to compile."; \
- ${ECHO_MSG} ">> Please install FreeBSD kernel source code in /usr/src/sys."; \
- ${FALSE}; \
- fi
-
-post-extract:
- @${LN} -s ../../../linux-${OSLEC_VERSION}/drivers/staging ${WRKSRC}/freebsd/drivers
- @${REINPLACE_CMD} -E -e 's,(new|old)/,freebsd/,g' ${WRKDIR}/zaphfc-${ZAPHFC_VERSION}
-.for _f in ${FIRMWARES}
- ${CP} ${DISTDIR}/${${_f}_DISTFILE} ${WRKSRC}/freebsd/freebsd/${${_f}_DIR}
-.endfor
-
-post-patch:
- @${REINPLACE_CMD} -e 's,/etc,${PREFIX}/etc,g'\
- ${WRKSRC}/tools/dahdi_cfg.c ${WRKSRC}/tools/fxotune.c\
- ${WRKSRC}/tools/doc/dahdi_cfg.8 ${WRKSRC}/tools/doc/fxotune.8
-
-pre-su-install:
- @${MKDIR} ${PREFIX}/lib/dahdi
-
-post-install:
- @${TOUCH} ${PREFIX}/lib/dahdi/linker.hints
-
-fw-versions: extract
-.for _v in ${FIRMWARES:=_VERSION}
- @${ECHO_CMD} "${_v}=`${MAKE} -V ${_v} -f ${WRKSRC}/freebsd/firmware.mk`"
-.endfor
-
-.include <bsd.port.post.mk>
diff --git a/misc/dahdi-kmod/distinfo b/misc/dahdi-kmod/distinfo
deleted file mode 100644
index 4a466a1643f8..000000000000
--- a/misc/dahdi-kmod/distinfo
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 (dahdi-freebsd-complete-2.4.0-rc5+2.4.0-rc1.tar.gz) = 453d247ee3192851b4f624163aba9e41
-SHA256 (dahdi-freebsd-complete-2.4.0-rc5+2.4.0-rc1.tar.gz) = f364a13d10aa67ac26eb68babfcd4aa2a789f6ce074a923e20192f12fa02e3d2
-SIZE (dahdi-freebsd-complete-2.4.0-rc5+2.4.0-rc1.tar.gz) = 2049189
-MD5 (oslec-linux-2.6.35.4.tar.gz) = e63e8e7cc4d7338bcb8e526594a34495
-SHA256 (oslec-linux-2.6.35.4.tar.gz) = 01cfaa1ca64056c822d1a3ebf4f7b3c81127cd7b308ad5b0738ff4eb2026e261
-SIZE (oslec-linux-2.6.35.4.tar.gz) = 12057
-MD5 (zaphfc-r5.tar.gz) = 5fbc6110c01b60e6795b5e8424bb4790
-SHA256 (zaphfc-r5.tar.gz) = 7e809b62dcc2bd3caf2e5a882390051b881eb08d37fea1733d7fb55e80bc6756
-SIZE (zaphfc-r5.tar.gz) = 15639
-MD5 (dahdi-fw-oct6114-064-1.05.01.tar.gz) = 88db9b7a07d8392736171b1b3e6bcc66
-SHA256 (dahdi-fw-oct6114-064-1.05.01.tar.gz) = 56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91
-SIZE (dahdi-fw-oct6114-064-1.05.01.tar.gz) = 165869
-MD5 (dahdi-fw-oct6114-128-1.05.01.tar.gz) = c1f1a18d3e20d283f42c71e580a64b5a
-SHA256 (dahdi-fw-oct6114-128-1.05.01.tar.gz) = e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775
-SIZE (dahdi-fw-oct6114-128-1.05.01.tar.gz) = 165849
-MD5 (dahdi-fw-tc400m-MR6.12.tar.gz) = 2ea860bb8a9d8ede2858b9557b74ee3c
-SHA256 (dahdi-fw-tc400m-MR6.12.tar.gz) = 11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774
-SIZE (dahdi-fw-tc400m-MR6.12.tar.gz) = 1750035
-MD5 (dahdi-fw-hx8-2.06.tar.gz) = a7f3886942bb3e9fed349a41b3390c9f
-SHA256 (dahdi-fw-hx8-2.06.tar.gz) = 449ab3fd03d55d808e999efb7677cd04de202b92c9fcb039539a7e48a39a80f5
-SIZE (dahdi-fw-hx8-2.06.tar.gz) = 29252
-MD5 (dahdi-fwload-vpmadt032-1.25.0.tar.gz) = 19a660c2073749641072ca644e983cbc
-SHA256 (dahdi-fwload-vpmadt032-1.25.0.tar.gz) = 3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1
-SIZE (dahdi-fwload-vpmadt032-1.25.0.tar.gz) = 149360
diff --git a/misc/dahdi-kmod/files/dahdi.in b/misc/dahdi-kmod/files/dahdi.in
deleted file mode 100644
index 484dd24eeee3..000000000000
--- a/misc/dahdi-kmod/files/dahdi.in
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: dahdi
-# REQUIRE: NETWORKING
-# KEYWORD: shutdown
-# BEFORE: asterisk
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# dahdi_enable (bool): YES/NO (default: NO)
-# dahdi_modules (list of strings): dahdi modules to load at boot (default: dahdi)
-#
-# Valid modules are:
-# - dahdi
-# - dahdi_transcode
-# - wcb4xxp
-# - wcfxo
-# - wct4xxp
-# - wctc4xxp
-# - wctdm
-# - wctdm24xxp
-# - wcte11xp
-# - wcte12xp
-#
-# Example:
-#
-# dahdi_enable="YES"
-# dahdi_modules="wct4xxp"
-#
-
-. /etc/rc.subr
-
-name="dahdi"
-rcvar=`set_rcvar`
-
-start_cmd="dahdi_start"
-stop_cmd="dahdi_stop"
-load_rc_config $name
-: ${dahdi_enable="NO"}
-: ${dahdi_modules="dahdi"}
-
-kmod_dir=%%PREFIX%%/lib/dahdi
-# reverse list
-dahdi_modules_unload=""
-for m in ${dahdi_modules}; do
- dahdi_modules_unload="$m ${dahdi_modules_unload}"
-done
-
-dahdi_start()
-{
- echo "Starting ${name}."
-
- # load kernel modules
- kldconfig -mf ${kmod_dir}
- for m in ${dahdi_modules}; do
- kldload $m || exit 1
- done
-
- # configure devfs
- devfs rule apply path 'dahdi/*' mode 0664 user root group dahdi
-
- # run configuration utilities
- %%PREFIX%%/sbin/dahdi_cfg
- if [ -r %%PREFIX%%/etc/fxotune.conf ]; then
- echo "Starting fxotune."
- %%PREFIX%%/sbin/fxotune -s
- fi
-}
-
-dahdi_stop()
-{
- echo -n " ${name}"
- for m in ${dahdi_modules_unload}; do
- kldunload $m
- done
-}
-
-run_rc_command "$1"
diff --git a/misc/dahdi-kmod/files/patch-bchan b/misc/dahdi-kmod/files/patch-bchan
deleted file mode 100644
index 4aa35a8b8163..000000000000
--- a/misc/dahdi-kmod/files/patch-bchan
+++ /dev/null
@@ -1,170 +0,0 @@
-# Translate the D channels to a standard channel data.
-# The HFC chipset provides us the D channel as data, but
-# Zaptel expects it as a standard channel with 1000 samples
-# per second.
-
-Index: freebsd/include/dahdi/dahdi_config.h
-===================================================================
---- freebsd/include/dahdi/dahdi_config.h (revision 8781)
-+++ freebsd/include/dahdi/dahdi_config.h (working copy)
-@@ -180,7 +180,13 @@
- */
- /* #define OPTIMIZE_CHANMUTE */
-
-+/*
-+ * Uncomment the following for BRI D channels
-+ *
-+ */
-+#define CONFIG_DAHDI_BRI_DCHANS
-
-+
- /*
- * Pass DAHDI_AUDIOMODE to channel driver as well
- */
-Index: freebsd/include/dahdi/kernel.h
-===================================================================
---- freebsd/include/dahdi/kernel.h (revision 8781)
-+++ freebsd/include/dahdi/kernel.h (working copy)
-@@ -426,6 +426,13 @@
- int statcount;
- int lastnumbufs;
- #endif
-+#ifdef CONFIG_DAHDI_BRI_DCHANS
-+ int bytes2receive;
-+ int maxbytes2transmit; /* size of the tx buffer in the card driver */
-+ int bytes2transmit;
-+ int eofrx;
-+ int eoftx;
-+#endif
- spinlock_t lock;
- char name[40];
- /* Specified by DAHDI */
-@@ -738,6 +745,9 @@
- DAHDI_FLAGBIT_LOOPED = 18, /*!< Loopback the receive data from the channel to the transmit */
- DAHDI_FLAGBIT_MTP2 = 19, /*!< Repeats last message in buffer and also discards repeating messages sent to us */
- DAHDI_FLAGBIT_HDLC56 = 20, /*!< Sets the given channel (if in HDLC mode) to use 56K HDLC instead of 64K */
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)
-+ DAHDI_FLAGBIT_BRIDCHAN = 21, /*!< hardhdlc-like handling of the D channel */
-+#endif
- };
-
- struct dahdi_count {
-@@ -788,6 +798,7 @@
- #define DAHDI_FLAG_LOOPED DAHDI_FLAG(LOOPED)
- #define DAHDI_FLAG_MTP2 DAHDI_FLAG(MTP2)
- #define DAHDI_FLAG_HDLC56 DAHDI_FLAG(HDLC56)
-+#define DAHDI_FLAG_BRIDCHAN DAHDI_FLAG(BRIDCHAN)
-
- struct dahdi_span {
- spinlock_t lock;
-Index: freebsd/drivers/dahdi/dahdi-base.c
-===================================================================
---- freebsd/drivers/dahdi/dahdi-base.c (revision 8860)
-+++ freebsd/drivers/dahdi/dahdi-base.c (working copy)
-@@ -6884,11 +6881,40 @@
- *(txb++) = fasthdlc_tx_run_nocheck(&ms->txhdlc);
- }
- bytes -= left;
-+#ifdef CONFIG_DAHDI_BRI_DCHANS
-+ } else if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
-+ /*
-+ * Let's get this right, we want to transmit complete frames only.
-+ * The card driver will do the dirty HDLC work for us.
-+ * txb (transmit buffer) is supposed to be big enough to store one frame
-+ * we will make this as big as the D fifo (1KB or 2KB)
-+ */
-+
-+ /* there are 'left' bytes in the user buffer left to transmit */
-+ left = ms->writen[ms->outwritebuf] - ms->writeidx[ms->outwritebuf] - 2;
-+ if (left > ms->maxbytes2transmit) {
-+ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], ms->maxbytes2transmit);
-+ ms->writeidx[ms->outwritebuf] += ms->maxbytes2transmit;
-+ txb += ms->maxbytes2transmit;
-+ ms->bytes2transmit = ms->maxbytes2transmit;
-+ ms->eoftx = 0;
-+ } else {
-+ memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
-+ ms->writeidx[ms->outwritebuf] += left + 2;
-+ txb += left + 2;
-+ ms->bytes2transmit = left;
-+ ms->eoftx = 1;
-+ }
-+ bytes = 0;
-+#endif
- } else {
- memcpy(txb, buf + ms->writeidx[ms->outwritebuf], left);
- ms->writeidx[ms->outwritebuf]+=left;
- txb += left;
- bytes -= left;
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)
-+ ms->bytes2transmit=DAHDI_CHUNKSIZE;
-+#endif
- }
- /* Check buffer status */
- if (ms->writeidx[ms->outwritebuf] >= ms->writen[ms->outwritebuf]) {
-@@ -6947,6 +6973,17 @@
- /* Transmit a flag if this is an HDLC channel */
- if (ms->flags & DAHDI_FLAG_HDLC)
- fasthdlc_tx_frame_nocheck(&ms->txhdlc);
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)
-+ if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
-+ // if (ms->bytes2transmit > 0) {
-+ // txb += 2;
-+ // ms->bytes2transmit -= 2;
-+ bytes=0;
-+ ms->eoftx = 1;
-+// printk(KERN_CRIT "zaptel EOF(%d) bytes2transmit %d\n",ms->eoftx,ms->bytes2transmit);
-+ // }
-+ }
-+#endif
- #ifdef CONFIG_DAHDI_NET
- if (ms->flags & DAHDI_FLAG_NETDEV)
- netif_wake_queue(ztchan_to_dev(ms));
-@@ -7007,6 +7044,12 @@
- memset(txb, 0xFF, bytes);
- }
- bytes = 0;
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)
-+ } else if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
-+ ms->bytes2transmit = 0;
-+ ms->eoftx = 0;
-+ bytes = 0;
-+#endif
- } else {
- memset(txb, DAHDI_LIN2X(0, ms), bytes); /* Lastly we use silence on telephony channels */
- bytes = 0;
-@@ -7905,6 +7948,14 @@
- int left, x;
-
-
-+#if defined(CONFIG_DAHDI_BRI_DCHANS)
-+ if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
-+ bytes = ms->bytes2receive;
-+ if (bytes < 1) return;
-+// printk(KERN_CRIT "bytes2receive %d\n",ms->bytes2receive);
-+ }
-+#endif
-+
- while(bytes) {
- #if defined(CONFIG_DAHDI_NET) || defined(CONFIG_DAHDI_PPP)
- skb = NULL;
-@@ -7962,6 +8013,19 @@
- }
- }
- }
-+#ifdef CONFIG_DAHDI_BRI_DCHANS
-+ } else if (test_bit(DAHDI_FLAGBIT_BRIDCHAN, &ms->flags)) {
-+ memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
-+ rxb += left;
-+ ms->readidx[ms->inreadbuf] += left;
-+ bytes -= left;
-+ if (ms->eofrx == 1) {
-+ eof=1;
-+ }
-+// printk(KERN_CRIT "receiving %d bytes\n",ms->bytes2receive);
-+ ms->bytes2receive = 0;
-+ ms->eofrx = 0;
-+#endif
- } else {
- /* Not HDLC */
- memcpy(buf + ms->readidx[ms->inreadbuf], rxb, left);
diff --git a/misc/dahdi-kmod/files/patch-freebsd-include-dahdi-compat-bsd.h b/misc/dahdi-kmod/files/patch-freebsd-include-dahdi-compat-bsd.h
deleted file mode 100644
index 0f95e4444217..000000000000
--- a/misc/dahdi-kmod/files/patch-freebsd-include-dahdi-compat-bsd.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- freebsd/include/dahdi/compat/bsd.h.orig 2010-10-05 23:41:23.000000000 +0700
-+++ freebsd/include/dahdi/compat/bsd.h 2010-10-05 23:42:01.000000000 +0700
-@@ -66,9 +66,11 @@
- #define __be32 u_int32_t
-
- #if _BYTE_ORDER == _LITTLE_ENDIAN
-+#define __LITTLE_ENDIAN
- #define __LITTLE_ENDIAN_BITFIELD
- #define __constant_htons(x) ((uint16_t) (((uint16_t) (x)) << 8 | ((uint16_t) (x)) >> 8))
- #elif _BYTE_ORDER == _BIG_ENDIAN
-+#define __BIG_ENDIAN
- #define __BIG_ENDIAN_BITFIELD
- #define __constant_htons(x) (x)
- #endif
diff --git a/misc/dahdi-kmod/files/patch-oslec b/misc/dahdi-kmod/files/patch-oslec
deleted file mode 100644
index 56eb68b89584..000000000000
--- a/misc/dahdi-kmod/files/patch-oslec
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru freebsd/drivers/staging/echo/echo.c.orig freebsd/drivers/staging/echo/echo.c.orig
---- freebsd/drivers/staging/echo/echo.c.orig 2010-08-27 06:47:12.000000000 +0700
-+++ freebsd/drivers/staging/echo/echo.c 2010-08-31 14:45:48.000000000 +0700
-@@ -102,9 +102,15 @@
- Mark, Pawel, and Pavel.
- */
-
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/libkern.h>
-+#include <dahdi/compat/bsd.h>
-+#else
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
-+#endif /* !__FreeBSD__ */
-
- #include "echo.h"
-
-@@ -656,7 +662,9 @@
- }
- EXPORT_SYMBOL_GPL(oslec_hpf_tx);
-
-+#if !defined(__FreeBSD__)
- MODULE_LICENSE("GPL");
- MODULE_AUTHOR("David Rowe");
- MODULE_DESCRIPTION("Open Source Line Echo Canceller");
- MODULE_VERSION("0.3.0");
-+#endif /* !__FreeBSD__ */
diff --git a/misc/dahdi-kmod/files/patch-tools-Makefile b/misc/dahdi-kmod/files/patch-tools-Makefile
deleted file mode 100644
index 48028dd64066..000000000000
--- a/misc/dahdi-kmod/files/patch-tools-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- tools/Makefile.orig 2010-04-01 22:45:47.000000000 +0700
-+++ tools/Makefile 2010-06-01 17:18:37.000000000 +0700
-@@ -27,7 +27,7 @@
- endif
-
- SUBDIRS_UTILS_ALL:= ppp
--SUBDIRS_UTILS := xpp
-+#SUBDIRS_UTILS := xpp
-
- OPTFLAGS=-O2
- CFLAGS+=-I. $(OPTFLAGS) -g -fPIC -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER
-@@ -229,10 +229,8 @@
- install -d $(DESTDIR)$(MAN_DIR)
- install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
- endif
--ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
-- $(INSTALL) -d $(DESTDIR)$(CONFIG_DIR)
-- $(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE)
--endif
-+ $(INSTALL) -d -m 755 $(DESTDIR)$(CONFIG_DIR)
-+ $(INSTALL) -m 644 system.conf.sample $(DESTDIR)$(CONFIG_FILE).sample
-
- install-libs: libs
- $(INSTALL) -d -m 755 $(DESTDIR)/$(LIB_DIR)
diff --git a/misc/dahdi-kmod/files/patch-zaphfc b/misc/dahdi-kmod/files/patch-zaphfc
deleted file mode 100644
index fd8b72d1bca2..000000000000
--- a/misc/dahdi-kmod/files/patch-zaphfc
+++ /dev/null
@@ -1,883 +0,0 @@
-diff -ruN freebsd/drivers/dahdi/zaphfc.orig/base.c freebsd/drivers/dahdi/zaphfc/base.c
---- freebsd/drivers/dahdi/zaphfc.orig/base.c 2010-09-01 00:55:30.000000000 +0700
-+++ freebsd/drivers/dahdi/zaphfc/base.c 2010-09-02 19:19:45.000000000 +0700
-@@ -23,6 +23,50 @@
- * Please read the README file for important infos.
- */
-
-+#if defined(__FreeBSD__)
-+#include <sys/types.h>
-+#include <sys/bus.h>
-+#include <sys/module.h>
-+#include <dev/pci/pcireg.h>
-+#include <dev/pci/pcivar.h>
-+
-+#define PCI_VENDOR_ID_CCD 0x1397
-+
-+#define PCI_DEVICE_ID_CCD_2BD0 0x2bd0
-+#define PCI_DEVICE_ID_CCD_B000 0xb000
-+#define PCI_DEVICE_ID_CCD_B006 0xb006
-+#define PCI_DEVICE_ID_CCD_B007 0xb007
-+#define PCI_DEVICE_ID_CCD_B008 0xb008
-+#define PCI_DEVICE_ID_CCD_B009 0xb009
-+#define PCI_DEVICE_ID_CCD_B00A 0xb00a
-+#define PCI_DEVICE_ID_CCD_B00B 0xb00b
-+#define PCI_DEVICE_ID_CCD_B00C 0xb00c
-+#define PCI_DEVICE_ID_CCD_B100 0xb100
-+
-+#define PCI_VENDOR_ID_ABOCOM 0x13D1
-+#define PCI_DEVICE_ID_ABOCOM_2BD1 0x2BD1
-+
-+#define PCI_VENDOR_ID_ANIGMA 0x1051
-+#define PCI_DEVICE_ID_ANIGMA_MC145575 0x0100
-+
-+#define PCI_VENDOR_ID_ASUSTEK 0x1043
-+#define PCI_DEVICE_ID_ASUSTEK_0675 0x0675
-+
-+#define PCI_VENDOR_ID_BERKOM 0x0871
-+#define PCI_DEVICE_ID_BERKOM_A1T 0xffa1
-+#define PCI_DEVICE_ID_BERKOM_T_CONCEPT 0xffa2
-+
-+#define PCI_VENDOR_ID_DIGI 0x114f
-+#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_E 0x0070
-+#define PCI_DEVICE_ID_DIGI_DF_M_E 0x0071
-+#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A 0x0072
-+#define PCI_DEVICE_ID_DIGI_DF_M_A 0x0073
-+
-+#define PCI_VENDOR_ID_ZOLTRIX 0x15b0
-+#define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0
-+
-+#define set_current_state(x)
-+#else /* !__FreeBSD__ */
- #include <linux/spinlock.h>
- #include <linux/init.h>
- #include <linux/pci.h>
-@@ -34,14 +78,13 @@
- #include <linux/delay.h>
- #include <linux/proc_fs.h>
- #include <linux/if_arp.h>
-+#endif /* !__FreeBSD__ */
-
- #include <dahdi/kernel.h>
-
- #include "zaphfc.h"
- #include "fifo.h"
-
--#if CONFIG_PCI
--
- #define DAHDI_B1 0
- #define DAHDI_B2 1
- #define DAHDI_D 2
-@@ -57,7 +100,9 @@
- static int nt_modes[hfc_MAX_BOARDS];
- static int nt_modes_count;
- static int force_l1_up;
-+#if !defined(__FreeBSD__)
- static struct proc_dir_entry *hfc_proc_zaphfc_dir;
-+#endif
-
- #ifdef DEBUG
- int debug_level;
-@@ -122,6 +167,31 @@
- {0,}
- };
-
-+#if defined(__FreeBSD__)
-+static void
-+hfc_release_resources(struct hfc_card *card)
-+{
-+ /* disconnect the interrupt handler */
-+ if (card->irq_handle != NULL) {
-+ bus_teardown_intr(card->pcidev->dev, card->irq_res, card->irq_handle);
-+ card->irq_handle = NULL;
-+ }
-+
-+ if (card->irq_res != NULL) {
-+ bus_release_resource(card->pcidev->dev, SYS_RES_IRQ, card->irq_rid, card->irq_res);
-+ card->irq_res = NULL;
-+ }
-+
-+ /* release DMA resources */
-+ dahdi_dma_free(&card->dma_tag, &card->dma_map, (void **) &card->fifos, &card->dma_addr);
-+
-+ /* release I/O range */
-+ if (card->mem_res != NULL) {
-+ bus_release_resource(card->pcidev->dev, SYS_RES_MEMORY, card->mem_rid, card->mem_res);
-+ card->mem_res = NULL;
-+ }
-+}
-+#else
- MODULE_DEVICE_TABLE(pci, hfc_pci_ids);
-
- static int __devinit hfc_probe(struct pci_dev *dev
-@@ -134,6 +204,7 @@
- .probe = hfc_probe,
- .remove = hfc_remove,
- };
-+#endif /* !__FreeBSD__ */
-
- /******************************************
- * HW routines
-@@ -418,7 +489,7 @@
-
- switch (chan->number) {
- case D:
-- if (chan->status != free &&
-+ if (chan->status != chan_free &&
- chan->status != open_framed) {
- spin_unlock(&chan->lock);
- return -EBUSY;
-@@ -428,7 +499,7 @@
-
- case B1:
- case B2:
-- if (chan->status != free) {
-+ if (chan->status != chan_free) {
- spin_unlock(&chan->lock);
- return -EBUSY;
- }
-@@ -437,7 +508,6 @@
- }
-
- chan->open_by_zaptel = TRUE;
-- try_module_get(THIS_MODULE);
- spin_unlock(&chan->lock);
-
- switch (chan->number) {
-@@ -484,7 +554,13 @@
- hfc_outb(card, hfc_SCTRL, card->regs.sctrl);
- hfc_outb(card, hfc_SCTRL_R, card->regs.sctrl_r);
-
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_POSTREAD);
-+#endif
- hfc_update_fifo_state(card);
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_PREWRITE);
-+#endif
-
- printk(KERN_INFO hfc_DRIVER_PREFIX
- "card %d: "
-@@ -509,12 +585,12 @@
-
- spin_lock(&chan->lock);
-
-- if (chan->status == free) {
-+ if (chan->status == chan_free) {
- spin_unlock(&chan->lock);
- return -EINVAL;
- }
-
-- chan->status = free;
-+ chan->status = chan_free;
- chan->open_by_zaptel = FALSE;
-
- spin_unlock(&chan->lock);
-@@ -538,8 +614,8 @@
- break;
- }
-
-- if (card->chans[B1].status == free &&
-- card->chans[B2].status == free)
-+ if (card->chans[B1].status == chan_free &&
-+ card->chans[B2].status == chan_free)
- card->regs.m2 &= ~hfc_M2_PROC_TRANS;
-
- hfc_outb(card, hfc_INT_M2, card->regs.m2);
-@@ -548,9 +624,13 @@
- hfc_outb(card, hfc_SCTRL, card->regs.sctrl);
- hfc_outb(card, hfc_SCTRL_R, card->regs.sctrl_r);
-
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_POSTREAD);
-+#endif
- hfc_update_fifo_state(card);
--
-- module_put(THIS_MODULE);
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_PREWRITE);
-+#endif
-
- printk(KERN_INFO hfc_DRIVER_PREFIX
- "card %d: "
-@@ -591,7 +671,7 @@
-
- static int hfc_zap_startup(struct dahdi_span *span)
- {
-- struct dahdi_hfc *zthfc = span->pvt;
-+ struct dahdi_hfc *zthfc = container_of(span, struct dahdi_hfc, span);
- struct hfc_card *hfctmp = zthfc->card;
- int alreadyrunning;
-
-@@ -642,6 +722,20 @@
- return 0;
- }
-
-+static const struct dahdi_span_ops hfc_zap_span_ops = {
-+ .owner = THIS_MODULE,
-+ .startup = hfc_zap_startup,
-+ .shutdown = hfc_zap_shutdown,
-+ .rbsbits = hfc_zap_rbsbits,
-+ .maint = hfc_zap_maint,
-+ .open = hfc_zap_open,
-+ .close = hfc_zap_close,
-+ .spanconfig = hfc_zap_spanconfig,
-+ .chanconfig = hfc_zap_chanconfig,
-+ .ioctl = hfc_zap_ioctl,
-+ .hdlc_hard_xmit = hfc_hdlc_hard_xmit,
-+};
-+
- static int hfc_zap_initialize(struct dahdi_hfc *hfccard)
- {
- struct hfc_card *hfctmp = hfccard->card;
-@@ -655,23 +749,14 @@
- hfctmp->nt_mode ? "NT" : "TE");
- hfccard->span.spantype = hfctmp->nt_mode ? "NT" : "TE";
- hfccard->span.manufacturer = "Cologne Chips";
-- hfccard->span.spanconfig = hfc_zap_spanconfig;
-- hfccard->span.chanconfig = hfc_zap_chanconfig;
-- hfccard->span.startup = hfc_zap_startup;
-- hfccard->span.shutdown = hfc_zap_shutdown;
-- hfccard->span.maint = hfc_zap_maint;
-- hfccard->span.rbsbits = hfc_zap_rbsbits;
-- hfccard->span.open = hfc_zap_open;
-- hfccard->span.close = hfc_zap_close;
-- hfccard->span.ioctl = hfc_zap_ioctl;
-- hfccard->span.hdlc_hard_xmit = hfc_hdlc_hard_xmit;
-+ hfccard->span.ops = &hfc_zap_span_ops;
- hfccard->span.flags = 0;
-- hfccard->span.irq = hfctmp->pcidev->irq;
-+ hfccard->span.irq = dahdi_pci_get_irq(hfctmp->pcidev);
- dahdi_copy_string(hfccard->span.devicetype, "HFC-S PCI-A ISDN",
- sizeof(hfccard->span.devicetype));
- sprintf(hfccard->span.location, "PCI Bus %02d Slot %02d",
-- hfctmp->pcidev->bus->number,
-- PCI_SLOT(hfctmp->pcidev->devfn) + 1);
-+ dahdi_pci_get_bus(hfctmp->pcidev),
-+ dahdi_pci_get_slot(hfctmp->pcidev));
- hfccard->span.chans = hfccard->_chans;
- hfccard->span.channels = 3;
- for (i = 0; i < hfccard->span.channels; i++)
-@@ -680,7 +765,6 @@
- hfccard->span.linecompat = DAHDI_CONFIG_AMI | DAHDI_CONFIG_CCS;
- hfccard->span.offset = 0;
- init_waitqueue_head(&hfccard->span.maintq);
-- hfccard->span.pvt = hfccard;
-
- for (i = 0; i < hfccard->span.channels; i++) {
- memset(&hfccard->chans[i], 0x0, sizeof(struct dahdi_chan));
-@@ -760,22 +844,20 @@
- static void hfc_frame_arrived(struct hfc_chan_duplex *chan);
- static void hfc_handle_voice(struct hfc_card *card);
-
--#if (KERNEL_VERSION(2, 6, 24) < LINUX_VERSION_CODE)
--static irqreturn_t hfc_interrupt(int irq, void *dev_id)
--#else
--static irqreturn_t hfc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
--#endif
-+DAHDI_IRQ_HANDLER(hfc_interrupt)
- {
- struct hfc_card *card = dev_id;
- unsigned long flags;
- u8 status, s1, s2;
-
-+#if !defined(__FreeBSD__)
- if (!card) {
- printk(KERN_CRIT hfc_DRIVER_PREFIX
- "spurious interrupt (IRQ %d)\n",
- irq);
- return IRQ_NONE;
- }
-+#endif /* !__FreeBSD__ */
-
- spin_lock_irqsave(&card->lock, flags);
- status = hfc_inb(card, hfc_STATUS);
-@@ -832,21 +914,40 @@
- /*
- * D chan RX (bit 5)
- */
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_POSTREAD);
-+#endif
- hfc_frame_arrived(&card->chans[D]);
-+
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_PREWRITE);
-+#endif
- }
-
- if (s1 & hfc_INTS_B1REC) {
- /*
- * B1 chan RX (bit 3)
- */
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_POSTREAD);
-+#endif
- hfc_frame_arrived(&card->chans[B1]);
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_PREWRITE);
-+#endif
- }
-
- if (s1 & hfc_INTS_B2REC) {
- /*
- * B2 chan RX (bit 4)
- */
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_POSTREAD);
-+#endif
- hfc_frame_arrived(&card->chans[B2]);
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_PREWRITE);
-+#endif
- }
-
- if (s1 & hfc_INTS_DTRANS) {
-@@ -940,7 +1041,13 @@
- card->regs.ctmt &= ~hfc_CTMT_TIMER_MASK;
- hfc_outb(card, hfc_CTMT, card->regs.ctmt);
-
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_POSTREAD);
-+#endif
- hfc_resume_fifo(card);
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_PREWRITE);
-+#endif
- }
- }
-
-@@ -971,11 +1078,17 @@
- hfc_outb(card, hfc_STATES, hfc_STATES_LOAD_STATE | 3);
- }
-
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_POSTREAD);
-+#endif
- if (new_state == 3 && card->l1_state != 3)
- hfc_resume_fifo(card);
-
- if (new_state != 3 && card->l1_state == 3)
- hfc_suspend_fifo(card);
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_PREWRITE);
-+#endif
-
- } else {
- if (new_state == 3) {
-@@ -1015,7 +1128,13 @@
- /*
- * TE has become inactive, disable FIFO
- */
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_POSTREAD);
-+#endif
- hfc_suspend_fifo(card);
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_PREWRITE);
-+#endif
- }
- }
-
-@@ -1040,6 +1159,9 @@
- available_bytes >= DAHDI_CHUNKSIZE + hfc_RX_FIFO_PRELOAD) {
- card->ticks = 0;
-
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_POSTREAD);
-+#endif
- if (available_bytes > DAHDI_CHUNKSIZE*2 + hfc_RX_FIFO_PRELOAD) {
- card->late_irqs++;
- /*
-@@ -1064,6 +1186,9 @@
- } else {
- hfc_handle_voice(card);
- }
-+#if defined(__FreeBSD__)
-+ bus_dmamap_sync(card->dma_tag, card->dma_map, BUS_DMASYNC_PREWRITE);
-+#endif
- }
-
- card->ticks++;
-@@ -1179,7 +1304,9 @@
- {
- struct hfc_card *card = chan->card;
- int antiloop = 16;
-+#if !defined(__FreeBSD__)
- struct sk_buff *skb;
-+#endif
-
- while (hfc_fifo_has_frames(&chan->rx) && --antiloop) {
- int frame_size = hfc_fifo_get_frame_size(&chan->rx);
-@@ -1229,6 +1356,7 @@
- break;
- }
-
-+#if !defined(__FreeBSD__)
- skb = dev_alloc_skb(frame_size - 3);
-
- if (!skb) {
-@@ -1254,6 +1382,7 @@
- #else
- skb->ip_summed = CHECKSUM_HW;
- #endif
-+#endif /* !__FreeBSD__ */
-
- if (chan->open_by_zaptel) {
- card->chans[D].rx.ugly_framebuf_size = frame_size - 1;
-@@ -1261,20 +1390,26 @@
- if (hfc_fifo_get_frame(&card->chans[D].rx,
- card->chans[D].rx.ugly_framebuf,
- frame_size - 1) == -1) {
-+#if !defined(__FreeBSD__)
- dev_kfree_skb(skb);
-+#endif
- continue;
- }
-
-+#if !defined(__FreeBSD__)
- memcpy(skb_put(skb, frame_size - 3),
- card->chans[D].rx.ugly_framebuf,
- frame_size - 3);
-+#endif
- } else {
-+#if !defined(__FreeBSD__)
- if (hfc_fifo_get_frame(&chan->rx,
- skb_put(skb, frame_size - 3),
- frame_size - 3) == -1) {
- dev_kfree_skb(skb);
- continue;
- }
-+#endif
- }
- }
-
-@@ -1289,8 +1424,12 @@
- * Module initialization and cleanup
- ******************************************/
-
-+#if defined(__FreeBSD__)
-+static int hfc_probe(device_t dev)
-+#else
- static int __devinit hfc_probe(struct pci_dev *pci_dev,
- const struct pci_device_id *ent)
-+#endif
- {
- static int cardnum;
- int err;
-@@ -1298,6 +1437,12 @@
-
- struct hfc_card *card = NULL;
- struct dahdi_hfc *zthfc = NULL;
-+
-+#if defined(__FreeBSD__)
-+ card = device_get_softc(dev);
-+ card->pcidev = &card->_dev;
-+ card->pcidev->dev = dev;
-+#else
- card = kmalloc(sizeof(struct hfc_card), GFP_KERNEL);
- if (!card) {
- printk(KERN_CRIT hfc_DRIVER_PREFIX
-@@ -1307,10 +1452,48 @@
- }
-
- memset(card, 0x00, sizeof(struct hfc_card));
-- card->cardnum = cardnum;
- card->pcidev = pci_dev;
-+#endif /* !__FreeBSD__ */
-+ card->cardnum = cardnum;
- spin_lock_init(&card->lock);
-
-+#if defined(__FreeBSD__)
-+ /* allocate IO resource */
-+ card->mem_rid = PCIR_BAR(1);
-+ card->mem_res = bus_alloc_resource_any(card->pcidev->dev, SYS_RES_MEMORY, &card->mem_rid, RF_ACTIVE);
-+ if (card->mem_res == NULL) {
-+ device_printf(dev, "Can't allocate memory resource\n");
-+ err = -ENXIO;
-+ goto err_pci_request_regions;
-+ }
-+
-+ /* enable bus mastering */
-+ pci_enable_busmaster(dev);
-+
-+ /* allocate DMA memory */
-+ err = dahdi_dma_allocate(card->pcidev->dev, hfc_FIFO_SIZE, &card->dma_tag, &card->dma_map,
-+ (void **) &card->fifos, &card->dma_addr);
-+ if (err)
-+ goto err_alloc_fifo;
-+
-+ /* setup interrupt */
-+ card->irq_res = bus_alloc_resource_any(
-+ card->pcidev->dev, SYS_RES_IRQ, &card->irq_rid, RF_SHAREABLE | RF_ACTIVE);
-+ if (card->irq_res == NULL) {
-+ device_printf(card->pcidev->dev, "Can't allocate irq resource\n");
-+ err = -ENXIO;
-+ goto err_request_irq;
-+ }
-+
-+ err = bus_setup_intr(
-+ card->pcidev->dev, card->irq_res, INTR_TYPE_CLK | INTR_MPSAFE,
-+ hfc_interrupt, NULL, card, &card->irq_handle);
-+ if (err) {
-+ device_printf(card->pcidev->dev, "Can't setup interrupt handler (error %d)\n", err);
-+ err = -ENXIO;
-+ goto err_request_irq;
-+ }
-+#else
- pci_set_drvdata(pci_dev, card);
-
- err = pci_enable_device(pci_dev);
-@@ -1403,6 +1586,7 @@
- card->cardnum);
- goto err_request_irq;
- }
-+#endif /* !__FreeBSD__ */
-
- card->nt_mode = FALSE;
-
-@@ -1419,7 +1603,7 @@
- */
- card->chans[D].card = card;
- card->chans[D].name = "D";
-- card->chans[D].status = free;
-+ card->chans[D].status = chan_free;
- card->chans[D].number = D;
- spin_lock_init(&card->chans[D].lock);
-
-@@ -1460,7 +1644,7 @@
- */
- card->chans[B1].card = card;
- card->chans[B1].name = "B1";
-- card->chans[B1].status = free;
-+ card->chans[B1].status = chan_free;
- card->chans[B1].number = B1;
- card->chans[B1].protocol = 0;
- spin_lock_init(&card->chans[B1].lock);
-@@ -1502,7 +1686,7 @@
- */
- card->chans[B2].card = card;
- card->chans[B2].name = "B2";
-- card->chans[B2].status = free;
-+ card->chans[B2].status = chan_free;
- card->chans[B2].number = B2;
- card->chans[B2].protocol = 0;
- spin_lock_init(&card->chans[B2].lock);
-@@ -1555,14 +1739,17 @@
- hfc_zap_initialize(zthfc);
- card->ztdev = zthfc;
-
-+#if !defined(__FreeBSD__)
- snprintf(card->proc_dir_name,
- sizeof(card->proc_dir_name),
- "%d", card->cardnum);
- card->proc_dir = proc_mkdir(card->proc_dir_name, hfc_proc_zaphfc_dir);
- SET_PROC_DIRENTRY_OWNER(card->proc_dir);
-+#endif /* !__FreeBSD__ */
-
- hfc_resetCard(card);
-
-+#if !defined(__FreeBSD__)
- printk(KERN_INFO hfc_DRIVER_PREFIX
- "card %d configured for %s mode at mem %#lx (0x%p) IRQ %u\n",
- card->cardnum,
-@@ -1570,28 +1757,106 @@
- card->io_bus_mem,
- card->io_mem,
- card->pcidev->irq);
-+#endif /* !__FreeBSD__ */
-
- cardnum++;
-
- return 0;
-
- err_request_irq:
-+#if !defined(__FreeBSD__)
- pci_free_consistent(pci_dev, hfc_FIFO_SIZE,
- card->fifo_mem, card->fifo_bus_mem);
-+#endif
- err_alloc_fifo:
-+#if !defined(__FreeBSD__)
- iounmap(card->io_mem);
- err_ioremap:
- err_noiobase:
- err_noirq:
- pci_release_regions(pci_dev);
-+#endif
- err_pci_request_regions:
-+#if defined(__FreeBSD__)
-+ hfc_release_resources(card);
-+#else
- err_pci_set_dma_mask:
- err_pci_enable_device:
- kfree(card);
- err_alloc_hfccard:
-+#endif
- return err;
- }
-
-+#if defined(__FreeBSD__)
-+SYSCTL_NODE(_dahdi, OID_AUTO, wcb1xxp, CTLFLAG_RW, 0, "DAHDI wcb1xxp");
-+#define MODULE_PARAM_PREFIX "dahdi.wcb1xxp"
-+#define MODULE_PARAM_PARENT _dahdi_wcb1xxp
-+
-+static int
-+wcb1xxp_device_probe(device_t dev)
-+{
-+ struct pci_device_id *id;
-+
-+ id = dahdi_pci_device_id_lookup(dev, hfc_pci_ids);
-+ if (id == NULL)
-+ return (ENXIO);
-+
-+ /* found device */
-+ device_printf(dev, "vendor=%x device=%x subvendor=%x\n",
-+ id->vendor, id->device, id->subvendor);
-+ device_set_desc(dev, "CCD HFC-S");
-+ return (0);
-+}
-+
-+static int
-+wcb1xxp_device_attach(device_t dev)
-+{
-+ int res;
-+ struct pci_device_id *id;
-+
-+ id = dahdi_pci_device_id_lookup(dev, hfc_pci_ids);
-+ if (id == NULL)
-+ return (ENXIO);
-+
-+ res = hfc_probe(dev);
-+ return (-res);
-+}
-+
-+static int
-+wcb1xxp_device_detach(device_t dev)
-+{
-+ struct hfc_card *card = device_get_softc(dev);
-+
-+ if (dahdi_module_usecount(THIS_MODULE) > 0)
-+ return (EBUSY);
-+
-+ hfc_softreset(card);
-+ dahdi_unregister(&card->ztdev->span);
-+ hfc_release_resources(card);
-+
-+ return (0);
-+}
-+
-+static device_method_t wcb1xxp_methods[] = {
-+ DEVMETHOD(device_probe, wcb1xxp_device_probe),
-+ DEVMETHOD(device_attach, wcb1xxp_device_attach),
-+ DEVMETHOD(device_detach, wcb1xxp_device_detach),
-+ { 0, 0 }
-+};
-+
-+static driver_t wcb1xxp_pci_driver = {
-+ "wcb1xxp",
-+ wcb1xxp_methods,
-+ sizeof(struct hfc_card)
-+};
-+
-+static devclass_t wcb1xxp_devclass;
-+
-+DAHDI_DRIVER_MODULE(wcb1xxp, pci, wcb1xxp_pci_driver, wcb1xxp_devclass);
-+MODULE_DEPEND(wcb1xxp, pci, 1, 1, 1);
-+MODULE_DEPEND(wcb1xxp, dahdi, 1, 1, 1);
-+#else
- static void __devexit hfc_remove(struct pci_dev *pci_dev)
- {
- struct hfc_card *card = pci_get_drvdata(pci_dev);
-@@ -1671,8 +1936,6 @@
-
- module_exit(hfc_module_exit);
-
--#endif
--
- MODULE_DESCRIPTION(hfc_DRIVER_DESCR);
- MODULE_AUTHOR("Jens Wilke <jw_vzaphfc@headissue.com>, "
- "Daniele (Vihai) Orlandi <daniele@orlandi.com>, "
-@@ -1681,15 +1944,18 @@
- #ifdef MODULE_LICENSE
- MODULE_LICENSE("GPL");
- #endif
-+#endif /* !__FreeBSD__ */
-
-
- module_param(modes, int, 0444);
-
-+#if !defined(__FreeBSD__)
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
- module_param_array(nt_modes, int, &nt_modes_count, 0444);
- #else
- module_param_array(nt_modes, int, nt_modes_count, 0444);
- #endif
-+#endif /* !__FreeBSD__ */
-
- module_param(force_l1_up, int, 0444);
- #ifdef DEBUG
-diff -ruN freebsd/drivers/dahdi/zaphfc.orig/fifo.c freebsd/drivers/dahdi/zaphfc/fifo.c
---- freebsd/drivers/dahdi/zaphfc.orig/fifo.c 2010-09-01 00:55:30.000000000 +0700
-+++ freebsd/drivers/dahdi/zaphfc/fifo.c 2010-09-01 01:09:07.000000000 +0700
-@@ -13,7 +13,9 @@
- *
- */
-
-+#if !defined(__FreeBSD__)
- #include <linux/kernel.h>
-+#endif
-
- #include <dahdi/kernel.h>
-
-@@ -36,7 +38,7 @@
- chan->z_base + z_start,
- bytes_to_boundary);
-
-- memcpy(data + bytes_to_boundary,
-+ memcpy((char *) data + bytes_to_boundary,
- chan->fifo_base,
- size - bytes_to_boundary);
- }
-@@ -60,7 +62,7 @@
- bytes_to_boundary);
-
- memcpy(chan->fifo_base,
-- data + bytes_to_boundary,
-+ (char *) data + bytes_to_boundary,
- size - bytes_to_boundary);
- }
- }
-diff -ruN freebsd/drivers/dahdi/zaphfc.orig/fifo.h freebsd/drivers/dahdi/zaphfc/fifo.h
---- freebsd/drivers/dahdi/zaphfc.orig/fifo.h 2010-09-01 00:55:30.000000000 +0700
-+++ freebsd/drivers/dahdi/zaphfc/fifo.h 2010-07-07 04:24:55.000000000 +0700
-@@ -21,22 +21,22 @@
-
- static inline u16 *Z1_F1(struct hfc_chan_simplex *chan)
- {
-- return chan->z1_base + (*chan->f1 * 4);
-+ return (u16 *) (chan->z1_base + (*chan->f1 * 4));
- }
-
- static inline u16 *Z2_F1(struct hfc_chan_simplex *chan)
- {
-- return chan->z2_base + (*chan->f1 * 4);
-+ return (u16 *) (chan->z2_base + (*chan->f1 * 4));
- }
-
- static inline u16 *Z1_F2(struct hfc_chan_simplex *chan)
- {
-- return chan->z1_base + (*chan->f2 * 4);
-+ return (u16 *) (chan->z1_base + (*chan->f2 * 4));
- }
-
- static inline u16 *Z2_F2(struct hfc_chan_simplex *chan)
- {
-- return chan->z2_base + (*chan->f2 * 4);
-+ return (u16 *) (chan->z2_base + (*chan->f2 * 4));
- }
-
- static inline u16 Z_inc(struct hfc_chan_simplex *chan, u16 z, u16 inc)
-diff -ruN freebsd/drivers/dahdi/zaphfc.orig/zaphfc.h freebsd/drivers/dahdi/zaphfc/zaphfc.h
---- freebsd/drivers/dahdi/zaphfc.orig/zaphfc.h 2010-09-01 00:55:30.000000000 +0700
-+++ freebsd/drivers/dahdi/zaphfc/zaphfc.h 2010-08-31 23:57:30.000000000 +0700
-@@ -24,7 +24,12 @@
- #ifndef _HFC_ZAPHFC_H
- #define _HFC_ZAPHFC_H
-
-+#if defined(__FreeBSD__)
-+#include <sys/rman.h>
-+#include <machine/bus.h>
-+#else
- #include <asm/io.h>
-+#endif
-
- #define hfc_DRIVER_NAME "vzaphfc"
- #define hfc_DRIVER_PREFIX hfc_DRIVER_NAME ": "
-@@ -273,9 +278,9 @@
- int ugly_framebuf_size;
- u16 ugly_framebuf_off;
-
-- void *z1_base, *z2_base;
-+ char *z1_base, *z2_base;
- void *fifo_base;
-- void *z_base;
-+ char *z_base;
- u16 z_min;
- u16 z_max;
- u16 fifo_size;
-@@ -293,7 +298,7 @@
- };
-
- enum hfc_chan_status {
-- free,
-+ chan_free,
- open_framed,
- open_voice,
- sniff_aux,
-@@ -330,12 +335,27 @@
- struct proc_dir_entry *proc_fifos;
- struct proc_dir_entry *proc_bufs;
-
-+#if defined(__FreeBSD__)
-+ struct pci_dev _dev;
-+
-+ struct resource *mem_res; /* resource for I/O range */
-+ int mem_rid;
-+
-+ struct resource *irq_res; /* resource for irq */
-+ int irq_rid;
-+ void *irq_handle;
-+
-+ uint32_t dma_addr;
-+ bus_dma_tag_t dma_tag;
-+ bus_dmamap_t dma_map;
-+#else
- unsigned long io_bus_mem;
- void __iomem *io_mem;
-
- dma_addr_t fifo_bus_mem;
-+#endif /* !__FreeBSD__ */
- void *fifo_mem;
-- void *fifos;
-+ char *fifos;
-
- int nt_mode;
- int sync_loss_reported;
-@@ -403,12 +423,24 @@
-
- static inline u8 hfc_inb(struct hfc_card *card, int offset)
- {
-+#if defined(__FreeBSD__)
-+ return bus_space_read_1(
-+ rman_get_bustag(card->mem_res), rman_get_bushandle(card->mem_res),
-+ offset);
-+#else
- return readb(card->io_mem + offset);
-+#endif
- }
-
- static inline void hfc_outb(struct hfc_card *card, int offset, u8 value)
- {
-+#if defined(__FreeBSD__)
-+ bus_space_write_1(
-+ rman_get_bustag(card->mem_res), rman_get_bushandle(card->mem_res),
-+ offset, value);
-+#else
- writeb(value, card->io_mem + offset);
-+#endif
- }
-
- #endif
-diff -ruN freebsd/freebsd/wcb1xxp.orig/Makefile freebsd/freebsd/wcb1xxp/Makefile
---- freebsd/freebsd/wcb1xxp.orig/Makefile 1970-01-01 07:00:00.000000000 +0700
-+++ freebsd/freebsd/wcb1xxp/Makefile 2010-09-01 01:00:49.000000000 +0700
-@@ -0,0 +1,9 @@
-+# $Id: Makefile 7432 2009-10-28 21:34:15Z fjoe $
-+
-+.PATH: ${.CURDIR}/../../drivers/dahdi/zaphfc
-+
-+KMOD= wcb1xxp
-+SRCS= base.c fifo.c
-+SRCS+= device_if.h bus_if.h pci_if.h
-+
-+.include <bsd.kmod.mk>
diff --git a/misc/dahdi-kmod/pkg-descr b/misc/dahdi-kmod/pkg-descr
deleted file mode 100644
index d6703144bc6e..000000000000
--- a/misc/dahdi-kmod/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-DAHDi (Digium/Asterisk Hardware Device Interface) is the open source
-device interface technology used to control Digium and other telephony
-interface cards.
-
-WWW: http://www.asterisk.org/dahdi/
diff --git a/misc/dahdi-kmod/pkg-plist b/misc/dahdi-kmod/pkg-plist
deleted file mode 100644
index 13f5f6ee148b..000000000000
--- a/misc/dahdi-kmod/pkg-plist
+++ /dev/null
@@ -1,52 +0,0 @@
-etc/dahdi/system.conf.sample
-include/dahdi/compat/types.h
-include/dahdi/tonezone.h
-include/dahdi/user.h
-include/dahdi/wctdm_user.h
-lib/dahdi/dahdi-fw-hx8.bin.ko
-lib/dahdi/dahdi-fw-oct6114-064.bin.ko
-lib/dahdi/dahdi-fw-oct6114-128.bin.ko
-lib/dahdi/dahdi-fw-tc400m.bin.ko
-lib/dahdi/dahdi.ko
-lib/dahdi/dahdi_dynamic.ko
-lib/dahdi/dahdi_dynamic_eth.ko
-lib/dahdi/dahdi_dynamic_ethmf.ko
-lib/dahdi/dahdi_dynamic_loc.ko
-lib/dahdi/dahdi_echocan_jpah.ko
-lib/dahdi/dahdi_echocan_kb1.ko
-lib/dahdi/dahdi_echocan_oslec.ko
-lib/dahdi/dahdi_echocan_mg2.ko
-lib/dahdi/dahdi_echocan_sec.ko
-lib/dahdi/dahdi_echocan_sec2.ko
-lib/dahdi/dahdi_transcode.ko
-lib/dahdi/dahdi_voicebus.ko
-%%X86%%lib/dahdi/dahdi_vpmadt032_loader.ko
-lib/dahdi/linker.hints
-lib/dahdi/ng_dahdi_netdev.ko
-lib/dahdi/wcb1xxp.ko
-lib/dahdi/wcb4xxp.ko
-lib/dahdi/wcfxo.ko
-lib/dahdi/wct4xxp.ko
-lib/dahdi/wctc4xxp.ko
-lib/dahdi/wctdm.ko
-lib/dahdi/wctdm24xxp.ko
-lib/dahdi/wcte11xp.ko
-lib/dahdi/wcte12xp.ko
-lib/libtonezone.a
-lib/libtonezone.so
-lib/libtonezone.so.1
-lib/libtonezone.so.1.0
-lib/libtonezone.so.2
-lib/libtonezone.so.2.0
-sbin/dahdi_cfg
-sbin/dahdi_maint
-sbin/dahdi_monitor
-sbin/dahdi_scan
-sbin/dahdi_speed
-sbin/dahdi_test
-sbin/dahdi_tool
-sbin/fxotune
-@dirrm lib/dahdi
-@dirrm include/dahdi/compat
-@dirrm include/dahdi
-@dirrmtry etc/dahdi
diff --git a/misc/freecode-submit/Makefile b/misc/freecode-submit/Makefile
deleted file mode 100644
index 19e1e3c9199f..000000000000
--- a/misc/freecode-submit/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for: freshmeat-submit
-# Date created: 2 Jan 2005
-# Whom: x
-#
-# $FreeBSD$
-#
-
-PORTNAME= freshmeat-submit
-PORTVERSION= 2.2
-CATEGORIES= misc
-MASTER_SITES= http://www.catb.org/~esr/freshmeat-submit/ \
- http://www.c-s.li/ports/
-
-MAINTAINER= c-s@c-s.li
-COMMENT= Submission of updates to Freshmeat via its XML-RPC
-
-LICENSE= BSD
-
-USE_PYTHON= yes
-NO_BUILD= yes
-
-PLIST_FILES= bin/freshmeat-submit
-MAN1= freshmeat-submit.1
-
-.include <bsd.port.pre.mk>
-
-do-install:
- ${MKDIR} ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/freshmeat-submit ${PREFIX}/bin
- ${MKDIR} ${MAN1PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/freshmeat-submit.1 ${MAN1PREFIX}/man/man1
-
-.include <bsd.port.post.mk>
diff --git a/misc/freecode-submit/distinfo b/misc/freecode-submit/distinfo
deleted file mode 100644
index 8b7bc676b0d7..000000000000
--- a/misc/freecode-submit/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (freshmeat-submit-2.2.tar.gz) = 87b9a73505ad520da5b949baabd129d018d0c1bdf761dd707d61ff8a1315dda1
-SIZE (freshmeat-submit-2.2.tar.gz) = 18495
diff --git a/misc/freecode-submit/pkg-descr b/misc/freecode-submit/pkg-descr
deleted file mode 100644
index 8f99979e7a4a..000000000000
--- a/misc/freecode-submit/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-freshmeat-submit is a Python script that supports remote submission of
-release updates to Freshmeat via its XML-RPC interface. It is intended
-for use in project release scripts. It reads the metadata from an
-RFC-2822-like message on standard input, possibly with overrides
-by command-line switches.
-
-WWW: http://www.catb.org/~esr/freshmeat-submit/
diff --git a/misc/krecipes-kde4/Makefile b/misc/krecipes-kde4/Makefile
deleted file mode 100644
index b6d14adb487f..000000000000
--- a/misc/krecipes-kde4/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# ports collection makefile for: krecipies
-# Date created: 19 March 2005
-# Whom: hank
-#
-# $FreeBSD$
-#
-
-PORTNAME= krecipes
-PORTVERSION= 0.9.1
-PORTREVISION= 5
-CATEGORIES= misc kde
-MASTER_SITES= SF
-
-MAINTAINER= hank@millerfarm.com
-COMMENT= Recipe database for cooks
-
-USE_KDELIBS_VER=3
-USE_AUTOTOOLS= libtool
-
-OPTIONS= SQLITE "Support for SQLite backend" on \
- MYSQL "Support for MySQL backend" off \
- POSTGRESQL "Support for PostgreSQL backend" off
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_SQLITE)
-CONFIGURE_ARGS+= --without-sqlite
-.else
-USE_SQLITE= yes
-.endif
-
-.if defined(WITH_MYSQL)
-RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt-mysql-plugin
-.else
-CONFIGURE_ARGS+= --without-mysql
-.endif
-
-.if defined(WITH_POSTGRESQL)
-RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt-pgsql-plugin
-.else
-CONFIGURE_ARGS+= --without-postgresql
-.endif
-
-post-extract:
- @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-
-pre-configure:
-.if defined(WITHOUT_SQLITE) && !defined(WITH_MYSQL) && !defined(WITH_POSTGRESQL)
- @${ECHO} "You must have at least one database backend"
- @exit 1
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/misc/krecipes-kde4/distinfo b/misc/krecipes-kde4/distinfo
deleted file mode 100644
index b294e7046c8a..000000000000
--- a/misc/krecipes-kde4/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (krecipes-0.9.1.tar.gz) = 7414fd5210561801ba04ee3dad6561d9
-SHA256 (krecipes-0.9.1.tar.gz) = 6efdb751f26ab2460d84c39be25042d0bea013becf8c6b1a5ae2a5c46998a0f3
-SIZE (krecipes-0.9.1.tar.gz) = 7791658
diff --git a/misc/krecipes-kde4/pkg-descr b/misc/krecipes-kde4/pkg-descr
deleted file mode 100644
index a511adb347a0..000000000000
--- a/misc/krecipes-kde4/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Krecipes lets you manage your recipes, create shopping lists, choose a
-recipe based on available ingredients, and plan your menu/diet in advance.
-Uses your choice of SQLite, MySQL, or PostgreSQL as a database backend.
-
-WWW: http://krecipes.sourceforge.net/
-
-- Hank
-hank@millerfarm.com
diff --git a/misc/krecipes-kde4/pkg-plist b/misc/krecipes-kde4/pkg-plist
deleted file mode 100644
index c7743eab6f70..000000000000
--- a/misc/krecipes-kde4/pkg-plist
+++ /dev/null
@@ -1,262 +0,0 @@
-bin/krecipes
-share/applnk/Utilities/krecipes.desktop
-share/apps/krecipes/data/abbrev.txt
-share/apps/krecipes/data/data.sql
-share/apps/krecipes/data/samples-cs_CZ.kreml
-share/apps/krecipes/data/samples-en_US.kreml
-share/apps/krecipes/icons/crystalsvg/128x128/mimetypes/krecipes_file.png
-share/apps/krecipes/icons/crystalsvg/16x16/actions/categories.png
-share/apps/krecipes/icons/crystalsvg/16x16/actions/diet.png
-share/apps/krecipes/icons/crystalsvg/16x16/actions/ingredients.png
-share/apps/krecipes/icons/crystalsvg/16x16/actions/properties.png
-share/apps/krecipes/icons/crystalsvg/16x16/actions/trolley.png
-share/apps/krecipes/icons/crystalsvg/16x16/actions/units.png
-share/apps/krecipes/icons/crystalsvg/16x16/mimetypes/krecipes_file.png
-share/apps/krecipes/icons/crystalsvg/22x22/actions/categories.png
-share/apps/krecipes/icons/crystalsvg/22x22/actions/diet.png
-share/apps/krecipes/icons/crystalsvg/22x22/actions/ingredients.png
-share/apps/krecipes/icons/crystalsvg/22x22/actions/properties.png
-share/apps/krecipes/icons/crystalsvg/22x22/actions/trolley.png
-share/apps/krecipes/icons/crystalsvg/22x22/actions/units.png
-share/apps/krecipes/icons/crystalsvg/32x32/actions/categories.png
-share/apps/krecipes/icons/crystalsvg/32x32/actions/diet.png
-share/apps/krecipes/icons/crystalsvg/32x32/actions/ingredients.png
-share/apps/krecipes/icons/crystalsvg/32x32/actions/krectip.png
-share/apps/krecipes/icons/crystalsvg/32x32/actions/properties.png
-share/apps/krecipes/icons/crystalsvg/32x32/actions/trolley.png
-share/apps/krecipes/icons/crystalsvg/32x32/actions/units.png
-share/apps/krecipes/icons/crystalsvg/32x32/mimetypes/krecipes_file.png
-share/apps/krecipes/icons/crystalsvg/48x48/actions/categories.png
-share/apps/krecipes/icons/crystalsvg/48x48/actions/diet.png
-share/apps/krecipes/icons/crystalsvg/48x48/actions/ingredients.png
-share/apps/krecipes/icons/crystalsvg/48x48/actions/properties.png
-share/apps/krecipes/icons/crystalsvg/48x48/actions/trolley.png
-share/apps/krecipes/icons/crystalsvg/48x48/actions/units.png
-share/apps/krecipes/icons/crystalsvg/64x64/mimetypes/krecipes_file.png
-share/apps/krecipes/krecipesui.rc
-share/apps/krecipes/layouts/default.klo
-share/apps/krecipes/layouts/default_print.klo
-share/apps/krecipes/layouts/one_column.klo
-share/apps/krecipes/pics/dbpermissions.png
-share/apps/krecipes/pics/menubg.png
-share/apps/krecipes/pics/network.png
-share/apps/krecipes/pics/rating0.png
-share/apps/krecipes/pics/rating1.png
-share/apps/krecipes/pics/rating2.png
-share/apps/krecipes/pics/rating3.png
-share/apps/krecipes/pics/rating4.png
-share/apps/krecipes/pics/rating5.png
-share/apps/krecipes/pics/recipes.png
-share/apps/krecipes/pics/save.png
-share/apps/krecipes/pics/star_half.png
-share/apps/krecipes/pics/star_off.png
-share/apps/krecipes/pics/star_on.png
-share/apps/krecipes/pics/startlogo.png
-share/apps/krecipes/pics/wizard.png
-share/doc/HTML/da/krecipes/common
-share/doc/HTML/da/krecipes/index.cache.bz2
-share/doc/HTML/da/krecipes/index.docbook
-share/doc/HTML/en/krecipes/1leftarrow.png
-share/doc/HTML/en/krecipes/1rightarrow.png
-share/doc/HTML/en/krecipes/2leftarrow.png
-share/doc/HTML/en/krecipes/2rightarrow.png
-share/doc/HTML/en/krecipes/adv-cat-search.png
-share/doc/HTML/en/krecipes/adv-recipe-found.png
-share/doc/HTML/en/krecipes/adv-search-parts.png
-share/doc/HTML/en/krecipes/adv-srch-multi.png
-share/doc/HTML/en/krecipes/authors-adding.png
-share/doc/HTML/en/krecipes/back.png
-share/doc/HTML/en/krecipes/categories.png
-share/doc/HTML/en/krecipes/clear_left.png
-share/doc/HTML/en/krecipes/common
-share/doc/HTML/en/krecipes/computer3.png
-share/doc/HTML/en/krecipes/config-email.png
-share/doc/HTML/en/krecipes/configure-shortcuts-adv.png
-share/doc/HTML/en/krecipes/configure-shortcuts-basic.png
-share/doc/HTML/en/krecipes/configure-shortcuts.png
-share/doc/HTML/en/krecipes/configure-toolbars.png
-share/doc/HTML/en/krecipes/diet-help.png
-share/doc/HTML/en/krecipes/down.png
-share/doc/HTML/en/krecipes/editpaste.png
-share/doc/HTML/en/krecipes/enter-recipe-tabs.png
-share/doc/HTML/en/krecipes/filenew.png
-share/doc/HTML/en/krecipes/formatting.png
-share/doc/HTML/en/krecipes/forward.png
-share/doc/HTML/en/krecipes/import-other-sql.png
-share/doc/HTML/en/krecipes/import-recipe-screen.png
-share/doc/HTML/en/krecipes/import-settings.png
-share/doc/HTML/en/krecipes/import-sqlite.png
-share/doc/HTML/en/krecipes/index.cache.bz2
-share/doc/HTML/en/krecipes/index.docbook
-share/doc/HTML/en/krecipes/ingredient-match.png
-share/doc/HTML/en/krecipes/ingredients.png
-share/doc/HTML/en/krecipes/krecipes-main.png
-share/doc/HTML/en/krecipes/krectip.png
-share/doc/HTML/en/krecipes/locationbar_erase.png
-share/doc/HTML/en/krecipes/menu.png
-share/doc/HTML/en/krecipes/no.png
-share/doc/HTML/en/krecipes/page-setup.png
-share/doc/HTML/en/krecipes/parser.png
-share/doc/HTML/en/krecipes/performance.png
-share/doc/HTML/en/krecipes/prep-method.png
-share/doc/HTML/en/krecipes/properties.png
-share/doc/HTML/en/krecipes/ratings.png
-share/doc/HTML/en/krecipes/recipe-description-tab.png
-share/doc/HTML/en/krecipes/recipe-ingredients-tab.png
-share/doc/HTML/en/krecipes/recipe-instructions-tab.png
-share/doc/HTML/en/krecipes/restore-msg.png
-share/doc/HTML/en/krecipes/server-settings.png
-share/doc/HTML/en/krecipes/shop-list.png
-share/doc/HTML/en/krecipes/smiley.png
-share/doc/HTML/en/krecipes/submit-bug.png
-share/doc/HTML/en/krecipes/unit-conversions.png
-share/doc/HTML/en/krecipes/units.png
-share/doc/HTML/en/krecipes/up.png
-share/doc/HTML/es/krecipes/adv-cat-search.png
-share/doc/HTML/es/krecipes/adv-search-parts.png
-share/doc/HTML/es/krecipes/adv-srch-multi.png
-share/doc/HTML/es/krecipes/authors-adding.png
-share/doc/HTML/es/krecipes/back.png
-share/doc/HTML/es/krecipes/categories.png
-share/doc/HTML/es/krecipes/clear_left.png
-share/doc/HTML/es/krecipes/configure-shortcuts-adv.png
-share/doc/HTML/es/krecipes/configure-shortcuts-basic.png
-share/doc/HTML/es/krecipes/configure-shortcuts.png
-share/doc/HTML/es/krecipes/configure-toolbars.png
-share/doc/HTML/es/krecipes/diet-help.png
-share/doc/HTML/es/krecipes/down.png
-share/doc/HTML/es/krecipes/enter-recipe-tabs.png
-share/doc/HTML/es/krecipes/filenew.png
-share/doc/HTML/es/krecipes/formatting.png
-share/doc/HTML/es/krecipes/forward.png
-share/doc/HTML/es/krecipes/import-other-sql.png
-share/doc/HTML/es/krecipes/import-recipe-screen.png
-share/doc/HTML/es/krecipes/import-settings.png
-share/doc/HTML/es/krecipes/import-sqlite.png
-share/doc/HTML/es/krecipes/ingredient-match.png
-share/doc/HTML/es/krecipes/ingredients.png
-share/doc/HTML/es/krecipes/krecipes-main.png
-share/doc/HTML/es/krecipes/krectip.png
-share/doc/HTML/es/krecipes/locationbar_erase.png
-share/doc/HTML/es/krecipes/menu.png
-share/doc/HTML/es/krecipes/no.png
-share/doc/HTML/es/krecipes/page-setup.png
-share/doc/HTML/es/krecipes/performance.png
-share/doc/HTML/es/krecipes/prep-method.png
-share/doc/HTML/es/krecipes/properties.png
-share/doc/HTML/es/krecipes/recipe-description-tab.png
-share/doc/HTML/es/krecipes/recipe-ingredients-tab.png
-share/doc/HTML/es/krecipes/recipe-instructions-tab.png
-share/doc/HTML/es/krecipes/server-settings.png
-share/doc/HTML/es/krecipes/shop-list.png
-share/doc/HTML/es/krecipes/unit-conversions.png
-share/doc/HTML/es/krecipes/units.png
-share/doc/HTML/es/krecipes/up.png
-share/doc/HTML/et/krecipes/common
-share/doc/HTML/et/krecipes/index.cache.bz2
-share/doc/HTML/et/krecipes/index.docbook
-share/doc/HTML/pt/krecipes/common
-share/doc/HTML/pt/krecipes/index.cache.bz2
-share/doc/HTML/pt/krecipes/index.docbook
-share/doc/HTML/sv/krecipes/adv-recipe-found.png
-share/doc/HTML/sv/krecipes/authors-adding.png
-share/doc/HTML/sv/krecipes/categories.png
-share/doc/HTML/sv/krecipes/common
-share/doc/HTML/sv/krecipes/configure-shortcuts-adv.png
-share/doc/HTML/sv/krecipes/configure-shortcuts-basic.png
-share/doc/HTML/sv/krecipes/configure-shortcuts.png
-share/doc/HTML/sv/krecipes/configure-toolbars.png
-share/doc/HTML/sv/krecipes/diet-help.png
-share/doc/HTML/sv/krecipes/enter-recipe-tabs.png
-share/doc/HTML/sv/krecipes/formatting.png
-share/doc/HTML/sv/krecipes/import-other-sql.png
-share/doc/HTML/sv/krecipes/import-recipe-screen.png
-share/doc/HTML/sv/krecipes/import-settings.png
-share/doc/HTML/sv/krecipes/import-sqlite.png
-share/doc/HTML/sv/krecipes/index.cache.bz2
-share/doc/HTML/sv/krecipes/index.docbook
-share/doc/HTML/sv/krecipes/ingredient-match.png
-share/doc/HTML/sv/krecipes/ingredients.png
-share/doc/HTML/sv/krecipes/krecipes-main.png
-share/doc/HTML/sv/krecipes/menu.png
-share/doc/HTML/sv/krecipes/page-setup.png
-share/doc/HTML/sv/krecipes/prep-method.png
-share/doc/HTML/sv/krecipes/properties.png
-share/doc/HTML/sv/krecipes/recipe-description-tab.png
-share/doc/HTML/sv/krecipes/recipe-ingredients-tab.png
-share/doc/HTML/sv/krecipes/recipe-instructions-tab.png
-share/doc/HTML/sv/krecipes/server-settings.png
-share/doc/HTML/sv/krecipes/shop-list.png
-share/doc/HTML/sv/krecipes/unit-conversions.png
-share/doc/HTML/sv/krecipes/units.png
-share/icons/crystalsvg/128x128/mimetypes/krecipes_file.png
-share/icons/crystalsvg/16x16/mimetypes/krecipes_file.png
-share/icons/crystalsvg/32x32/mimetypes/krecipes_file.png
-share/icons/crystalsvg/64x64/mimetypes/krecipes_file.png
-share/icons/hicolor/128x128/apps/krecipes.png
-share/icons/hicolor/16x16/apps/krecipes.png
-share/icons/hicolor/22x22/apps/krecipes.png
-share/icons/hicolor/32x32/apps/krecipes.png
-share/icons/hicolor/48x48/apps/krecipes.png
-share/icons/hicolor/64x64/apps/krecipes.png
-share/locale/az/LC_MESSAGES/krecipes.mo
-share/locale/bg/LC_MESSAGES/krecipes.mo
-share/locale/br/LC_MESSAGES/krecipes.mo
-share/locale/ca/LC_MESSAGES/krecipes.mo
-share/locale/cs/LC_MESSAGES/krecipes.mo
-share/locale/cy/LC_MESSAGES/krecipes.mo
-share/locale/da/LC_MESSAGES/krecipes.mo
-share/locale/de/LC_MESSAGES/krecipes.mo
-share/locale/el/LC_MESSAGES/krecipes.mo
-share/locale/en_GB/LC_MESSAGES/krecipes.mo
-share/locale/es/LC_MESSAGES/krecipes.mo
-share/locale/et/LC_MESSAGES/krecipes.mo
-share/locale/fi/LC_MESSAGES/krecipes.mo
-share/locale/fr/LC_MESSAGES/krecipes.mo
-share/locale/ga/LC_MESSAGES/krecipes.mo
-share/locale/is/LC_MESSAGES/krecipes.mo
-share/locale/it/LC_MESSAGES/krecipes.mo
-share/locale/lt/LC_MESSAGES/krecipes.mo
-share/locale/mt/LC_MESSAGES/krecipes.mo
-share/locale/nb/LC_MESSAGES/krecipes.mo
-share/locale/nl/LC_MESSAGES/krecipes.mo
-share/locale/pl/LC_MESSAGES/krecipes.mo
-share/locale/pt/LC_MESSAGES/krecipes.mo
-share/locale/pt_BR/LC_MESSAGES/krecipes.mo
-share/locale/ro/LC_MESSAGES/krecipes.mo
-share/locale/ru/LC_MESSAGES/krecipes.mo
-share/locale/rw/LC_MESSAGES/krecipes.mo
-share/locale/sl/LC_MESSAGES/krecipes.mo
-share/locale/sr/LC_MESSAGES/krecipes.mo
-share/locale/sr@Latn/LC_MESSAGES/krecipes.mo
-share/locale/sv/LC_MESSAGES/krecipes.mo
-share/locale/ta/LC_MESSAGES/krecipes.mo
-share/locale/tr/LC_MESSAGES/krecipes.mo
-share/mimelnk/application/x-krecipes-backup.desktop
-share/mimelnk/application/x-krecipes-recipes.desktop
-@dirrm share/doc/HTML/sv/krecipes
-@dirrm share/doc/HTML/pt/krecipes
-@dirrm share/doc/HTML/et/krecipes
-@dirrm share/doc/HTML/es/krecipes
-@dirrm share/doc/HTML/en/krecipes
-@dirrm share/doc/HTML/da/krecipes
-@dirrm share/apps/krecipes/pics
-@dirrm share/apps/krecipes/layouts
-@dirrm share/apps/krecipes/icons/crystalsvg/64x64/mimetypes
-@dirrm share/apps/krecipes/icons/crystalsvg/64x64
-@dirrm share/apps/krecipes/icons/crystalsvg/48x48/actions
-@dirrm share/apps/krecipes/icons/crystalsvg/48x48
-@dirrm share/apps/krecipes/icons/crystalsvg/32x32/mimetypes
-@dirrm share/apps/krecipes/icons/crystalsvg/32x32/actions
-@dirrm share/apps/krecipes/icons/crystalsvg/32x32
-@dirrm share/apps/krecipes/icons/crystalsvg/22x22/actions
-@dirrm share/apps/krecipes/icons/crystalsvg/22x22
-@dirrm share/apps/krecipes/icons/crystalsvg/16x16/mimetypes
-@dirrm share/apps/krecipes/icons/crystalsvg/16x16/actions
-@dirrm share/apps/krecipes/icons/crystalsvg/16x16
-@dirrm share/apps/krecipes/icons/crystalsvg/128x128/mimetypes
-@dirrm share/apps/krecipes/icons/crystalsvg/128x128
-@dirrm share/apps/krecipes/icons/crystalsvg
-@dirrm share/apps/krecipes/icons
-@dirrm share/apps/krecipes/data
-@dirrm share/apps/krecipes
diff --git a/misc/logsurfer+/Makefile b/misc/logsurfer+/Makefile
deleted file mode 100644
index c79ae74f02ea..000000000000
--- a/misc/logsurfer+/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# New ports collection makefile for: logsurfer
-# Date created: 28 Jul 1996
-# Whom: shanee@augusta.de
-#
-# $FreeBSD$
-#
-
-PORTNAME= logsurfer
-PORTVERSION= 1.5b
-CATEGORIES= misc
-MASTER_SITES= ftp://ftp.cert.dfn.de/pub/tools/audit/logsurfer/%SUBDIR%/ \
- ftp://ftp.tuwien.ac.at/infosys/security/dfn/tools/audit/logsurfer/%SUBDIR%/
-EXTRACT_SUFX= .tar
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Process logfiles and conditionally perform certain actions
-
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --with-etc-dir=${PREFIX}/etc
-
-MAN1= logsurfer.1
-MAN4= logsurfer.conf.4
-
-post-install:
- @${MKDIR} ${PREFIX}/share/examples/logsurfer
- ${INSTALL_DATA} ${WRKSRC}/config-examples/README \
- ${PREFIX}/share/examples/logsurfer
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
-.for file in ChangeLog README
- ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.mk>
diff --git a/misc/logsurfer+/distinfo b/misc/logsurfer+/distinfo
deleted file mode 100644
index dfd2c0aa98ae..000000000000
--- a/misc/logsurfer+/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (logsurfer-1.5b.tar) = ade77bed7bc3c73fd26039e69c4937f4
-SHA256 (logsurfer-1.5b.tar) = d78328c3179e4500ecc5535712e298cf422acb8cc5c9c657b529f2fbb1b8b596
-SIZE (logsurfer-1.5b.tar) = 703488
diff --git a/misc/logsurfer+/files/patch-ac b/misc/logsurfer+/files/patch-ac
deleted file mode 100644
index 4bcb1e4a400a..000000000000
--- a/misc/logsurfer+/files/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/logsurfer.c.orig Mon Apr 8 10:15:53 1996
-+++ src/logsurfer.c Fri May 28 14:28:06 1999
-@@ -382,6 +382,7 @@
- (void) fprintf(stderr, "unable to allocate memory for logline_buffer\n");
- exit(99);
- }
-+ logline_buffer[0]='\0';
-
- while ( (opt = getopt(argc, argv, "fc:d:l:p:r:s")) != EOF )
- switch(opt) {
diff --git a/misc/logsurfer+/pkg-descr b/misc/logsurfer+/pkg-descr
deleted file mode 100644
index 55333f8a7359..000000000000
--- a/misc/logsurfer+/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Logsurfer is a program that works on single textlines from
-a logfile (or from standard input). It compares each line
-against regular expressions of a set of "rules" and per-
-forms certain actions that are defined for this match.
-
-WWW: http://www.cert.dfn.de/eng/logsurf/
diff --git a/misc/logsurfer+/pkg-plist b/misc/logsurfer+/pkg-plist
deleted file mode 100644
index 8d527a7b5130..000000000000
--- a/misc/logsurfer+/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/logsurfer
-%%PORTDOCS%%share/doc/logsurfer/ChangeLog
-%%PORTDOCS%%share/doc/logsurfer/README
-%%PORTDOCS%%@dirrm share/doc/logsurfer
-share/examples/logsurfer/README
-@dirrm share/examples/logsurfer