From 19786a8ee466d159b1e034312b1a4cc1c50c72e3 Mon Sep 17 00:00:00 2001 From: knu Date: Mon, 11 Jun 2001 09:32:02 +0000 Subject: Fix plist problems. Reported by: bento --- lang/ruby-devel/Makefile | 8 ++++++-- lang/ruby-devel/pkg-plist | 2 +- lang/ruby/Makefile | 8 ++++++-- lang/ruby/pkg-plist | 2 +- lang/ruby16/Makefile | 8 ++++++-- lang/ruby16/pkg-plist | 2 +- lang/ruby18/Makefile | 8 ++++++-- lang/ruby18/pkg-plist | 2 +- 8 files changed, 28 insertions(+), 12 deletions(-) (limited to 'lang') diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile index 33ddd6b..b25a2b6 100644 --- a/lang/ruby-devel/Makefile +++ b/lang/ruby-devel/Makefile @@ -86,9 +86,13 @@ post-install: ${LN} -fs ${RUBY_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX}${RUBY_R} ${RUBY_WITHOUT_SUFFIX}${RUBY_R}; \ ${LN} -fs ruby${RUBY_DEFAULT_SUFFIX}${RUBY_R}.1 ${PREFIX}/man/man1/ruby${RUBY_R}.1; \ fi - ${LN} -fs ${IRB_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX} ${IRB_WITHOUT_SUFFIX} + if [ -x ${RUBY_WITHOUT_SUFFIX} ]; then \ + ${LN} -fs ${IRB_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX} ${IRB_WITHOUT_SUFFIX}; \ + fi .if !empty(RUBY_R) - ${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R} + if [ -x ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ]; then \ + ${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R}; \ + fi .endif ${LDCONFIG} -m ${LOCALBASE}/lib ${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \ diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist index 3a59449..ebe8873 100644 --- a/lang/ruby-devel/pkg-plist +++ b/lang/ruby-devel/pkg-plist @@ -223,4 +223,4 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty @dirrm %%RUBY_EXAMPLESDIR%% @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true -@unexec rmdir -p %D/%%RUBY_ELISPDIR%% 2>/dev/null || true +@dirrm %%RUBY_ELISPDIR%% diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 60850d5..2cf767b 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -84,9 +84,13 @@ post-install: ${LN} -fs ${RUBY_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX}${RUBY_R} ${RUBY_WITHOUT_SUFFIX}${RUBY_R}; \ ${LN} -fs ruby${RUBY_DEFAULT_SUFFIX}${RUBY_R}.1 ${PREFIX}/man/man1/ruby${RUBY_R}.1; \ fi - ${LN} -fs ${IRB_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX} ${IRB_WITHOUT_SUFFIX} + if [ -x ${RUBY_WITHOUT_SUFFIX} ]; then \ + ${LN} -fs ${IRB_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX} ${IRB_WITHOUT_SUFFIX}; \ + fi .if !empty(RUBY_R) - ${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R} + if [ -x ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ]; then \ + ${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R}; \ + fi .endif ${LDCONFIG} -m ${LOCALBASE}/lib ${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \ diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist index 8bb5632..761743c 100644 --- a/lang/ruby/pkg-plist +++ b/lang/ruby/pkg-plist @@ -218,4 +218,4 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty @dirrm %%RUBY_EXAMPLESDIR%% @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true -@unexec rmdir -p %D/%%RUBY_ELISPDIR%% 2>/dev/null || true +@dirrm %%RUBY_ELISPDIR%% diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile index 60850d5..2cf767b 100644 --- a/lang/ruby16/Makefile +++ b/lang/ruby16/Makefile @@ -84,9 +84,13 @@ post-install: ${LN} -fs ${RUBY_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX}${RUBY_R} ${RUBY_WITHOUT_SUFFIX}${RUBY_R}; \ ${LN} -fs ruby${RUBY_DEFAULT_SUFFIX}${RUBY_R}.1 ${PREFIX}/man/man1/ruby${RUBY_R}.1; \ fi - ${LN} -fs ${IRB_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX} ${IRB_WITHOUT_SUFFIX} + if [ -x ${RUBY_WITHOUT_SUFFIX} ]; then \ + ${LN} -fs ${IRB_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX} ${IRB_WITHOUT_SUFFIX}; \ + fi .if !empty(RUBY_R) - ${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R} + if [ -x ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ]; then \ + ${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R}; \ + fi .endif ${LDCONFIG} -m ${LOCALBASE}/lib ${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \ diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist index 8bb5632..761743c 100644 --- a/lang/ruby16/pkg-plist +++ b/lang/ruby16/pkg-plist @@ -218,4 +218,4 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty @dirrm %%RUBY_EXAMPLESDIR%% @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true -@unexec rmdir -p %D/%%RUBY_ELISPDIR%% 2>/dev/null || true +@dirrm %%RUBY_ELISPDIR%% diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile index 33ddd6b..b25a2b6 100644 --- a/lang/ruby18/Makefile +++ b/lang/ruby18/Makefile @@ -86,9 +86,13 @@ post-install: ${LN} -fs ${RUBY_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX}${RUBY_R} ${RUBY_WITHOUT_SUFFIX}${RUBY_R}; \ ${LN} -fs ruby${RUBY_DEFAULT_SUFFIX}${RUBY_R}.1 ${PREFIX}/man/man1/ruby${RUBY_R}.1; \ fi - ${LN} -fs ${IRB_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX} ${IRB_WITHOUT_SUFFIX} + if [ -x ${RUBY_WITHOUT_SUFFIX} ]; then \ + ${LN} -fs ${IRB_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX} ${IRB_WITHOUT_SUFFIX}; \ + fi .if !empty(RUBY_R) - ${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R} + if [ -x ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ]; then \ + ${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R}; \ + fi .endif ${LDCONFIG} -m ${LOCALBASE}/lib ${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \ diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist index 3a59449..ebe8873 100644 --- a/lang/ruby18/pkg-plist +++ b/lang/ruby18/pkg-plist @@ -223,4 +223,4 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty @dirrm %%RUBY_EXAMPLESDIR%% @unexec rmdir -p %D/lib/xemacs/site-lisp 2>/dev/null || true -@unexec rmdir -p %D/%%RUBY_ELISPDIR%% 2>/dev/null || true +@dirrm %%RUBY_ELISPDIR%% -- cgit v1.1