diff --git a/srcpkgs/ruby/patches/ruby-1.9.2pre1-openssl1-patch.bz2 b/srcpkgs/ruby/patches/ruby-1.9.2pre1-openssl1-patch.bz2 deleted file mode 100644 index 6334e6275bd..00000000000 Binary files a/srcpkgs/ruby/patches/ruby-1.9.2pre1-openssl1-patch.bz2 and /dev/null differ diff --git a/srcpkgs/ruby/ruby-devel.template b/srcpkgs/ruby/ruby-devel.template index 6323ac94c77..819bb83b368 100644 --- a/srcpkgs/ruby/ruby-devel.template +++ b/srcpkgs/ruby/ruby-devel.template @@ -16,9 +16,10 @@ Add_dependency run ruby do_install() { - mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/lib/ruby/1.9.1 + mkdir -p ${DESTDIR}/usr/{lib,share} ${DESTDIR}/usr/lib/ruby/1.9.1 mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/ruby/1.9.1/mkmf.rb \ ${DESTDIR}/usr/lib/ruby/1.9.1 + mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share } diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template index e9d901ede72..44eb49a0567 100644 --- a/srcpkgs/ruby/template +++ b/srcpkgs/ruby/template @@ -1,17 +1,16 @@ # Template build file for 'ruby'. pkgname=ruby -ruby_ver="1.9.1" -ruby_distpatchver="p376" +ruby_ver="1.9.2" +ruby_distpatchver="p136" ruby_distver="${ruby_ver}-${ruby_distpatchver}" version=${ruby_ver}${ruby_distpatchver} -revision=1 wrksrc="${pkgname}-${ruby_distver}" distfiles="ftp://ftp.ruby-lang.org/pub/ruby/1.9/$pkgname-${ruby_distver}.tar.gz" build_style=gnu_configure configure_args="--enable-pthread --enable-shared --disable-rpath" short_desc="Ruby programming language" maintainer="Juan RP " -checksum=58b8fc1645283fcf3d5be195dffcaf55b7c85cbc210074273b57b835409b21ca +checksum=c4314df44f3ab81230685fb51c296ce21034f4c719e2fcc0baba221d19f28746 long_desc=" Ruby is the interpreted scripting language for quick and easy object oriented programming. It has many features to process text files and to @@ -27,17 +26,14 @@ Add_dependency run libssl Add_dependency run zlib Add_dependency run readline Add_dependency run ncursesw -Add_dependency run ncurses-libs +Add_dependency run libffi Add_dependency build db-devel Add_dependency build gdbm-devel Add_dependency build openssl-devel Add_dependency build zlib-devel Add_dependency build readline-devel -Add_dependency build ncurses-devel Add_dependency build ncursesw-devel - -pre_configure() -{ - export PATH="/usr/bin:/bin:$PATH" -} +Add_dependency build libffi-devel +Add_dependency build groff +Add_dependency build doxygen