aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/ruby-gnustep/Makefile20
-rw-r--r--devel/ruby-gnustep/pkg-plist1
2 files changed, 13 insertions, 8 deletions
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 244cb7ec4c67..0f08166c741b 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -18,16 +18,16 @@ DIST_SUBDIR= ruby
MAINTAINER= knu@FreeBSD.org
COMMENT= A Ruby interface to the GNUstep development environment
-BUILD_DEPENDS= ${GNUSTEP_PREFIX}/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make \
+BUILD_DEPENDS= ${GNUSTEP_PREFIX}/System/Makefiles/GNUstep.sh:${PORTSDIR}/${GNUSTEP_MAKE_PORT} \
${LOCALBASE}/lib/libcallback.a:${PORTSDIR}/devel/ffcall \
- ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base \
- ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui \
- ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+ ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT} \
+ ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/${GNUSTEP_GUI_PORT} \
+ ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
LIB_DEPENDS+= objc:${PORTSDIR}/${GNUSTEP_OBJC_PORT}
-RUN_DEPENDS= ${GNUSTEP_PREFIX}/System/Makefiles/GNUstep.sh:${PORTSDIR}/devel/gnustep-make \
- ${COMBOLIBDIR}/libgnustep-base.so:${PORTSDIR}/lang/gnustep-base \
- ${COMBOLIBDIR}/libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui \
- ${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/x11-toolkits/gnustep-back
+RUN_DEPENDS= ${GNUSTEP_PREFIX}/System/Makefiles/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:${PORTSDIR}/${GNUSTEP_BACK_PORT}
USE_RUBY= yes
RUBY_WITH_PTHREAD= yes
@@ -36,6 +36,10 @@ CC= gcc32
CXX= g++32
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
GNUSTEP_PREFIX= ${LOCALBASE}/GNUstep
GNUSTEP_LOCAL_ROOT= ${GNUSTEP_PREFIX}/Local
GNUSTEP_SYSTEM_ROOT= ${GNUSTEP_PREFIX}/System
diff --git a/devel/ruby-gnustep/pkg-plist b/devel/ruby-gnustep/pkg-plist
index 8315d24db51c..e6f705afee82 100644
--- a/devel/ruby-gnustep/pkg-plist
+++ b/devel/ruby-gnustep/pkg-plist
@@ -71,6 +71,7 @@ GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu/librigs.so
@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
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Base/Simple.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverter.rb
%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverterIcon.tiff