5 files changed, 35 insertions, 69 deletions

diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 5bffc7f6f8d0..8dbeb764ebdf 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -6,66 +6,31 @@
 #
 
 PORTNAME=	gnustep
-PORTVERSION=	0.2.1
-PORTREVISION=	3
+PORTVERSION=	0.2.2
 CATEGORIES=	devel ruby
-MASTER_SITES=	ftp://ftp.gnustep.org/pub/gnustep/libs/
+MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}-ruby-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
+DISTNAME=	rigs-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	A Ruby interface to the GNUstep development environment
 
-BUILD_DEPENDS=	${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT} \
-		${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall \
-		${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT} \
-		${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT} \
-		${BACKBUNDLEDIR}/libgnustep-back${BACKSUFFIX}:${PORTSDIR}/${GNUSTEP_BACK_PORT}
-RUN_DEPENDS=	${SYSMAKEDIR}/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT} \
-		${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT} \
-		${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT} \
-		${BACKBUNDLEDIR}/libgnustep-back${BACKSUFFIX}:${PORTSDIR}/${GNUSTEP_BACK_PORT}
-.if !defined(GNUSTEP_WITH_BASE_GCC)
-BUILD_DEPENDS+=	${TARGLIB}/libobjc.so:${PORTSDIR}/${GNUSTEP_GCC_PORT}
-RUN_DEPENDS+=	${TARGLIB}/libobjc.so:${PORTSDIR}/${GNUSTEP_GCC_PORT}
-.else
-BUILD_DEPENDS+=	${COMBOLIBDIR}/libobjc.so:${PORTSDIR}/${GNUSTEP_OBJC_PORT}
-RUN_DEPENDS+=	${COMBOLIBDIR}/libobjc.so:${PORTSDIR}/${GNUSTEP_OBJC_PORT}
-.endif
-
 USE_RUBY=	yes
 USE_GMAKE=	yes
-CC=		gcc32
-CXX=		g++32
+USE_GNUSTEP=	yes
+USE_GNUSTEP_BACK=	yes
 
-GNUSTEP_GCC_PORT?=	lang/gcc-objc
-GNUSTEP_OBJC_PORT?=	lang/gnustep-objc
-GNUSTEP_MAKE_PORT?=	devel/gnustep-make
-GNUSTEP_BASE_PORT?=	lang/gnustep-base
-GNUSTEP_GUI_PORT?=	x11-toolkits/gnustep-gui
-GNUSTEP_BACK_PORT?=	x11-toolkits/gnustep-back
-BACKSUFFIX?=		-010
-GNUSTEP_PREFIX=		${LOCALBASE}/GNUstep
+GNUSTEP_PREFIX?=	${LOCALBASE}/GNUstep
 GNUSTEP_LOCAL_ROOT=	${GNUSTEP_PREFIX}/Local
 GNUSTEP_SYSTEM_ROOT=	${GNUSTEP_PREFIX}/System
 GNUSTEP_NETWORK_ROOT=	${GNUSTEP_PREFIX}/Network
 GNUSTEP_USER_ROOT=	${GNUSTEP_PREFIX}/Local/Users
 GNUSTEP_MAKEFILES=	${GNUSTEP_SYSTEM_ROOT}/Library/Makefiles
 
-BACKBUNDLEDIR=	${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back${BACKSUFFIX}.bundle
-SYSLIBDIR=	${GNUSTEP_PREFIX}/System/Library/Libraries
-SYSMAKEDIR=	${GNUSTEP_MAKEFILES}
-COMBOLIBDIR=	${SYSLIBDIR}
 MAKE_ENV+=	GNUSTEP_FLATTENED=yes
 
 .include <bsd.port.pre.mk>
-.if ${MACHINE_ARCH} == "i386"
-GNU_ARCH=	ix86
-.else
-GNU_ARCH=	${MACHINE_ARCH}
-.endif
 
 MAKEFILE=	GNUmakefile
 MAKE_ENV+=	GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT} \
@@ -78,6 +43,7 @@ NO_FILTER_SHLIBS=	yes
 
 post-extract:
 	${FIND} ${WRKSRC}/ -type f -name '.cvsignore' -delete
+	${FIND} -d ${WRKSRC}/ -type d -name CVS -exec ${RM} -rf "{}" ";"
 
 post-patch:
 	${RUBY} -i~ -p \
diff --git a/devel/ruby-gnustep/distinfo b/devel/ruby-gnustep/distinfo
index 0f38a38e447c..37f661414edf 100644
--- a/devel/ruby-gnustep/distinfo
+++ b/devel/ruby-gnustep/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/gnustep-ruby-0.2.1.tgz) = 2adb1444179d47566aa7dd5730c789ba
-SHA256 (ruby/gnustep-ruby-0.2.1.tgz) = 170bffe8956e50653fab9be2bbe1596b43c00a9bea78fadd406018274e470833
-SIZE (ruby/gnustep-ruby-0.2.1.tgz) = 80285
+MD5 (ruby/rigs-0.2.2.tar.gz) = d6e0231311f1822f8981014a0cf6cffc
+SHA256 (ruby/rigs-0.2.2.tar.gz) = d9ac258584734541d84ef065d4ac5c82bd3d2b900f9954a29bd87237547e3a3e
+SIZE (ruby/rigs-0.2.2.tar.gz) = 89593
diff --git a/devel/ruby-gnustep/files/patch-ObjcRuntimeUtilities.m b/devel/ruby-gnustep/files/patch-ObjcRuntimeUtilities.m
new file mode 100644
index 000000000000..4421ad310919
--- /dev/null
+++ b/devel/ruby-gnustep/files/patch-ObjcRuntimeUtilities.m
@@ -0,0 +1,15 @@
+RCS file: /sources/gnustep/gnustep/dev-libs/ruby/Source/ObjcRuntimeUtilities.m,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- Source/ObjcRuntimeUtilities.m	2001/09/24 11:48:14	1.3
++++ Source/ObjcRuntimeUtilities.m	2005/03/28 02:21:28	1.4
+@@ -56,7 +56,7 @@
+ 			      const char *superclassName, 
+ 			      int ivarNumber, ...)
+ {
+-  objc_EXPORT void __objc_exec_class (Module_t module);
++  objc_EXPORT void __objc_exec_class (void *module);
+   objc_EXPORT void __objc_resolve_class_links ();
+   Module_t module;
+   Symtab_t symtab;
diff --git a/devel/ruby-gnustep/files/patch-RIGSCore.m b/devel/ruby-gnustep/files/patch-RIGSCore.m
deleted file mode 100644
index 41a84983ebc7..000000000000
--- a/devel/ruby-gnustep/files/patch-RIGSCore.m
+++ /dev/null
@@ -1,23 +0,0 @@
---- Source/RIGSCore.m.orig	Sat May 31 18:23:50 2003
-+++ Source/RIGSCore.m	Sun Jun  1 16:57:00 2003
-@@ -988,7 +988,7 @@
- (see below)
- */
- #ifdef GNUSTEP
--static MethodList_t class_nextMethodList( Class class, void ** iterator_ptr) 
-+static MethodList_t rb_class_nextMethodList( Class class, void ** iterator_ptr) 
- {
-   MethodList_t mlist;
-   
-@@ -1015,7 +1015,11 @@
- 
-   while(class) {
- 
-+#ifdef GNUSTEP
-+    while( (mlist = rb_class_nextMethodList(class, &iterator)) != NULL) {
-+#else
-     while( (mlist = class_nextMethodList(class, &iterator)) != NULL) {
-+#endif
-       
-           for(i = 0; i < mlist->method_count; i++) {
-               SEL sel = mlist->method_list[i].method_name;
diff --git a/devel/ruby-gnustep/pkg-plist b/devel/ruby-gnustep/pkg-plist
index e684c3484859..952965970164 100644
--- a/devel/ruby-gnustep/pkg-plist
+++ b/devel/ruby-gnustep/pkg-plist
@@ -63,8 +63,8 @@
 %%RUBY_SITELIBDIR%%/rigs/NSWindow.rb
 %%RUBY_SITEARCHLIBDIR%%/librigs.so
 @dirrm %%RUBY_SITELIBDIR%%/rigs
-GNUstep/Local/Library/Libraries/librigs.so.0.2.1
-GNUstep/Local/Library/Libraries/librigs.so.0
+GNUstep/Local/Library/Libraries/librigs.so.%%VERSION%%
+GNUstep/Local/Library/Libraries/librigs.so.%%MAJORVERSION%%
 GNUstep/Local/Library/Libraries/librigs.so
 @dirrm GNUstep/Local/Library/Libraries
 @dirrm GNUstep/Local/Library
@@ -75,6 +75,12 @@ GNUstep/Local/Library/Libraries/librigs.so
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/GNUmakefile
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/GNUmakefile.postamble
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/fake.m
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstApp.app/Resources/Info-gnustep.plist
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstApp.app/Resources/FirstApp.desktop
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstApp.app/Resources/FirstAppIcon.tiff
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstApp.app/FirstApp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstApp.app/library_paths.openapp
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstApp.app/stamp.make
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstApp.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstAppIcon.tiff
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstAppInfo.plist
@@ -84,6 +90,8 @@ GNUstep/Local/Library/Libraries/librigs.so
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/README
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Base
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstApp.app/Resources
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp/FirstApp.app
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Gui/FirstApp
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/Gui
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%