summaryrefslogtreecommitdiff
path: root/devel/ruby-gnustep
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2003-07-26 14:53:55 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2003-07-26 14:53:55 +0000
commit39ac94bc8433b950a3ec2455fa0ffdfd9d06c6ca (patch)
treedcfd0611ae5bd0d9c732a96b777336febbd8622d /devel/ruby-gnustep
parent- update to 0.3.0 (diff)
- flat layout
Approved by: knu
Notes
Notes: svn path=/head/; revision=85629
Diffstat (limited to 'devel/ruby-gnustep')
-rw-r--r--devel/ruby-gnustep/Makefile12
-rw-r--r--devel/ruby-gnustep/pkg-plist12
2 files changed, 15 insertions, 9 deletions
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 0f08166c741b..09b5f3c2ba71 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -47,15 +47,21 @@ GNUSTEP_NETWORK_ROOT= ${GNUSTEP_PREFIX}/Network
GNUSTEP_USER_ROOT= ${GNUSTEP_PREFIX}/Local/Users
GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Makefiles
-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}
+BACKBUNDLEDIR= ${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle
+SYSLIBDIR= ${GNUSTEP_PREFIX}/System/Library/Libraries
+COMBOLIBDIR= ${SYSLIBDIR}
PLIST_SUB+= LOCALLIBRARY=Local/Library
+PLIST_SUB+= NOFLAT=""
+PLIST_SUB+= GNUSTEP_STABLE="@comment "
.else
+BACKBUNDLEDIR= ${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/
SYSLIBDIR= ${GNUSTEP_PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}
+COMBOLIBDIR= ${SYSLIBDIR}/gnu-gnu-gnu
PLIST_SUB+= LOCALLIBRARY=Local
+PLIST_SUB+= NOFLAT="${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/"
+PLIST_SUB+= GNUSTEP_STABLE=""
.endif
-COMBOLIBDIR= ${SYSLIBDIR}/gnu-gnu-gnu
.include <bsd.port.pre.mk>
diff --git a/devel/ruby-gnustep/pkg-plist b/devel/ruby-gnustep/pkg-plist
index e6f705afee82..60ea2d033212 100644
--- a/devel/ruby-gnustep/pkg-plist
+++ b/devel/ruby-gnustep/pkg-plist
@@ -63,12 +63,12 @@
%%RUBY_SITELIBDIR%%/rigs/NSWindow.rb
%%RUBY_SITEARCHLIBDIR%%/librigs.so
@dirrm %%RUBY_SITELIBDIR%%/rigs
-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
+GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so.0.2.1
+GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so.0
+GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so
+%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu 2> /dev/null || true
+%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%% 2> /dev/null || true
+%%GNUSTEP_STABLE%%@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
@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%% 2> /dev/null || true