From a58da456deb459af716ac636e3d0df45598519ef Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 19 Oct 2003 11:14:19 +0000
Subject: - Layout for GnuSTEP 1.8.0

---
 devel/ruby-gnustep/Makefile  | 12 ------------
 devel/ruby-gnustep/pkg-plist | 14 +++++---------
 2 files changed, 5 insertions(+), 21 deletions(-)

(limited to 'devel/ruby-gnustep')

diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 9a8a723ec810..4f625d900e5a 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -47,22 +47,10 @@ GNUSTEP_NETWORK_ROOT=	${GNUSTEP_PREFIX}/Network
 GNUSTEP_USER_ROOT=	${GNUSTEP_PREFIX}/Local/Users
 GNUSTEP_MAKEFILES=	${GNUSTEP_SYSTEM_ROOT}/Makefiles
 
-.if defined(WITH_GNUSTEP_DEVEL)
 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 "
 MAKE_ENV+=	GNUSTEP_FLATTENED=yes
-.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
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/ruby-gnustep/pkg-plist b/devel/ruby-gnustep/pkg-plist
index 60ea2d033212..e684c3484859 100644
--- a/devel/ruby-gnustep/pkg-plist
+++ b/devel/ruby-gnustep/pkg-plist
@@ -63,15 +63,11 @@
 %%RUBY_SITELIBDIR%%/rigs/NSWindow.rb
 %%RUBY_SITEARCHLIBDIR%%/librigs.so
 @dirrm %%RUBY_SITELIBDIR%%/rigs
-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
+GNUstep/Local/Library/Libraries/librigs.so.0.2.1
+GNUstep/Local/Library/Libraries/librigs.so.0
+GNUstep/Local/Library/Libraries/librigs.so
+@dirrm GNUstep/Local/Library/Libraries
+@dirrm GNUstep/Local/Library
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Base/Simple.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverter.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverterIcon.tiff
-- 
cgit v1.2.3