From owner-svn-ports-all@freebsd.org Fri Jul 7 02:07:34 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 339D3D971D4; Fri, 7 Jul 2017 02:07:34 +0000 (UTC) (envelope-from swills@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 005C72D45; Fri, 7 Jul 2017 02:07:33 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6727Xqo030977; Fri, 7 Jul 2017 02:07:33 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6727X5j030976; Fri, 7 Jul 2017 02:07:33 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201707070207.v6727X5j030976@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Fri, 7 Jul 2017 02:07:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r445195 - in head/textproc/rubygem-nokogiri: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/textproc/rubygem-nokogiri: . files X-SVN-Commit-Revision: 445195 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.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: Fri, 07 Jul 2017 02:07:34 -0000 Author: swills Date: Fri Jul 7 02:07:32 2017 New Revision: 445195 URL: https://svnweb.freebsd.org/changeset/ports/445195 Log: textproc/rubygem-nokogiri: fix build with newer pkg-config While here, add missing lib dep on libgcrypt Modified: head/textproc/rubygem-nokogiri/Makefile head/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb Modified: head/textproc/rubygem-nokogiri/Makefile ============================================================================== --- head/textproc/rubygem-nokogiri/Makefile Fri Jul 7 01:03:51 2017 (r445194) +++ head/textproc/rubygem-nokogiri/Makefile Fri Jul 7 02:07:32 2017 (r445195) @@ -2,6 +2,7 @@ PORTNAME= nokogiri PORTVERSION= 1.8.0 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -13,6 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= rubygem-pkg-config>=1.1.7:devel/rubygem-pkg-config RUN_DEPENDS:= ${BUILD_DEPENDS} +LIB_DEPENDS= libgcrypt.so:security/libgcrypt CONFIGURE_ARGS= --use-system-libraries USE_GNOME= libxml2 libxslt Modified: head/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb ============================================================================== --- head/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb Fri Jul 7 01:03:51 2017 (r445194) +++ head/textproc/rubygem-nokogiri/files/patch-ext_nokogiri_extconf.rb Fri Jul 7 02:07:32 2017 (r445195) @@ -1,9 +1,19 @@ ---- ext/nokogiri/extconf.rb.orig 2017-06-05 04:54:11 UTC -+++ ext/nokogiri/extconf.rb -@@ -658,6 +658,43 @@ have_func('xmlRelaxNGSetValidStructuredE +--- ext/nokogiri/extconf.rb.orig 2017-07-04 01:54:01.043919000 +0000 ++++ ext/nokogiri/extconf.rb 2017-07-04 01:54:59.447166000 +0000 +@@ -116,7 +116,7 @@ + + begin + require 'rubygems' +- gem 'pkg-config', (gem_ver='~> 1.1.7') ++ gem 'pkg-config', (gem_ver='~> 1.1') + require 'pkg-config' and message("Using pkg-config gem version #{PKGConfig::VERSION}\n") + rescue LoadError + message "pkg-config could not be used to find #{pkg}\nPlease install either `pkg-config` or the pkg-config gem per\n\n gem install pkg-config -v #{gem_ver.inspect}\n\n" +@@ -657,6 +657,43 @@ + have_func('xmlRelaxNGSetValidStructuredErrors') have_func('xmlSchemaSetValidStructuredErrors') have_func('xmlSchemaSetParserStructuredErrors') - ++ +$INSTALLFILES = [ + ['html_document.h', '$(archdir)'], + ['html_element_description.h', '$(archdir)'], @@ -40,7 +50,6 @@ + ['xml_xpath_context.h', '$(archdir)'], + ['xslt_stylesheet.h', '$(archdir)'], +] -+ + create_makefile('nokogiri/nokogiri') - if enable_config('clean', true)