USE_RC_SUBR=yes has not done anything for a long time, remove it from

the few remaining ports and make it give an error.

Sponsored by:	Absolight

8 files changed, 12 insertions, 9 deletions

diff --git a/CHANGES b/CHANGES
index 2590d75a2c06..d3ee0e8f55a4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,12 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
-20160416:
+20160414:
+AUTHOR: mat@FreeBSD.org
+
+  USE_RC_SUBR=yes has not done anything for a long time, it will now give an error.
+
+20160413:
 AUTHOR: jbeich@FreeBSD.org
 
   Introducing CONFIGURE_OUTSOURCE. It changes HAS_CONFIGURE and GNU_CONFIGURE
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 10771fac26ff..643bbefe23f1 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1708,7 +1708,7 @@ MAKE_ENV+=	${b}="${${b}}"
 .include "${PORTSDIR}/Mk/bsd.ldap.mk"
 .endif
 
-.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} != "YES"
+.if defined(USE_RC_SUBR)
 SUB_FILES+=	${USE_RC_SUBR}
 .endif
 
@@ -4931,7 +4931,7 @@ add-plist-post:
 .endif
 
 .if !target(install-rc-script)
-.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} != "YES"
+.if defined(USE_RC_SUBR)
 install-rc-script:
 	@${ECHO_MSG} "===> Staging rc.d startup script(s)"
 	@for i in ${USE_RC_SUBR}; do \
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index 0bfaae46f35a..929650cb2adf 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -157,6 +157,10 @@ DEV_ERROR+=	"INSTALLS_EGGINFO is no longer supported, please add the entry direc
 DEV_ERROR+=	"WANT_SDL is no longer supported. If you need SDL, use USE_SDL, if you need optional dependency, use options"
 .endif
 
+.if defined(USE_RC_SUBR) && ${USE_RC_SUBR:tu} == YES
+DEV_ERROR+=	"USE_RC_SUBR=yes has not been supported for a long time, remove it."
+.endif
+
 SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_READLINE USE_ICONV PERL_CONFIGURE PERL_MODBUILD \
 		USE_PERL5_BUILD USE_PERL5_RUN USE_DISPLAY USE_FUSE \
diff --git a/java/avis/Makefile b/java/avis/Makefile
index 2c4cc10febf5..0924d530d57d 100644
--- a/java/avis/Makefile
+++ b/java/avis/Makefile
@@ -11,7 +11,6 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	benjsc@FreeBSD.org
 COMMENT=	Elvin Publish/Subscribe Message Bus server based on the Elvin protocol
 
-USE_RC_SUBR=	yes
 USES=		zip
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
diff --git a/mail/rmilter/Makefile b/mail/rmilter/Makefile
index f9bdb77428ca..c55452230e65 100644
--- a/mail/rmilter/Makefile
+++ b/mail/rmilter/Makefile
@@ -15,7 +15,6 @@ LIB_DEPENDS=	libpcre.so:devel/pcre \
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
 
-USE_RC_SUBR=	yes
 USES=		cmake:outsource bison
 USE_OPENSSL=	yes
 
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 72c6c49cb831..7ffff2748aaa 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -44,8 +44,6 @@ CONFLICTS=	howl-[0-9]*
 
 DAEMON_CONFIG_FILES=	hosts avahi-daemon.conf
 .endif
-
-USE_RC_SUBR=yes
 .endif # !avahi-header
 
 .include <bsd.port.options.mk>
diff --git a/security/osiris/Makefile b/security/osiris/Makefile
index 08ce269d4980..bc44e4c49a7c 100644
--- a/security/osiris/Makefile
+++ b/security/osiris/Makefile
@@ -12,7 +12,6 @@ COMMENT=	Shmoo client/server host integrity checker
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_RC_SUBR=	yes
 
 OPTIONS_DEFINE=	OSIRISMD OSIRISD PRINTDB CLI
 OPTIONS_DEFAULT=	OSIRISD
diff --git a/sysutils/daedalus/Makefile b/sysutils/daedalus/Makefile
index f35f527dc2b0..d6cf00fb8237 100644
--- a/sysutils/daedalus/Makefile
+++ b/sysutils/daedalus/Makefile
@@ -17,7 +17,6 @@ USE_RUBY=	yes
 
 NO_BUILD=	yes
 
-USE_RC_SUBR=	yes
 SED_SCRIPT=	-e 's,%%PREFIX%%,${PREFIX},g' \
 		-e 's,%%RUBY_WITHOUT_SUFFIX%%,${RUBY_WITHOUT_SUFFIX},g'