ports/179531: commit references a PR

[dfilter service]

The following reply was made to PR ports/179531; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: ports/179531: commit references a PR
Date: Mon, 17 Jun 2013 19:26:55 +0000 (UTC)

 Author: kwm
 Date: Mon Jun 17 19:26:33 2013
 New Revision: 321146
 URL: http://svnweb.freebsd.org/changeset/ports/321146
 
 Log:
   Add patch to fix ruby script with ruby 1.9+ [1]
   Remove Obsolete reinplace lines.
   Make sure we have ruby and bash available for building docs and not depend
     on others to supply it.
   Don't install docs double.
   
   PR:		ports/179531 [1]
   Submitted by:	bar@
 
 Added:
   head/graphics/gegl/files/patch-tools_create-reference.rb   (contents, props changed)
 Modified:
   head/graphics/gegl/Makefile
   head/graphics/gegl/pkg-plist
 
 Modified: head/graphics/gegl/Makefile
 ==============================================================================
 --- head/graphics/gegl/Makefile	Mon Jun 17 19:05:33 2013	(r321145)
 +++ head/graphics/gegl/Makefile	Mon Jun 17 19:26:33 2013	(r321146)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	gegl
  PORTVERSION=	0.2.0
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	graphics
  MASTER_SITES=	ftp://ftp.gimp.org/pub/gegl/0.2/
  
 @@ -22,13 +22,13 @@ SPIRO_DESC=	Spiro support
  #UMFPACK_DESC=	UMFpack support
  
  USE_GNOME=	glib20 intltool
 -USES=		pathfix pkgconfig gettext
 +USES=		gettext pathfix pkgconfig shebangfix
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_LDCONFIG=	${PREFIX}/lib/gegl-0.2
  GNU_CONFIGURE=	yes
  CONFIGURE_ENV+=	ac_cv_header_execinfo_h=no
 -CONFIGURE_ARGS+=--without-vala
 +CONFIGURE_ARGS+=--without-vala --disable-docs
  CPPFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS+=	-L${LOCALBASE}/lib -lintl
  
 @@ -40,6 +40,8 @@ EXAMPLES=	2geglbuffer csugar float-looku
  		gegl-convert gegl-slicer geglbuffer-add-image \
  		geglbuffer-clock hello-world-video hello-world
  
 +SHEBANG_FILES=	tools/xml_insert.sh
 +
  .include <bsd.port.options.mk>
  
  .if ${PORT_OPTIONS:MPIXBUF}
 @@ -191,20 +193,21 @@ PLIST_SUB+=	EXIV2="@comment "
  
  .if ${PORT_OPTIONS:MDOCS}
  BUILD_DEPENDS+=	a2x:${PORTSDIR}/textproc/asciidoc \
 +		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
  		vimdot:${PORTSDIR}/graphics/graphviz
 +USE_RUBY=	yes
 +RUBY_NO_RUN_DEPENDS=yes
  .else
  CONFIGURE_ARGS+=--disable-docs
  .endif
  
  post-patch:
 -.if empty(PORT_OPTIONS:MDOCS)
 -	${REINPLACE_CMD} -e '10s|\\||; 11,13d' \
 -		${WRKSRC}/Makefile.am
 +.if ! ${PORT_OPTIONS:MDOCS}
 +	${REINPLACE_CMD} -e 's|tools examples|tools|g' \
 +		${WRKSRC}/Makefile.in
  .endif
  	${REINPLACE_CMD} -e 's|\(lua\)\(5\.1\)|\1-\2|g ; s|x86_64|amd64|g' \
  		${WRKSRC}/configure
 -	${REINPLACE_CMD} -e 's|/usr/bin/ruby|/usr/bin/env ruby|' \
 -		${WRKSRC}/tools/gobj2dot.rb
  
  .if ${PORT_OPTIONS:MDOCS}
  pre-configure:
 @@ -216,7 +219,8 @@ pre-configure:
  
  post-build:
  .if ${PORT_OPTIONS:MDOCS}
 -	cd ${WRKSRC}/docs && ${GMAKE}
 +	cd ${WRKSRC}/docs && ${GMAKE} index.html
 +	cd ${WRKSRC}/docs/gallery && ${GMAKE} index.html
  .endif
  
  post-install:
 
 Added: head/graphics/gegl/files/patch-tools_create-reference.rb
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/gegl/files/patch-tools_create-reference.rb	Mon Jun 17 19:26:33 2013	(r321146)
 @@ -0,0 +1,14 @@
 +--- tools/create-reference.rb.orig	2013-06-17 14:02:54.000000000 +0000
 ++++ tools/create-reference.rb	2013-06-17 14:03:31.000000000 +0000
 +@@ -5,6 +5,11 @@
 + # Use under a public domain license.
 + #
 + 
 ++if RUBY_VERSION != /^1.8/
 ++  Encoding.default_external = Encoding::UTF_8
 ++  Encoding.default_internal = Encoding::UTF_8
 ++end
 ++
 + class Argument
 +     attr_accessor :name, :data_type, :doc
 +     def initialize
 
 Modified: head/graphics/gegl/pkg-plist
 ==============================================================================
 --- head/graphics/gegl/pkg-plist	Mon Jun 17 19:05:33 2013	(r321145)
 +++ head/graphics/gegl/pkg-plist	Mon Jun 17 19:26:33 2013	(r321146)
 @@ -292,27 +292,9 @@ lib/libgegl-%%GEGL_VER%%.la
  lib/libgegl-%%GEGL_VER%%.so
  lib/libgegl-%%GEGL_VER%%.so.%%GEGL_MINOR%%
  libdata/pkgconfig/gegl-%%GEGL_VER%%.pc
 -%%PORTDOCS%%share/gtk-doc/html/gegl/brightness-contrast.c.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation-area-filter.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation-composer.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation-filter.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation-meta.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation-point-composer.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation-point-filter.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation-point-render.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation-sink.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation-source.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation-temporal.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-operation.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl-plugin.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl.css
 -%%PORTDOCS%%share/gtk-doc/html/gegl/gegl.h.html
 -%%PORTDOCS%%share/gtk-doc/html/gegl/operations.html
  %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
  %%PORTDOCS%%%%DOCSDIR%%/api.html
  %%PORTDOCS%%%%DOCSDIR%%/brightness-contrast.c.html
 -%%PORTDOCS%%%%DOCSDIR%%/class-hierarchy.html
 -%%PORTDOCS%%%%DOCSDIR%%/development.html
  %%PORTDOCS%%%%DOCSDIR%%/devhelp.css
  %%PNG%%%%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-00.png
  %%PORTDOCS%%%%DOCSDIR%%/gallery/OpenRaster-00.txt
 @@ -363,9 +345,6 @@ share/locale/sl/LC_MESSAGES/gegl-%%GEGL_
  @dirrm include/gegl-%%GEGL_VER%%/opencl
  @dirrm include/gegl-%%GEGL_VER%%
  @dirrm lib/gegl-%%GEGL_VER%%
 -%%PORTDOCS%%@dirrm share/gtk-doc/html/gegl
 -%%PORTDOCS%%@dirrmtry share/gtk-doc/html
 -%%PORTDOCS%%@dirrmtry share/gtk-doc
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/gallery
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/data
 _______________________________________________
 svn-ports-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"