Remove expired ports:

2018-09-15 www/bookmarkbridge: Unmaintained. Unlikely to work correctly with modern browsers
2018-09-15 mail/annoyance-filter: Unmaintained upstream
2018-09-15 mail/pop3vscan: Unmaintained upstream
2018-09-15 audio/firefly: Unmaintained.  Use audio/forked-daapd instead
2018-09-15 www/hs-hS3: Not being developed upstream
2018-09-15 converters/hs-dataenc: Not being developed upstream
2018-09-15 devel/tinyq: Unmaintained upstream and unused in the ports tree
2018-09-15 devel/hs-hashed-storage: Not being developed upstream

11 files changed, 0 insertions, 446 deletions

diff --git a/audio/Makefile b/audio/Makefile
index a1c604ddc2b1..fa701556ff66 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -180,7 +180,6 @@
     SUBDIR += festvox-rab16
     SUBDIR += festvox-rab8
     SUBDIR += festvox-russian
-    SUBDIR += firefly
     SUBDIR += flac
     SUBDIR += flac123
     SUBDIR += flacon
diff --git a/audio/firefly/Makefile b/audio/firefly/Makefile
deleted file mode 100644
index 842e709b8237..000000000000
--- a/audio/firefly/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-# Created by: Mark Foster <mark@foster.cc>
-# $FreeBSD$
-
-PORTNAME=	firefly
-PORTVERSION=	1696
-PORTREVISION=	17
-CATEGORIES=	audio
-MASTER_SITES=	SF/fireflyserver-server/Sources/mt-daapd/svn-${PORTVERSION}
-DISTNAME=	mt-daapd-svn-${PORTVERSION}
-
-MAINTAINER=	info@NetOcean.de
-COMMENT=	Open-source media server for the Roku SoundBridge and iTunes
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Unmaintained.  Use audio/forked-daapd instead
-EXPIRATION_DATE=	2018-09-15
-
-BUILD_DEPENDS=	${LOCALBASE}/include/vorbis/codec.h:audio/libvorbis \
-		${LOCALBASE}/include/FLAC/metadata.h:audio/flac
-RUN_DEPENDS=	oggdec:audio/vorbis-tools \
-		flac:audio/flac
-LIB_DEPENDS=	libogg.so:audio/libogg \
-		libsqlite3.so:databases/sqlite3 \
-		libid3tag.so:audio/libid3tag
-
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--with-id3tag=${LOCALBASE} --enable-sqlite3 \
-		--enable-oggvorbis --enable-flac --localstatedir=/var
-USES=		libtool
-INSTALL_TARGET=	install-strip
-
-DAAPD_USER?=	daapd
-DAAPD_GROUP?=	daapd
-DAAPD_DBDIR?=	/var/db/${PORTNAME}
-USE_RC_SUBR=	mt-daapd
-USERS=		${DAAPD_USER}
-GROUPS=		${DAAPD_GROUP}
-
-SUB_LIST+=	DAAPD_USER=${DAAPD_USER} \
-		DAAPD_GROUP=${DAAPD_GROUP} \
-		DAAPD_DBDIR=${DAAPD_DBDIR}
-SUB_FILES=	pkg-message
-PLIST_SUB+=	DAAPD_DBDIR=${DAAPD_DBDIR} \
-		DAAPD_USER=${DAAPD_USER} \
-		DAAPD_GROUP=${DAAPD_GROUP}
-
-USE_LDCONFIG=	yes
-
-USE_GCC=	any
-
-OPTIONS_DEFINE=	JAPANESE DOCS
-JAPANESE_DESC=	Japanese support in ID3 tags
-
-JAPANESE_EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_scan-mp3.c
-JAPANESE_USES=		iconv
-JAPANESE_CONFIGURE_ON=	--enable-iconv
-
-pre-everything::
-	@${ECHO_CMD} "Define vars below if you need:"
-	@${ECHO_CMD} "DAAPD_USER=${DAAPD_USER} (default: daapd)"
-	@${ECHO_CMD} "DAAPD_GROUP=${DAAPD_GROUP} (default: daapd)"
-	@${ECHO_CMD} "DAAPD_DBDIR=${DAAPD_DBDIR} (default: /var/db/${PORTNAME})"
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.conf \
-		${STAGEDIR}${PREFIX}/etc/${PORTNAME}/mt-daapd.conf.sample
-	@${MKDIR} ${STAGEDIR}${DAAPD_DBDIR}
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in README AUTHORS COPYING CREDITS \
-	ChangeLog INSTALL NEWS TODO
-	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/audio/firefly/distinfo b/audio/firefly/distinfo
deleted file mode 100644
index 7bd8f076c929..000000000000
--- a/audio/firefly/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mt-daapd-svn-1696.tar.gz) = 9c3f1fc4d46391286ec8572c3080bb28d681ea6b1afe3ba51ffadf2eb7cfa344
-SIZE (mt-daapd-svn-1696.tar.gz) = 1371458
diff --git a/audio/firefly/files/extra-patch-src_scan-mp3.c b/audio/firefly/files/extra-patch-src_scan-mp3.c
deleted file mode 100644
index 2110bea067a1..000000000000
--- a/audio/firefly/files/extra-patch-src_scan-mp3.c
+++ /dev/null
@@ -1,138 +0,0 @@
---- src/scan-mp3.c.orig	2007-09-25 16:55:23.000000000 +0900
-+++ src/scan-mp3.c	2011-09-05 13:52:16.000000000 +0900
-@@ -18,6 +18,15 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
-
-+#define USE_CP932
-+
-+#ifdef USE_CP932
-+    #define UNKNOWN_STR    "UNKNOWN"
-+    #ifndef FILESYSTEM_CES
-+        #define FILESYSTEM_CES "CP932"
-+    #endif
-+#endif
-+
- #ifdef HAVE_CONFIG_H
- #  include "config.h"
- #endif
-@@ -34,6 +43,10 @@
- #include <string.h>
- #include <time.h>
-
-+#ifdef USE_CP932
-+    #include <iconv.h>
-+#endif
-+
- #include "daapd.h"
- #include "conf.h"
- #include "err.h"
-@@ -289,6 +302,96 @@
-     return 1;
- }
-
-+#ifdef USE_CP932
-+#define MAX_ICONV_BUF 1024
-+
-+typedef enum {
-+    ICONV_OK,
-+    ICONV_TRYNEXT,
-+    ICONV_FATAL
-+}   iconv_result;
-+
-+static iconv_result do_convert(const char* to_ces, const char* from_ces,
-+                   char *inbuf,  size_t inbytesleft,
-+                   char *outbuf_orig, size_t outbytesleft_orig) {
-+    size_t rc;
-+    iconv_result ret = ICONV_OK;
-+
-+    size_t outbytesleft = outbytesleft_orig - 1;
-+    char* outbuf = outbuf_orig;
-+
-+    iconv_t cd  = iconv_open(to_ces, from_ces);
-+    if (cd == (iconv_t)-1) {
-+        return ICONV_FATAL;
-+    }
-+    rc = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-+    if (rc == (size_t)-1) {
-+        if (errno == E2BIG) {
-+            ret = ICONV_FATAL;
-+        } else {
-+            ret = ICONV_TRYNEXT;
-+            memset(outbuf_orig, '\0', outbytesleft_orig);
-+        }
-+    }
-+    iconv_close(cd);
-+
-+    return ret;
-+}
-+
-+static unsigned char* get_utf8_text(const id3_ucs4_t* native_text) {
-+    unsigned char* utf8_text = NULL;
-+    char * in, * in8, * iconv_buf;
-+    iconv_result rc;
-+
-+    in = (char*)id3_ucs4_latin1duplicate(native_text);
-+    if (!in) goto out;
-+
-+    in8 = (char*)id3_ucs4_utf8duplicate(native_text);
-+    if (!in8) {
-+      free(in);
-+      goto out;
-+    }
-+
-+    iconv_buf = (char*)calloc(MAX_ICONV_BUF, sizeof(char));
-+    if (!iconv_buf) {
-+      free(in); free(in8);
-+      goto out;
-+    }
-+
-+    /* (1) try utf8 -> cp932 */
-+    rc = do_convert("CP932", "UTF-8", in8, strlen(in8), iconv_buf, MAX_ICONV_BUF);
-+    if (rc == ICONV_OK) {
-+        utf8_text = (unsigned char*)in8;
-+        free(iconv_buf);
-+    } else if (rc == ICONV_TRYNEXT) {
-+        /* (2) try cp932 -> utf8 */
-+        rc = do_convert("UTF-8", "CP932", in, strlen(in), iconv_buf, MAX_ICONV_BUF);
-+        if (rc == ICONV_OK) {
-+            utf8_text = (unsigned char*)iconv_buf;
-+        } else if (rc == ICONV_TRYNEXT) {
-+            /* (3) try euc-jp -> utf8 */
-+            rc = do_convert("UTF-8", "EUC-JP", in, strlen(in), iconv_buf, MAX_ICONV_BUF);
-+            if (rc == ICONV_OK) {
-+                utf8_text = (unsigned char*)iconv_buf;
-+            } else if (rc == ICONV_TRYNEXT) {
-+                /* utf-8 including non-japanese char? fallback. */
-+                utf8_text = (unsigned char*)id3_ucs4_utf8duplicate(native_text);
-+                free(iconv_buf);
-+            }
-+        }
-+        free(in8);
-+    }
-+    free(in);
-+
-+  out:
-+    if (!utf8_text) {
-+        utf8_text = (unsigned char*)strdup(UNKNOWN_STR);
-+    }
-+
-+    return utf8_text;
-+}
-+#endif
-+
- int scan_mp3_get_mp3tags(char *file, MP3FILE *pmp3) {
-     struct id3_file *pid3file;
-     struct id3_tag *pid3tag;
-@@ -352,8 +455,11 @@
-             if(native_text) {
-                 have_utf8=1;
-
--
-+#ifdef USE_CP932
-+		utf8_text = (char *)get_utf8_text(native_text);
-+#else
-                 utf8_text = (char*)id3_ucs4_utf8duplicate(native_text);
-+#endif
-                 if(utf8_text)
-                     mem_register(utf8_text,0);
diff --git a/audio/firefly/files/mt-daapd.in b/audio/firefly/files/mt-daapd.in
deleted file mode 100644
index 0b9b083b7847..000000000000
--- a/audio/firefly/files/mt-daapd.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: firefly
-# REQUIRE: LOGIN
-
-. /etc/rc.subr
-
-: ${firefly_enable=NO}
-
-name="firefly"
-rcvar=firefly_enable
-
-command="%%PREFIX%%/sbin/mt-daapd"
-command_args="-c %%PREFIX%%/etc/firefly/mt-daapd.conf"
-pidfile="/var/run/mt-daapd.pid"
-required_dirs="%%DAAPD_DBDIR%%"
-required_files="%%PREFIX%%/etc/firefly/mt-daapd.conf"
-
-load_rc_config "$name"
-run_rc_command "$1"
diff --git a/audio/firefly/files/patch-contrib_Makefile.in b/audio/firefly/files/patch-contrib_Makefile.in
deleted file mode 100644
index c3ff6905801b..000000000000
--- a/audio/firefly/files/patch-contrib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/Makefile.in.orig	2007-10-29 06:03:19 UTC
-+++ contrib/Makefile.in
-@@ -200,7 +200,7 @@ SUBDIRS = init.d
- EXTRA_DIST = README mt-daapd.spec mt-daapd.conf.templ mt-daapd-ssc.sh mt-daapd-ssc.pl
- BUILT_SOURCES = mt-daapd.conf
- bin_SCRIPTS = mt-daapd-ssc.sh
--dbdir = "$(localstatedir)/cache/mt-daapd"
-+dbdir = "$(localstatedir)/db/firefly"
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
- 
diff --git a/audio/firefly/files/patch-contrib_mt-daapd.conf.templ b/audio/firefly/files/patch-contrib_mt-daapd.conf.templ
deleted file mode 100644
index 03a3e398dc88..000000000000
--- a/audio/firefly/files/patch-contrib_mt-daapd.conf.templ
+++ /dev/null
@@ -1,67 +0,0 @@
---- contrib/mt-daapd.conf.templ.orig	2007-09-25 07:55:23 UTC
-+++ contrib/mt-daapd.conf.templ
-@@ -57,7 +57,7 @@ admin_pw = mt-daapd
- # info in.  Valid choices are "sqlite" and "sqlite3".
- #
- 
--db_type = sqlite
-+db_type = sqlite3
- 
- #
- # db_parms
-@@ -81,7 +81,7 @@ db_parms = @dbdir@
- # in the same physical filesystem.
- #
- 
--mp3_dir = /mnt/mp3
-+mp3_dir = /media,/mnt
- 
- #
- # servername (required)
-@@ -105,7 +105,7 @@ servername = Firefly %v on %h
- # This is also ignored on Windows.
- #
- 
--runas = nobody
-+runas = daapd
- 
- #
- # password (optional)
-@@ -136,7 +136,7 @@ runas = nobody
- # --enable-musepack.
- #
- 
--extensions = .mp3,.m4a,.m4p
-+extensions = .mp3,.m4a,.m4p,.ogg,.flac
- 
- #
- # ssc_codectypes (optional)
-@@ -194,8 +194,8 @@ ssc_prog = @prefix@/bin/mt-daapd-ssc.sh
- # will vary the amount of logging you get.
- #
- 
--#logfile = /var/log/mt-daapd.log
--
-+logfile = /var/log/mt-daapd.log
-+debuglevel = 5  
- #
- # rescan_interval
- #
-@@ -252,7 +252,7 @@ ssc_prog = @prefix@/bin/mt-daapd-ssc.sh
- #   the file is indexed.
- # 
- 
--scan_type = 2
-+scan_type = 0
- 
- #
- # compress
-@@ -267,7 +267,7 @@ scan_type = 2
- # It will eventually default to 1, but currently it defaults to 0.
- #
- 
--#compress = 0
-+compress = 1
- 
- [plugins]
- plugin_dir = @libdir@/mt-daapd/plugins
diff --git a/audio/firefly/files/patch-src_plugins_out-daap.c b/audio/firefly/files/patch-src_plugins_out-daap.c
deleted file mode 100644
index d248ae343add..000000000000
--- a/audio/firefly/files/patch-src_plugins_out-daap.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/plugins/out-daap.c.orig	2007-10-13 22:10:06 UTC
-+++ src/plugins/out-daap.c
-@@ -1392,11 +1392,9 @@ void out_daap_server_info(WS_CONNINFO *p
- 
-     size = sizeof(servername);
-     pi_server_name(servername,&size);
--    //    supports_update = conf_get_int("daap","supports_update",1);
-+    supports_update = pi_conf_get_int("daap","supports_update",1);
- 
-     actual_length=139 + (int) strlen(servername);
--    if(!supports_update)
--        actual_length -= 9;
- 
-     if(actual_length > sizeof(server_info)) {
-         pi_log(E_FATAL,"Server name too long.\n");
-@@ -1434,6 +1432,8 @@ void out_daap_server_info(WS_CONNINFO *p
-     current += dmap_add_int(current,"msdc",1);          /* 12 */
- 
-     if(supports_update)
-+        current += dmap_add_char(current,"msup",1);         /* 9 */
-+    else
-         current += dmap_add_char(current,"msup",0);         /* 9 */
- 
-     out_daap_output_start(pwsc,ppi,actual_length);
diff --git a/audio/firefly/files/pkg-message.in b/audio/firefly/files/pkg-message.in
deleted file mode 100644
index 651a451c173d..000000000000
--- a/audio/firefly/files/pkg-message.in
+++ /dev/null
@@ -1,26 +0,0 @@
-----------------------------------------------------------------------------
-
-Working configuration and an example are placed under
-
-    %%ETCDIR%%/mt-daapd.conf.sample
-    %%ETCDIR%%/mt-daapd.conf
-
-Change admin_pw, password and mp3_dir in the configuration according to your
-needs
-
-
-In order to let FireFly service start at boot, add following to rc.conf
-
-    firefly_enable="YES"
-
-
-FireFly service can be initialized by the following command
-
-    service mt-daapd start
-
-
-For further information and tips, see the following webpage
-
-    https://sourceforge.net/projects/fireflyserver-server/
-
-----------------------------------------------------------------------------
diff --git a/audio/firefly/pkg-descr b/audio/firefly/pkg-descr
deleted file mode 100644
index 8415eaa8e2d7..000000000000
--- a/audio/firefly/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-iTunes-compatible DAAP Server
-
-Firefly Media Server (formerly mt-daapd) is an open-source audio media server
-(or daemon) for the Roku SoundBridge and iTunes. It serves media files using
-Roku Server Protocol (RSP) and Digital Audio Access Protocol (DAAP). It
-supports server-side transcoding and other advanced features.
-
-WWW: https://sourceforge.net/projects/fireflyserver-server/
diff --git a/audio/firefly/pkg-plist b/audio/firefly/pkg-plist
deleted file mode 100644
index cc0844613452..000000000000
--- a/audio/firefly/pkg-plist
+++ /dev/null
@@ -1,68 +0,0 @@
-@sample %%ETCDIR%%/mt-daapd.conf.sample
-bin/mt-daapd-ssc.sh
-bin/wavstreamer
-lib/mt-daapd/plugins/out-daap.a
-lib/mt-daapd/plugins/out-daap.so
-lib/mt-daapd/plugins/rsp.a
-lib/mt-daapd/plugins/rsp.so
-lib/mt-daapd/plugins/ssc-script.a
-lib/mt-daapd/plugins/ssc-script.so
-sbin/mt-daapd
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/mt-daapd/admin-root/CREDITS
-share/mt-daapd/admin-root/DAAPApplet-0.1.jar
-share/mt-daapd/admin-root/about.html
-share/mt-daapd/admin-root/applet.html
-share/mt-daapd/admin-root/config-update.html
-share/mt-daapd/admin-root/config.css
-share/mt-daapd/admin-root/config.html
-share/mt-daapd/admin-root/config.js
-share/mt-daapd/admin-root/config.xml
-share/mt-daapd/admin-root/feedback.html
-share/mt-daapd/admin-root/ff_logo_sm.gif
-share/mt-daapd/admin-root/firefly.css
-share/mt-daapd/admin-root/firefly.js
-share/mt-daapd/admin-root/ftr.html
-share/mt-daapd/admin-root/gpl-license.html
-share/mt-daapd/admin-root/gpl-license.txt
-share/mt-daapd/admin-root/hdr.html
-share/mt-daapd/admin-root/index.css
-share/mt-daapd/admin-root/index.html
-share/mt-daapd/admin-root/lib-js/prototype.js
-share/mt-daapd/admin-root/lib-js/rico.js
-share/mt-daapd/admin-root/lib-js/script.aculo.us/builder.js
-share/mt-daapd/admin-root/lib-js/script.aculo.us/controls.js
-share/mt-daapd/admin-root/lib-js/script.aculo.us/dragdrop.js
-share/mt-daapd/admin-root/lib-js/script.aculo.us/effects.js
-share/mt-daapd/admin-root/lib-js/script.aculo.us/scriptaculous.js
-share/mt-daapd/admin-root/lib-js/script.aculo.us/slider.js
-share/mt-daapd/admin-root/lib-js/script.aculo.us/unittest.js
-share/mt-daapd/admin-root/linkOpaque.gif
-share/mt-daapd/admin-root/linkTransparent.gif
-share/mt-daapd/admin-root/no_access.html
-share/mt-daapd/admin-root/playlist.html
-share/mt-daapd/admin-root/playlist.js
-share/mt-daapd/admin-root/pngfix.js
-share/mt-daapd/admin-root/required.gif
-share/mt-daapd/admin-root/smart.html
-share/mt-daapd/admin-root/smart.js
-share/mt-daapd/admin-root/smartpopup.html
-share/mt-daapd/admin-root/spinner.gif
-share/mt-daapd/admin-root/spinner_stopped.gif
-share/mt-daapd/admin-root/status.js
-share/mt-daapd/admin-root/thanks.html
-share/mt-daapd/admin-root/util.js
-share/mt-daapd/admin-root/xiph-license.html
-share/mt-daapd/admin-root/xiph-license.txt
-share/mt-daapd/admin-root/zlib-license.html
-share/mt-daapd/admin-root/zlib-license.txt
-@dir(%%DAAPD_USER%%,%%DAAPD_GROUP%%,) %%DATADIR%%
-@rmtry %%DAAPD_DBDIR%%/songs3.db
-@dir(%%DAAPD_USER%%,%%DAAPD_GROUP%%,) %%DAAPD_DBDIR%%