From owner-svn-ports-all@freebsd.org Tue Nov 27 23:04:08 2018 Return-Path: Delivered-To: svn-ports-all@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 6866D113EEB2; Tue, 27 Nov 2018 23:04:08 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0883273F18; Tue, 27 Nov 2018 23:04:08 +0000 (UTC) (envelope-from stephen@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 D66CD21F58; Tue, 27 Nov 2018 23:04:07 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wARN47XY042511; Tue, 27 Nov 2018 23:04:07 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wARN47WY042510; Tue, 27 Nov 2018 23:04:07 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201811272304.wARN47WY042510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Tue, 27 Nov 2018 23:04:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486072 - head/devel/gdcm X-SVN-Group: ports-head X-SVN-Commit-Author: stephen X-SVN-Commit-Paths: head/devel/gdcm X-SVN-Commit-Revision: 486072 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0883273F18 X-Spamd-Result: default: False [0.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.19)[0.195,0]; NEURAL_SPAM_MEDIUM(0.30)[0.301,0]; NEURAL_SPAM_LONG(0.47)[0.465,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2018 23:04:08 -0000 Author: stephen Date: Tue Nov 27 23:04:07 2018 New Revision: 486072 URL: https://svnweb.freebsd.org/changeset/ports/486072 Log: - Combine the two USES together - one used to incorrectly over-right the other. PR: ports/233568 Submitted by: Piotr Kubaj Modified: head/devel/gdcm/Makefile Modified: head/devel/gdcm/Makefile ============================================================================== --- head/devel/gdcm/Makefile Tue Nov 27 22:56:17 2018 (r486071) +++ head/devel/gdcm/Makefile Tue Nov 27 23:04:07 2018 (r486072) @@ -15,7 +15,7 @@ BUILD_DEPENDS= pkgconf:devel/pkgconf LIB_DEPENDS= libopenjp2.so:graphics/openjpeg \ libexpat.so:textproc/expat2 -USES= compiler:c++11-lang +USES= alias cmake:outsource compiler:c++11-lang tar:bzip2 ssl OPTIONS_RADIO= VTK OPTIONS_RADIO_VTK= VTK5 VTK6 @@ -39,7 +39,6 @@ GDCM_PATCH= 8 VTK5_VERSION= 5.10 VTK6_VERSION= 6.2 -USES= alias cmake:outsource tar:bzip2 ssl USE_LDCONFIG= yes CFLAGS+= -I${LOCALBASE}/include CMAKE_ARGS= -DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON \