summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mk/bsd.ruby.mk21
-rw-r--r--lang/ruby-devel/Makefile8
-rw-r--r--lang/ruby-devel/distinfo1
-rw-r--r--lang/ruby-devel/pkg-plist7
-rw-r--r--lang/ruby/Makefile4
-rw-r--r--lang/ruby/distinfo2
-rw-r--r--lang/ruby/pkg-plist7
-rw-r--r--lang/ruby16/Makefile4
-rw-r--r--lang/ruby16/distinfo2
-rw-r--r--lang/ruby16/pkg-plist7
-rw-r--r--lang/ruby18/Makefile8
-rw-r--r--lang/ruby18/distinfo1
-rw-r--r--lang/ruby18/pkg-plist7
13 files changed, 45 insertions, 34 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index 1e8c476d076b..a4f05d725b3f 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -39,8 +39,7 @@ Ruby_Include_MAINTAINER= knu@FreeBSD.org
# RUBY_PORTVERSION - PORTVERSION for the standard ruby ports (ruby, ruby-gdbm, etc.).
# RUBY_DISTNAME - DISTNAME for the standard ruby ports, i.e. the basename of the ruby distribution tarball.
# RUBY_DISTVERSION - The version number part of RUBY_DISTNAME.
-# RUBY_DISTVER - Same as RUBY_DISTVERSION, but converted into PORTVERSION style (preview -> .p etc.)
-# RUBY_PATCHLEVEL - Patchlevel, or a snapshot date.
+# RUBY_PATCHFILES - PATCHFILES for the standard ruby ports, i.e. the basename of the ruby distribution tarball.
# RUBY_WRKSRC - WRKSRC for the ruby port.
#
# RUBY_SHLIBVER - Major version of libruby (see below for current value).
@@ -99,26 +98,24 @@ RUBY_SUFFIX?= ${_RUBY_SUFFIX}
.elif defined(RUBY_VER) && ${RUBY_VER} == 1.7
RUBY_VERSION?= 1.7.0
RUBY_SUFFIX?= ${_RUBY_SUFFIX}
+RUBY_PORT?= lang/ruby-devel
RUBY_WRKSRC?= ${WRKDIR}/ruby
RUBY_DISTVERSION?= ${RUBY_VERSION}-alpha-2001.05.08
-#RUBY_PATCHLEVEL?=
-RUBY_PORT?= lang/ruby-devel
+RUBY_DISTPATCHVERSION?= ${RUBY_DISTVERSION}-2001.05.12
+RUBY_PORTVERSION?= ${RUBY_VERSION}-a2001.05.12
.else
RUBY_VERSION?= 1.6.4
RUBY_SUFFIX?= # empty
RUBY_DISTVERSION?= ${RUBY_VERSION}-preview2
-RUBY_PATCHLEVEL?= 2001.05.08
+RUBY_DISTPATCHVERSION?= ${RUBY_DISTVERSION}-2001.05.12
+RUBY_PORTVERSION?= ${RUBY_VERSION}.p2.2001.05.12
.endif
RUBY_DISTVERSION?= ${RUBY_VERSION}
-RUBY_DISTVER= ${RUBY_DISTVERSION:S/-preview/.p/:S/-alpha-/.a/:S/-beta-/.b/}
-
-.if !defined(RUBY_PATCHLEVEL) || empty(RUBY_PATCHLEVEL)
-RUBY_PORTVERSION= ${RUBY_DISTVER}
-.else
-RUBY_PORTVERSION= ${RUBY_DISTVER}.${RUBY_PATCHLEVEL}
+RUBY_PORTVERSION?= ${RUBY_VERSION}
+.if defined(RUBY_DISTPATCHVERSION) && !empty(RUBY_DISTPATCHVERSION)
+RUBY_PATCHFILES?= ruby-${RUBY_DISTPATCHVERSION}.patch.gz
.endif
-
RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION}
RUBY_WRKSRC?= ${WRKDIR}/ruby-${RUBY_VERSION}
diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index b31cfc9cc092..2edf8f0cbe46 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= ${RUBY_VER}
DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
-#PATCH_SITES= http://www.ruby-lang.org/~knu/
-#PATCHFILES= ${RUBY_DISTNAME}-${RUBY_PATCHLEVEL}.patch.gz
-#PATCH_DIST_STRIP= -p1
+PATCH_SITES= http://www.ruby-lang.org/~knu/
+PATCHFILES= ${RUBY_PATCHFILES}
+PATCH_DIST_STRIP= -p1
MAINTAINER= knu@FreeBSD.org
@@ -101,7 +101,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
${MKDIR} ${RUBY_DOCDIR}/readline
${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${RUBY_DOCDIR}/readline
- ${CP} -R ${WRKSRC}/doc/irb ${RUBY_DOCDIR}/
+ ${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo
index 743c91a117f4..bf5b5f5b6163 100644
--- a/lang/ruby-devel/distinfo
+++ b/lang/ruby-devel/distinfo
@@ -1 +1,2 @@
MD5 (ruby/ruby-1.7.0-alpha-2001.05.08.tar.gz) = 8c691df68e049d1e9cee3d3fb2af2562
+MD5 (ruby/ruby-1.7.0-alpha-2001.05.08-2001.05.12.patch.gz) = fe79bb7083dc3272bde0c39e2a97afde
diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist
index ee214e939271..23ebb4ef5c47 100644
--- a/lang/ruby-devel/pkg-plist
+++ b/lang/ruby-devel/pkg-plist
@@ -46,6 +46,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_LIBDIR%%/final.rb
%%RUBY_LIBDIR%%/finalize.rb
%%RUBY_LIBDIR%%/find.rb
+%%RUBY_LIBDIR%%/forwardable.rb
%%RUBY_LIBDIR%%/ftools.rb
%%RUBY_LIBDIR%%/ftplib.rb
%%RUBY_LIBDIR%%/getoptlong.rb
@@ -122,9 +123,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@dirrm %%RUBY_LIBDIR%%
@unexec rmdir %D/lib/ruby 2>/dev/null || true
%%PORTDOCS%%%%RUBY_DOCDIR%%/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
@@ -133,9 +136,9 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 0ce4b099c830..1f8a1ddd12aa 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
PATCH_SITES= http://www.ruby-lang.org/~knu/
-PATCHFILES= ${RUBY_DISTNAME}-${RUBY_PATCHLEVEL}.patch.gz
+PATCHFILES= ${RUBY_PATCHFILES}
PATCH_DIST_STRIP= -p1
MAINTAINER= knu@FreeBSD.org
@@ -99,7 +99,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
${MKDIR} ${RUBY_DOCDIR}/readline
${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${RUBY_DOCDIR}/readline
- ${CP} -R ${WRKSRC}/doc/irb ${RUBY_DOCDIR}/
+ ${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo
index 39bf2320a3a8..3204b8219f59 100644
--- a/lang/ruby/distinfo
+++ b/lang/ruby/distinfo
@@ -1,2 +1,2 @@
MD5 (ruby/ruby-1.6.4-preview2.tar.gz) = ff4cb6a7593157938f1766021ff74c2e
-MD5 (ruby/ruby-1.6.4-preview2-2001.05.08.patch.gz) = e9a275d2986c73e68669b0403ace6454
+MD5 (ruby/ruby-1.6.4-preview2-2001.05.12.patch.gz) = 8246d41dd1f0687048bde01ea4f2178e
diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist
index 0912019d6a9f..5ce72bdb3919 100644
--- a/lang/ruby/pkg-plist
+++ b/lang/ruby/pkg-plist
@@ -46,6 +46,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_LIBDIR%%/final.rb
%%RUBY_LIBDIR%%/finalize.rb
%%RUBY_LIBDIR%%/find.rb
+%%RUBY_LIBDIR%%/forwardable.rb
%%RUBY_LIBDIR%%/ftools.rb
%%RUBY_LIBDIR%%/ftplib.rb
%%RUBY_LIBDIR%%/getoptlong.rb
@@ -122,9 +123,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@dirrm %%RUBY_LIBDIR%%
@unexec rmdir %D/lib/ruby 2>/dev/null || true
%%PORTDOCS%%%%RUBY_DOCDIR%%/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
@@ -133,9 +136,9 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 0ce4b099c830..1f8a1ddd12aa 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -14,7 +14,7 @@ DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
PATCH_SITES= http://www.ruby-lang.org/~knu/
-PATCHFILES= ${RUBY_DISTNAME}-${RUBY_PATCHLEVEL}.patch.gz
+PATCHFILES= ${RUBY_PATCHFILES}
PATCH_DIST_STRIP= -p1
MAINTAINER= knu@FreeBSD.org
@@ -99,7 +99,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
${MKDIR} ${RUBY_DOCDIR}/readline
${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${RUBY_DOCDIR}/readline
- ${CP} -R ${WRKSRC}/doc/irb ${RUBY_DOCDIR}/
+ ${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index 39bf2320a3a8..3204b8219f59 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1,2 +1,2 @@
MD5 (ruby/ruby-1.6.4-preview2.tar.gz) = ff4cb6a7593157938f1766021ff74c2e
-MD5 (ruby/ruby-1.6.4-preview2-2001.05.08.patch.gz) = e9a275d2986c73e68669b0403ace6454
+MD5 (ruby/ruby-1.6.4-preview2-2001.05.12.patch.gz) = 8246d41dd1f0687048bde01ea4f2178e
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 0912019d6a9f..5ce72bdb3919 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -46,6 +46,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_LIBDIR%%/final.rb
%%RUBY_LIBDIR%%/finalize.rb
%%RUBY_LIBDIR%%/find.rb
+%%RUBY_LIBDIR%%/forwardable.rb
%%RUBY_LIBDIR%%/ftools.rb
%%RUBY_LIBDIR%%/ftplib.rb
%%RUBY_LIBDIR%%/getoptlong.rb
@@ -122,9 +123,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@dirrm %%RUBY_LIBDIR%%
@unexec rmdir %D/lib/ruby 2>/dev/null || true
%%PORTDOCS%%%%RUBY_DOCDIR%%/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
@@ -133,9 +136,9 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index b31cfc9cc092..2edf8f0cbe46 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -13,9 +13,9 @@ MASTER_SITE_SUBDIR= ${RUBY_VER}
DISTNAME= ${RUBY_DISTNAME}
DIST_SUBDIR= ruby
-#PATCH_SITES= http://www.ruby-lang.org/~knu/
-#PATCHFILES= ${RUBY_DISTNAME}-${RUBY_PATCHLEVEL}.patch.gz
-#PATCH_DIST_STRIP= -p1
+PATCH_SITES= http://www.ruby-lang.org/~knu/
+PATCHFILES= ${RUBY_PATCHFILES}
+PATCH_DIST_STRIP= -p1
MAINTAINER= knu@FreeBSD.org
@@ -101,7 +101,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${RUBY_DOCDIR}/pty
${MKDIR} ${RUBY_DOCDIR}/readline
${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${RUBY_DOCDIR}/readline
- ${CP} -R ${WRKSRC}/doc/irb ${RUBY_DOCDIR}/
+ ${CP} -R ${WRKSRC}/doc/* ${RUBY_DOCDIR}/
.endif
@${CAT} ${PKGMESSAGE}
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 743c91a117f4..bf5b5f5b6163 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1 +1,2 @@
MD5 (ruby/ruby-1.7.0-alpha-2001.05.08.tar.gz) = 8c691df68e049d1e9cee3d3fb2af2562
+MD5 (ruby/ruby-1.7.0-alpha-2001.05.08-2001.05.12.patch.gz) = fe79bb7083dc3272bde0c39e2a97afde
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index ee214e939271..23ebb4ef5c47 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -46,6 +46,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_LIBDIR%%/final.rb
%%RUBY_LIBDIR%%/finalize.rb
%%RUBY_LIBDIR%%/find.rb
+%%RUBY_LIBDIR%%/forwardable.rb
%%RUBY_LIBDIR%%/ftools.rb
%%RUBY_LIBDIR%%/ftplib.rb
%%RUBY_LIBDIR%%/getoptlong.rb
@@ -122,9 +123,11 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@dirrm %%RUBY_LIBDIR%%
@unexec rmdir %D/lib/ruby 2>/dev/null || true
%%PORTDOCS%%%%RUBY_DOCDIR%%/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT
%%PORTDOCS%%%%RUBY_DOCDIR%%/README.EXT.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/README.jp
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd
+%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/irb/irb-tools.rd.jp
@@ -133,9 +136,9 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/md5/md5.txt.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README
+%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect
%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.expect.jp
-%%PORTDOCS%%%%RUBY_DOCDIR%%/pty/README.jp
%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-18 03:43:39 +0000