svn commit: r352644 - head/databases/evolution-data-server

[John Hein]

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 <bsd.port.options.mk>
 >  
 > 
 > 

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 <bsd.port.options.mk>
 



Alternately, bsd.options.mk could allow <opt>_WITHOUT, if defined, to
override the default behavior of automatically adding --without-<opt>
(below).  Then you would just have to fix the spelling
CONFGIURE->CONFIGURE.  I don't really like this implementation of
<opt>_CONFIGURE_WITHOUT since it is really just almost the same as
<opt>_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)