Remove expired ports:

2018-06-17 net/syncthing-discosrv: Included in net/syncthing now
2018-06-17 net/syncthing-inotify: Included in net/syncthing now

10 files changed, 2 insertions, 180 deletions

diff --git a/MOVED b/MOVED
index a39ef18d1b52..597ef502ff85 100644
--- a/MOVED
+++ b/MOVED
@@ -10277,3 +10277,5 @@ textproc/elasticsearch2-plugin-hq||2018-06-15|Removed, depends on expired textpr
 textproc/elasticsearch2-plugin-migration||2018-06-15|Removed, depends on expired textproc/elasticsearch2
 textproc/elasticsearch2||2018-06-15|Has expired: Elastic 2.4 EoL is 2018-02-28
 net-im/imspector||2018-06-16|Has expired: No active upstream, master site disappeared long ago
+net/syncthing-discosrv|net/syncthing|2018-06-18|Has expired: Included in net/syncthing now
+net/syncthing-inotify|net/syncthing|2018-06-18|Has expired: Included in net/syncthing now
diff --git a/net/Makefile b/net/Makefile
index e18880c6d3ae..a96e51b72abe 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1422,8 +1422,6 @@
     SUBDIR += svnup
     SUBDIR += syncthing
     SUBDIR += syncthing-cli
-    SUBDIR += syncthing-discosrv
-    SUBDIR += syncthing-inotify
     SUBDIR += syndication
     SUBDIR += tableutil
     SUBDIR += tac_plus4
diff --git a/net/syncthing-discosrv/Makefile b/net/syncthing-discosrv/Makefile
deleted file mode 100644
index b21789741117..000000000000
--- a/net/syncthing-discosrv/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Created by: Steve Wills <swills@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	syncthing-discosrv
-PORTVERSION=	0.13.0
-DISTVERSIONPREFIX=	v
-CATEGORIES=	net
-
-MAINTAINER=	swills@FreeBSD.org
-COMMENT=	Discovery server for syncthing
-
-BUILD_DEPENDS=	go:lang/go
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	syncthing
-GH_PROJECT=	discosrv
-
-PLIST_FILES=	bin/syncthing-discosrv
-
-USE_RC_SUBR=	syncthing-discosrv
-USERS=		syncthing
-GROUPS=		syncthing
-
-
-DEPRECATED=	Included in net/syncthing now
-EXPIRATION_DATE=	2018-06-17
-
-post-patch:
-	@cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
-		${MV} .gitignore CONTRIBUTORS LICENSE README.md build.sh \
-		clean.go db.go main.go psql.go ql.go querysrv.go stats.go \
-		vendor \
-		src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-
-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
-		${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
-	@${MV} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/discosrv ${WRKSRC}/syncthing-discosrv
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/syncthing-discosrv ${STAGEDIR}${PREFIX}/bin/
-
-.include <bsd.port.mk>
diff --git a/net/syncthing-discosrv/distinfo b/net/syncthing-discosrv/distinfo
deleted file mode 100644
index 45c54168503d..000000000000
--- a/net/syncthing-discosrv/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1464113564
-SHA256 (syncthing-discosrv-v0.13.0_GH0.tar.gz) = dfcbfd3d334844e8e7ab377bb48ec01391e4e5322fa978272911f68a2ea4cbcb
-SIZE (syncthing-discosrv-v0.13.0_GH0.tar.gz) = 2401348
diff --git a/net/syncthing-discosrv/files/syncthing-discosrv.in b/net/syncthing-discosrv/files/syncthing-discosrv.in
deleted file mode 100644
index 4c3528fb73d5..000000000000
--- a/net/syncthing-discosrv/files/syncthing-discosrv.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: syncthingdiscosrv
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# syncthingdiscosrv_enable (bool):	Set to NO by default.
-#				Set it to YES to enable syncthing-discosrv.
-# syncthingdiscosrv_user (user):        Set user to run syncthing-discosrv.
-#                               Default is "syncthing".
-# syncthingdiscosrv_group (group):      Set group to run syncthing-discosrv.
-#                               Default is "syncthing".
-# syncthingdiscosrv_dir (dir):          Set dir to run syncthing-discosrv in.
-#                               Default is "/var/db/syncthing-discosrv".
-# syncthingdiscosrv_key (file):         Set key file to use
-#                               Default is "${syncthingdiscosrv_dir}/syncthing.key".
-# syncthingdiscosrv_cert (file):        Set cert file to use
-#                               Default is "${syncthingdiscosrv_dir}/syncthing.cert".
-# syncthingdiscosrv_args (string):      Extra args to pass to syncthing-discosrv
-#                               Default is ""
-
-. /etc/rc.subr
-
-name=syncthingdiscosrv
-rcvar=syncthingdiscosrv_enable
-
-load_rc_config $name
-
-: ${syncthingdiscosrv_enable:="NO"}
-: ${syncthingdiscosrv_user:="syncthing"}
-: ${syncthingdiscosrv_group:="syncthing"}
-: ${syncthingdiscosrv_dir:="/var/db/syncthing-discosrv"}
-: ${syncthingdiscosrv_key:="${syncthingdiscosrv_dir}/syncthing.key"}
-: ${syncthingdiscosrv_cert:="${syncthingdiscosrv_dir}/syncthing.cert"}
-
-export STNORESTART=true
-
-pidfile=/var/run/syncthingdiscosrv.pid
-procname="%%PREFIX%%/bin/syncthing-discosrv"
-command="/usr/sbin/daemon"
-command_args="-f -p ${pidfile} ${procname} -key ${syncthingdiscosrv_key} -cert ${syncthingdiscosrv_cert} ${syncthingdiscosrv_args}"
-
-start_precmd=syncthingdiscosrv_startprecmd
-
-syncthingdiscosrv_startprecmd()
-{
-        if [ ! -e ${pidfile} ]; then
-                install -o ${syncthingdiscosrv_user} -g ${syncthingdiscosrv_group} /dev/null ${pidfile};
-        fi
-
-        if [ ! -d ${syncthingdiscosrv_dir} ]; then
-                install -d -o ${syncthingdiscosrv_user} -g ${syncthingdiscosrv_group} ${syncthingdiscosrv_dir}
-        fi
-
-}
-
-run_rc_command "$1"
diff --git a/net/syncthing-discosrv/pkg-descr b/net/syncthing-discosrv/pkg-descr
deleted file mode 100644
index 6545c858fc58..000000000000
--- a/net/syncthing-discosrv/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Syncthing discovery server
-
-WWW: https://syncthing.net/
diff --git a/net/syncthing-discosrv/pkg-message b/net/syncthing-discosrv/pkg-message
deleted file mode 100644
index 408235c025ca..000000000000
--- a/net/syncthing-discosrv/pkg-message
+++ /dev/null
@@ -1,27 +0,0 @@
-WARNING: This version is not backwards compatible with 0.11.x or older
-releases!
-
-For more information, please read:
-
-https://forum.syncthing.net/t/syncthing-v0-11-0-release-notes/2426
-https://forum.syncthing.net/t/syncthing-syncthing-v0-12-0-beryllium-bedbug/6026
-
-WARNING: This version requires cert and key files. You must supply a TLS key
-and cert. The service will not start without these files. The default key/cert
-files are:
-
-/var/db/syncthing-discosrv/syncthing.key
-/var/db/syncthing-discosrv/syncthing.cert
-
-You may specify the location by adding these lines to /etc/rc.conf:
-
-syncthingdiscosrv_key="/path/to/your/key"
-syncthingdiscosrv_cert="/path/to/your/cert"
-
-WARNING: The database is no longer automatically persisted to disk. You may
-persist it to disk by adding this line to /etc/rc.conf:
-
-syncthingdiscosrv_args="-db-dsn=file:///var/db/syncthing-discosrv/discosrv.db"
-
-NOTE: Additional args such as stats file may also be added to
-syncthingdiscosrv_args in /etc/rc.conf
diff --git a/net/syncthing-inotify/Makefile b/net/syncthing-inotify/Makefile
deleted file mode 100644
index 4e1aade3dd41..000000000000
--- a/net/syncthing-inotify/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	syncthing-inotify
-PORTVERSION=	0.8.7
-DISTVERSIONPREFIX=	v
-CATEGORIES=	net
-
-MAINTAINER=	swills@FreeBSD.org
-COMMENT=	Syncthing inotify monitor
-
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	syncthing 
-GH_SUBDIR=	src/github.com/syncthing/syncthing-inotify
-PLIST_FILES=	bin/syncthing-inotify
-
-DEPRECATED=	Included in net/syncthing now
-EXPIRATION_DATE=	2018-06-17
-
-
-do-build:
-	@cd ${WRKSRC}/${GH_SUBDIR} ; ${SETENV} ${MAKE_ENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/syncthing-inotify ${STAGEDIR}${PREFIX}/bin/
-
-.include <bsd.port.mk>
diff --git a/net/syncthing-inotify/distinfo b/net/syncthing-inotify/distinfo
deleted file mode 100644
index 7adf78d7cb8c..000000000000
--- a/net/syncthing-inotify/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-TIMESTAMP = 1505682602
-SHA256 (syncthing-syncthing-inotify-v0.8.7_GH0.tar.gz) = bf7a71695206c765cf407d85656f6f0f8be1715af3d3bb7f81985f749162a6b2
-SIZE (syncthing-syncthing-inotify-v0.8.7_GH0.tar.gz) = 995241
-SHA256 (cenkalti-backoff-9831e1e_GH0.tar.gz) = aadaf18958680eeab6bcb0ddce87b5654fb94bc7f19fb4bb9464f53a1ce5099c
-SIZE (cenkalti-backoff-9831e1e_GH0.tar.gz) = 6415
-SHA256 (zillode-notify-2da5cc9_GH0.tar.gz) = 55f9f78ad903d8f626637e35463de900b89e872d1d9b39f2986fc7486517a9d8
-SIZE (zillode-notify-2da5cc9_GH0.tar.gz) = 55099
-SHA256 (syncthing-syncthing-v0.13.4_GH0.tar.gz) = c7ecb7ace4837295a03fc72d0b133d2ec149e412bd998d9247d7d4504ef0f64b
-SIZE (syncthing-syncthing-v0.13.4_GH0.tar.gz) = 3937983
diff --git a/net/syncthing-inotify/pkg-descr b/net/syncthing-inotify/pkg-descr
deleted file mode 100644
index 68f3ebb47096..000000000000
--- a/net/syncthing-inotify/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Provides inotify/kqueue support for Syncthing
-
-WWW: https://github.com/syncthing/syncthing-inotify