1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00

- Add WITH_GNUSTEP_DEVEL

- resolve namespace confict
Approved by:	knu
This commit is contained in:
Dirk Meyer 2003-06-18 05:20:04 +00:00
parent 0431ec9a94
commit 0f084d5028
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=83231
3 changed files with 39 additions and 10 deletions

View File

@ -43,9 +43,15 @@ GNUSTEP_NETWORK_ROOT= ${GNUSTEP_PREFIX}/Network
GNUSTEP_USER_ROOT= ${GNUSTEP_PREFIX}/Local/Users
GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Makefiles
SYSLIBDIR= ${GNUSTEP_PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}
COMBOLIBDIR= ${SYSLIBDIR}/gnu-gnu-gnu
BACKBUNDLEDIR= ${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/
.if defined(WITH_GNUSTEP_DEVEL)
SYSLIBDIR= ${GNUSTEP_PREFIX}/System/Library/Libraries/${GNU_ARCH}/${OPSYS:L}
PLIST_SUB+= LOCALLIBRARY=Local/Library
.else
SYSLIBDIR= ${GNUSTEP_PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}
PLIST_SUB+= LOCALLIBRARY=Local
.endif
COMBOLIBDIR= ${SYSLIBDIR}/gnu-gnu-gnu
.include <bsd.port.pre.mk>

View File

@ -0,0 +1,23 @@
--- 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;

View File

@ -63,14 +63,14 @@
%%RUBY_SITELIBDIR%%/rigs/NSWindow.rb
%%RUBY_SITEARCHLIBDIR%%/librigs.so
@dirrm %%RUBY_SITELIBDIR%%/rigs
GNUstep/Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so.0.2.1
GNUstep/Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so.0
GNUstep/Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so
@unexec /bin/rmdir %D/GNUstep/Local/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/Local/Libraries/%%GNU_ARCH%%/%%OPSYS%% 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/Local/Libraries/%%GNU_ARCH%% 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/Local/Libraries 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/Local/Headers 2> /dev/null || true
GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so.0.2.1
GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so.0
GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%% 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%% 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries 2> /dev/null || true
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Headers 2> /dev/null || true
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Base/Simple.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverter.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverterIcon.tiff