From owner-svn-ports-head@FreeBSD.ORG Fri May 24 11:46:12 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D6BA6899; Fri, 24 May 2013 11:46:12 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C7DF8896; Fri, 24 May 2013 11:46:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4OBkC7A091913; Fri, 24 May 2013 11:46:12 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4OBkBKP091904; Fri, 24 May 2013 11:46:11 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201305241146.r4OBkBKP091904@svn.freebsd.org> From: Bryan Drewery Date: Fri, 24 May 2013 11:46:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318958 - in head: devel/librcc devel/ode devel/poco-ssl graphics/showimg mail/courier-pythonfilter news/nntpcache X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 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: Fri, 24 May 2013 11:46:12 -0000 Author: bdrewery Date: Fri May 24 11:46:11 2013 New Revision: 318958 URL: http://svnweb.freebsd.org/changeset/ports/318958 Log: - Fix options conversion Modified: head/devel/librcc/Makefile head/devel/ode/Makefile head/devel/poco-ssl/Makefile head/graphics/showimg/Makefile head/mail/courier-pythonfilter/Makefile head/news/nntpcache/Makefile Modified: head/devel/librcc/Makefile ============================================================================== --- head/devel/librcc/Makefile Fri May 24 10:46:51 2013 (r318957) +++ head/devel/librcc/Makefile Fri May 24 11:46:11 2013 (r318958) @@ -81,7 +81,7 @@ PLIST_SUB+= TOOLS="@comment " pre-everything:: .if ${ARCH} == "i386" -.if ${PORT_OPTIONS:MBDB) || ${PORT_OPTIONS:MTRANSLATE} +.if ${PORT_OPTIONS:MBDB} || ${PORT_OPTIONS:MTRANSLATE} @${ECHO} 'BDB/LibTranslate support may cause breakages in depended apps on ${ARCH}' @${ECHO} 'Use it with caution' .endif Modified: head/devel/ode/Makefile ============================================================================== --- head/devel/ode/Makefile Fri May 24 10:46:51 2013 (r318957) +++ head/devel/ode/Makefile Fri May 24 11:46:11 2013 (r318958) @@ -34,7 +34,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER CFLAGS+= -fPIC -DPIC .endif -.if ${PORT_OPTIONS:MGIMPACT) && defined(WITH_DOUBLE} +.if ${PORT_OPTIONS:MGIMPACT} && defined(WITH_DOUBLE} IGNORE= currently double precision is not supported by gimpact .endif Modified: head/devel/poco-ssl/Makefile ============================================================================== --- head/devel/poco-ssl/Makefile Fri May 24 10:46:51 2013 (r318957) +++ head/devel/poco-ssl/Makefile Fri May 24 11:46:11 2013 (r318958) @@ -43,15 +43,15 @@ CONFIGURE_ARGS+= --no-samples # ODBC # -.if ! ${PORT_OPTIONS:MUODBC) && ! ${PORT_OPTIONS:MIODBC} +.if ! ${PORT_OPTIONS:MUODBC} && ! ${PORT_OPTIONS:MIODBC} CONFIGURE_ARGS+= --omit=Data/ODBC .endif -.if ${PORT_OPTIONS:MUODBC) && ! ${PORT_OPTIONS:MIODBC} +.if ${PORT_OPTIONS:MUODBC} && ! ${PORT_OPTIONS:MIODBC} LIB_DEPENDS+= odbc.2:${PORTSDIR}/databases/unixODBC .endif -.if ${PORT_OPTIONS:MIODBC) && ! ${PORT_OPTIONS:MUODBC} +.if ${PORT_OPTIONS:MIODBC} && ! ${PORT_OPTIONS:MUODBC} LIB_DEPENDS+= iodbc.3:${PORTSDIR}/databases/libiodbc .endif Modified: head/graphics/showimg/Makefile ============================================================================== --- head/graphics/showimg/Makefile Fri May 24 10:46:51 2013 (r318957) +++ head/graphics/showimg/Makefile Fri May 24 11:46:11 2013 (r318958) @@ -40,7 +40,7 @@ LIB_DEPENDS+= kexif:${PORTSDIR}/graphics CONFIGURE_ARGS+=--without-kexif .endif -.if ${PORT_OPTIONS:MKEXIDB) && {PORT_OPTIONS:MMYSQL} +.if ${PORT_OPTIONS:MKEXIDB} && ${PORT_OPTIONS:MMYSQL} PLIST_SUB+= KEXIDB="" .else CONFIGURE_ARGS+=--without-showimgdb Modified: head/mail/courier-pythonfilter/Makefile ============================================================================== --- head/mail/courier-pythonfilter/Makefile Fri May 24 10:46:51 2013 (r318957) +++ head/mail/courier-pythonfilter/Makefile Fri May 24 11:46:11 2013 (r318958) @@ -59,11 +59,11 @@ OPTIONS_DEFAULT= DEBUG WHITELIST_RELAY W PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${SCRIPTSDIR} -.if ${PORT_OPTIONS:MCLAMAV_CLAMD) && ! ${PORT_OPTIONS:MCLAMAV_LIB} +.if ${PORT_OPTIONS:MCLAMAV_CLAMD} && ! ${PORT_OPTIONS:MCLAMAV_LIB} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pyclamd.py:${PORTSDIR}/security/py-pyclamd .endif -.if ${PORT_OPTIONS:MCLAMAV_LIB) && ! ${PORT_OPTIONS:MCLAMAV_CLAMD} +.if ${PORT_OPTIONS:MCLAMAV_LIB} && ! ${PORT_OPTIONS:MCLAMAV_CLAMD} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pyclamav.so:${PORTSDIR}/security/py-clamav .endif @@ -83,7 +83,7 @@ post-configure: .if ${PORT_OPTIONS:MLOCALSENDERS} @${ECHO_MSG} localsenders >> ${WRKSRC}/pythonfilter.conf.sample .endif -.if ${PORT_OPTIONS:MCLAMAV_CLAMD) || ${PORT_OPTIONS:MCLAMAV_LIB} +.if ${PORT_OPTIONS:MCLAMAV_CLAMD} || ${PORT_OPTIONS:MCLAMAV_LIB} @${ECHO_MSG} clamav >> ${WRKSRC}/pythonfilter.conf.sample .endif .if ${PORT_OPTIONS:MSPAMASSASSIN} Modified: head/news/nntpcache/Makefile ============================================================================== --- head/news/nntpcache/Makefile Fri May 24 10:46:51 2013 (r318957) +++ head/news/nntpcache/Makefile Fri May 24 11:46:11 2013 (r318958) @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --with-authinfo-radius AUTHINFO_EXT+= authinfo_radius.ext .endif -.if ${PORT_OPTIONS:MLDAP) || defined(WITH_LDAP2} +.if ${PORT_OPTIONS:MLDAP} || defined(WITH_LDAP2} USE_OPENLDAP= yes CONFIGURE_ARGS+= --with-authinfo-ldap CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include