svn commit: r320440 - head/Mk

[Baptiste Daroussin]

Author: bapt
Date: Mon Jun 10 07:27:05 2013
New Revision: 320440
URL: http://svnweb.freebsd.org/changeset/ports/320440

Log:
  Removed useless quotes

Modified:
  head/Mk/bsd.gstreamer.mk
  head/Mk/bsd.options.mk
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.gstreamer.mk
==============================================================================
--- head/Mk/bsd.gstreamer.mk	Mon Jun 10 07:18:36 2013	(r320439)
+++ head/Mk/bsd.gstreamer.mk	Mon Jun 10 07:27:05 2013	(r320440)
@@ -60,6 +60,8 @@ GST1_MINOR_VERSION=	.0
 GST1_SHLIB_VERSION=	0
 GST1_MINIMAL_VERSION=	.5
 
+MAKE_ENV+=	GI_SCANNER_DISABLE_CACHE=yes
+
 #
 # missing base: alsa ivorbisdec
 # missing good: pulseaudio(need newer pulse version)

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Mon Jun 10 07:18:36 2013	(r320439)
+++ head/Mk/bsd.options.mk	Mon Jun 10 07:27:05 2013	(r320440)
@@ -306,10 +306,51 @@ WITH_${opt}:=  true
 .endif
 .      undef opt
 .endfor
-.endif
 ###
 
+.for opt in ${COMPLETE_OPTIONS_LIST}
+# PLIST_SUB
+PLIST_SUB?=
+.  if defined(OPTIONS_SUB)
+.    if ! ${PLIST_SUB:M${opt}=*}
+.      if ${PORT_OPTIONS:M${opt}}
+PLIST_SUB:=	${PLIST_SUB} ${opt}=""
+.      else
+PLIST_SUB:=	${PLIST_SUB} ${opt}="@comment "
+.      endif
+.    endif
+.  endif
+
+.  if ${PORT_OPTIONS:M${opt}}
+.    if defined(${opt}_CONFIGURE_ENABLE)
+CONFIGURE_ARGS+=	--enable-${${opt}_CONFIGURE_ENABLE}
+.    endif
+.    if defined(${opt}_CONFIGURE_ON)
+CONFIGURE_ARGS+=	${${opt}_CONFIGURE_ON}
+.    endif
+.    for flags in CFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ENV USES DISTFILES
+.      if defined(${opt}_${flags})
+${flags}+=	${${opt}_${flags}}
+.      endif
+.    endfor
+.    for deptype in PKG EXTRACT PATCH FETCH BUILD LIB RUN
+.      if defined(${opt}_${deptype}_DEPENDS)
+${deptype}_DEPENDS+=	${${opt}_${deptype}_DEPENDS}
+.      endif
+.    endfor
+.  else
+.    if defined(${opt}_CONFIGURE_ENABLE)
+CONFIGURE_ARGS+=	--disable-${${opt}_CONFIGURE_ENABLE}
+.    endif
+.    if defined(${opt}_CONFIGURE_OFF)
+CONFIGURE_ARGS+=	${${opt}_CONFIGURE_OFF}
+.    endif
+.  endif
+.endfor
+
 _OPTIONS_WITHOUT_GLOBALS:=	${COMPLETE_OPTIONS_LIST}
 .for opt in ${GLOBAL_OPTIONS}
 _OPTIONS_WITHOUT_GLOBALS:=	${_OPTIONS_WITHOUT_GLOBALS:N${opt}}
 .endfor
+
+.endif

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Jun 10 07:18:36 2013	(r320439)
+++ head/Mk/bsd.port.mk	Mon Jun 10 07:27:05 2013	(r320440)
@@ -6175,9 +6175,9 @@ config-conditional: pre-config
 
 .if !target(showconfig)
 .include "${PORTSDIR}/Mk/bsd.options.desc.mk"
-MULTI_EOL=	": you have to choose at least one of them"
-SINGLE_EOL=	": you have to select exactly one of them"
-RADIO_EOL=	": you can only select none or one of them"
+MULTI_EOL=	: you have to choose at least one of them
+SINGLE_EOL=	: you have to select exactly one of them
+RADIO_EOL=	: you can only select none or one of them
 showconfig:
 .if !empty(COMPLETE_OPTIONS_LIST)
 	@${ECHO_MSG} "===> The following configuration options are available for ${PKGNAME}":