diff options
24 files changed, 96 insertions, 43 deletions
diff --git a/accessibility/ruby-atk/Makefile b/accessibility/ruby-atk/Makefile index 257fe176b1e3..e912840ed278 100644 --- a/accessibility/ruby-atk/Makefile +++ b/accessibility/ruby-atk/Makefile @@ -20,7 +20,6 @@ COMMENT= Ruby binding for ATK RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 USE_RUBY= yes -USE_XLIB= yes USE_GNOME= atk USE_RUBY_EXTCONF= yes diff --git a/databases/ruby-libgda/Makefile b/databases/ruby-libgda/Makefile index a97e3b4408e0..60a27d548682 100644 --- a/databases/ruby-libgda/Makefile +++ b/databases/ruby-libgda/Makefile @@ -20,7 +20,6 @@ COMMENT= Ruby binding for libgda (GNOME-DB Project) RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 USE_RUBY= yes -USE_XLIB= yes USE_GNOME= libgda2 USE_RUBY_EXTCONF= yes diff --git a/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile index 060e024656be..d9cba0d4a2b7 100644 --- a/devel/ruby-glib2/Makefile +++ b/devel/ruby-glib2/Makefile @@ -19,6 +19,7 @@ COMMENT= Ruby binding for GLib2 USE_RUBY= yes USE_GNOME= glib20 +USE_REINPLACE= yes USE_RUBY_EXTCONF= yes .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common" @@ -28,10 +29,16 @@ INSTALL_TARGET= site-install DOCS= COPYING.LIB ChangeLog README +post-patch: + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/sample/utils.rb + @${FIND} ${WRKSRC} -name '*.bak' -delete + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${RUBY_MODEXAMPLESDIR} @${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/ + @${INSTALL_DATA} ${WRKSRC}/tests/* ${RUBY_MODEXAMPLESDIR}/ @${MKDIR} ${RUBY_MODDOCDIR} .for f in ${DOCS} @${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ diff --git a/devel/ruby-glib2/files/patch-extconf.rb b/devel/ruby-glib2/files/patch-extconf.rb new file mode 100644 index 000000000000..bf39d382ec17 --- /dev/null +++ b/devel/ruby-glib2/files/patch-extconf.rb @@ -0,0 +1,10 @@ +--- extconf.rb.orig Sun Mar 6 22:41:34 2005 ++++ extconf.rb Sun Mar 6 22:41:59 2005 +@@ -13,6 +13,7 @@ + require 'mkmf-gnome2' + + PKGConfig.have_package('gobject-2.0') or exit 1 ++PKGConfig.have_package('gthread-2.0') or exit 1 + + setup_win32(PACKAGE_NAME) + diff --git a/devel/ruby-glib2/pkg-plist b/devel/ruby-glib2/pkg-plist index 24c8eae093fb..35cb6bc383e4 100644 --- a/devel/ruby-glib2/pkg-plist +++ b/devel/ruby-glib2/pkg-plist @@ -4,6 +4,9 @@ %%RUBY_SITEARCHLIBDIR%%/rbgutil.h %%RUBY_SITELIBDIR%%/glib2.rb %%RUBY_SITELIBDIR%%/mkmf-gnome2.rb +%%RUBY_SITELIBDIR%%/pkg-config.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/spawn.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-glib2.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/type-register.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/type-register2.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/utils.rb diff --git a/devel/ruby-gnomevfs/Makefile b/devel/ruby-gnomevfs/Makefile index 4159e8b9ee35..2bcfa3cc180d 100644 --- a/devel/ruby-gnomevfs/Makefile +++ b/devel/ruby-gnomevfs/Makefile @@ -21,6 +21,7 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 USE_RUBY= yes USE_GNOME= gnomevfs2 +USE_REINPLACE= yes USE_RUBY_EXTCONF= yes .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common" @@ -30,6 +31,11 @@ INSTALL_TARGET= site-install DOCS= COPYING.LIB ChangeLog README +post-patch: + @${REINPLACE_CMD} -e 's|/bin/ruby -w|/bin/env ruby|g' \ + ${WRKSRC}/tests/*.rb + @${FIND} ${WRKSRC} -name '*.bak' -delete + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${RUBY_MODEXAMPLESDIR} diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile index 64d2c8e60f40..44d3d09b3e4f 100644 --- a/graphics/ruby-gdk_pixbuf2/Makefile +++ b/graphics/ruby-gdk_pixbuf2/Makefile @@ -20,8 +20,8 @@ COMMENT= Ruby binding for GdkPixbuf2 RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 USE_RUBY= yes -USE_XLIB= yes USE_GNOME= gtk20 +USE_REINPLACE= yes USE_RUBY_EXTCONF= yes .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common" @@ -31,6 +31,11 @@ INSTALL_TARGET= site-install DOCS= COPYING.LIB ChangeLog README +post-patch: + @${REINPLACE_CMD} -e 's|local/bin/ruby|bin/env ruby|g' \ + ${WRKSRC}/sample/*.rb + @${FIND} ${WRKSRC} -name '*.bak' -delete + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${RUBY_MODEXAMPLESDIR} diff --git a/graphics/ruby-gdk_pixbuf2/pkg-plist b/graphics/ruby-gdk_pixbuf2/pkg-plist index 5c7c42079be3..ade9355353b1 100644 --- a/graphics/ruby-gdk_pixbuf2/pkg-plist +++ b/graphics/ruby-gdk_pixbuf2/pkg-plist @@ -2,12 +2,14 @@ %%RUBY_SITELIBDIR%%/gdk_pixbuf2.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/anim.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/composite.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/flip.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/floppybuddy.gif %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/format.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-foot.png %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/inline.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/loader.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pixdata.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rotate.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/save.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/scale.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/utils.rb diff --git a/graphics/ruby-gnomecanvas2/Makefile b/graphics/ruby-gnomecanvas2/Makefile index 033373568ceb..a153af0fd932 100644 --- a/graphics/ruby-gnomecanvas2/Makefile +++ b/graphics/ruby-gnomecanvas2/Makefile @@ -21,7 +21,6 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \ ${RUBY_SITEARCHLIBDIR}/libart2.so:${PORTSDIR}/graphics/ruby-libart2 USE_RUBY= yes -USE_XLIB= yes USE_GNOME= libgnomecanvas USE_RUBY_EXTCONF= yes diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile index e5bbcbc27dfa..680be70c2ca0 100644 --- a/graphics/ruby-rsvg2/Makefile +++ b/graphics/ruby-rsvg2/Makefile @@ -17,7 +17,7 @@ DIST_SUBDIR= ruby MAINTAINER= mezz@FreeBSD.org COMMENT= Ruby binding for librsvg2 -RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gdk_pixbuf2.so:${PORTSDIR}/graphics/ruby-gdk_pixbuf2 +RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 USE_RUBY= yes USE_GNOME= librsvg2 diff --git a/multimedia/ruby-gst/Makefile b/multimedia/ruby-gst/Makefile index df2126bb989c..80a667e7f97c 100644 --- a/multimedia/ruby-gst/Makefile +++ b/multimedia/ruby-gst/Makefile @@ -7,7 +7,6 @@ PORTNAME= gst PORTVERSION= ${RUBY_GNOME_PORTVERSION} -PORTREVISION= 1 CATEGORIES= multimedia devel ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} @@ -22,6 +21,7 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 USE_RUBY= yes USE_GSTREAMER= core +USE_REINPLACE= yes USE_RUBY_EXTCONF= yes .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common" @@ -31,6 +31,11 @@ INSTALL_TARGET= site-install DOCS= COPYING.LIB ChangeLog README +post-patch: + @${REINPLACE_CMD} -e 's|tests/||g' \ + ${WRKSRC}/tests/tc_*.rb + @${FIND} ${WRKSRC} -name '*.bak' -delete + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${RUBY_MODEXAMPLESDIR} diff --git a/print/ruby-gnomeprint/Makefile b/print/ruby-gnomeprint/Makefile index f75fcf999343..7400f5d2ac7a 100644 --- a/print/ruby-gnomeprint/Makefile +++ b/print/ruby-gnomeprint/Makefile @@ -17,8 +17,7 @@ DIST_SUBDIR= ruby MAINTAINER= mezz@FreeBSD.org COMMENT= Ruby binding for libgnomeprint -RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \ - ${RUBY_SITEARCHLIBDIR}/libart2.so:${PORTSDIR}/graphics/ruby-libart2 \ +RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/libart2.so:${PORTSDIR}/graphics/ruby-libart2 \ ${RUBY_SITEARCHLIBDIR}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango USE_RUBY= yes diff --git a/www/ruby-gtkhtml2/Makefile b/www/ruby-gtkhtml2/Makefile index be0e7721df15..4677a4b29781 100644 --- a/www/ruby-gtkhtml2/Makefile +++ b/www/ruby-gtkhtml2/Makefile @@ -20,7 +20,6 @@ COMMENT= Ruby binding for GtkHtml2 RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 USE_RUBY= yes -USE_XLIB= yes USE_GNOME= libgtkhtml USE_RUBY_EXTCONF= yes diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile index 6daf8c31fb38..e9794526fa3b 100644 --- a/x11-toolkits/ruby-gtk2/Makefile +++ b/x11-toolkits/ruby-gtk2/Makefile @@ -7,7 +7,6 @@ PORTNAME= gtk2 PORTVERSION= ${RUBY_GNOME_PORTVERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} @@ -18,12 +17,12 @@ DIST_SUBDIR= ruby MAINTAINER= mezz@FreeBSD.org COMMENT= Ruby binding for GTK+2 +BUILD_DEPENDS= ${RUBY_SITEARCHLIBDIR}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/atk.so:${PORTSDIR}/accessibility/ruby-atk \ ${RUBY_SITEARCHLIBDIR}/gdk_pixbuf2.so:${PORTSDIR}/graphics/ruby-gdk_pixbuf2 \ ${RUBY_SITEARCHLIBDIR}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango USE_RUBY= yes -USE_XLIB= yes USE_GNOME= gtk20 USE_REINPLACE= yes USE_RUBY_EXTCONF= yes @@ -38,8 +37,11 @@ DOCS= COPYING.LIB ChangeLog README post-patch: @${REINPLACE_CMD} -e 's|/usr/share|${X11BASE}/share|g' \ ${WRKSRC}/sample/gtk-demo/common.rb - @${REINPLACE_CMD} -e 's|/usr/local/share|${X11BASE}/share|g' \ - ${WRKSRC}/sample/testgtk/testgtkrc + @${REINPLACE_CMD} -e 's|local/bin/ruby|bin/env ruby|g' \ + ${WRKSRC}/sample/misc/*.rb + @${REINPLACE_CMD} -e 's|/usr/local/share|${X11BASE}/share|g ; \ + s|local/bin/ruby|bin/env ruby|g' \ + ${WRKSRC}/sample/testgtk/testgtk* @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist index 0d8041ea1e7a..d6e3db7ccf13 100644 --- a/x11-toolkits/ruby-gtk2/pkg-plist +++ b/x11-toolkits/ruby-gtk2/pkg-plist @@ -7,21 +7,29 @@ %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/alphatest.png %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/apple-red.png %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/appwindow.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/background.jpg %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/button_box.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/changedisplay.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/clipboard.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/colorsel.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/common.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/dialog.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/drawingarea.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/editable_cells.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/entry_completion.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/expander.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/floppybuddy.gif %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-applets.png %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-calendar.png %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-foot.png +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-fs-directory.png +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-fs-regular.png %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-gimp.png %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-gmush.png %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-gsame.png +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnu-keys.png %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gtk-logo-rgb.gif +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/iconview.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/images.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/item_factory.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/list_store.rb @@ -29,18 +37,20 @@ %%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/rotated_text.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/ruby-gnome2-logo.png %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/sizegroup.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/stock_browser.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/textview.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/tree_store.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/aboutdialog.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/aboutdialog2.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/bindings.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/button.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/button2.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/buttonbox.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/calendar.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/checkbutton.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/color_font_button.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/combo_check.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/combobox.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/cursor.rb @@ -66,6 +76,8 @@ %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/label.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/listview.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/menu.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/misc_button.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/pangorenderer.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/pointer_grab.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/properties.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/radiobutton.rb @@ -80,6 +92,7 @@ %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/to_drawable.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/togglebutton.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/toolbar.rb +%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/tree_progress.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/treemodelfilter.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/treeview.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/uimanager.rb diff --git a/x11-toolkits/ruby-gtkglext/Makefile b/x11-toolkits/ruby-gtkglext/Makefile index d322066a4290..9e2f6328dbf7 100644 --- a/x11-toolkits/ruby-gtkglext/Makefile +++ b/x11-toolkits/ruby-gtkglext/Makefile @@ -22,7 +22,6 @@ RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \ ${RUBY_SITEARCHLIBDIR}/opengl.so:${PORTSDIR}/graphics/ruby-opengl USE_RUBY= yes -USE_XLIB= yes USE_RUBY_EXTCONF= yes .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common" @@ -32,12 +31,6 @@ INSTALL_TARGET= site-install DOCS= ChangeLog README -.include <bsd.port.pre.mk> - -.if ${OSVERSION} < 500000 -IGNORE= "Does not work on FreeBSD 4.x, because of thread issue with ruby-opengl and ruby-gnome2-all" -.endif - post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${RUBY_MODEXAMPLESDIR} @@ -48,4 +41,4 @@ post-install: .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/ruby-gtksourceview/Makefile b/x11-toolkits/ruby-gtksourceview/Makefile index 58851affda2f..758059d06acb 100644 --- a/x11-toolkits/ruby-gtksourceview/Makefile +++ b/x11-toolkits/ruby-gtksourceview/Makefile @@ -17,7 +17,7 @@ DIST_SUBDIR= ruby MAINTAINER= mezz@FreeBSD.org COMMENT= Ruby binding for GtkSourceView -RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 +RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 USE_RUBY= yes USE_GNOME= gtksourceview diff --git a/x11-toolkits/ruby-panelapplet/Makefile b/x11-toolkits/ruby-panelapplet/Makefile index de768d7f572a..f9358f9a7a8d 100644 --- a/x11-toolkits/ruby-panelapplet/Makefile +++ b/x11-toolkits/ruby-panelapplet/Makefile @@ -17,10 +17,11 @@ DIST_SUBDIR= ruby MAINTAINER= mezz@FreeBSD.org COMMENT= Ruby binding for libpanel-applet -RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 +RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gnome2.so:${PORTSDIR}/x11/ruby-gnome2 USE_RUBY= yes USE_GNOME= gnomepanel +USE_REINPLACE= yes USE_RUBY_EXTCONF= yes .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common" @@ -30,6 +31,14 @@ INSTALL_TARGET= site-install DOCS= COPYING.LIB ChangeLog README +post-patch: + @${REINPLACE_CMD} -e 's|/usr/lib/|${X11BASE}/libdata/|g ; \ + s|/usr/libexec/|${X11BASE}/libexec/|g' \ + ${WRKSRC}/sample/README ${WRKSRC}/sample/*.server + @${REINPLACE_CMD} -e 's|bin/ruby|bin/env ruby|g' \ + ${WRKSRC}/sample/hello-applet.rb + @${FIND} ${WRKSRC} -name '*.bak' -delete + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${RUBY_MODEXAMPLESDIR} diff --git a/x11-toolkits/ruby-pango/Makefile b/x11-toolkits/ruby-pango/Makefile index a2187ac8a451..783697e8fa7d 100644 --- a/x11-toolkits/ruby-pango/Makefile +++ b/x11-toolkits/ruby-pango/Makefile @@ -20,8 +20,8 @@ COMMENT= Ruby binding for Pango RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 USE_RUBY= yes -USE_XLIB= yes USE_GNOME= pango +USE_REINPLACE= yes USE_RUBY_EXTCONF= yes .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common" @@ -31,6 +31,11 @@ INSTALL_TARGET= site-install DOCS= COPYING.LIB ChangeLog README +post-patch: + @${REINPLACE_CMD} -e 's|local/bin/ruby|bin/env ruby|g' \ + ${WRKSRC}/sample/*.rb + @${FIND} ${WRKSRC} -name '*.bak' -delete + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${RUBY_MODEXAMPLESDIR} diff --git a/x11-toolkits/ruby-pango/pkg-plist b/x11-toolkits/ruby-pango/pkg-plist index 5b2a6ae7732a..dc03bb40cc9d 100644 --- a/x11-toolkits/ruby-pango/pkg-plist +++ b/x11-toolkits/ruby-pango/pkg-plist @@ -1,5 +1,6 @@ %%RUBY_SITEARCHLIBDIR%%/pango.so %%RUBY_SITEARCHLIBDIR%%/rbpango.h +%%RUBY_SITEARCHLIBDIR%%/rbpangoversion.h %%RUBY_SITELIBDIR%%/pango.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/attribute.rb %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gdk_layout.rb diff --git a/x11/ruby-gnome2-all/Makefile b/x11/ruby-gnome2-all/Makefile index 9904676a2c2b..4a9c2e202835 100644 --- a/x11/ruby-gnome2-all/Makefile +++ b/x11/ruby-gnome2-all/Makefile @@ -7,7 +7,6 @@ PORTNAME= gnome2-all PORTVERSION= ${RUBY_GNOME_PORTVERSION} -PORTREVISION= 1 CATEGORIES= x11 ruby gnome MASTER_SITES= # none PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -18,16 +17,16 @@ MAINTAINER= mezz@FreeBSD.org COMMENT= The "meta-port" for Ruby/GNOME2 RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2 \ - ${RUBY_SITEARCHLIBDIR}/gnome2.so:${PORTSDIR}/x11/ruby-gnome2 \ - ${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2 \ ${RUBY_SITEARCHLIBDIR}/gtkhtml2.so:${PORTSDIR}/www/ruby-gtkhtml2 \ ${RUBY_SITEARCHLIBDIR}/gnomevfs.so:${PORTSDIR}/devel/ruby-gnomevfs \ ${RUBY_SITEARCHLIBDIR}/gst.so:${PORTSDIR}/multimedia/ruby-gst \ ${RUBY_SITEARCHLIBDIR}/libgda.so:${PORTSDIR}/databases/ruby-libgda \ + ${RUBY_SITEARCHLIBDIR}/rsvg2.so:${PORTSDIR}/graphics/ruby-rsvg2 \ + ${RUBY_SITEARCHLIBDIR}/gtkglext.so:${PORTSDIR}/x11-toolkits/ruby-gtkglext \ ${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}/rsvg2.so:${PORTSDIR}/graphics/ruby-rsvg2 \ - ${RUBY_SITEARCHLIBDIR}/gnomeprintui2.so:${PORTSDIR}/x11-toolkits/ruby-gnomeprintui + ${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2 USE_RUBY= yes @@ -35,13 +34,7 @@ USE_RUBY= yes NO_BUILD= yes -.include <bsd.port.pre.mk> - -.if ${OSVERSION} > 500000 -RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/gtkglext.so:${PORTSDIR}/x11-toolkits/ruby-gtkglext -.endif - do-install: @${DO_NADA} -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile index 3228b13332b7..64df4a48076b 100644 --- a/x11/ruby-gnome2/Makefile +++ b/x11/ruby-gnome2/Makefile @@ -17,12 +17,11 @@ DIST_SUBDIR= ruby MAINTAINER= mezz@FreeBSD.org COMMENT= A set of Ruby bindings for GNOME2 -RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \ - ${RUBY_SITEARCHLIBDIR}/gnomecanvas2.so:${PORTSDIR}/graphics/ruby-gnomecanvas2 +RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gnomecanvas2.so:${PORTSDIR}/graphics/ruby-gnomecanvas2 USE_RUBY= yes -USE_XLIB= yes USE_GNOME= libgnomeui +USE_REINPLACE= yes USE_RUBY_EXTCONF= yes .include "${.CURDIR}/Makefile.common" @@ -32,6 +31,11 @@ INSTALL_TARGET= site-install DOCS_EN= AUTHORS COPYING.LIB ChangeLog README README.gnome2-all +post-patch: + @${REINPLACE_CMD} -e 's| /usr/local/bin/ruby|/usr/bin/env ruby|g' \ + ${WRKSRC}/sample/test-gnome/*.rb + @${FIND} ${WRKSRC} -name '*.bak' -delete + post-build: @${CP} ${RUBY_GNOME_WRKSRC}/AUTHORS ${WRKSRC}/AUTHORS @${CP} ${RUBY_GNOME_WRKSRC}/README ${WRKSRC}/README.gnome2-all diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common index 917b9a987403..ab093bada178 100644 --- a/x11/ruby-gnome2/Makefile.common +++ b/x11/ruby-gnome2/Makefile.common @@ -1,6 +1,6 @@ # $FreeBSD$ -RUBY_GNOME_VERSION= 0.11.0 +RUBY_GNOME_VERSION= 0.12.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 b9a4d089be20..12fd57f1b4f0 100644 --- a/x11/ruby-gnome2/distinfo +++ b/x11/ruby-gnome2/distinfo @@ -1,2 +1,2 @@ -MD5 (ruby/ruby-gnome2-all-0.11.0.tar.gz) = a4fe0c52f971bf01e2382479f4c56470 -SIZE (ruby/ruby-gnome2-all-0.11.0.tar.gz) = 1066284 +MD5 (ruby/ruby-gnome2-all-0.12.0.tar.gz) = 3aa40a574f0365361745d852494240a3 +SIZE (ruby/ruby-gnome2-all-0.12.0.tar.gz) = 1121926 |