Date: Mon, 10 Jun 2013 08:20:26 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320443 - head/Mk Message-ID: <201306100820.r5A8KQZT086576@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Jun 10 08:20:25 2013 New Revision: 320443 URL: http://svnweb.freebsd.org/changeset/ports/320443 Log: Partial revert of r320440 some things has been committed that shouldn't have yet Modified: head/Mk/bsd.gstreamer.mk head/Mk/bsd.options.mk Modified: head/Mk/bsd.gstreamer.mk ============================================================================== --- head/Mk/bsd.gstreamer.mk Mon Jun 10 08:20:15 2013 (r320442) +++ head/Mk/bsd.gstreamer.mk Mon Jun 10 08:20:25 2013 (r320443) @@ -60,8 +60,6 @@ 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 08:20:15 2013 (r320442) +++ head/Mk/bsd.options.mk Mon Jun 10 08:20:25 2013 (r320443) @@ -49,7 +49,9 @@ .if !defined(OPTIONSMKINCLUDED) OPTIONSMKINCLUDED= bsd.options.mk +OPTIONS_NAME?= ${PKGORIGIN:S/\//_/} OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options +OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options #ALL_OPTIONS= DOCS \ # NLS @@ -176,6 +178,7 @@ PORT_OPTIONS:= ${PORT_OPTIONS:O:u} PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} . endfor +# XXX To remove once UNIQUENAME will be removed ## Set the options specified per-port (set by user in make.conf) . for opt in ${${UNIQUENAME}_SET} . if !empty(COMPLETE_OPTIONS_LIST:M${opt}) @@ -188,7 +191,22 @@ PORT_OPTIONS:= ${PORT_OPTIONS:O:u} . for opt in ${${UNIQUENAME}_UNSET} PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} . endfor +# XXX To remove once UNIQUENAME will be removed +## Set the options specified per-port (set by user in make.conf) +. for opt in ${${OPTIONS_NAME}_SET} +. if !empty(COMPLETE_OPTIONS_LIST:M${opt}) +PORT_OPTIONS+= ${opt} +. endif +. endfor +PORT_OPTIONS:= ${PORT_OPTIONS:O:u} + +## Unset the options excluded per-port (set by user in make.conf) +. for opt in ${${OPTIONS_NAME}_UNSET} +PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} +. endfor + +# XXX to remove once UNIQUENAME is removed ## options files (from dialog) . if exists(${OPTIONSFILE}) && !make(rmconfig) . include "${OPTIONSFILE}" @@ -196,6 +214,15 @@ PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} . if exists(${OPTIONSFILE}.local) . include "${OPTIONSFILE}.local" . endif +# XXX to remove once UNIQUENAME is removed + +## options files (from dialog) +. if exists(${OPTIONS_FILE}) && !make(rmconfig) +. include "${OPTIONS_FILE}" +. endif +. if exists(${OPTIONS_FILE}.local) +. include "${OPTIONS_FILE}.local" +. endif ### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile .for opt in ${ALL_OPTIONS} @@ -306,51 +333,10 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306100820.r5A8KQZT086576>