svn commit: r489658 - in head: devel/llvm-cheri devel/llvm-devel devel/llvm38 devel/llvm40 devel/llvm50 devel/llvm60 devel/llvm70 devel/mono-addins multimedia/audacious-plugins

[Tobias Kortkamp]

Author: tobik
Date: Tue Jan  8 09:06:37 2019
New Revision: 489658
URL: https://svnweb.freebsd.org/changeset/ports/489658

Log:
  Do not set OPTIONS_SUB twice

Modified:
  head/devel/llvm-cheri/Makefile
  head/devel/llvm-devel/Makefile
  head/devel/llvm38/Makefile
  head/devel/llvm40/Makefile
  head/devel/llvm50/Makefile
  head/devel/llvm60/Makefile
  head/devel/llvm70/Makefile
  head/devel/mono-addins/Makefile
  head/multimedia/audacious-plugins/Makefile

Modified: head/devel/llvm-cheri/Makefile
==============================================================================
--- head/devel/llvm-cheri/Makefile	Tue Jan  8 09:00:26 2019	(r489657)
+++ head/devel/llvm-cheri/Makefile	Tue Jan  8 09:06:37 2019	(r489658)
@@ -70,8 +70,6 @@ LLDB_BINARY_ALIAS=	swig=swig3.0
 LLDB_GH_PROJECT=	lldb:lldb
 LLDB_GH_TAGNAME=	${LLDB_COMMIT}:lldb
 
-OPTIONS_SUB=	yes
-
 DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 
 PLIST_SUB+=	COMMAND_SUFFIX=${COMMAND_SUFFIX} \

Modified: head/devel/llvm-devel/Makefile
==============================================================================
--- head/devel/llvm-devel/Makefile	Tue Jan  8 09:00:26 2019	(r489657)
+++ head/devel/llvm-devel/Makefile	Tue Jan  8 09:06:37 2019	(r489658)
@@ -114,8 +114,6 @@ GOLD_DESC=		Build the LLVM Gold plugin for LTO
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
 GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
 
-OPTIONS_SUB=	yes
-
 PLIST_SUB+=	LLVM_MAJOR=${LLVM_MAJOR} \
 		LLVM_RELEASE=${LLVM_RELEASE}
 

Modified: head/devel/llvm38/Makefile
==============================================================================
--- head/devel/llvm38/Makefile	Tue Jan  8 09:00:26 2019	(r489657)
+++ head/devel/llvm38/Makefile	Tue Jan  8 09:06:37 2019	(r489658)
@@ -104,8 +104,6 @@ _CRTLIBDIR=    ${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang
 WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 .endfor
 
-OPTIONS_SUB=	yes
-
 DOCS_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE}

Modified: head/devel/llvm40/Makefile
==============================================================================
--- head/devel/llvm40/Makefile	Tue Jan  8 09:00:26 2019	(r489657)
+++ head/devel/llvm40/Makefile	Tue Jan  8 09:06:37 2019	(r489658)
@@ -112,8 +112,6 @@ _CRTLIBDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${
 WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 .endfor
 
-OPTIONS_SUB=	yes
-
 PLIST_SUB+=	LLVM_LIB_VER=${LLVM_LIB_VER} \
 		LLVM_MAJOR=${LLVM_MAJOR} \
 		LLVM_RELEASE=${LLVM_RELEASE} \

Modified: head/devel/llvm50/Makefile
==============================================================================
--- head/devel/llvm50/Makefile	Tue Jan  8 09:00:26 2019	(r489657)
+++ head/devel/llvm50/Makefile	Tue Jan  8 09:06:37 2019	(r489658)
@@ -114,8 +114,6 @@ _CRTLIBDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${
 WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 .endfor
 
-OPTIONS_SUB=	yes
-
 PLIST_SUB+=	LLVM_LIB_VER=${LLVM_LIB_VER} \
 		LLVM_MAJOR=${LLVM_MAJOR} \
 		LLVM_RELEASE=${LLVM_RELEASE} \

Modified: head/devel/llvm60/Makefile
==============================================================================
--- head/devel/llvm60/Makefile	Tue Jan  8 09:00:26 2019	(r489657)
+++ head/devel/llvm60/Makefile	Tue Jan  8 09:06:37 2019	(r489658)
@@ -104,8 +104,6 @@ _CRTLIBDIR=	${LLVM_PREFIX:S|${PREFIX}/||}/lib/clang/${
 WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 .endfor
 
-OPTIONS_SUB=	yes
-
 PLIST_SUB+=	LLVM_LIB_VER=${LLVM_LIB_VER} \
 		LLVM_MAJOR=${LLVM_MAJOR} \
 		LLVM_RELEASE=${LLVM_RELEASE} \

Modified: head/devel/llvm70/Makefile
==============================================================================
--- head/devel/llvm70/Makefile	Tue Jan  8 09:00:26 2019	(r489657)
+++ head/devel/llvm70/Makefile	Tue Jan  8 09:06:37 2019	(r489658)
@@ -103,8 +103,6 @@ STRIP=
 WRKSRC_${option:tl}=		${WRKDIR}/${${option}_DISTFILES:S/${EXTRACT_SUFX}//}
 .endfor
 
-OPTIONS_SUB=	yes
-
 PLIST_SUB+=	LLVM_RELEASE=${LLVM_RELEASE} \
 		LLVM_SUFFIX=${LLVM_SUFFIX} \
 		LLVM_MAJOR=${LLVM_MAJOR}

Modified: head/devel/mono-addins/Makefile
==============================================================================
--- head/devel/mono-addins/Makefile	Tue Jan  8 09:00:26 2019	(r489657)
+++ head/devel/mono-addins/Makefile	Tue Jan  8 09:06:37 2019	(r489658)
@@ -20,14 +20,13 @@ USES=		autoreconf gmake mono pkgconfig
 
 OPTIONS_DEFINE=	GTK2 GTK3
 OPTIONS_DEFAULT=GTK2
+OPTIONS_SUB=	yes
 
 GTK2_USE=	GNOME=gtksharp20
 GTK2_CONFIGURE_ENABLE=	gui
-OPTIONS_SUB=	yes
 
 #GTK3_USE=	GNOME=gtksharp30
 GTK3_CONFIGURE_ENABLE=	gui-gtk3
-OPTIONS_SUB=	yes
 
 PLIST_SUB+=	VER=1.0.0
 

Modified: head/multimedia/audacious-plugins/Makefile
==============================================================================
--- head/multimedia/audacious-plugins/Makefile	Tue Jan  8 09:00:26 2019	(r489657)
+++ head/multimedia/audacious-plugins/Makefile	Tue Jan  8 09:06:37 2019	(r489658)
@@ -117,7 +117,6 @@ VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 VORBIS_CONFIGURE_ENABLE=vorbis
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CONFIGURE_ENABLE=	wavpack
-OPTIONS_SUB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| $${MFLAGS}||g' \