net-im/jabberd: Remove expired port

2024-04-30 net-im/jabberd: No longer developed as of 2019, consider using net-im/ejabberd

18 files changed, 1 insertions, 580 deletions

diff --git a/MOVED b/MOVED
index a4f0b052299d..30f18bee92e7 100644
--- a/MOVED
+++ b/MOVED
@@ -3225,3 +3225,4 @@ devel/libphk||2024-04-30|Has expired: Superseded by various other projects
 games/2048-qt||2024-04-30|Has expired: Unmaintained, last upstream release in 2016
 devel/cdash||2024-04-30|Has expired: Very outdated version that's unsupported upstream
 sysutils/dim||2024-04-30|Has expired: Abandonware, upstream stopped development in 2005
+net-im/jabberd||2024-04-30|Has expired: No longer developed as of 2019, consider using net-im/ejabberd
diff --git a/net-im/Makefile b/net-im/Makefile
index 464d73c16fd1..740c9532a0bc 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -29,7 +29,6 @@
     SUBDIR += iamb
     SUBDIR += icmpchat
     SUBDIR += icqlib
-    SUBDIR += jabberd
     SUBDIR += jarl
     SUBDIR += jicofo
     SUBDIR += jitsi-meet-full
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
deleted file mode 100644
index d8d2476a8a31..000000000000
--- a/net-im/jabberd/Makefile
+++ /dev/null
@@ -1,163 +0,0 @@
-PORTNAME=	jabberd
-PORTVERSION=	2.7.0
-PORTREVISION=	6
-CATEGORIES=	net-im
-MASTER_SITES=	https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \
-		LOCAL/matthew/${PORTNAME}
-
-MAINTAINER=	mm@FreeBSD.org
-COMMENT=	Online presence and instant messaging server
-WWW=		https://jabberd2.org/
-
-LICENSE=	GPLv2
-
-DEPRECATED=	No longer developed as of 2019, consider using net-im/ejabberd
-EXPIRATION_DATE=2024-04-30
-
-LIB_DEPENDS=	libexpat.so:textproc/expat2 \
-		libgsasl.so:security/libgsasl \
-		libidn.so:dns/libidn \
-		libudns.so:dns/udns
-
-USES=		autoreconf compiler:c11 iconv libtool perl5 pkgconfig \
-		ssl tar:xz
-
-OPTIONS_DEFINE=	MYSQL PGSQL LDAP BDB SQLITE PAM PIPE ANON FS DEBUG REQUIRES \
-		DOCS SUPERSEDED EXPERIMENTAL
-OPTIONS_DEFAULT=MYSQL DEBUG
-OPTIONS_SUB=	yes
-
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-INSTALL_TARGET=	install-strip
-USE_PERL5=	run
-USE_RC_SUBR=	jabberd
-USE_LDCONFIG=	${PREFIX}/lib/jabberd
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--sysconfdir=${PREFIX}/etc/jabberd \
-		--enable-ssl --enable-mio=kqueue \
-		--disable-tests \
-		--with-sasl=gsasl \
-		--with-extra-include-path="${LOCALBASE}/include ${EIP}" \
-		--with-extra-library-path="${LOCALBASE}/lib ${ELP}"
-
-JABBER_USER=	jabber
-JABBER_GROUP=	jabber
-
-USERS=		${JABBER_USER}
-GROUPS=		${JABBER_GROUP}
-
-JABBER_ETCDIR=	"${PREFIX}/etc/jabberd"
-JABBER_RUNDIR=	"/var/jabberd"
-
-PLIST_SUB+=	JABBER_USER=${JABBER_USER} \
-		JABBER_GROUP=${JABBER_GROUP} \
-		JABBER_ETCDIR="${JABBER_ETCDIR}" \
-		JABBER_RUNDIR="${JABBER_RUNDIR}"
-
-SUB_LIST+=	JABBER_USER=${JABBER_USER} \
-		JABBER_RUNDIR="${JABBER_RUNDIR}" \
-		PERL="${PERL}"
-
-PORTDOCS=	*
-
-DOCFILES=	AUTHORS ChangeLog NEWS README README.config \
-		README.protocol TODO
-
-_REQUIRE=	LOGIN
-
-ELP+=	${OPENSSLLIB}
-EIP+=	${OPENSSLINC}
-
-DEBUG_CONFIGURE_ENABLE=	debug
-
-PGSQL_USES=		pgsql
-PGSQL_CONFIGURE_ENABLE=	pgsql
-
-SQLITE_CONFIGURE_ENABLE=sqlite
-SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
-
-MYSQL_USES=		mysql
-MYSQL_CONFIGURE_ENABLE=	mysql
-MYSQL_VARS=	IGNORE_WITH_MYSQL="81"
-
-BDB_USES=		bdb
-BDB_CONFIGURE_ENABLE=	db
-BDB_CONFIGURE_ON=	--oldincludedir=/nonexistant
-
-LDAP_USES=		ldap
-LDAP_CONFIGURE_ENABLE=	ldap
-
-FS_CONFIGURE_ENABLE=	fs
-FS_DESC=		Filesystem storage (only for testing)
-
-PAM_CONFIGURE_ENABLE=	pam
-
-PIPE_CONFIGURE_ENABLE=	pipe
-PIPE_DESC=		Enable pipe (auth/reg)
-
-ANON_CONFIGURE_ENABLE=	anon
-ANON_DESC=		Enable anonymous (auth/reg)
-
-SUPERSEDED_CONFIGURE_ENABLE=	superseded
-SUPERSEDED_DESC=	Enable superseded features (ns_TIME)
-
-EXPERIMENTAL_CONFIGURE_ENABLE=	experimental
-EXPERIMENTAL_DESC=	Enable experimental features (TLS-Everywhere)
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPGSQL}
-_REQUIRE+=		postgresql
-.endif
-
-.if ${PORT_OPTIONS:MMYSQL}
-EIP+=${LOCALBASE}/include/mysql
-ELP+=${LOCALBASE}/lib/mysql
-_REQUIRE+=	mysql
-.endif
-
-.if ${PORT_OPTIONS:MBDB}
-EIP+=${BDB_INCLUDE_DIR}
-ELP+=${BDB_LIB_DIR}
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-_REQUIRE+=	slapd
-.endif
-
-.if ${PORT_OPTIONS:MREQUIRES}
-SUB_LIST+=	REQUIRE="${_REQUIRE}"
-.else
-SUB_LIST+=	REQUIRE="LOGIN"
-.endif
-REQUIRES_DESC=	Add backend requires to startup script
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-.for FILE in c2s.xml jabberd.cfg router-filter.xml router-users.xml \
-	router.xml s2s.xml sm.xml templates/roster.xml
-	@${MV} ${WRKSRC}/etc/${FILE}.dist.in ${WRKSRC}/etc/${FILE}.sample.in
-.endfor
-.if ${PORT_OPTIONS:MMYSQL} && ${MYSQL_VER:U} == 80
-	cd ${WRKSRC}/storage && \
-	${REINPLACE_CMD} 's/my_bool/_Bool/g' authreg_mysql.c storage_mysql.c
-.endif
-
-post-install:
-.for DIR in db logs pid
-	@${MKDIR} ${STAGEDIR}${JABBER_RUNDIR}/${DIR}
-.endfor
-	@${CHMOD} -R go= ${STAGEDIR}${JABBER_RUNDIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for FILE in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR}
-.endfor
-.for FILE in db-setup.mysql db-setup.pgsql db-setup.sqlite
-	${INSTALL_DATA} ${WRKSRC}/tools/${FILE} ${STAGEDIR}${DOCSDIR}
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/net-im/jabberd/distinfo b/net-im/jabberd/distinfo
deleted file mode 100644
index 4edbd1b5ccd3..000000000000
--- a/net-im/jabberd/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1541116827
-SHA256 (jabberd-2.7.0.tar.xz) = a0273b5db690b18e5b86e2aecbe08fd0561f4ec20c190b390d4ef8c9034382a3
-SIZE (jabberd-2.7.0.tar.xz) = 1560872
diff --git a/net-im/jabberd/files/jabberd.in b/net-im/jabberd/files/jabberd.in
deleted file mode 100644
index 48f16063e194..000000000000
--- a/net-im/jabberd/files/jabberd.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: jabberd
-# REQUIRE: %%REQUIRE%%
-# KEYWORD: shutdown
-
-
-# Define these jabberd_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
-jabberd_chdir=${jabberd_chdir-"%%JABBER_RUNDIR%%/pid"}
-jabberd_enable=${jabberd_enable-"NO"}
-jabberd_user=${jabberd_user-"%%JABBER_USER%%"}
-
-. /etc/rc.subr
-
-name="jabberd"
-rcvar=jabberd_enable
-command_interpreter="%%PERL%%"
-command="%%PREFIX%%/bin/jabberd"
-command_args="-b"
-stop_postcmd=jabberd_post_stopcmd
-
-load_rc_config $name
-
-jabberd_post_stopcmd()
-{
-	for file in c2s router s2s sm; do
-		rm -f ${jabberd_chdir}/$file.pid
-	done
-}
-
-case "$1" in
-	forcestop)
-		echo "Stopping jabberd."
-		killall -u ${jabberd_user} c2s router s2s sm
-		jabberd_post_stopcmd
-	;;
-	*)
-		run_rc_command "$1"
-	;;
-esac
diff --git a/net-im/jabberd/files/patch-configure.ac b/net-im/jabberd/files/patch-configure.ac
deleted file mode 100644
index c250de1d7d1d..000000000000
--- a/net-im/jabberd/files/patch-configure.ac
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure.ac.orig	2018-11-01 20:35:12 UTC
-+++ configure.ac
-@@ -74,10 +74,6 @@ if test "x-$want_mio_debug" = "x-yes" ; then
-     AC_DEFINE(MIO_DEBUG,1,[Define to 1 if you want to enable managed IO debug output.])
- fi
- 
--# Colorized build output
--AX_CHECK_COMPILE_FLAG([-fdiagnostics-color], [CFLAGS="${CFLAGS} -fdiagnostics-color"],
--    [AX_CHECK_COMPILE_FLAG([-fcolor-diagnostics], [CFLAGS="${CFLAGS} -fcolor-diagnostics"])])
--
- # Two-step header checking.  First check for headers which don't
- # require any other headers.
- AC_HEADER_DIRENT
-@@ -396,15 +392,39 @@ fi
- #
- # optional libs
- 
--# OpenSSL >= 1.0.2
--AC_ARG_ENABLE(ssl, AC_HELP_STRING([--enable-ssl], [enable SSL/TLS support (yes)]), want_ssl=$enableval, want_ssl=yes)
--AS_IF([test "x$want_ssl" = "xyes"], [
--	PKG_CHECK_MODULES(SSL, openssl >= 1.0.2,
--		have_ssl="yes"
-+# OpenSSL >= 1.0.1
-+AC_ARG_ENABLE(ssl, AC_HELP_STRING([--enable-ssl[=DIR]], [enable SSL/TLS support (yes)]), want_ssl=$enableval, want_ssl=yes)
-+if test "x-$want_ssl" != "x-no" ; then
-+    if test "x-$want_ssl" != "x-yes" ; then
-+        CFLAGS="$CFLAGS -I$enableval/include" 
-+        CPPFLAGS="$CPPFLAGS -I$enableval/include" 
-+        LDFLAGS="$LDFLAGS -L$enableval/lib"
-+    fi
-+    AC_CHECK_HEADERS(openssl/crypto.h)
-+    if test "x-$ac_cv_header_openssl_crypto_h" = "x-yes" ; then
-+        AC_CHECK_LIB(crypto, HMAC_Update)
-+    fi
-+    if test "x-$ac_cv_lib_crypto_HMAC_Update" = "x-yes" ; then
-+        AC_CHECK_HEADERS(openssl/ssl.h)
-+    fi
-+    if test "x-$ac_cv_header_openssl_ssl_h" = "x-yes" ; then
-+        AC_CHECK_LIB(ssl, SSL_connect)
-+    fi
-+    if test "x-$ac_cv_lib_ssl_SSL_connect" = "x-yes" ; then
-+        AC_MSG_CHECKING(for OpenSSL version >= 1.0.1)
-+        AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <openssl/crypto.h>]],
-+                                       [[return !(SSLeay() >= 0x010001000L)]])],
-+                      [AC_MSG_RESULT(yes)
-+                       have_openssl=yes],
-+                      AC_MSG_RESULT(no))
-+    fi
-+    if test "x-$have_openssl" != "x-yes" ; then
-+        AC_MSG_ERROR([OpenSSL >= 1.0.1 not found])
-+    fi
-+
-     AC_DEFINE(HAVE_SSL,1,[Define to 1 if OpenSSL is available.])
--	)
--])
--AM_CONDITIONAL(HAVE_SSL, [test "x$have_ssl" = "xyes"])
-+fi
-+AM_CONDITIONAL(HAVE_SSL, [test "x-$have_openssl" = "x-yes"])
- 
- dnl Check for & handle argument to --with-zlib.
- _cppflags=$CPPFLAGS
diff --git a/net-im/jabberd/files/patch-etc__Makefile.am b/net-im/jabberd/files/patch-etc__Makefile.am
deleted file mode 100644
index a75f5ee73d49..000000000000
--- a/net-im/jabberd/files/patch-etc__Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
---- etc/Makefile.am.orig	2016-05-03 22:25:09 UTC
-+++ etc/Makefile.am
-@@ -1,12 +1,8 @@
- LIBTOOL += --quiet
- 
--sysconf_DATA = c2s.xml.dist router.xml.dist s2s.xml.dist sm.xml.dist jabberd.cfg.dist router-users.xml.dist router-filter.xml.dist
--initdir = $(prefix)/etc/init
--init_DATA = jabberd-c2s.conf jabberd-router.conf jabberd-s2s.conf jabberd-sm.conf
--systemddir = $(prefix)/lib/systemd/system
--systemd_DATA = jabberd-sm.service jabberd.service jabberd-s2s.service jabberd-router.service jabberd-c2s.service
--configs = $(sysconf_DATA) $(init_DATA) $(systemd_DATA)
--EXTRA_DIST = $(sysconf_DATA:%.dist=%.dist.in) $(init_DATA:%.conf=%.conf.in) $(systemd_DATA:%.service=%.service.in)
-+sysconf_DATA = c2s.xml.sample router.xml.sample s2s.xml.sample sm.xml.sample jabberd.cfg.sample router-users.xml.sample router-filter.xml.sample
-+configs = $(sysconf_DATA)
-+EXTRA_DIST = $(sysconf_DATA:%.sample=%.sample.in)
- 
- SUBDIRS = templates
- 
-@@ -20,7 +16,7 @@ edit = sed \
- 	-e 's,@libdir\@,$(libdir),g' \
- 	-e 's,@pkglibdir\@,$(pkglibdir),g'
- 
--$(configs): $(sysconf_DATA:%.dist=@srcdir@/%.dist.in) $(init_DATA:%.conf=@srcdir@/%.conf.in) $(systemd_DATA:%.service=%.service.in)
-+$(configs): $(sysconf_DATA:%.sample=@srcdir@/%.sample.in)
- 	@echo "generating $@ from $@.in"; \
-     edit='$(edit)'; \
-     list='$(jabberd_bin)'; for p in $$list; do \
-@@ -33,7 +29,7 @@ $(configs): $(sysconf_DATA:%.dist=@srcdir@/%.dist.in) 
-     
- install-data-hook:
- 	@list='$(sysconf_DATA)'; for p in $$list; do \
--      dest=`echo $$p | sed -e s/.dist//`; \
-+      dest=`echo $$p | sed -e s/.sample//`; \
- 	  if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
-         echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
-       else \
diff --git a/net-im/jabberd/files/patch-etc__templates__Makefile.am b/net-im/jabberd/files/patch-etc__templates__Makefile.am
deleted file mode 100644
index 24c06e3c499f..000000000000
--- a/net-im/jabberd/files/patch-etc__templates__Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
---- etc/templates/Makefile.am.orig	2016-05-03 22:25:09 UTC
-+++ etc/templates/Makefile.am
-@@ -2,8 +2,8 @@ templatesdir = $(sysconfdir)/templates
- 
- LIBTOOL += --quiet
- 
--templates_DATA = roster.xml.dist
--EXTRA_DIST = roster.xml.dist.in
-+templates_DATA = roster.xml.sample
-+EXTRA_DIST = roster.xml.sample.in
- 
- edit = sed \
- 	-e 's,@sysconfdir\@,$(sysconfdir),g' \
-@@ -18,7 +18,7 @@ $(templates_DATA):
-     
- install-data-hook:
- 	@list='$(templates_DATA)'; for p in $$list; do \
--      dest=`echo $$p | sed -e s/.dist//`; \
-+      dest=`echo $$p | sed -e s/.sample//`; \
- 	  if test -f $(DESTDIR)$(templatesdir)/$$dest; then \
-         echo "$@ will not overwrite existing $(DESTDIR)$(templatesdir)/$$dest"; \
-       else \
diff --git a/net-im/jabberd/files/patch-sm__mod_iq_time.c b/net-im/jabberd/files/patch-sm__mod_iq_time.c
deleted file mode 100644
index b3ad54935960..000000000000
--- a/net-im/jabberd/files/patch-sm__mod_iq_time.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- sm/mod_iq_time.c.orig	2016-02-09 09:47:02 UTC
-+++ sm/mod_iq_time.c
-@@ -77,7 +77,7 @@ static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pk
- 
-     datetime_out(t, dt_DATETIME, buf, 64);
-     nad_insert_elem(pkt->nad, 2, NAD_ENS(pkt->nad, 1), "utc", buf);
--#ifdef HAVE_TZSET
-+#ifdef HAVE_TZNAME
-     snprintf(buf, 64, "%+03d:%02d", -((int)timezone)/(60*60), -((int)timezone)%(60*60));
- #else
-     snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60));
diff --git a/net-im/jabberd/files/patch-storage__authreg_ldapfull.c b/net-im/jabberd/files/patch-storage__authreg_ldapfull.c
deleted file mode 100644
index 523d0d821bb3..000000000000
--- a/net-im/jabberd/files/patch-storage__authreg_ldapfull.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/authreg_ldapfull.c.orig	2018-11-01 20:14:26 UTC
-+++ storage/authreg_ldapfull.c
-@@ -29,6 +29,8 @@
-  * !!! this blocks for every auth.
-  */
- 
-+#include <stdio.h>
-+
- #define _XOPEN_SOURCE 500	// need this to get crypt()
- #include "c2s.h"
- 
diff --git a/net-im/jabberd/files/patch-storage__authreg_mysql.c b/net-im/jabberd/files/patch-storage__authreg_mysql.c
deleted file mode 100644
index 804b657ae5ac..000000000000
--- a/net-im/jabberd/files/patch-storage__authreg_mysql.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/authreg_mysql.c.orig	2018-11-02 00:09:16 UTC
-+++ storage/authreg_mysql.c
-@@ -20,6 +20,8 @@
- 
- /* this module talks to a MySQL server via libmysqlclient */
- 
-+#include <stdio.h>
-+
- #define _XOPEN_SOURCE 500
- #include "c2s.h"
- #include <mysql.h>
diff --git a/net-im/jabberd/files/patch-storage__authreg_pgsql.c b/net-im/jabberd/files/patch-storage__authreg_pgsql.c
deleted file mode 100644
index d6764a5c3adc..000000000000
--- a/net-im/jabberd/files/patch-storage__authreg_pgsql.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/authreg_pgsql.c.orig	2016-05-08 14:30:08 UTC
-+++ storage/authreg_pgsql.c
-@@ -20,6 +20,8 @@
- 
- /* this module talks to a PostgreSQL server via libpq */
- 
-+#include <stdio.h>
-+
- #define _XOPEN_SOURCE 500
- #include "c2s.h"
- #include <libpq-fe.h>
diff --git a/net-im/jabberd/files/patch-storage__authreg_sqlite.c b/net-im/jabberd/files/patch-storage__authreg_sqlite.c
deleted file mode 100644
index abb082300344..000000000000
--- a/net-im/jabberd/files/patch-storage__authreg_sqlite.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/authreg_sqlite.c.orig	2016-05-03 20:05:25 UTC
-+++ storage/authreg_sqlite.c
-@@ -29,6 +29,8 @@
-  * to the Jabberd project.
-  */
- 
-+#include <stdio.h>
-+
- #define _XOPEN_SOURCE 500
- #include "c2s.h"
- #include <sqlite3.h>
diff --git a/net-im/jabberd/files/patch-tools__jabberd.in b/net-im/jabberd/files/patch-tools__jabberd.in
deleted file mode 100644
index bb542fde0bf0..000000000000
--- a/net-im/jabberd/files/patch-tools__jabberd.in
+++ /dev/null
@@ -1,54 +0,0 @@
---- tools/jabberd.in.orig	2016-02-09 09:45:54 UTC
-+++ tools/jabberd.in
-@@ -1,10 +1,5 @@
--#!/bin/sh
--#-*-Perl-*-
-+#!/usr/local/bin/perl
- 
--exec perl -w -x $0 "$@"
--
--#!perl
--
- ##############################################################################
- #
- # jabberd - perl wrapper script to manage launching and controlling the various
-@@ -28,8 +23,7 @@ my $Bin = "@bindir@";
- my $LibExec = "@libexecdir@";
- my $VERSION = "@VERSION@";
- my $config_dir = "@sysconfdir@";
--my $config = $config_dir."/jabberd.cfg";
--$config = "internal" unless (-e $config);
-+my $config = "jabberd.cfg";
- my $debug = 0;
- my $daemon = 0;
- my $g_kill_signal = "";
-@@ -44,13 +38,20 @@ my @programs;
- # Process the command line arguments
- #-----------------------------------------------------------------------------
- my %opts;
--getopts("c:Dhb",\%opts);
-+getopts("c:d:Dhb",\%opts);
- &usage if exists($opts{h});
- if (exists($opts{c}))
- {
-     $config = $opts{c} if (defined($opts{c}) && ($opts{c} ne ""));
-     &usage() if (!defined($opts{c}) || ($opts{c} eq ""));
- }
-+if (exists($opts{d}))
-+{
-+    $config_dir = $opts{d} if (defined($opts{d}) && ($opts{d} ne ""));
-+    &usage() if (!defined($opts{d}) || ($opts{d} eq ""));
-+}
-+$config = $config_dir.'/'.$config if ($config !~ /^\//);
-+$config = "internal" unless (-e $config);
- 
- $debug = 1 if exists($opts{D});
- $daemon = 1 if exists($opts{b});
-@@ -120,6 +121,7 @@ if ($debug)
-     &debug("jabberd","stdout","debug on\n");
-     &debug("jabberd","stdout","version($VERSION)\n");
-     &debug("jabberd","stdout","config_dir($config_dir)\n");
-+    &debug("jabberd","stdout","config($config)\n");
- }
- 
- #-----------------------------------------------------------------------------
diff --git a/net-im/jabberd/files/patch-util_crypt__blowfish.c b/net-im/jabberd/files/patch-util_crypt__blowfish.c
deleted file mode 100644
index eac69eb7484a..000000000000
--- a/net-im/jabberd/files/patch-util_crypt__blowfish.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/crypt_blowfish.c.orig	2016-05-08 14:30:08 UTC
-+++ util/crypt_blowfish.c
-@@ -1106,7 +1106,7 @@ char *crypt_ra(const char *key, const char *setting,
- 	return _crypt_blowfish_rn(key, setting, (char *)*data, *size);
- }
- 
--char *crypt_r(const char *key, const char *setting, void *data)
-+char *_crypt_r(const char *key, const char *setting, void *data)
- {
- 	return _crypt_retval_magic(
- 		crypt_rn(key, setting, data, CRYPT_OUTPUT_SIZE),
diff --git a/net-im/jabberd/files/patch-util_crypt__blowfish.h b/net-im/jabberd/files/patch-util_crypt__blowfish.h
deleted file mode 100644
index 499e1ff5834b..000000000000
--- a/net-im/jabberd/files/patch-util_crypt__blowfish.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- util/crypt_blowfish.h.orig	2016-05-08 14:30:08 UTC
-+++ util/crypt_blowfish.h
-@@ -23,7 +23,7 @@
- #endif
- 
- extern char *bcrypt(__const char *key, __const char *setting);
--extern char *crypt_r(__const char *key, __const char *setting, void *data);
-+extern char *_crypt_r(__const char *key, __const char *setting, void *data);
- 
- #ifndef __SKIP_OW
- extern char *crypt_rn(__const char *key, __const char *setting,
diff --git a/net-im/jabberd/pkg-descr b/net-im/jabberd/pkg-descr
deleted file mode 100644
index 8dea462c54ed..000000000000
--- a/net-im/jabberd/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-jabberd 2.x series is the next generation of the Jabber/XMPP server.
-It has been rewritten from the ground up to be scalable, architecturally
-sound and to support the latest protocol extensions coming out of the XSF.
diff --git a/net-im/jabberd/pkg-plist b/net-im/jabberd/pkg-plist
deleted file mode 100644
index 299566ecc5af..000000000000
--- a/net-im/jabberd/pkg-plist
+++ /dev/null
@@ -1,115 +0,0 @@
-bin/c2s
-bin/jabberd
-bin/router
-bin/s2s
-bin/sm
-@sample etc/jabberd/c2s.xml.sample
-@sample etc/jabberd/jabberd.cfg.sample
-@sample etc/jabberd/router-filter.xml.sample
-@sample etc/jabberd/router-users.xml.sample
-@sample etc/jabberd/router.xml.sample
-@sample etc/jabberd/s2s.xml.sample
-@sample etc/jabberd/sm.xml.sample
-@sample etc/jabberd/templates/roster.xml.sample
-%%ANON%%lib/jabberd/authreg_anon.so
-%%BDB%%lib/jabberd/authreg_db.so
-%%LDAP%%lib/jabberd/authreg_ldap.so
-%%LDAP%%lib/jabberd/authreg_ldapfull.so
-%%MYSQL%%lib/jabberd/authreg_mysql.so
-%%PAM%%lib/jabberd/authreg_pam.so
-%%PIPE%%lib/jabberd/authreg_pipe.so
-%%PGSQL%%lib/jabberd/authreg_pgsql.so
-%%SQLITE%%lib/jabberd/authreg_sqlite.so
-lib/jabberd/libstorage.so
-lib/jabberd/libstorage.so.0
-lib/jabberd/libstorage.so.0.0.0
-lib/jabberd/mod_active.so
-lib/jabberd/mod_active.so.0
-lib/jabberd/mod_active.so.0.0.0
-lib/jabberd/mod_amp.so
-lib/jabberd/mod_amp.so.0
-lib/jabberd/mod_amp.so.0.0.0
-lib/jabberd/mod_announce.so
-lib/jabberd/mod_announce.so.0
-lib/jabberd/mod_announce.so.0.0.0
-lib/jabberd/mod_deliver.so
-lib/jabberd/mod_deliver.so.0
-lib/jabberd/mod_deliver.so.0.0.0
-lib/jabberd/mod_disco.so
-lib/jabberd/mod_disco.so.0
-lib/jabberd/mod_disco.so.0.0.0
-lib/jabberd/mod_echo.so
-lib/jabberd/mod_echo.so.0
-lib/jabberd/mod_echo.so.0.0.0
-lib/jabberd/mod_help.so
-lib/jabberd/mod_help.so.0
-lib/jabberd/mod_help.so.0.0.0
-lib/jabberd/mod_iq-last.so
-lib/jabberd/mod_iq-last.so.0
-lib/jabberd/mod_iq-last.so.0.0.0
-lib/jabberd/mod_iq-ping.so
-lib/jabberd/mod_iq-ping.so.0
-lib/jabberd/mod_iq-ping.so.0.0.0
-lib/jabberd/mod_iq-private.so
-lib/jabberd/mod_iq-private.so.0
-lib/jabberd/mod_iq-private.so.0.0.0
-lib/jabberd/mod_iq-time.so
-lib/jabberd/mod_iq-time.so.0
-lib/jabberd/mod_iq-time.so.0.0.0
-lib/jabberd/mod_iq-vcard.so
-lib/jabberd/mod_iq-vcard.so.0
-lib/jabberd/mod_iq-vcard.so.0.0.0
-lib/jabberd/mod_iq-version.so
-lib/jabberd/mod_iq-version.so.0
-lib/jabberd/mod_iq-version.so.0.0.0
-lib/jabberd/mod_offline.so
-lib/jabberd/mod_offline.so.0
-lib/jabberd/mod_offline.so.0.0.0
-lib/jabberd/mod_pep.so
-lib/jabberd/mod_pep.so.0
-lib/jabberd/mod_pep.so.0.0.0
-lib/jabberd/mod_presence.so
-lib/jabberd/mod_presence.so.0
-lib/jabberd/mod_presence.so.0.0.0
-lib/jabberd/mod_privacy.so
-lib/jabberd/mod_privacy.so.0
-lib/jabberd/mod_privacy.so.0.0.0
-lib/jabberd/mod_roster.so
-lib/jabberd/mod_roster.so.0
-lib/jabberd/mod_roster.so.0.0.0
-lib/jabberd/mod_roster-publish.so
-lib/jabberd/mod_roster-publish.so.0
-lib/jabberd/mod_roster-publish.so.0.0.0
-lib/jabberd/mod_session.so
-lib/jabberd/mod_session.so.0
-lib/jabberd/mod_session.so.0.0.0
-lib/jabberd/mod_status.so
-lib/jabberd/mod_status.so.0
-lib/jabberd/mod_status.so.0.0.0
-lib/jabberd/mod_template-roster.so
-lib/jabberd/mod_template-roster.so.0
-lib/jabberd/mod_template-roster.so.0.0.0
-lib/jabberd/mod_vacation.so
-lib/jabberd/mod_vacation.so.0
-lib/jabberd/mod_vacation.so.0.0.0
-lib/jabberd/mod_validate.so
-lib/jabberd/mod_validate.so.0
-lib/jabberd/mod_validate.so.0.0.0
-lib/jabberd/mod_verify.so
-lib/jabberd/mod_verify.so.0
-lib/jabberd/mod_verify.so.0.0.0
-%%FS%%lib/jabberd/storage_fs.so
-%%BDB%%lib/jabberd/storage_db.so
-%%LDAP%%lib/jabberd/storage_ldapvcard.so
-%%MYSQL%%lib/jabberd/storage_mysql.so
-%%PGSQL%%lib/jabberd/storage_pgsql.so
-%%SQLITE%%lib/jabberd/storage_sqlite.so
-share/man/man8/c2s.8.gz
-share/man/man8/jabberd.8.gz
-share/man/man8/router.8.gz
-share/man/man8/s2s.8.gz
-share/man/man8/sm.8.gz
-@dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_RUNDIR%%/db
-@dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_RUNDIR%%/logs
-@dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_RUNDIR%%/pid
-@dir(%%JABBER_USER%%,%%JABBER_GROUP%%,0700) %%JABBER_RUNDIR%%