aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/ruby-glib2/Makefile3
-rw-r--r--devel/ruby-glib2/files/patch-mkmf-gnome2.rb15
-rw-r--r--devel/ruby-glib2/pkg-plist2
-rw-r--r--graphics/ruby-gdk_pixbuf2/Makefile3
-rw-r--r--x11-toolkits/ruby-gtk2/pkg-plist4
-rw-r--r--x11/ruby-gnome2/Makefile.common2
-rw-r--r--x11/ruby-gnome2/distinfo2
7 files changed, 10 insertions, 21 deletions
diff --git a/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile
index d6dd123ddffb..8ab8d8090751 100644
--- a/devel/ruby-glib2/Makefile
+++ b/devel/ruby-glib2/Makefile
@@ -7,7 +7,6 @@
PORTNAME= glib2
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
-PORTREVISION= 1
CATEGORIES= devel ruby
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -33,6 +32,8 @@ DOCS= ChangeLog \
post-install:
.if !defined(NOPORTDOCS)
+ ${MKDIR} ${RUBY_MODEXAMPLESDIR}
+ ${CP} -R ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
${MKDIR} ${RUBY_MODDOCDIR}
.for f in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/devel/ruby-glib2/files/patch-mkmf-gnome2.rb b/devel/ruby-glib2/files/patch-mkmf-gnome2.rb
deleted file mode 100644
index b3541c1f364d..000000000000
--- a/devel/ruby-glib2/files/patch-mkmf-gnome2.rb
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/lib/mkmf-gnome2.rb.orig Sun Sep 7 21:00:32 2003
-+++ src/lib/mkmf-gnome2.rb Sat Oct 18 19:41:58 2003
-@@ -137,11 +137,7 @@
- end
- end
-
--alias :old_create_makefile :create_makefile
--def create_makefile(lib, src_prefix = nil)
-- $CFLAGS << " -I$(sitearchdir) "
-- old_create_makefile(lib, src_prefix)
--end
-+$CPPFLAGS << " -I$(sitearchdir) "
-
- def create_top_makefile(sub_dirs = ["src"])
- mfile = File.open("Makefile", "w")
diff --git a/devel/ruby-glib2/pkg-plist b/devel/ruby-glib2/pkg-plist
index 79815fb856bd..f3bf02f999f4 100644
--- a/devel/ruby-glib2/pkg-plist
+++ b/devel/ruby-glib2/pkg-plist
@@ -1,6 +1,8 @@
%%RUBY_SITEARCHLIBDIR%%/glib2.so
%%RUBY_SITELIBDIR%%/glib2.rb
%%RUBY_SITELIBDIR%%/mkmf-gnome2.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/type-register.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index 128200a286df..d758be319bb3 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -7,7 +7,6 @@
PORTNAME= gdk_pixbuf2
PORTVERSION= ${RUBY_GNOME_PORTVERSION}
-PORTREVISION= 1
CATEGORIES= graphics ruby gnome
MASTER_SITES= ${RUBY_GNOME_MASTER_SITES}
MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -21,8 +20,6 @@ COMMENT= Ruby binding for GdkPixbuf2
LIB_DEPENDS= gdk_pixbuf-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
-BROKEN= "Broken pkg-plist; will be removed after Feb 2"
-
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
USE_XLIB= yes
diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index ebaef54bfe3b..b0b6fa0f6c7f 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -1,8 +1,11 @@
%%RUBY_SITEARCHLIBDIR%%/gtk2.so
+%%RUBY_SITEARCHLIBDIR%%/gtk20.so
+%%RUBY_SITEARCHLIBDIR%%/gtk22.so
%%RUBY_SITELIBDIR%%/gtk2.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/alphatest.png
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/appwindow.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/button_box.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/changedisplay.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/colorsel.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/common.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/dialog.rb
@@ -16,6 +19,7 @@
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/main.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/menus.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/panes.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/pixbufs.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/sizegroup.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/stock_browser.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/textview.rb
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 593b43233402..79452d9b1e7b 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,6 +1,6 @@
# $FreeBSD$
-RUBY_GNOME_VERSION= 0.7.0
+RUBY_GNOME_VERSION= 0.8.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 a1bde6b5eadf..5d681a33e07a 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-gnome2-all-0.7.0.tar.gz) = 412292423f145ef756edf918f0892d7e
+MD5 (ruby/ruby-gnome2-all-0.8.0.tar.gz) = f4f631dc954c66652626f9dc49fba133