Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Apr 2016 11:00:23 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413252 - in head: . Mk java/avis mail/rmilter net/avahi-app security/osiris sysutils/daedalus
Message-ID:  <201604141100.u3EB0NJB046739@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu Apr 14 11:00:23 2016
New Revision: 413252
URL: https://svnweb.freebsd.org/changeset/ports/413252

Log:
  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

Modified:
  head/CHANGES
  head/Mk/bsd.port.mk   (contents, props changed)
  head/Mk/bsd.sanity.mk   (contents, props changed)
  head/java/avis/Makefile   (contents, props changed)
  head/mail/rmilter/Makefile   (contents, props changed)
  head/net/avahi-app/Makefile   (contents, props changed)
  head/security/osiris/Makefile   (contents, props changed)
  head/sysutils/daedalus/Makefile   (contents, props changed)

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Thu Apr 14 10:40:38 2016	(r413251)
+++ head/CHANGES	Thu Apr 14 11:00:23 2016	(r413252)
@@ -10,7 +10,12 @@ in the release notes and/or placed into 
 
 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

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Apr 14 10:40:38 2016	(r413251)
+++ head/Mk/bsd.port.mk	Thu Apr 14 11:00:23 2016	(r413252)
@@ -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 \

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Thu Apr 14 10:40:38 2016	(r413251)
+++ head/Mk/bsd.sanity.mk	Thu Apr 14 11:00:23 2016	(r413252)
@@ -157,6 +157,10 @@ DEV_ERROR+=	"INSTALLS_EGGINFO is no long
 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 \

Modified: head/java/avis/Makefile
==============================================================================
--- head/java/avis/Makefile	Thu Apr 14 10:40:38 2016	(r413251)
+++ head/java/avis/Makefile	Thu Apr 14 11:00:23 2016	(r413252)
@@ -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+

Modified: head/mail/rmilter/Makefile
==============================================================================
--- head/mail/rmilter/Makefile	Thu Apr 14 10:40:38 2016	(r413251)
+++ head/mail/rmilter/Makefile	Thu Apr 14 11:00:23 2016	(r413252)
@@ -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
 

Modified: head/net/avahi-app/Makefile
==============================================================================
--- head/net/avahi-app/Makefile	Thu Apr 14 10:40:38 2016	(r413251)
+++ head/net/avahi-app/Makefile	Thu Apr 14 11:00:23 2016	(r413252)
@@ -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>

Modified: head/security/osiris/Makefile
==============================================================================
--- head/security/osiris/Makefile	Thu Apr 14 10:40:38 2016	(r413251)
+++ head/security/osiris/Makefile	Thu Apr 14 11:00:23 2016	(r413252)
@@ -12,7 +12,6 @@ COMMENT=	Shmoo client/server host integr
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_RC_SUBR=	yes
 
 OPTIONS_DEFINE=	OSIRISMD OSIRISD PRINTDB CLI
 OPTIONS_DEFAULT=	OSIRISD

Modified: head/sysutils/daedalus/Makefile
==============================================================================
--- head/sysutils/daedalus/Makefile	Thu Apr 14 10:40:38 2016	(r413251)
+++ head/sysutils/daedalus/Makefile	Thu Apr 14 11:00:23 2016	(r413252)
@@ -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'
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604141100.u3EB0NJB046739>