From owner-svn-ports-all@freebsd.org Mon May 29 15:26:19 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D456D4ED2C; Mon, 29 May 2017 15:26:19 +0000 (UTC) (envelope-from sunpoet@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 mx1.freebsd.org (Postfix) with ESMTPS id 3BC337D8E8; Mon, 29 May 2017 15:26:19 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4TFQIDb055429; Mon, 29 May 2017 15:26:18 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4TFQIwg055428; Mon, 29 May 2017 15:26:18 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201705291526.v4TFQIwg055428@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 29 May 2017 15:26:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441992 - head/archivers/unrar X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 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: Mon, 29 May 2017 15:26:19 -0000 Author: sunpoet Date: Mon May 29 15:26:18 2017 New Revision: 441992 URL: https://svnweb.freebsd.org/changeset/ports/441992 Log: Update CONFLICTS_INSTALL Modified: head/archivers/unrar/Makefile Modified: head/archivers/unrar/Makefile ============================================================================== --- head/archivers/unrar/Makefile Mon May 29 15:24:01 2017 (r441991) +++ head/archivers/unrar/Makefile Mon May 29 15:26:18 2017 (r441992) @@ -24,7 +24,7 @@ OPTIONS_DEFINE= OPENSSL_AES OPTIONS_DEFAULT=OPENSSL_AES OPENSSL_AES_DESC= Use OpenSSL implementation of AES -CONFLICTS_INSTALL?= zh-unrar-[0-9].* unrar-iconv-[0-9].* +CONFLICTS_INSTALL?= zh-unrar unrar-iconv LDFLAGS+= -lpthread MAKE_ARGS= CXX=${CXX} CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" STRIP=${STRIP_CMD}