svn commit: r354025 - in head/textproc/rubygem-nokogiri: . files

[Steve Wills]

Sorry, the patch neglected to add back this line:

CONFIGURE_ARGS=	--use-system-libraries	

Add that, then it should be OK.

And please, remove rubygem-mini_portile. We don't want nokogiri downloading and
installing it's own copy of libxml2 or libxslt during it's build and bundling
them with the gem.

Steve

On Fri, May 16, 2014 at 03:41:57PM +0000, Steve Wills wrote:
> Hi,
> 
> This is not the correct fix. Please see attached. Please use this fix and
> remove rubygem-mini_portile from ports. The mini_portile gem does it's own
> installing of libraries and other things and this is not how we want ports to
> work, IMHO, so we really should avoid having it in port if possible.
> 
> Steve
> 
> On Wed, May 14, 2014 at 06:50:24AM +0000, Akinori MUSHA wrote:
> > Author: knu
> > Date: Wed May 14 06:50:24 2014
> > New Revision: 354025
> > URL: http://svnweb.freebsd.org/changeset/ports/354025
> > QAT: https://qat.redports.org/buildarchive/r354025/
> > 
> > Log:
> >   Update to 1.6.2.1 and use the bundled libraries.
> >   
> >   Nokogiri currently does not fully support libxml2 2.9.1 which our
> >   textproc/libxml2 has just been updated to, and using the bundled
> >   libraries is the only supported configuration.
> > 
> > Deleted:
> >   head/textproc/rubygem-nokogiri/files/
> > Modified:
> >   head/textproc/rubygem-nokogiri/Makefile
> >   head/textproc/rubygem-nokogiri/distinfo
> > 
> > Modified: head/textproc/rubygem-nokogiri/Makefile
> > ==============================================================================
> > --- head/textproc/rubygem-nokogiri/Makefile	Wed May 14 06:49:07 2014	(r354024)
> > +++ head/textproc/rubygem-nokogiri/Makefile	Wed May 14 06:50:24 2014	(r354025)
> > @@ -1,19 +1,19 @@
> >  # $FreeBSD$
> >  
> >  PORTNAME=	nokogiri
> > -PORTVERSION=	1.6.2
> > +PORTVERSION=	1.6.2.1
> >  CATEGORIES=	textproc rubygems
> >  MASTER_SITES=	RG
> >  
> >  MAINTAINER=	ruby at FreeBSD.org
> >  COMMENT=	HTML, XML, SAX, and Reader parser
> >  
> > +BUILD_DEPENDS=	rubygem-mini_portile=0.6.0:${PORTSDIR}/devel/rubygem-mini_portile
> > +RUN_DEPENDS=	rubygem-mini_portile=0.6.0:${PORTSDIR}/devel/rubygem-mini_portile
> > +
> >  LICENSE=	MIT
> >  
> >  GEM_ENV=	LC_CTYPE=UTF-8
> > -CONFIGURE_ARGS=	--use-system-libraries
> > -
> > -USE_GNOME=	libxml2 libxslt
> >  
> >  USE_RUBY=	yes
> >  USE_RUBY_FEATURES=	iconv
> > 
> > Modified: head/textproc/rubygem-nokogiri/distinfo
> > ==============================================================================
> > --- head/textproc/rubygem-nokogiri/distinfo	Wed May 14 06:49:07 2014	(r354024)
> > +++ head/textproc/rubygem-nokogiri/distinfo	Wed May 14 06:50:24 2014	(r354025)
> > @@ -1,2 +1,2 @@
> > -SHA256 (rubygem/nokogiri-1.6.2.gem) = d7e366ba831188b6fd1f4efd2a73d242b5323f9d027064603c362e5e06fc7f98
> > -SIZE (rubygem/nokogiri-1.6.2.gem) = 8601088
> > +SHA256 (rubygem/nokogiri-1.6.2.1.gem) = dfb23254b87672a93582981c4ac5880d178ff32db6878fc351d75198aa544836
> > +SIZE (rubygem/nokogiri-1.6.2.1.gem) = 8753664

> Index: Makefile
> ===================================================================
> --- Makefile	(revision 354236)
> +++ Makefile	(working copy)
> @@ -2,6 +2,7 @@
>  
>  PORTNAME=	nokogiri
>  PORTVERSION=	1.6.2.1
> +PORTREVISION=	1
>  CATEGORIES=	textproc rubygems
>  MASTER_SITES=	RG
>  
> @@ -8,17 +9,14 @@
>  MAINTAINER=	ruby at FreeBSD.org
>  COMMENT=	HTML, XML, SAX, and Reader parser
>  
> -BUILD_DEPENDS=	rubygem-mini_portile=0.6.0:${PORTSDIR}/devel/rubygem-mini_portile
> -RUN_DEPENDS=	rubygem-mini_portile=0.6.0:${PORTSDIR}/devel/rubygem-mini_portile
> -
>  LICENSE=	MIT
>  
> -GEM_ENV=	LC_CTYPE=UTF-8
> -
>  USE_RUBY=	yes
>  USE_RUBY_FEATURES=	iconv
>  USE_RUBYGEMS=	yes
>  RUBYGEM_AUTOPLIST=	yes
> +USE_GNOME=	libxml2 libxslt
> +USES=		pkgconfig
>  
>  PLIST_FILES=	bin/nokogiri
>