- Update to 0.90.2

- Add dependency on rubygem-pkg-config Submitted by: me (swills) Approved by: pgollucci (mentor)
svn path=/head/; revision=262864
2024-10-20 20:09:11 +00:00 · 2010-10-12 03:23:26 +00:00 · 2010-10-12 03:23:26 +00:00 · ccd32680d4 · 2021-03-31 03:12:20 +00:00
commit ccd32680d4
parent 6802d534bc
25 changed files with 67 additions and 19 deletions
--- a/accessibility/ruby-atk/Makefile
+++ b/accessibility/ruby-atk/Makefile
@ -18,7 +18,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for ATK

-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2
+BUILD_DEPENDS+= rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
+		rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config

 USE_RUBY=	yes
 USE_GNOME=	atk
--- a/devel/ruby-gconf2/Makefile
+++ b/devel/ruby-gconf2/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A Ruby interface to GConf2

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2

 USE_RUBY=	yes
--- a/devel/ruby-glib2/Makefile
+++ b/devel/ruby-glib2/Makefile
@ -18,21 +18,22 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GLib2

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+
 USE_RUBY=	yes
 USE_GNOME=	glib20
 USE_RUBY_EXTCONF=	yes

 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"

-WRKSRC=		${RUBY_GNOME_WRKSRC}/glib
+WRKSRC=		${RUBY_GNOME_WRKSRC}/glib2
 INSTALL_TARGET=	site-install

 DOCS=		COPYING.LIB ChangeLog README

 post-patch: general-patch
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/sample/utils.rb
-	@${FIND} ${WRKSRC} -name '*.bak' -delete
+	@${RM} ${WRKSRC}/lib/gnome2-win32-binary-downloader.rb

 post-configure: general-configure

--- a/devel/ruby-glib2/pkg-plist
+++ b/devel/ruby-glib2/pkg-plist
@ -8,7 +8,6 @@ libdata/pkgconfig/ruby-glib2.pc
 %%RUBY_SITEARCHLIBDIR%%/rbgutil.h
 %%RUBY_SITEARCHLIBDIR%%/glib-enum-types.h
 %%RUBY_SITELIBDIR%%/mkmf-gnome2.rb
-%%RUBY_SITELIBDIR%%/pkg-config.rb
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
--- a/devel/ruby-gnomevfs/Makefile
+++ b/devel/ruby-gnomevfs/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GnomeVFS

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2

 USE_RUBY=	yes
--- a/devel/ruby-libglade2/Makefile
+++ b/devel/ruby-libglade2/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for Libglade2

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2

 USE_RUBY=	yes
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@ -18,7 +18,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GdkPixbuf2

-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2
+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
+		rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config

 USE_RUBY=	yes
 USE_GNOME=	gtk20
@ -26,7 +28,7 @@ USE_RUBY_EXTCONF=	yes

 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"

-WRKSRC=		${RUBY_GNOME_WRKSRC}/gdkpixbuf
+WRKSRC=		${RUBY_GNOME_WRKSRC}/gdk_pixbuf2
 INSTALL_TARGET=	site-install

 DOCS=		COPYING.LIB ChangeLog README
--- a/graphics/ruby-gnomecanvas2/Makefile
+++ b/graphics/ruby-gnomecanvas2/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GnomeCanvas2

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
 		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/libart2.so:${PORTSDIR}/graphics/ruby-libart2

--- a/graphics/ruby-libart2/Makefile
+++ b/graphics/ruby-libart2/Makefile
@ -18,6 +18,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for Libart2

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
+RUN_DEPENDS+=	${BUILD_DEPENDS}
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png

--- a/graphics/ruby-rsvg2/Makefile
+++ b/graphics/ruby-rsvg2/Makefile
@ -18,7 +18,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for librsvg2

-BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
+BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/cairo.so:${PORTSDIR}/graphics/ruby-cairo \
+		rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2

 USE_RUBY=	yes
@ -27,7 +28,7 @@ USE_RUBY_EXTCONF=	yes

 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"

-WRKSRC=		${RUBY_GNOME_WRKSRC}/rsvg
+WRKSRC=		${RUBY_GNOME_WRKSRC}/rsvg2
 INSTALL_TARGET=	site-install

 DOCS=		COPYING.LIB ChangeLog README
--- a/print/ruby-gnomeprint/Makefile
+++ b/print/ruby-gnomeprint/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for libgnomeprint

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/libart2.so:${PORTSDIR}/graphics/ruby-libart2 \
 		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango

--- a/www/ruby-gtkhtml2/Makefile
+++ b/www/ruby-gtkhtml2/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GtkHtml2

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2

 USE_RUBY=	yes
--- a/www/ruby-gtkmozembed/Makefile
+++ b/www/ruby-gtkmozembed/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GtkMozEmbed a widget embedding a Gecko renderer

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2

 USE_RUBY=	yes
--- a/www/ruby-gtkmozembed/files/patch-extconf-rb
+++ b/www/ruby-gtkmozembed/files/patch-extconf-rb
@ -0,0 +1,16 @@
+--- extconf.rb.orig	2010-09-25 04:26:28.000000000 -0400
+++ extconf.rb	2010-10-06 21:09:27.986446199 -0400
+@@ -20,12 +20,7 @@
+ $LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
+ 
+ module_name = "gtkmozembed"
+-package_ids = ["libxul-embedding-unstable",
+-               "libxul-embedding",
+-               "xulrunner-gtkmozembed",
+-               "firefox-gtkmozembed",
+-               "seamonkey-gtkmozembed",
+-               "mozilla-gtkmozembed"]
+package_ids = ["seamonkey-gtkmozembed"]
+ 
+ require 'mkmf-gnome2'
+ 
--- a/x11-toolkits/ruby-gnomeprintui/Makefile
+++ b/x11-toolkits/ruby-gnomeprintui/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for libgnomeprintui

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
 		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnomeprint2.so:${PORTSDIR}/print/ruby-gnomeprint

--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@ -18,7 +18,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GTK+2

-BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango
+BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango \
+		rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/atk.so:${PORTSDIR}/accessibility/ruby-atk \
 		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gdk_pixbuf2.so:${PORTSDIR}/graphics/ruby-gdk_pixbuf2 \
 		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango
@ -29,7 +30,7 @@ USE_RUBY_EXTCONF=	yes

 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"

-WRKSRC=		${RUBY_GNOME_WRKSRC}/gtk
+WRKSRC=		${RUBY_GNOME_WRKSRC}/gtk2
 INSTALL_TARGET=	site-install

 DOCS=		COPYING.LIB ChangeLog README
@ -48,7 +49,7 @@ post-configure: general-configure
 # Have to do that to generate ruby-glib's glib-enum-types.h or
 # it will not build.
 pre-configure:
-	@(cd ${RUBY_GNOME_WRKSRC}/glib ; ${SETENV} ${CONFIGURE_ENV} \
+	@(cd ${RUBY_GNOME_WRKSRC}/glib2 ; ${SETENV} ${CONFIGURE_ENV} \
 		${RUBY} ${RUBY_FLAGS} ${RUBY_EXTCONF} ${CONFIGURE_ARGS})

 post-install:
--- a/x11-toolkits/ruby-gtk2/files/patch-gtk2-ext-gtk2-rbgtkitemfactory-c
+++ b/x11-toolkits/ruby-gtk2/files/patch-gtk2-ext-gtk2-rbgtkitemfactory-c
@ -0,0 +1,11 @@
+--- ext/gtk2/rbgtkitemfactory.c.orig	2010-10-10 15:01:35.146315748 -0400
+++ ext/gtk2/rbgtkitemfactory.c	2010-10-10 15:01:45.129705841 -0400
+@@ -29,7 +29,7 @@
+ {
+     VALUE obj = rb_eval_string("eval('self', binding)");
+     G_RELATIVE(obj, self);
+-    RBGTK_INITIALIZE(self, gtk_item_factory_new(FIX2INT(type), RVAL2CSTR(path),
+    RBGTK_INITIALIZE(self, gtk_item_factory_new(NUM2UINT(type), RVAL2CSTR(path),
+                                                 RVAL2ACCEL(accel)));
+    
+     return Qnil;
--- a/x11-toolkits/ruby-gtkglext/Makefile
+++ b/x11-toolkits/ruby-gtkglext/Makefile
@ -19,6 +19,7 @@ MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GtkGLExt

 LIB_DEPENDS=	gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
 		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/opengl.so:${PORTSDIR}/graphics/ruby-opengl

--- a/x11-toolkits/ruby-gtksourceview/Makefile
+++ b/x11-toolkits/ruby-gtksourceview/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for GtkSourceView

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2

 USE_RUBY=	yes
--- a/x11-toolkits/ruby-panelapplet/Makefile
+++ b/x11-toolkits/ruby-panelapplet/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for libpanel-applet

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnome2.so:${PORTSDIR}/x11/ruby-gnome2

 USE_RUBY=	yes
--- a/x11-toolkits/ruby-pango/Makefile
+++ b/x11-toolkits/ruby-pango/Makefile
@ -18,8 +18,10 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby binding for Pango

-BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
+BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/cairo.so:${PORTSDIR}/graphics/ruby-cairo \
+		rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
+		rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config \
 		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/cairo.so:${PORTSDIR}/graphics/ruby-cairo

 USE_RUBY=	yes
--- a/x11/ruby-gnome2-all/Makefile
+++ b/x11/ruby-gnome2-all/Makefile
@ -8,7 +8,6 @@

 PORTNAME=	gnome2-all
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 ruby gnome
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@ -18,6 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A set of Ruby bindings for GNOME2

+BUILD_DEPENDS+=	rubygem-pkg-config>=1.0.7:${PORTSDIR}/devel/rubygem-pkg-config
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnomecanvas2.so:${PORTSDIR}/graphics/ruby-gnomecanvas2

 USE_RUBY=	yes
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@ -1,6 +1,6 @@
 # $FreeBSD$

-RUBY_GNOME_VERSION=		0.19.4
+RUBY_GNOME_VERSION=		0.90.2
 #RUBY_GNOME_SNAPSHOTDATE=	20061130
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@ -1,3 +1,3 @@
-MD5 (ruby/ruby-gnome2-all-0.19.4.tar.gz) = 40451e4173e2c8bcd5046aea7e499ef9
-SHA256 (ruby/ruby-gnome2-all-0.19.4.tar.gz) = 40beced42c867c5980aafef23a3b03a5a7ef007fde07e32dc36d207d07475caf
-SIZE (ruby/ruby-gnome2-all-0.19.4.tar.gz) = 2401534
+MD5 (ruby/ruby-gnome2-all-0.90.2.tar.gz) = b25065050aeed8f94c235bee9d4ddf3e
+SHA256 (ruby/ruby-gnome2-all-0.90.2.tar.gz) = 9a30db7802455976f7072fdd57b2e7abdc2a381a8a12e677bc3eabbf8f89e7ea
+SIZE (ruby/ruby-gnome2-all-0.90.2.tar.gz) = 2427946