From owner-svn-ports-all@freebsd.org Tue Jun 5 14:44:27 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 20E0CFE5923; Tue, 5 Jun 2018 14:44:27 +0000 (UTC) (envelope-from mfechner@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 C09C17C56C; Tue, 5 Jun 2018 14:44:26 +0000 (UTC) (envelope-from mfechner@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 9D5871DD5B; Tue, 5 Jun 2018 14:44:26 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w55EiQMs012987; Tue, 5 Jun 2018 14:44:26 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w55EiQUi012986; Tue, 5 Jun 2018 14:44:26 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201806051444.w55EiQUi012986@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Tue, 5 Jun 2018 14:44:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r471765 - in branches/2018Q2/devel: libgit2 libgit2-glib/files X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in branches/2018Q2/devel: libgit2 libgit2-glib/files X-SVN-Commit-Revision: 471765 X-SVN-Commit-Repository: ports 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.26 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, 05 Jun 2018 14:44:27 -0000 Author: mfechner Date: Tue Jun 5 14:44:26 2018 New Revision: 471765 URL: https://svnweb.freebsd.org/changeset/ports/471765 Log: MFH: r469930 r470014 Mark devel/libgit2-glib as broken, upstream does not support libgit 0.27.0 Reviewed by: wg (maintainer) Approved by: wg (maintainer) Differential Revision: https://reviews.freebsd.org/D15321 devel/libgit2-glib: Unbreak with libgit2 0.27. The fix is two-fold: * Adjust the path for the sed call in devel/libgit2 so that we leave out openssl from libgit2.pc's Requires.private line, otherwise libgit2-glib will look for openssl.pc, which does not exist when OpenSSL from base is used. * Reset libgit2-glib back to 0.26, and import a patch both Arch Linux and openSUSE have been carrying to fix the build with libgit2 0.27. PORTEPOCH was not set because there is no libgit2-glib 0.27 and no package could have possibly been built after r469930. Approved by: mfechner, gnome (kwm) Differential Revision: https://reviews.freebsd.org/D15437 Approved by: ports-secteam (eadler) Added: branches/2018Q2/devel/libgit2-glib/files/ - copied from r470014, head/devel/libgit2-glib/files/ Modified: branches/2018Q2/devel/libgit2/Makefile Directory Properties: branches/2018Q2/ (props changed) Modified: branches/2018Q2/devel/libgit2/Makefile ============================================================================== --- branches/2018Q2/devel/libgit2/Makefile Tue Jun 5 14:40:59 2018 (r471764) +++ branches/2018Q2/devel/libgit2/Makefile Tue Jun 5 14:44:26 2018 (r471765) @@ -2,6 +2,7 @@ PORTNAME= libgit2 PORTVERSION= 0.27.0 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= devel @@ -38,7 +39,7 @@ post-patch: @${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt .if ${SSL_DEFAULT} == base @${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \ - ${WRKSRC}/CMakeLists.txt + ${WRKSRC}/src/CMakeLists.txt .endif .include