From 385168118c58de55a4b24193e54568b5c26312af Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Thu, 23 Jan 2003 16:14:47 +0000 Subject: [PATCH] - unbreak INDEX (was still broken) - migrate dependency gnustep-xgps -> gnustep-back - don't depend on gnustep-objc in CURRENT - Fix PLIST as we are here PR: 47351 Approved by: knu --- devel/ruby-gnustep/Makefile | 14 +++++++++----- devel/ruby-gnustep/pkg-plist | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile index d69c219ce90f..d190d6912615 100644 --- a/devel/ruby-gnustep/Makefile +++ b/devel/ruby-gnustep/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnustep PORTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= devel ruby MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/libs/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -17,15 +18,13 @@ DIST_SUBDIR= ruby MAINTAINER= knu@FreeBSD.org BUILD_DEPENDS= ${GNUSTEP_PREFIX}/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make \ - ${SYSLIBDIR}/libobjc.so:${PORTSDIR}/lang/gnustep-objc \ ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base \ ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui \ - ${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps + ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back RUN_DEPENDS= ${GNUSTEP_PREFIX}/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make \ - ${SYSLIBDIR}/libobjc.so:${PORTSDIR}/lang/gnustep-objc \ ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base \ ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui \ - ${XGPSBUNDLEDIR}/libgnustep-xgps:${PORTSDIR}/x11-toolkits/gnustep-xgps + ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back USE_RUBY= yes RUBY_WITH_PTHREAD= yes @@ -40,7 +39,7 @@ GNUSTEP_MAKEFILES= ${GNUSTEP_SYSTEM_ROOT}/Makefiles SYSLIBDIR= ${GNUSTEP_PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L} COMBOLIBDIR= ${SYSLIBDIR}/gnu-gnu-gnu -XGPSBUNDLEDIR= ${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-xgps.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/ +BACKBUNDLEDIR= ${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/ .include @@ -50,6 +49,11 @@ GNU_ARCH= ix86 GNU_ARCH= ${MACHINE_ARCH} .endif +.if ${OSVERSION} < 500000 +BUILD_DEPENDS+= ${SYSLIBDIR}/libobjc.so:${PORTSDIR}/lang/gnustep-objc +RUN_DEPENDS+= ${SYSLIBDIR}/libobjc.so:${PORTSDIR}/lang/gnustep-objc +.endif + MAKEFILE= GNUmakefile MAKE_ENV= GNUSTEP_LOCAL_ROOT=${GNUSTEP_LOCAL_ROOT} \ GNUSTEP_SYSTEM_ROOT=${GNUSTEP_SYSTEM_ROOT} \ diff --git a/devel/ruby-gnustep/pkg-plist b/devel/ruby-gnustep/pkg-plist index fc5bd2b4cee8..1076909d6749 100644 --- a/devel/ruby-gnustep/pkg-plist +++ b/devel/ruby-gnustep/pkg-plist @@ -61,6 +61,7 @@ %%RUBY_SITELIBDIR%%/rigs/NSURLHandle.rb %%RUBY_SITELIBDIR%%/rigs/NSView.rb %%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