4 files changed, 16 insertions, 15 deletions

diff --git a/x11/ruby-gnome2-all/Makefile b/x11/ruby-gnome2-all/Makefile
index 6db0245c7ae8..61ff5c02acb1 100644
--- a/x11/ruby-gnome2-all/Makefile
+++ b/x11/ruby-gnome2-all/Makefile
@@ -21,14 +21,12 @@ RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2 \
 		${RUBY_SITEARCHLIBDIR}/gtkhtml2.so:${PORTSDIR}/www/ruby-gtkhtml2 \
 		${RUBY_SITEARCHLIBDIR}/gtkmozembed.so:${PORTSDIR}/www/ruby-gtkmozembed \
 		${RUBY_SITEARCHLIBDIR}/gnomevfs.so:${PORTSDIR}/devel/ruby-gnomevfs \
-		${RUBY_SITEARCHLIBDIR}/gst.so:${PORTSDIR}/multimedia/ruby-gst \
 		${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}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2 \
-		${RUBY_SITEARCHLIBDIR}/libgda.so:${PORTSDIR}/databases/ruby-libgda
+		${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2
 
 USE_RUBY=	yes
 
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index c74c3f05476b..e1076d63308c 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -31,6 +31,8 @@ INSTALL_TARGET=	site-install
 
 DOCS_EN=	AUTHORS COPYING.LIB ChangeLog README README.gnome2-all
 
+post-patch: general-patch
+
 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 51201901cbea..001163900579 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,16 +1,19 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.15.0
-RUBY_GNOME_SNAPSHOTDATE=	20061130
+RUBY_GNOME_VERSION=		0.16.0
+#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=	http://mbsd.msk.ru/dist/
+RUBY_GNOME_MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 RUBY_GNOME_MASTER_SITE_SUBDIR=	ruby-gnome2
 RUBY_GNOME_DISTNAME=		ruby-gnome2-all-${RUBY_GNOME_VERSION:S/r/rev/}
+
 CONFIGURE_ARGS+=		--ruby=${RUBY}
+RUBY_DOCDIR=			${PREFIX}/share/doc/${RUBY_NAME}
+RUBY_EXAMPLESDIR=		${PREFIX}/share/examples/${RUBY_NAME}
 
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_WRKSRC=	${WRKDIR}/ruby-gnome2-snapshot-${RUBY_GNOME_SNAPSHOTDATE}
@@ -19,10 +22,8 @@ RUBY_GNOME_WRKSRC=	${WRKDIR}/${RUBY_GNOME_DISTNAME}
 .endif
 
 RUBY_GNOME_PORTDIR=	${PORTSDIR}/x11/ruby-gnome2
+MD5_FILE=		${RUBY_GNOME_PORTDIR}/distinfo
 
-MD5_FILE=	${RUBY_GNOME_PORTDIR}/distinfo
-
-#post-extract:	pre-post-extract
-
-pre-post-extract:
-	${FIND} ${WRKSRC} -name CVS -type d -print0 | ${XARGS} -0 ${RM} -rf
+general-patch:
+	@${FIND} ${WRKDIR} -name mkmf-gnome2.rb | ${XARGS} ${REINPLACE_CMD} -e \
+		's|CFLAGS}|CFLAGS} -I${RUBY_SITEARCHLIBDIR}|g'
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index bcc38530ac07..b1981b93f7dc 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 324c2c19cd704353dad835d89e777be7
-SHA256 (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 12735ce24e416819f55284c82c648810fd6e0aca7a2743d783d3a16b145b2515
-SIZE (ruby/ruby-gnome2-all-0.15.0.tar.gz) = 1317766
+MD5 (ruby/ruby-gnome2-all-0.16.0.tar.gz) = b3b4f81ef0fe2ce6b3f965bb7c6d3686
+SHA256 (ruby/ruby-gnome2-all-0.16.0.tar.gz) = 0910f08c5224bc39aad66c46b506e5c97e260475ede6b427d5365a9ef2d69ad4
+SIZE (ruby/ruby-gnome2-all-0.16.0.tar.gz) = 1208856