diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2000-09-06 22:46:12 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2000-09-06 22:46:12 +0000 |
| commit | 988a074d1ffb00e86ff5491f15032326ef9f9fd9 (patch) | |
| tree | 38ac7cecf46c966271ebcc128e5281d810da24db /lang | |
| parent | Add _RUBY_SUFFIX, which is always set to "${RUBY_VER:S/.//}". (diff) | |
Make coexistence support almost perfect except for bin/ruby and
man/man1/ruby.1 symlinks.)
Notes
Notes:
svn path=/head/; revision=32352
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby/Makefile | 12 | ||||
| -rw-r--r-- | lang/ruby/pkg-plist | 4 | ||||
| -rw-r--r-- | lang/ruby14/Makefile | 12 | ||||
| -rw-r--r-- | lang/ruby14/pkg-plist | 4 | ||||
| -rw-r--r-- | lang/ruby16/Makefile | 12 | ||||
| -rw-r--r-- | lang/ruby16/pkg-plist | 4 |
6 files changed, 33 insertions, 15 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index d69dc5b26316..9efd00c39ddd 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -18,7 +18,8 @@ MAINTAINER= yasuf@bsdclub.org USE_AUTOCONF= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared -MAN1= ${RUBY_NAME}.1 +MAN1= ruby${_RUBY_SUFFIX}.1 +MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} @@ -32,7 +33,6 @@ XEMACSLISPDIR= ${PREFIX}/lib/xemacs/site-lisp .if !empty(RUBY_SUFFIX) CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" -MLINKS= ${RUBY_NAME}.1 ruby.1 .endif .if ${OSVERSION} >= 400014 @@ -46,7 +46,13 @@ post-patch: post-install: strip ${RUBY} - ${LN} -fs ${RUBY} ${PREFIX}/ruby +.if empty(RUBY_SUFFIX) + ${MV} ${RUBY} ${RUBY}${_RUBY_SUFFIX} + ${LN} -fs ${RUBY}${_RUBY_SUFFIX} ${RUBY} + ${MV} ${PREFIX}/man/man1/ruby.1 ${PREFIX}/man/man1/ruby${_RUBY_SUFFIX}.1 +.else + ${LN} -fs ${RUBY} ${PREFIX}/bin/ruby +.endif .if !defined(NOPORTDOCS) ${MKDIR} ${RUBY_EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR} diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist index 28525df2d3b7..e547d5f73aa9 100644 --- a/lang/ruby/pkg-plist +++ b/lang/ruby/pkg-plist @@ -1,6 +1,6 @@ bin/irb -bin/%%RUBY_NAME%% -@unexec if [ -f %D/bin/ruby ]; then rm %D/bin/ruby; fi +bin/ruby +bin/ruby%%_RUBY_SUFFIX%% lib/lib%%RUBY_NAME%%.so lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBY_ARCHLIBDIR%%/config.h diff --git a/lang/ruby14/Makefile b/lang/ruby14/Makefile index 08ee9eaf13ab..2b20345a654c 100644 --- a/lang/ruby14/Makefile +++ b/lang/ruby14/Makefile @@ -19,7 +19,8 @@ RUBY_VER= 1.4 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared -MAN1= ${RUBY_NAME}.1 +MAN1= ruby${_RUBY_SUFFIX}.1 +MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1 ELISP_FILES= inf-ruby.el ruby-mode.el rubydb3x.el @@ -31,7 +32,6 @@ XEMACSLISPDIR= ${PREFIX}/lib/xemacs/site-lisp .if !empty(RUBY_SUFFIX) CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" -MLINKS= ${RUBY_NAME}.1 ruby.1 .endif .if ${OSVERSION} >= 400014 @@ -46,7 +46,13 @@ post-patch: post-install: strip ${RUBY} - ${LN} -fs ${RUBY} ${PREFIX}/ruby +.if empty(RUBY_SUFFIX) + ${MV} ${RUBY} ${RUBY}${_RUBY_SUFFIX} + ${LN} -fs ${RUBY}${_RUBY_SUFFIX} ${RUBY} + ${MV} ${PREFIX}/man/man1/ruby.1 ${PREFIX}/man/man1/ruby${_RUBY_SUFFIX}.1 +.else + ${LN} -fs ${RUBY} ${PREFIX}/bin/ruby +.endif .if !defined(NOPORTDOCS) ${MKDIR} ${RUBY_EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR} diff --git a/lang/ruby14/pkg-plist b/lang/ruby14/pkg-plist index 0af4a573952e..31b2c301cdba 100644 --- a/lang/ruby14/pkg-plist +++ b/lang/ruby14/pkg-plist @@ -1,5 +1,5 @@ -bin/%%RUBY_NAME%% -@unexec if [ -f %D/bin/ruby ]; then rm %D/bin/ruby; fi +bin/ruby +bin/ruby%%_RUBY_SUFFIX%% lib/lib%%RUBY_NAME%%.so lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBY_ARCHLIBDIR%%/config.h diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile index d69dc5b26316..9efd00c39ddd 100644 --- a/lang/ruby16/Makefile +++ b/lang/ruby16/Makefile @@ -18,7 +18,8 @@ MAINTAINER= yasuf@bsdclub.org USE_AUTOCONF= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --enable-shared -MAN1= ${RUBY_NAME}.1 +MAN1= ruby${_RUBY_SUFFIX}.1 +MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} @@ -32,7 +33,6 @@ XEMACSLISPDIR= ${PREFIX}/lib/xemacs/site-lisp .if !empty(RUBY_SUFFIX) CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" -MLINKS= ${RUBY_NAME}.1 ruby.1 .endif .if ${OSVERSION} >= 400014 @@ -46,7 +46,13 @@ post-patch: post-install: strip ${RUBY} - ${LN} -fs ${RUBY} ${PREFIX}/ruby +.if empty(RUBY_SUFFIX) + ${MV} ${RUBY} ${RUBY}${_RUBY_SUFFIX} + ${LN} -fs ${RUBY}${_RUBY_SUFFIX} ${RUBY} + ${MV} ${PREFIX}/man/man1/ruby.1 ${PREFIX}/man/man1/ruby${_RUBY_SUFFIX}.1 +.else + ${LN} -fs ${RUBY} ${PREFIX}/bin/ruby +.endif .if !defined(NOPORTDOCS) ${MKDIR} ${RUBY_EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR} diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist index 28525df2d3b7..e547d5f73aa9 100644 --- a/lang/ruby16/pkg-plist +++ b/lang/ruby16/pkg-plist @@ -1,6 +1,6 @@ bin/irb -bin/%%RUBY_NAME%% -@unexec if [ -f %D/bin/ruby ]; then rm %D/bin/ruby; fi +bin/ruby +bin/ruby%%_RUBY_SUFFIX%% lib/lib%%RUBY_NAME%%.so lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBY_ARCHLIBDIR%%/config.h |