aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2000-09-07 05:50:04 +0800
committerknu <knu@FreeBSD.org>2000-09-07 05:50:04 +0800
commit7bccbb14234791278e57e0dfdd6f91b0a3814f39 (patch)
tree329bde986d61897b8bb0a5da301adcd724e5b16c
parentdfe1686fd79352145c73392b035b80c801ec2a22 (diff)
downloadfreebsd-ports-gnome-7bccbb14234791278e57e0dfdd6f91b0a3814f39.tar.gz
freebsd-ports-gnome-7bccbb14234791278e57e0dfdd6f91b0a3814f39.tar.zst
freebsd-ports-gnome-7bccbb14234791278e57e0dfdd6f91b0a3814f39.zip
Support the case when RUBY_SUFFIX is empty.
-rw-r--r--lang/ruby14/Makefile3
-rw-r--r--lang/ruby14/pkg-plist2
2 files changed, 3 insertions, 2 deletions
diff --git a/lang/ruby14/Makefile b/lang/ruby14/Makefile
index 076895e643b4..08ee9eaf13ab 100644
--- a/lang/ruby14/Makefile
+++ b/lang/ruby14/Makefile
@@ -18,7 +18,7 @@ RUBY_VER= 1.4
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
-CONFIGURE_ARGS= --enable-shared --program-suffix="${RUBY_SUFFIX}"
+CONFIGURE_ARGS= --enable-shared
MAN1= ${RUBY_NAME}.1
ELISP_FILES= inf-ruby.el ruby-mode.el rubydb3x.el
@@ -30,6 +30,7 @@ XEMACSLISPDIR= ${PREFIX}/lib/xemacs/site-lisp
.include "${PORTSDIR}/Mk/bsd.ruby.mk"
.if !empty(RUBY_SUFFIX)
+CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
MLINKS= ${RUBY_NAME}.1 ruby.1
.endif
diff --git a/lang/ruby14/pkg-plist b/lang/ruby14/pkg-plist
index d4c97d23b90b..0af4a573952e 100644
--- a/lang/ruby14/pkg-plist
+++ b/lang/ruby14/pkg-plist
@@ -1,5 +1,5 @@
-bin/ruby
bin/%%RUBY_NAME%%
+@unexec if [ -f %D/bin/ruby ]; then rm %D/bin/ruby; fi
lib/lib%%RUBY_NAME%%.so
lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_ARCHLIBDIR%%/config.h