aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--graphics/ruby-rsvg2/Makefile1
-rw-r--r--www/ruby-gtkmozembed/Makefile7
-rw-r--r--www/ruby-gtkmozembed/files/patch-extconf.rb12
-rw-r--r--x11-toolkits/ruby-gtk2/pkg-plist2
-rw-r--r--x11-toolkits/ruby-gtkglext/Makefile3
-rw-r--r--x11/ruby-gnome2-all/Makefile6
-rw-r--r--x11/ruby-gnome2/Makefile.common2
-rw-r--r--x11/ruby-gnome2/distinfo6
8 files changed, 26 insertions, 13 deletions
diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile
index 4e0fc062fa9..807b3ba7af6 100644
--- a/graphics/ruby-rsvg2/Makefile
+++ b/graphics/ruby-rsvg2/Makefile
@@ -18,6 +18,7 @@ DIST_SUBDIR= ruby
MAINTAINER= mezz@FreeBSD.org
COMMENT= Ruby binding for librsvg2
+BUILD_DEPENDS= ${RUBY_SITEARCHLIBDIR}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
USE_RUBY= yes
diff --git a/www/ruby-gtkmozembed/Makefile b/www/ruby-gtkmozembed/Makefile
index ba9ffcfdffb..b9ee5b4c4e4 100644
--- a/www/ruby-gtkmozembed/Makefile
+++ b/www/ruby-gtkmozembed/Makefile
@@ -21,7 +21,7 @@ COMMENT= Ruby binding for GtkMozEmbed a widget embedding a Gecko renderer
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
USE_RUBY= yes
-USE_GECKO= mozilla
+USE_GECKO= firefox mozilla xulrunner
USE_RUBY_EXTCONF= yes
.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
@@ -35,8 +35,9 @@ DOCS= COPYING.LIB ChangeLog README
.include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"
post-patch:
- @${REINPLACE_CMD} -e 's|mozilla-|${GECKO}-|g' \
- ${WRKSRC}/extconf.rb
+ @${REINPLACE_CMD} -e 's|xulrunner-|${GECKO}-|g ; \
+ s|%%GECKO_PATH%%|${X11BASE}/lib/${GECKO}|g' \
+ ${WRKSRC}/extconf.rb
post-install:
.if !defined(NOPORTDOCS)
diff --git a/www/ruby-gtkmozembed/files/patch-extconf.rb b/www/ruby-gtkmozembed/files/patch-extconf.rb
new file mode 100644
index 00000000000..c08018c84c2
--- /dev/null
+++ b/www/ruby-gtkmozembed/files/patch-extconf.rb
@@ -0,0 +1,12 @@
+--- extconf.rb.orig Sun Jul 2 19:15:05 2006
++++ extconf.rb Sun Jul 2 19:19:25 2006
+@@ -23,8 +23,7 @@
+ PKGConfig.have_package(PACKAGE_ID)
+ setup_win32(PACKAGE_NAME)
+
+-mozpath = PKGConfig.libs_only_L(PACKAGE_ID)
+-mozpath.strip!.sub!(/^-L/, "")
++mozpath = "%%GECKO_PATH%%"
+
+ if mozpath
+ # please comment the CFLAGS line if you don't want a default comp_path
diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index 01eddc606ef..0b3a4e06d28 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -3,6 +3,7 @@
%%RUBY_SITEARCHLIBDIR%%/gtk22.so
%%RUBY_SITEARCHLIBDIR%%/rbgtk.h
%%RUBY_SITELIBDIR%%/gtk2.rb
+%%RUBY_SITELIBDIR%%/gtk2/base.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/README
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/alphatest.png
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/apple-red.png
@@ -180,3 +181,4 @@
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+@dirrm %%RUBY_SITELIBDIR%%/gtk2
diff --git a/x11-toolkits/ruby-gtkglext/Makefile b/x11-toolkits/ruby-gtkglext/Makefile
index caad08ae992..d2c7c37ab95 100644
--- a/x11-toolkits/ruby-gtkglext/Makefile
+++ b/x11-toolkits/ruby-gtkglext/Makefile
@@ -8,7 +8,6 @@
PORTNAME= gtkglext
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
-PORTREVISION= 1
CATEGORIES= x11-toolkits ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -19,7 +18,7 @@ DIST_SUBDIR= ruby
MAINTAINER= mezz@FreeBSD.org
COMMENT= Ruby binding for GtkGLExt
-LIB_DEPENDS= gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
+LIB_DEPENDS= gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
${RUBY_SITEARCHLIBDIR}/opengl.so:${PORTSDIR}/graphics/ruby-opengl
diff --git a/x11/ruby-gnome2-all/Makefile b/x11/ruby-gnome2-all/Makefile
index 2f5d1b907f9..6db0245c7ae 100644
--- a/x11/ruby-gnome2-all/Makefile
+++ b/x11/ruby-gnome2-all/Makefile
@@ -8,7 +8,6 @@
PORTNAME= gnome2-all
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
-PORTREVISION= 1
CATEGORIES= x11 ruby gnome
MASTER_SITES= # none
PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
@@ -28,9 +27,8 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2 \
${RUBY_SITEARCHLIBDIR}/gtksourceview.so:${PORTSDIR}/x11-toolkits/ruby-gtksourceview \
${RUBY_SITEARCHLIBDIR}/gnomeprintui2.so:${PORTSDIR}/x11-toolkits/ruby-gnomeprintui \
${RUBY_SITEARCHLIBDIR}/panelapplet2.so:${PORTSDIR}/x11-toolkits/ruby-panelapplet \
- ${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2
-
-#${RUBY_SITEARCHLIBDIR}/libgda.so:${PORTSDIR}/databases/ruby-libgda
+ ${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2 \
+ ${RUBY_SITEARCHLIBDIR}/libgda.so:${PORTSDIR}/databases/ruby-libgda
USE_RUBY= yes
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 242de18c8c8..0b4c55f16b6 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,6 +1,6 @@
# $FreeBSD$
-RUBY_GNOME_VERSION= 0.14.1
+RUBY_GNOME_VERSION= 0.15.0
#RUBY_GNOME_SNAPSHOTDATE= 20010224
.if defined(RUBY_GNOME_SNAPSHOTDATE)
RUBY_GNOME_PORTVERSION= ${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index 250c91c88a4..c9de1629bd2 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-gnome2-all-0.14.1.tar.gz) = 94c7ac07571fcb4d20d8bb87caf3b4b7
-SHA256 (ruby/ruby-gnome2-all-0.14.1.tar.gz) = d63f742094829027f55178d740deb3abc30435f59255793fd4f09d2c1a75c05f
-SIZE (ruby/ruby-gnome2-all-0.14.1.tar.gz) = 1223083
+MD5 (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 3e5b89b674a2b60ff9d3a2eeac0468e9
+SHA256 (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 313e6f9c7b328fd3c28c54be9dca7eec13eb70daaf717590988e4d22ace951b3
+SIZE (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 1273856