diff options
| author | swills <swills@FreeBSD.org> | 2014-07-01 22:30:59 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2014-07-01 22:30:59 +0800 |
| commit | ea84e45769e6d08ad91f2cb7cc50c72ddced3196 (patch) | |
| tree | 470e23cf04250d5c7cf8c1b772a57a8689cfdb4f /lang | |
| parent | 57edc2aedb75e4fa5d5b796120cb4fcfbebc2955 (diff) | |
| download | freebsd-ports-gnome-ea84e45769e6d08ad91f2cb7cc50c72ddced3196.tar.gz freebsd-ports-gnome-ea84e45769e6d08ad91f2cb7cc50c72ddced3196.tar.zst freebsd-ports-gnome-ea84e45769e6d08ad91f2cb7cc50c72ddced3196.zip | |
- Force use of libreadline from ports rather than base, in order to avoid
unexpectedly getting readline from ports if it's already installed.
- Add patch to work with newer libreadline.
- Provide an option to use libedit from ports, avoiding the libedit in base.
- Note: libreadline is not BSD licensed and while libedit would be preferable,
it seems to have issues with UTF8 still, see ruby bug 9204. Once that's
resolved, we can make libedit the default. Similar changes were done to Ruby
2.0 and 2.1 in r355890. Also convert to USES=tar:bzip2 while here and cleanup
a plist issue.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby19/Makefile | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/lang/ruby19/Makefile b/lang/ruby19/Makefile index f0f505e989ee..910d54dba820 100644 --- a/lang/ruby19/Makefile +++ b/lang/ruby19/Makefile @@ -40,7 +40,6 @@ USE_AUTOTOOLS= autoconf WRKSRC= ${WRKDIR}/${PORTNAME}-${RUBY_DISTVERSION} RUBY_VER= 1.9 -USE_BZIP2= yes USE_RUBY= yes RUBY_NO_BUILD_DEPENDS= yes RUBY_NO_RUN_DEPENDS= yes @@ -49,9 +48,19 @@ MAKE_JOBS_UNSAFE= yes NO_LATEST_LINK= yes -OPTIONS_DEFINE= RDOC DEBUG -RDOC_DESC= Build and install Rdoc indexes -DEBUG_DESC= Compile-in debug info +OPTIONS_DEFINE= RDOC DEBUG +OPTIONS_DEFAULT= READLINE +OPTIONS_RADIO= EDIT +OPTIONS_RADIO_EDIT= LIBEDIT READLINE +RDOC_DESC= Build and install Rdoc indexes +DEBUG_DESC= Compile-in debug info +EDIT_DESC= Which line editing lib to use +LIBEDIT_DESC= Use libedit +READLINE_DESC= Use libreadline + +.include <bsd.port.options.mk> + +USES= tar:bzip2 .include <bsd.port.pre.mk> @@ -80,6 +89,18 @@ CONFIGURE_ARGS+= --disable-install-doc CONFIGURE_ENV= debugflags= +.if ${PORT_OPTIONS:MLIBEDIT} +BUILD_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit +RUN_DEPENDS+= libedit>=0:${PORTSDIR}/devel/libedit +CONFIGURE_ARGS+= --enable-libedit --with-libedit-prefix=${LOCALBASE} +.endif + +.if ${PORT_OPTIONS:MREADLINE} +BUILD_DEPENDS+= readline>=0:${PORTSDIR}/devel/readline +RUN_DEPENDS+= readline>=0:${PORTSDIR}/devel/readline +CONFIGURE_ARGS+= --disable-libedit --with-readline-prefix=${LOCALBASE} +.endif + .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} MLINKS= ${RUBY_NAME}.1 ruby.1 PLIST_SUB+= IF_DEFAULT="" @@ -157,8 +178,6 @@ pre-su-install: ${STAGEDIR}${RUBY_SITEARCHLIBDIR} \ ${STAGEDIR}${RUBY_VENDORARCHLIBDIR} - ${SETENV} LC_TIME=C /bin/date > ${STAGEDIR}${RUBY_RIDIR}/created.rid - ${SETENV} LC_TIME=C /bin/date > ${STAGEDIR}${RUBY_SITERIDIR}/created.rid ${TOUCH} ${STAGEDIR}${RUBY_EXAMPLESDIR}/.keep_me ${TOUCH} ${STAGEDIR}${RUBY_DOCDIR}/.keep_me ${TOUCH} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/.keep_me |