From owner-svn-ports-head@FreeBSD.ORG Wed Apr 30 18:11:22 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A451EB6B; Wed, 30 Apr 2014 18:11:22 +0000 (UTC) Received: from duck.symmetricom.us (duck.symmetricom.us [206.168.13.214]) by mx1.freebsd.org (Postfix) with ESMTP id 7BCB512BA; Wed, 30 Apr 2014 18:11:22 +0000 (UTC) Received: from gromit.timing.com (gromit.timing.com [206.168.13.209]) by duck.symmetricom.us (8.14.6/8.14.6) with ESMTP id s3UIBK85063914; Wed, 30 Apr 2014 12:11:20 -0600 (MDT) (envelope-from jhein@symmetricom.com) Received: from gromit.timing.com (localhost [127.0.0.1]) by gromit.timing.com (8.14.7/8.14.5) with ESMTP id s3UIBBKL067883; Wed, 30 Apr 2014 12:11:11 -0600 (MDT) (envelope-from jhein@gromit.timing.com) Received: (from jhein@localhost) by gromit.timing.com (8.14.8/8.14.8/Submit) id s3UIBAru067882; Wed, 30 Apr 2014 12:11:10 -0600 (MDT) (envelope-from jhein) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <21345.15550.693857.499038@gromit.timing.com> Date: Wed, 30 Apr 2014 12:11:10 -0600 From: John Hein To: Koop Mast Subject: Re: svn commit: r352644 - head/databases/evolution-data-server In-Reply-To: <201404292109.s3TL9RsG039964@svn.freebsd.org> References: <201404292109.s3TL9RsG039964@svn.freebsd.org> X-Mailer: VM 8.2.0b-trunk-1484 under 24.3.1 (i386-portbld-freebsd8.3) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Apr 2014 18:11:22 -0000 Koop Mast wrote at 21:09 +0000 on Apr 29, 2014: > Author: kwm > Date: Tue Apr 29 21:09:26 2014 > New Revision: 352644 > URL: http://svnweb.freebsd.org/changeset/ports/352644 > QAT: https://qat.redports.org/buildarchive/r352644/ > > Log: > Fix kerberos enable/disable flags. > > PR: ports/189037 (based on) > Submitted by: barbara@ > > Modified: > head/databases/evolution-data-server/Makefile > > Modified: head/databases/evolution-data-server/Makefile > ============================================================================== > --- head/databases/evolution-data-server/Makefile Tue Apr 29 21:05:43 2014 (r352643) > +++ head/databases/evolution-data-server/Makefile Tue Apr 29 21:09:26 2014 (r352644) > @@ -44,7 +44,8 @@ WEATHER_DESC= Weather calendar backend > > WEATHER_LIB_DEPENDS= libgweather.so:${PORTSDIR}/net/libgweather > WEATHER_CONFIGURE_WITH= weather > -KERBEROS_CONFIGURE_WITH= --with-krb5=/usr > +KERBEROS_CONFIGURE_WITH= krb5=/usr > +KERBEROS_CONFGIURE_WITHOUT= --without-krb5 > > .include > > > There is no support for _WITHOUT in bsd.options.mk at this time. It was misspelled (CONFGIURE), but it doesn't work anyway: % make configure WITHOUT=KERBEROS BATCH=1 . . ===> Configuring for evolution-data-server-2.32.1_7 configure: error: invalid package name: krb5=/usr Fix: Index: Makefile =================================================================== --- Makefile (revision 352677) +++ Makefile (working copy) @@ -44,8 +44,8 @@ WEATHER_LIB_DEPENDS= libgweather.so:${PORTSDIR}/net/libgweather WEATHER_CONFIGURE_WITH= weather -KERBEROS_CONFIGURE_WITH= krb5=/usr -KERBEROS_CONFGIURE_WITHOUT= --without-krb5 +KERBEROS_CONFIGURE_ON= --with-krb5=/usr +KERBEROS_CONFIGURE_OFF= --without-krb5 .include Alternately, bsd.options.mk could allow _WITHOUT, if defined, to override the default behavior of automatically adding --without- (below). Then you would just have to fix the spelling CONFGIURE->CONFIGURE. I don't really like this implementation of _CONFIGURE_WITHOUT since it is really just almost the same as _CONFIGURE_OFF with the addition of turning off the automatic --without-* processing. That is, it's almost redundant with _OFF, but not quite. Index: bsd.options.mk =================================================================== --- bsd.options.mk (revision 352590) +++ bsd.options.mk (working copy) @@ -86,8 +86,10 @@ # Option disabled --disable-${content} # ${opt}_CONFIGURE_WITH Will add to CONFIGURE_ARGS: # Option enabled --with-${content} -# Option disabled --without-${content} -# +# Option disabled --without-${content} unless +# ${opt}_CONFIGURE_WITHOUT is set. +# ${opt}_CONFIGURE_WITHOUT When option is disabled, it will add its content to +# CONFIGURE_ARGS. # ${opt}_CMAKE_ON When option is enabled, it will add its content to # the CMAKE_ARGS. # ${opt}_CMAKE_OFF When option is disabled, it will add its content to @@ -469,9 +471,13 @@ . endfor . endif . if defined(${opt}_CONFIGURE_WITH) -. for iopt in ${${opt}_CONFIGURE_WITH} +. if defined(${opt}_CONFIGURE_WITHOUT) +CONFIGURE_ARGS+= ${${opt}_CONFIGURE_WITHOUT} +. else +. for iopt in ${${opt}_CONFIGURE_WITH} CONFIGURE_ARGS+= --without-${iopt} -. endfor +. endfor +. endif . endif . for configure in CONFIGURE CMAKE QMAKE . if defined(${opt}_${configure}_OFF)