diff options
-rw-r--r-- | Mk/bsd.ruby.mk | 4 | ||||
-rw-r--r-- | lang/ruby-devel/Makefile | 4 | ||||
-rw-r--r-- | lang/ruby-devel/distinfo | 2 | ||||
-rw-r--r-- | lang/ruby-devel/pkg-plist | 3 | ||||
-rw-r--r-- | lang/ruby18/Makefile | 4 | ||||
-rw-r--r-- | lang/ruby18/distinfo | 2 | ||||
-rw-r--r-- | lang/ruby18/pkg-plist | 3 |
7 files changed, 12 insertions, 10 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 53c313c41d6..8c34f865b98 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -121,9 +121,9 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} .if defined(RUBY_VER) && ${RUBY_VER} == 1.7 RUBY_VERSION?= 1.7.3 RUBY_PORT?= lang/ruby${RUBY_R}-devel -RUBY_DISTVERSION?= ${RUBY_VERSION}-2002.10.30 +RUBY_DISTVERSION?= ${RUBY_VERSION}-2002.11.14 #RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2 -RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.10.30 +RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.11.14 .else RUBY_VERSION?= 1.6.8 RUBY_DISTVERSION?= ${RUBY_VERSION}-preview2 diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile index 94aea149f05..28810554889 100644 --- a/lang/ruby-devel/Makefile +++ b/lang/ruby-devel/Makefile @@ -47,7 +47,7 @@ WRKSRC= ${RUBY_WRKSRC} CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --enable-shared MAKE_ENV= LANG=C # prevent bison 1.33 w/ gettext 0.10.35 from coredumping -#MAKE_ARGS= -j3 +MAKE_ARGS= -j3 INSTALLS_SHLIB= yes MAN1= ruby${_RUBY_SUFFIX}.1 @@ -92,7 +92,7 @@ OBSOLETED_MODULES= dl \ post-extract: .if defined(WITH_ONIGURUMA) - cd ${WRKDIR}; ${TAR} zxvf ${_DISTDIR}/${ONIGURUMA_DISTFILE} + ${TAR} -zxvf ${DISTDIR}/${DIST_SUBDIR}/${ONIGURUMA_DISTFILE} -C ${WRKDIR} .endif post-patch: diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo index f08b32fb5ee..9196017b225 100644 --- a/lang/ruby-devel/distinfo +++ b/lang/ruby-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (ruby/ruby-1.7.3-2002.10.30.tar.bz2) = 59c07fcc8f760bac08e52c5e7b855abc +MD5 (ruby/ruby-1.7.3-2002.11.14.tar.bz2) = 9e1978a64c23acc5ee754e7b9f1e0627 MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0 diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist index d5ba0075d61..0c6d16c43c9 100644 --- a/lang/ruby-devel/pkg-plist +++ b/lang/ruby-devel/pkg-plist @@ -11,13 +11,14 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBY_ARCHLIBDIR%%/dbm.so %%RUBY_ARCHLIBDIR%%/defines.h %%RUBY_ARCHLIBDIR%%/digest.so +%%RUBY_ARCHLIBDIR%%/dl.h %%RUBY_ARCHLIBDIR%%/dl.so +%%RUBY_ARCHLIBDIR%%/dlconfig.h %%RUBY_ARCHLIBDIR%%/dln.h %%RUBY_ARCHLIBDIR%%/env.h %%RUBY_ARCHLIBDIR%%/etc.so %%RUBY_ARCHLIBDIR%%/fcntl.so %%RUBY_ARCHLIBDIR%%/intern.h -%%RUBY_ARCHLIBDIR%%/lib%%RUBY_NAME%%.a %%RUBY_ARCHLIBDIR%%/missing.h %%RUBY_ARCHLIBDIR%%/nkf.so %%RUBY_ARCHLIBDIR%%/node.h diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile index 94aea149f05..28810554889 100644 --- a/lang/ruby18/Makefile +++ b/lang/ruby18/Makefile @@ -47,7 +47,7 @@ WRKSRC= ${RUBY_WRKSRC} CONFIGURE_ARGS= ${RUBY_CONFIGURE_ARGS} \ --enable-shared MAKE_ENV= LANG=C # prevent bison 1.33 w/ gettext 0.10.35 from coredumping -#MAKE_ARGS= -j3 +MAKE_ARGS= -j3 INSTALLS_SHLIB= yes MAN1= ruby${_RUBY_SUFFIX}.1 @@ -92,7 +92,7 @@ OBSOLETED_MODULES= dl \ post-extract: .if defined(WITH_ONIGURUMA) - cd ${WRKDIR}; ${TAR} zxvf ${_DISTDIR}/${ONIGURUMA_DISTFILE} + ${TAR} -zxvf ${DISTDIR}/${DIST_SUBDIR}/${ONIGURUMA_DISTFILE} -C ${WRKDIR} .endif post-patch: diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo index f08b32fb5ee..9196017b225 100644 --- a/lang/ruby18/distinfo +++ b/lang/ruby18/distinfo @@ -1,2 +1,2 @@ -MD5 (ruby/ruby-1.7.3-2002.10.30.tar.bz2) = 59c07fcc8f760bac08e52c5e7b855abc +MD5 (ruby/ruby-1.7.3-2002.11.14.tar.bz2) = 9e1978a64c23acc5ee754e7b9f1e0627 MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0 diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist index d5ba0075d61..0c6d16c43c9 100644 --- a/lang/ruby18/pkg-plist +++ b/lang/ruby18/pkg-plist @@ -11,13 +11,14 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBY_ARCHLIBDIR%%/dbm.so %%RUBY_ARCHLIBDIR%%/defines.h %%RUBY_ARCHLIBDIR%%/digest.so +%%RUBY_ARCHLIBDIR%%/dl.h %%RUBY_ARCHLIBDIR%%/dl.so +%%RUBY_ARCHLIBDIR%%/dlconfig.h %%RUBY_ARCHLIBDIR%%/dln.h %%RUBY_ARCHLIBDIR%%/env.h %%RUBY_ARCHLIBDIR%%/etc.so %%RUBY_ARCHLIBDIR%%/fcntl.so %%RUBY_ARCHLIBDIR%%/intern.h -%%RUBY_ARCHLIBDIR%%/lib%%RUBY_NAME%%.a %%RUBY_ARCHLIBDIR%%/missing.h %%RUBY_ARCHLIBDIR%%/nkf.so %%RUBY_ARCHLIBDIR%%/node.h |