Date: Sun, 29 Aug 2010 15:19:53 GMT From: Steve Wills <steve@mouf.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/150087: [PATCH] update ruby-gnome ports to latest version Message-ID: <201008291519.o7TFJr9p045048@www.freebsd.org> Resent-Message-ID: <201008291520.o7TFK6da055672@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 150087
>Category: ports
>Synopsis: [PATCH] update ruby-gnome ports to latest version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 29 15:20:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Steve Wills
>Release: 8.1-amd64
>Organization:
>Environment:
>Description:
ruby gnome ports are out of date
>How-To-Repeat:
>Fix:
Attached patch will update the following ports:
accessibility/ruby-atk
devel/ruby-gconf2
devel/ruby-glib2
devel/ruby-gnomevfs
devel/ruby-libglade2
graphics/ruby-gdk_pixbuf2
graphics/ruby-gnomecanvas2
graphics/ruby-libart2
graphics/ruby-rsvg2
print/ruby-gnomeprint
www/ruby-gtkhtml2
www/ruby-gtkmozembed
x11-toolkits/ruby-gnomeprintui
x11-toolkits/ruby-gtk2
x11-toolkits/ruby-gtkglext
x11-toolkits/ruby-gtksourceview
x11-toolkits/ruby-panelapplet
x11-toolkits/ruby-pango
x11/ruby-gnome2
Patch attached with submission follows:
diff -ruN accessibility/ruby-atk.orig/Makefile accessibility/ruby-atk/Makefile
--- accessibility/ruby-atk.orig/Makefile 2010-08-23 01:15:16.764306301 -0400
+++ accessibility/ruby-atk/Makefile 2010-08-23 23:03:56.892807511 -0400
@@ -32,6 +32,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTDOCS)
diff -ruN accessibility/ruby-atk.orig/pkg-plist accessibility/ruby-atk/pkg-plist
--- accessibility/ruby-atk.orig/pkg-plist 2010-08-23 01:15:16.764306301 -0400
+++ accessibility/ruby-atk/pkg-plist 2010-08-24 22:22:34.585805241 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-atk.pc
%%RUBY_SITELIBDIR%%/atk.rb
%%RUBY_SITEARCHLIBDIR%%/atk.so
%%RUBY_SITEARCHLIBDIR%%/rbatk.h
diff -ruN devel/ruby-gconf2.orig/Makefile devel/ruby-gconf2/Makefile
--- devel/ruby-gconf2.orig/Makefile 2010-08-23 01:15:16.769311103 -0400
+++ devel/ruby-gconf2/Makefile 2010-08-23 23:05:04.936195886 -0400
@@ -33,6 +33,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
diff -ruN devel/ruby-gconf2.orig/pkg-plist devel/ruby-gconf2/pkg-plist
--- devel/ruby-gconf2.orig/pkg-plist 2010-08-23 01:15:16.769311103 -0400
+++ devel/ruby-gconf2/pkg-plist 2010-08-24 22:22:36.897593888 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gconf2.pc
%%RUBY_SITELIBDIR%%/gconf2.rb
%%RUBY_SITEARCHLIBDIR%%/gconf2.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff -ruN devel/ruby-glib2.orig/Makefile devel/ruby-glib2/Makefile
--- devel/ruby-glib2.orig/Makefile 2010-08-23 01:15:16.773342323 -0400
+++ devel/ruby-glib2/Makefile 2010-08-23 23:06:18.175746676 -0400
@@ -34,6 +34,8 @@
${WRKSRC}/sample/utils.rb
@${FIND} ${WRKSRC} -name '*.bak' -delete
+post-configure: general-configure
+
post-install:
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff -ruN devel/ruby-glib2.orig/pkg-plist devel/ruby-glib2/pkg-plist
--- devel/ruby-glib2.orig/pkg-plist 2010-08-23 01:15:16.773342323 -0400
+++ devel/ruby-glib2/pkg-plist 2010-08-24 22:22:38.761717161 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-glib2.pc
%%RUBY_SITELIBDIR%%/glib-mkenums.rb
%%RUBY_SITELIBDIR%%/glib2.rb
%%RUBY_SITEARCHLIBDIR%%/glib2.so
@@ -5,6 +6,7 @@
%%RUBY_SITEARCHLIBDIR%%/rbglib.h
%%RUBY_SITEARCHLIBDIR%%/rbgobject.h
%%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
diff -ruN devel/ruby-gnomevfs.orig/Makefile devel/ruby-gnomevfs/Makefile
--- devel/ruby-gnomevfs.orig/Makefile 2010-08-23 01:15:16.776346601 -0400
+++ devel/ruby-gnomevfs/Makefile 2010-08-23 23:05:31.949854208 -0400
@@ -37,6 +37,8 @@
${WRKSRC}/tests/*.rb
@${FIND} ${WRKSRC} -name '*.bak' -delete
+post-configure: general-configure
+
post-install:
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff -ruN devel/ruby-gnomevfs.orig/pkg-plist devel/ruby-gnomevfs/pkg-plist
--- devel/ruby-gnomevfs.orig/pkg-plist 2010-08-23 01:15:16.777347841 -0400
+++ devel/ruby-gnomevfs/pkg-plist 2010-08-24 22:22:45.761458853 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gnomevfs.pc
%%RUBY_SITELIBDIR%%/gnomevfs.rb
%%RUBY_SITEARCHLIBDIR%%/gnomevfs.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff -ruN devel/ruby-libglade2.orig/Makefile devel/ruby-libglade2/Makefile
--- devel/ruby-libglade2.orig/Makefile 2010-08-23 01:15:16.779349483 -0400
+++ devel/ruby-libglade2/Makefile 2010-08-23 23:06:41.543286559 -0400
@@ -35,6 +35,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
diff -ruN devel/ruby-libglade2.orig/pkg-plist devel/ruby-libglade2/pkg-plist
--- devel/ruby-libglade2.orig/pkg-plist 2010-08-23 01:15:16.779349483 -0400
+++ devel/ruby-libglade2/pkg-plist 2010-08-24 22:22:47.385244068 -0400
@@ -1,4 +1,5 @@
bin/ruby-glade-create-template
+libdata/pkgconfig/ruby-libglade2.pc
%%RUBY_SITEARCHLIBDIR%%/libglade2.so
%%RUBY_SITELIBDIR%%/libglade2.rb
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff -ruN graphics/ruby-gdk_pixbuf2.orig/Makefile graphics/ruby-gdk_pixbuf2/Makefile
--- graphics/ruby-gdk_pixbuf2.orig/Makefile 2010-08-23 01:15:16.807548184 -0400
+++ graphics/ruby-gdk_pixbuf2/Makefile 2010-08-23 23:08:42.862974948 -0400
@@ -33,6 +33,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
diff -ruN graphics/ruby-gdk_pixbuf2.orig/pkg-plist graphics/ruby-gdk_pixbuf2/pkg-plist
--- graphics/ruby-gdk_pixbuf2.orig/pkg-plist 2010-08-23 01:15:16.806539960 -0400
+++ graphics/ruby-gdk_pixbuf2/pkg-plist 2010-08-24 22:22:48.857673339 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gdkpixbuf2.pc
%%RUBY_SITELIBDIR%%/gdk_pixbuf2.rb
%%RUBY_SITEARCHLIBDIR%%/gdk_pixbuf2.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff -ruN graphics/ruby-gnomecanvas2.orig/Makefile graphics/ruby-gnomecanvas2/Makefile
--- graphics/ruby-gnomecanvas2.orig/Makefile 2010-08-23 01:15:16.821666951 -0400
+++ graphics/ruby-gnomecanvas2/Makefile 2010-08-23 23:09:34.630573443 -0400
@@ -34,6 +34,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
diff -ruN graphics/ruby-gnomecanvas2.orig/pkg-plist graphics/ruby-gnomecanvas2/pkg-plist
--- graphics/ruby-gnomecanvas2.orig/pkg-plist 2010-08-23 01:15:16.821666951 -0400
+++ graphics/ruby-gnomecanvas2/pkg-plist 2010-08-24 22:22:50.537374612 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gnomecanvas2.pc
%%RUBY_SITELIBDIR%%/gnomecanvas2.rb
%%RUBY_SITEARCHLIBDIR%%/gnomecanvas2.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff -ruN graphics/ruby-libart2.orig/Makefile graphics/ruby-libart2/Makefile
--- graphics/ruby-libart2.orig/Makefile 2010-08-23 01:15:16.823675018 -0400
+++ graphics/ruby-libart2/Makefile 2010-08-23 22:55:58.626399129 -0400
@@ -34,6 +34,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
diff -ruN graphics/ruby-libart2.orig/pkg-plist graphics/ruby-libart2/pkg-plist
--- graphics/ruby-libart2.orig/pkg-plist 2010-08-23 01:15:16.823675018 -0400
+++ graphics/ruby-libart2/pkg-plist 2010-08-24 22:22:52.161026851 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-libart2.pc
%%RUBY_SITEARCHLIBDIR%%/libart2.so
%%RUBY_SITEARCHLIBDIR%%/rbart.h
%%RUBY_SITELIBDIR%%/libart2.rb
diff -ruN graphics/ruby-rsvg2.orig/Makefile graphics/ruby-rsvg2/Makefile
--- graphics/ruby-rsvg2.orig/Makefile 2010-08-23 01:15:16.825685319 -0400
+++ graphics/ruby-rsvg2/Makefile 2010-08-23 23:10:34.381860591 -0400
@@ -34,6 +34,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
diff -ruN graphics/ruby-rsvg2.orig/pkg-plist graphics/ruby-rsvg2/pkg-plist
--- graphics/ruby-rsvg2.orig/pkg-plist 2010-08-23 01:15:16.824677095 -0400
+++ graphics/ruby-rsvg2/pkg-plist 2010-08-24 22:22:53.673505714 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-rsvg2.pc
%%RUBY_SITEARCHLIBDIR%%/rsvg2.so
%%RUBY_SITELIBDIR%%/rsvg2.rb
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff -ruN print/ruby-gnomeprint.orig/Makefile print/ruby-gnomeprint/Makefile
--- print/ruby-gnomeprint.orig/Makefile 2010-08-23 01:15:16.832749592 -0400
+++ print/ruby-gnomeprint/Makefile 2010-08-23 23:11:20.095531439 -0400
@@ -34,6 +34,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
diff -ruN print/ruby-gnomeprint.orig/pkg-plist print/ruby-gnomeprint/pkg-plist
--- print/ruby-gnomeprint.orig/pkg-plist 2010-08-23 01:15:16.831737736 -0400
+++ print/ruby-gnomeprint/pkg-plist 2010-08-24 22:22:55.425480353 -0400
@@ -1,5 +1,7 @@
+libdata/pkgconfig/ruby-gnomeprint2.pc
%%RUBY_SITELIBDIR%%/gnomeprint2.rb
%%RUBY_SITEARCHLIBDIR%%/gnomeprint2.so
+%%RUBY_SITEARCHLIBDIR%%/rblibgnomeprintversion.h
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
diff -ruN www/ruby-gtkhtml2.orig/Makefile www/ruby-gtkhtml2/Makefile
--- www/ruby-gtkhtml2.orig/Makefile 2010-08-23 01:15:16.847851439 -0400
+++ www/ruby-gtkhtml2/Makefile 2010-08-23 23:11:57.446584737 -0400
@@ -33,6 +33,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
diff -ruN www/ruby-gtkhtml2.orig/pkg-plist www/ruby-gtkhtml2/pkg-plist
--- www/ruby-gtkhtml2.orig/pkg-plist 2010-08-23 01:15:16.847851439 -0400
+++ www/ruby-gtkhtml2/pkg-plist 2010-08-24 22:22:57.169802659 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gtkhtml2.pc
%%RUBY_SITELIBDIR%%/gtkhtml2.rb
%%RUBY_SITEARCHLIBDIR%%/gtkhtml2.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff -ruN www/ruby-gtkmozembed.orig/Makefile www/ruby-gtkmozembed/Makefile
--- www/ruby-gtkmozembed.orig/Makefile 2010-08-23 01:15:16.850861584 -0400
+++ www/ruby-gtkmozembed/Makefile 2010-08-23 23:12:28.529342846 -0400
@@ -37,6 +37,8 @@
s|%%GECKO_PATH%%|${LOCALBASE}/lib/${GECKO}|g' \
${WRKSRC}/extconf.rb
+post-configure: general-configure
+
post-install:
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff -ruN www/ruby-gtkmozembed.orig/files/patch-extconf.rb www/ruby-gtkmozembed/files/patch-extconf.rb
--- www/ruby-gtkmozembed.orig/files/patch-extconf.rb 2010-08-23 01:15:16.849858948 -0400
+++ www/ruby-gtkmozembed/files/patch-extconf.rb 1969-12-31 19:00:00.000000000 -0500
@@ -1,12 +0,0 @@
---- extconf.rb.orig Fri Dec 1 02:00:22 2006
-+++ extconf.rb Fri Dec 1 03:37:15 2006
-@@ -40,8 +40,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 -ruN www/ruby-gtkmozembed.orig/pkg-plist www/ruby-gtkmozembed/pkg-plist
--- www/ruby-gtkmozembed.orig/pkg-plist 2010-08-23 01:15:16.850861584 -0400
+++ www/ruby-gtkmozembed/pkg-plist 2010-08-24 22:22:58.721057774 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gtkmozembed.pc
%%RUBY_SITELIBDIR%%/gtkmozembed.rb
%%RUBY_SITEARCHLIBDIR%%/gtkmozembed.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff -ruN x11-toolkits/ruby-gnomeprintui.orig/Makefile x11-toolkits/ruby-gnomeprintui/Makefile
--- x11-toolkits/ruby-gnomeprintui.orig/Makefile 2010-08-23 01:15:16.863961511 -0400
+++ x11-toolkits/ruby-gnomeprintui/Makefile 2010-08-23 23:13:04.232099742 -0400
@@ -34,6 +34,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
# Have to do that to generate ruby-gnomeprint's rblibgnomeprintversion.h or
# it will not build.
diff -ruN x11-toolkits/ruby-gnomeprintui.orig/pkg-plist x11-toolkits/ruby-gnomeprintui/pkg-plist
--- x11-toolkits/ruby-gnomeprintui.orig/pkg-plist 2010-08-23 01:15:16.863961511 -0400
+++ x11-toolkits/ruby-gnomeprintui/pkg-plist 2010-08-24 22:23:00.224997883 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gnomeprintui2.pc
%%RUBY_SITELIBDIR%%/gnomeprintui2.rb
%%RUBY_SITEARCHLIBDIR%%/gnomeprintui2.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff -ruN x11-toolkits/ruby-gtk2.orig/Makefile x11-toolkits/ruby-gtk2/Makefile
--- x11-toolkits/ruby-gtk2.orig/Makefile 2010-08-23 01:15:16.865975724 -0400
+++ x11-toolkits/ruby-gtk2/Makefile 2010-08-23 23:13:33.094296628 -0400
@@ -44,6 +44,8 @@
${WRKSRC}/sample/testgtk/testgtk*
@${FIND} ${WRKSRC} -name '*.bak' -delete
+post-configure: general-configure
+
# Have to do that to generate ruby-glib's glib-enum-types.h or
# it will not build.
pre-configure:
diff -ruN x11-toolkits/ruby-gtk2.orig/pkg-plist x11-toolkits/ruby-gtk2/pkg-plist
--- x11-toolkits/ruby-gtk2.orig/pkg-plist 2010-08-23 01:15:16.864974484 -0400
+++ x11-toolkits/ruby-gtk2/pkg-plist 2010-08-24 22:23:02.097978105 -0400
@@ -1,7 +1,12 @@
+libdata/pkgconfig/ruby-gtk2.pc
%%RUBY_SITELIBDIR%%/gtk2.rb
%%RUBY_SITELIBDIR%%/gtk2/base.rb
%%RUBY_SITEARCHLIBDIR%%/gtk2.so
%%RUBY_SITEARCHLIBDIR%%/rbgtk.h
+%%RUBY_SITEARCHLIBDIR%%/rbgdk.h
+%%RUBY_SITEARCHLIBDIR%%/rbgdkconversions.h
+%%RUBY_SITEARCHLIBDIR%%/rbgtkconversions.h
+%%RUBY_SITEARCHLIBDIR%%/rbgtkmacros.h
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
diff -ruN x11-toolkits/ruby-gtkglext.orig/Makefile x11-toolkits/ruby-gtkglext/Makefile
--- x11-toolkits/ruby-gtkglext.orig/Makefile 2010-08-23 01:15:16.866980316 -0400
+++ x11-toolkits/ruby-gtkglext/Makefile 2010-08-23 23:14:05.306142844 -0400
@@ -34,6 +34,7 @@
DOCS= ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
diff -ruN x11-toolkits/ruby-gtkglext.orig/pkg-plist x11-toolkits/ruby-gtkglext/pkg-plist
--- x11-toolkits/ruby-gtkglext.orig/pkg-plist 2010-08-23 01:15:16.866980316 -0400
+++ x11-toolkits/ruby-gtkglext/pkg-plist 2010-08-24 22:23:03.649550018 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gtkglext.pc
%%RUBY_SITELIBDIR%%/gtkglext.rb
%%RUBY_SITEARCHLIBDIR%%/gtkglext.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
diff -ruN x11-toolkits/ruby-gtksourceview.orig/Makefile x11-toolkits/ruby-gtksourceview/Makefile
--- x11-toolkits/ruby-gtksourceview.orig/Makefile 2010-08-23 01:15:16.867984629 -0400
+++ x11-toolkits/ruby-gtksourceview/Makefile 2010-08-23 23:14:51.877243277 -0400
@@ -33,6 +33,7 @@
DOCS= COPYING.LIB ChangeLog README
post-patch: general-patch
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
diff -ruN x11-toolkits/ruby-gtksourceview.orig/pkg-plist x11-toolkits/ruby-gtksourceview/pkg-plist
--- x11-toolkits/ruby-gtksourceview.orig/pkg-plist 2010-08-23 01:15:16.867984629 -0400
+++ x11-toolkits/ruby-gtksourceview/pkg-plist 2010-08-24 22:23:05.049591944 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gtksourceview.pc
%%RUBY_SITELIBDIR%%/gtksourceview.rb
%%RUBY_SITEARCHLIBDIR%%/gtksourceview.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
diff -ruN x11-toolkits/ruby-panelapplet.orig/Makefile x11-toolkits/ruby-panelapplet/Makefile
--- x11-toolkits/ruby-panelapplet.orig/Makefile 2010-08-23 01:15:16.869996327 -0400
+++ x11-toolkits/ruby-panelapplet/Makefile 2010-08-23 23:15:22.715929740 -0400
@@ -24,10 +24,7 @@
USE_RUBY= yes
USE_GNOME= gnomepanel
USE_RUBY_EXTCONF= yes
-
-BROKEN= does not build with GNOME 2.26.
-DEPRECATED= has been broken for 7 months
-EXPIRATION_DATE=2010-01-08
+MAKE_JOBS_UNSAFE= yes
.include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
@@ -44,6 +41,8 @@
${WRKSRC}/sample/hello-applet.rb
@${FIND} ${WRKSRC} -name '*.bak' -delete
+post-configure: general-configure
+
post-install:
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff -ruN x11-toolkits/ruby-panelapplet.orig/pkg-plist x11-toolkits/ruby-panelapplet/pkg-plist
--- x11-toolkits/ruby-panelapplet.orig/pkg-plist 2010-08-23 01:15:16.869996327 -0400
+++ x11-toolkits/ruby-panelapplet/pkg-plist 2010-08-24 22:23:07.528948294 -0400
@@ -1,4 +1,6 @@
+libdata/pkgconfig/ruby-panelapplet2.pc
%%RUBY_SITEARCHLIBDIR%%/panelapplet2.so
+%%RUBY_SITEARCHLIBDIR%%/panelapplet2_main.so
%%RUBY_SITELIBDIR%%/panelapplet2.rb
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
diff -ruN x11-toolkits/ruby-pango.orig/Makefile x11-toolkits/ruby-pango/Makefile
--- x11-toolkits/ruby-pango.orig/Makefile 2010-08-23 01:15:16.870998964 -0400
+++ x11-toolkits/ruby-pango/Makefile 2010-08-23 23:15:56.382977892 -0400
@@ -39,6 +39,7 @@
${WRKSRC}/sample/layout.rb
@${FIND} ${WRKSRC} -name '*.bak' -delete
+post-configure: general-configure
post-install:
.if !defined(NOPORTEXAMPLES)
@${MKDIR} ${RUBY_MODEXAMPLESDIR}
diff -ruN x11-toolkits/ruby-pango.orig/pkg-plist x11-toolkits/ruby-pango/pkg-plist
--- x11-toolkits/ruby-pango.orig/pkg-plist 2010-08-23 01:15:16.870998964 -0400
+++ x11-toolkits/ruby-pango/pkg-plist 2010-08-24 22:23:09.569335307 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-pango.pc
%%RUBY_SITEARCHLIBDIR%%/pango.so
%%RUBY_SITEARCHLIBDIR%%/rbpango.h
%%RUBY_SITEARCHLIBDIR%%/rbpangoversion.h
diff -ruN x11/ruby-gnome2.orig/Makefile x11/ruby-gnome2/Makefile
--- x11/ruby-gnome2.orig/Makefile 2010-08-23 01:15:16.889154537 -0400
+++ x11/ruby-gnome2/Makefile 2010-08-23 23:16:55.372529233 -0400
@@ -33,6 +33,7 @@
DOCS_EN= AUTHORS COPYING.LIB ChangeLog README README.gnome2-all
post-patch: general-patch
+post-configure: general-configure
post-build:
@${CP} ${RUBY_GNOME_WRKSRC}/AUTHORS ${WRKSRC}/AUTHORS
diff -ruN x11/ruby-gnome2.orig/Makefile.common x11/ruby-gnome2/Makefile.common
--- x11/ruby-gnome2.orig/Makefile.common 2010-08-23 01:15:16.888148549 -0400
+++ x11/ruby-gnome2/Makefile.common 2010-08-23 22:55:40.530372206 -0400
@@ -1,17 +1,17 @@
# $FreeBSD: ports/x11/ruby-gnome2/Makefile.common,v 1.33 2008/09/06 18:46:40 mezz Exp $
-RUBY_GNOME_VERSION= 0.16.0.20080905 #YYYYMMDD
+RUBY_GNOME_VERSION= 0.19.4
#RUBY_GNOME_SNAPSHOTDATE= 20061130
.if defined(RUBY_GNOME_SNAPSHOTDATE)
RUBY_GNOME_PORTVERSION= ${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
.else
RUBY_GNOME_PORTVERSION= ${RUBY_GNOME_VERSION}
.endif
-#RUBY_GNOME_MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-#RUBY_GNOME_MASTER_SITE_SUBDIR= ruby-gnome2
-RUBY_GNOME_MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://people.freebsd.org/~mezz/distfiles/
-RUBY_GNOME_MASTER_SITE_SUBDIR= mezz
+RUBY_GNOME_MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+RUBY_GNOME_MASTER_SITE_SUBDIR= ruby-gnome2/ruby-gnome2/ruby-gnome2-${RUBY_GNOME_VERSION:S/r/rev/}
+#RUBY_GNOME_MASTER_SITES= ${MASTER_SITE_LOCAL} \
+# http://people.freebsd.org/~mezz/distfiles/
+#RUBY_GNOME_MASTER_SITE_SUBDIR= mezz
RUBY_GNOME_DISTNAME= ruby-gnome2-all-${RUBY_GNOME_VERSION:S/r/rev/}
CONFIGURE_ARGS+= --ruby=${RUBY}
@@ -28,3 +28,7 @@
general-patch:
@${FIND} ${WRKDIR} -name mkmf-gnome2.rb | ${XARGS} ${REINPLACE_CMD} -e \
's|CFLAGS}|CFLAGS} -I${LOCALBASE}/lib/ruby/site_ruby/${RUBY_VER}/${RUBY_ARCH}|g'
+
+general-configure:
+ @${FIND} ${WRKDIR} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|$(libdir)/pkgconfig|$(libdir)data/pkgconfig|g'
diff -ruN x11/ruby-gnome2.orig/distinfo x11/ruby-gnome2/distinfo
--- x11/ruby-gnome2.orig/distinfo 2010-08-23 01:15:16.889154537 -0400
+++ x11/ruby-gnome2/distinfo 2010-08-23 01:18:05.039550831 -0400
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-gnome2-all-0.16.0.20080905.tar.gz) = 8808a5af33811b6188208aefbc1a5b7e
-SHA256 (ruby/ruby-gnome2-all-0.16.0.20080905.tar.gz) = bbddb560744503b7a23d9c92b91b752bf5b12eef60133a1a301e213278b4a013
-SIZE (ruby/ruby-gnome2-all-0.16.0.20080905.tar.gz) = 1494710
+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
diff -ruN x11/ruby-gnome2.orig/pkg-plist x11/ruby-gnome2/pkg-plist
--- x11/ruby-gnome2.orig/pkg-plist 2010-08-23 01:15:16.888148549 -0400
+++ x11/ruby-gnome2/pkg-plist 2010-08-24 22:23:11.073524330 -0400
@@ -1,3 +1,4 @@
+libdata/pkgconfig/ruby-gnome2.pc
%%RUBY_SITELIBDIR%%/gnome2.rb
%%RUBY_SITEARCHLIBDIR%%/gnome2.so
%%PORTDOCS%%%%RUBY_MODDOCDIR%%/AUTHORS
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008291519.o7TFJr9p045048>