From owner-svn-ports-head@freebsd.org Fri Mar 15 08:33:18 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 76DE21542A2B; Fri, 15 Mar 2019 08:33:18 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E45EC8E6A3; Fri, 15 Mar 2019 08:33:17 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D55157976; Fri, 15 Mar 2019 08:33:17 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2F8XHR6081977; Fri, 15 Mar 2019 08:33:17 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2F8XH2i081976; Fri, 15 Mar 2019 08:33:17 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201903150833.x2F8XH2i081976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 15 Mar 2019 08:33:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495774 - head/databases/virtuoso X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/databases/virtuoso X-SVN-Commit-Revision: 495774 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E45EC8E6A3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 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, 15 Mar 2019 08:33:18 -0000 Author: tobik Date: Fri Mar 15 08:33:17 2019 New Revision: 495774 URL: https://svnweb.freebsd.org/changeset/ports/495774 Log: databases/virtuoso: Replace IODBC_CPPFLAGS and append directly to CPPFLAGS The result is identical and having a variable that looks like an options helper (IODBC_CPPFLAGS) after bsd.port.options.mk would be an error if D19553 is accepted. Reported by: tobik (in D19553) Modified: head/databases/virtuoso/Makefile Modified: head/databases/virtuoso/Makefile ============================================================================== --- head/databases/virtuoso/Makefile Fri Mar 15 07:22:09 2019 (r495773) +++ head/databases/virtuoso/Makefile Fri Mar 15 08:33:17 2019 (r495774) @@ -41,7 +41,7 @@ CONFIGURE_ARGS= --with-readline\ --datadir="${PREFIX}"\ --localstatedir="${PREFIX}" CONFIGURE_ENV= ac_cv_header_sys_timeb_h=no -CPPFLAGS+= -std=gnu89 ${IODBC_CPPFLAGS} +CPPFLAGS+= -std=gnu89 LDFLAGS+= -lexecinfo MAKE_ENV= PATH=${LOCALBASE}/bin:${PATH}\ ISQL=isql-vt @@ -79,10 +79,10 @@ PLIST_SUB+= WITH_IMAGEMAGICK="@comment " .if ${PORT_OPTIONS:MIODBC} CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE} LIB_DEPENDS+= libiodbc.so:databases/libiodbc -IODBC_CPPFLAGS= -I${LOCALBASE}/include/libiodbc +CPPFLAGS+= -I${LOCALBASE}/include/libiodbc PLIST_SUB+= WITH_IODBC="" .else -IODBC_CPPFLAGS= -I../../libsrc/odbcsdk/include +CPPFLAGS+= -I../../libsrc/odbcsdk/include PLIST_SUB+= WITH_IODBC="@comment " .endif