pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2006Q3]: pkgsrc Pullup ticket 1943 - requested by taca
details: https://anonhg.NetBSD.org/pkgsrc/rev/54da02cb4ffb
branches: pkgsrc-2006Q3
changeset: 519250:54da02cb4ffb
user: salo <salo%pkgsrc.org@localhost>
date: Sat Dec 09 10:17:46 2006 +0000
description:
Pullup ticket 1943 - requested by taca
security update for ruby18
Revisions pulled up:
- pkgsrc/lang/ruby/Makefile 1.41
- pkgsrc/lang/ruby/rubyversion.mk 1.29, 1.30
- pkgsrc/lang/ruby18-base/Makefile 1.29
- pkgsrc/lang/ruby18-base/PLIST 1.9
- pkgsrc/lang/ruby18-base/PLIST.common_end 1.2
- pkgsrc/lang/ruby18-base/distinfo 1.17
- pkgsrc/lang/ruby18-base/options.mk 1.1
- pkgsrc/lang/ruby18-base/patches/patch-af 1.1
- pkgsrc/lang/ruby18-base/patches/patch-bl removed
- pkgsrc/lang/ruby18/Makefile 1.15
- pkgsrc/databases/ruby-gdbm/Makefile 1.15
- pkgsrc/databases/ruby-gdbm/distinfo 1.1
- pkgsrc/devel/ruby-curses/Makefile 1.10
- pkgsrc/devel/ruby-curses/distinfo 1.7
- pkgsrc/devel/ruby-mode/Makefile 1.15
- pkgsrc/devel/ruby-mode/distinfo 1.6
- pkgsrc/devel/ruby-readline/Makefile 1.20
- pkgsrc/devel/ruby-readline/distinfo 1.13
- pkgsrc/devel/ruby-readline/patches/patch-aa 1.5
- pkgsrc/x11/ruby-tk/Makefile 1.25, 1.26
- pkgsrc/x11/ruby-tk/PLIST 1.7
- pkgsrc/x11/ruby-tk/distinfo 1.11
- pkgsrc/mk/defaults/options.description 1.130
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 16:25:26 UTC 2006
Modified Files:
pkgsrc/databases/ruby-gdbm: Makefile
Added Files:
pkgsrc/databases/ruby-gdbm: distinfo
Log Message:
Update ruby-gdbm package to 1.8.5.20061205:
- rdoc addition and trivial change.
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 16:28:18 UTC 2006
Modified Files:
pkgsrc/devel/ruby-curses: Makefile distinfo
Log Message:
Update ruby-curses package to 1.8.5.20061205:
- Fixed colose_set method always returns false.
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 16:36:41 UTC 2006
Modified Files:
pkgsrc/devel/ruby-mode: Makefile
Added Files:
pkgsrc/devel/ruby-mode: distinfo
Log Message:
Update ruby-mode package to 1.8.5.20061205.
Tue Dec 5 00:59:05 2006 Yukihiro Matsumoto <matz%ruby-lang.org@localhost>
* misc/ruby-mode.el (ruby-parse-partial): need to parse "/=" as
self assignment operator, not regex. [ruby-talk:227324]
Wed Sep 13 18:25:18 2006 Yukihiro Matsumoto <matz%ruby-lang.org@localhost>
* misc/ruby-mode.el (ruby-parse-partial): better here-doc support.
a patch from Marshall T. Vandegrift <llasram at gmail.com>.
[ruby-core:08804]
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 16:31:34 UTC 2006
Modified Files:
pkgsrc/devel/ruby-readline: Makefile distinfo
pkgsrc/devel/ruby-readline/patches: patch-aa
Log Message:
Update ruby-readline package to 1.8.5.20061205:
- No change with 20061205 patch.
- Disable checking rl_filename_completion_function() to prevent compile
error.
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 16:34:42 UTC 2006
Modified Files:
pkgsrc/lang/ruby: Makefile
Log Message:
Update ruby package to 1.8.5.20061205. No change for this wrapper package.
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 16:17:17 UTC 2006
Modified Files:
pkgsrc/lang/ruby: rubyversion.mk
Log Message:
- Handle patchlevel which has introduced to Ruby.
- Introduce RUBY_PATCH_DATE and RUBY_VERSION_SUFFIX.
- Change _RUBY_VERS_TEENY to _RUBY_VER_TEENY as other version variable
like RUBY_VER_MAJOR.
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 16:19:50 UTC 2006
Modified Files:
pkgsrc/lang/ruby: rubyversion.mk
Log Message:
Update RUBY18_PATCH_DATE to 20061205, starting update of Ruby.
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 16:34:09 UTC 2006
Modified Files:
pkgsrc/lang/ruby18: Makefile
Log Message:
Update ruby18 package to 1.8.5.20061205. No change for this meta pacakge
itself.
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 16:24:27 UTC 2006
Modified Files:
pkgsrc/lang/ruby18-base: Makefile PLIST PLIST.common_end distinfo
Added Files:
pkgsrc/lang/ruby18-base: options.mk
pkgsrc/lang/ruby18-base/patches: patch-af
Removed Files:
pkgsrc/lang/ruby18-base/patches: patch-bl
Log Message:
o Update ruby18-base pacakge to Ruby 1.8 branch 2006/12/05.
- Many changes from 2006/9/6; see Changes file, please.
- Fixes another cgi.rb vulnerability:
http://jvn.jp/jp/JVN%2384798830/index.html
o Introduce ruby-build-ri-db PKG_OPTION which enable installing database
for Ruby's ri utility. Default is disabled and should be fix
PR pkg/34587.
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 17:00:54 UTC 2006
Modified Files:
pkgsrc/mk/defaults: options.description
Log Message:
Add description of ruby-build-ri-db.
---
Module Name: pkgsrc
Committed By: tv
Date: Fri Nov 10 16:54:54 UTC 2006
Modified Files:
pkgsrc/x11/ruby-tk: Makefile
Log Message:
Use find -print | xargs rather than find -exec.
---
Module Name: pkgsrc
Committed By: taca
Date: Wed Dec 6 16:33:16 UTC 2006
Modified Files:
pkgsrc/x11/ruby-tk: Makefile PLIST distinfo
Log Message:
Update ruby-tk package to 1.8.5.20061205:
Changes are huge, please see Changes.
- pkgsrc change; fix permission of a image file.
diffstat:
databases/ruby-gdbm/Makefile | 21 ++++++++++++---------
databases/ruby-gdbm/distinfo | 8 ++++++++
devel/ruby-curses/Makefile | 6 +++---
devel/ruby-curses/distinfo | 8 ++++----
devel/ruby-mode/Makefile | 9 ++++++---
devel/ruby-mode/distinfo | 8 ++++++++
devel/ruby-readline/Makefile | 4 ++--
devel/ruby-readline/distinfo | 4 ++--
devel/ruby-readline/patches/patch-aa | 10 +++++++++-
lang/ruby/Makefile | 4 ++--
lang/ruby/rubyversion.mk | 31 +++++++++++++++++--------------
lang/ruby18-base/Makefile | 35 +++++++++++++++++++----------------
lang/ruby18-base/PLIST | 8 +++++---
lang/ruby18-base/PLIST.common_end | 3 +++
lang/ruby18-base/distinfo | 10 +++++-----
lang/ruby18-base/options.mk | 11 +++++++++++
lang/ruby18-base/patches/patch-af | 13 +++++++++++++
lang/ruby18-base/patches/patch-bl | 13 -------------
lang/ruby18/Makefile | 12 ++++++------
mk/defaults/options.description | 1 +
x11/ruby-tk/Makefile | 32 ++++++++++++++++++--------------
x11/ruby-tk/PLIST | 6 +++++-
x11/ruby-tk/distinfo | 8 ++++----
23 files changed, 163 insertions(+), 102 deletions(-)
diffs (truncated from 604 to 300 lines):
diff -r 99463d40a38c -r 54da02cb4ffb databases/ruby-gdbm/Makefile
--- a/databases/ruby-gdbm/Makefile Sat Dec 09 09:24:16 2006 +0000
+++ b/databases/ruby-gdbm/Makefile Sat Dec 09 10:17:46 2006 +0000
@@ -1,18 +1,21 @@
-# $NetBSD: Makefile,v 1.14 2005/11/02 09:32:28 taca Exp $
+# $NetBSD: Makefile,v 1.14.8.1 2006/12/09 10:17:46 salo Exp $
#
-DISTNAME= ${RUBY_DISTNAME}
-PKGNAME= ${RUBY_PKGPREFIX}-gdbm-${RUBY_VERSION}
-CATEGORIES= databases ruby
-MASTER_SITES= ${MASTER_SITE_RUBY}
+DISTNAME= ${RUBY_DISTNAME}
+PKGNAME= ${RUBY_PKGPREFIX}-gdbm-${RUBY_VERSION_SUFFIX}
+CATEGORIES= databases ruby
+MASTER_SITES= ${MASTER_SITE_RUBY}
-MAINTAINER= taca%NetBSD.org@localhost
-HOMEPAGE= ${RUBY_HOMEPAGE}
-COMMENT= Ruby extension to GDBM library
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCHFILES= ruby-1.8.5-gdbm-${RUBY18_PATCH_DATE}.patch.bz2
+PATCH_DIST_STRIP= -p3
+
+MAINTAINER= taca%NetBSD.org@localhost
+HOMEPAGE= ${RUBY_HOMEPAGE}
+COMMENT= Ruby extension to GDBM library
RUBY_HAS_ARCHLIB= yes
USE_RUBY_EXTCONF= yes
-DISTINFO_FILE= ${RUBY_DISTINFO_FILE}
WRKSRC= ${RUBY_WRKSRC}/ext/gdbm
EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/gdbm
diff -r 99463d40a38c -r 54da02cb4ffb databases/ruby-gdbm/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/databases/ruby-gdbm/distinfo Sat Dec 09 10:17:46 2006 +0000
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1.2.2 2006/12/09 10:17:47 salo Exp $
+
+SHA1 (ruby-1.8.5-gdbm-20061205.patch.bz2) = a2eafb5213f8dfa4c9a2c83a31e81dfdfb5e4bc3
+RMD160 (ruby-1.8.5-gdbm-20061205.patch.bz2) = c685d7792617eae3dd3f382e374b4bc287162530
+Size (ruby-1.8.5-gdbm-20061205.patch.bz2) = 5447 bytes
+SHA1 (ruby-1.8.5.tar.gz) = 0638ea26e1088fc9f4237abde8c85331689ce77c
+RMD160 (ruby-1.8.5.tar.gz) = 991899146c23c9ea30ac09f41b7077fa0c8686b6
+Size (ruby-1.8.5.tar.gz) = 4438603 bytes
diff -r 99463d40a38c -r 54da02cb4ffb devel/ruby-curses/Makefile
--- a/devel/ruby-curses/Makefile Sat Dec 09 09:24:16 2006 +0000
+++ b/devel/ruby-curses/Makefile Sat Dec 09 10:17:46 2006 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2006/09/07 15:41:12 taca Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2006/12/09 10:17:47 salo Exp $
#
DISTNAME= ${RUBY_DISTNAME}
-PKGNAME= ${RUBY_PKGPREFIX}-curses-${RUBY_VERSION}
+PKGNAME= ${RUBY_PKGPREFIX}-curses-${RUBY_VERSION_SUFFIX}
CATEGORIES= devel ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCHFILES= ruby-1.8.5-curses-${RUBY18_PATCH_DATE}.patch.bz2
-PATCH_DIST_STRIP= -p2
+PATCH_DIST_STRIP= -p3
MAINTAINER= taca%NetBSD.org@localhost
HOMEPAGE= ${RUBY_HOMEPAGE}
diff -r 99463d40a38c -r 54da02cb4ffb devel/ruby-curses/distinfo
--- a/devel/ruby-curses/distinfo Sat Dec 09 09:24:16 2006 +0000
+++ b/devel/ruby-curses/distinfo Sat Dec 09 10:17:46 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/09/07 15:41:12 taca Exp $
+$NetBSD: distinfo,v 1.6.2.1 2006/12/09 10:17:47 salo Exp $
-SHA1 (ruby-1.8.5-curses-20060906.patch.bz2) = 7a098f32073306f1c819a9d6f1640c60fdd5afe8
-RMD160 (ruby-1.8.5-curses-20060906.patch.bz2) = 21ba86256231d12dd2c7d82f65098cbb4fba2d8a
-Size (ruby-1.8.5-curses-20060906.patch.bz2) = 455 bytes
+SHA1 (ruby-1.8.5-curses-20061205.patch.bz2) = 516b696f83cb1f980b388f093b6fb41796632ee9
+RMD160 (ruby-1.8.5-curses-20061205.patch.bz2) = 2310a2f1395d6c9249aed57cbf345aef2a0b56f5
+Size (ruby-1.8.5-curses-20061205.patch.bz2) = 438 bytes
SHA1 (ruby-1.8.5.tar.gz) = 0638ea26e1088fc9f4237abde8c85331689ce77c
RMD160 (ruby-1.8.5.tar.gz) = 991899146c23c9ea30ac09f41b7077fa0c8686b6
Size (ruby-1.8.5.tar.gz) = 4438603 bytes
diff -r 99463d40a38c -r 54da02cb4ffb devel/ruby-mode/Makefile
--- a/devel/ruby-mode/Makefile Sat Dec 09 09:24:16 2006 +0000
+++ b/devel/ruby-mode/Makefile Sat Dec 09 10:17:46 2006 +0000
@@ -1,17 +1,20 @@
-# $NetBSD: Makefile,v 1.14 2006/09/07 15:46:12 taca Exp $
+# $NetBSD: Makefile,v 1.14.2.1 2006/12/09 10:17:47 salo Exp $
#
DISTNAME= ${RUBY_DISTNAME}
-PKGNAME= ${EMACS_PKGNAME_PREFIX}${RUBY_PKGPREFIX}-mode-${RUBY_VERSION}
+PKGNAME= ${EMACS_PKGNAME_PREFIX}${RUBY_PKGPREFIX}-mode-${RUBY_VERSION_SUFFIX}
#PKGREVISION=
CATEGORIES= devel ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCHFILES= ruby-1.8.5-ruby-mode-${RUBY18_PATCH_DATE}.patch.bz2
+PATCH_DIST_STRIP= -p2
+
MAINTAINER= taca%NetBSD.org@localhost
HOMEPAGE= ${RUBY_HOMEPAGE}
COMMENT= Ruby editing mode for Emacs
-DISTINFO_FILE= ${RUBY_DISTINFO_FILE}
WRKSRC= ${RUBY_WRKSRC}/misc
EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/misc
RUBY_VERSION= ${RUBY18_VERSION}
diff -r 99463d40a38c -r 54da02cb4ffb devel/ruby-mode/distinfo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ruby-mode/distinfo Sat Dec 09 10:17:46 2006 +0000
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.5.12.1 2006/12/09 10:17:47 salo Exp $
+
+SHA1 (ruby-1.8.5-ruby-mode-20061205.patch.bz2) = dae048666c29f43af75a1f5c3ab1c28413ff5c76
+RMD160 (ruby-1.8.5-ruby-mode-20061205.patch.bz2) = da0f74fe5aaa16c203d8afd7c6458995ec0bdece
+Size (ruby-1.8.5-ruby-mode-20061205.patch.bz2) = 708 bytes
+SHA1 (ruby-1.8.5.tar.gz) = 0638ea26e1088fc9f4237abde8c85331689ce77c
+RMD160 (ruby-1.8.5.tar.gz) = 991899146c23c9ea30ac09f41b7077fa0c8686b6
+Size (ruby-1.8.5.tar.gz) = 4438603 bytes
diff -r 99463d40a38c -r 54da02cb4ffb devel/ruby-readline/Makefile
--- a/devel/ruby-readline/Makefile Sat Dec 09 09:24:16 2006 +0000
+++ b/devel/ruby-readline/Makefile Sat Dec 09 10:17:46 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2005/11/02 09:13:06 taca Exp $
+# $NetBSD: Makefile,v 1.19.8.1 2006/12/09 10:17:47 salo Exp $
#
DISTNAME= ${RUBY_DISTNAME}
-PKGNAME= ${RUBY_PKGPREFIX}-readline-${RUBY_VERSION}
+PKGNAME= ${RUBY_PKGPREFIX}-readline-${RUBY_VERSION_SUFFIX}
CATEGORIES= devel ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
diff -r 99463d40a38c -r 54da02cb4ffb devel/ruby-readline/distinfo
--- a/devel/ruby-readline/distinfo Sat Dec 09 09:24:16 2006 +0000
+++ b/devel/ruby-readline/distinfo Sat Dec 09 10:17:46 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2006/09/07 15:42:30 taca Exp $
+$NetBSD: distinfo,v 1.12.2.1 2006/12/09 10:17:47 salo Exp $
SHA1 (ruby-1.8.5.tar.gz) = 0638ea26e1088fc9f4237abde8c85331689ce77c
RMD160 (ruby-1.8.5.tar.gz) = 991899146c23c9ea30ac09f41b7077fa0c8686b6
Size (ruby-1.8.5.tar.gz) = 4438603 bytes
-SHA1 (patch-aa) = 3fa6c4454e05e75b3fb82b53736ef7ba5f54529f
+SHA1 (patch-aa) = d13708667777361c792710c78f0a991ea1d6250f
diff -r 99463d40a38c -r 54da02cb4ffb devel/ruby-readline/patches/patch-aa
--- a/devel/ruby-readline/patches/patch-aa Sat Dec 09 09:24:16 2006 +0000
+++ b/devel/ruby-readline/patches/patch-aa Sat Dec 09 10:17:46 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2005/11/02 08:59:05 taca Exp $
+$NetBSD: patch-aa,v 1.4.8.1 2006/12/09 10:17:47 salo Exp $
This patch is generated with "diff -u -U 2".
@@ -20,3 +20,11 @@
if enable_libedit
unless (have_readline_header("editline/readline.h") ||
+@@ -42,7 +39,6 @@ else
+ end
+ end
+
+-have_readline_var("rl_filename_completion_function")
+ have_readline_var("rl_deprep_term_function")
+ have_readline_var("rl_completion_append_character")
+ have_readline_var("rl_basic_word_break_characters")
diff -r 99463d40a38c -r 54da02cb4ffb lang/ruby/Makefile
--- a/lang/ruby/Makefile Sat Dec 09 09:24:16 2006 +0000
+++ b/lang/ruby/Makefile Sat Dec 09 10:17:46 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2006/01/03 14:39:51 taca Exp $
+# $NetBSD: Makefile,v 1.40.6.1 2006/12/09 10:17:47 salo Exp $
-DISTNAME= ruby-${RUBY_VERSION}
+DISTNAME= ruby-${RUBY_VERSION}.${RUBY_PATCH_DATE}
CATEGORIES= lang ruby
MASTER_SITES= # empty
DISTFILES= # empty
diff -r 99463d40a38c -r 54da02cb4ffb lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Sat Dec 09 09:24:16 2006 +0000
+++ b/lang/ruby/rubyversion.mk Sat Dec 09 10:17:46 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.27.2.1 2006/10/07 02:55:16 salo Exp $
+# $NetBSD: rubyversion.mk,v 1.27.2.2 2006/12/09 10:17:47 salo Exp $
#
.if !defined(_RUBYVERSION_MK)
@@ -7,10 +7,10 @@
.include "../../mk/bsd.prefs.mk"
# current supported Ruby's version
-RUBY18_VERSION?= 1.8.5
+RUBY18_VERSION= 1.8.5
-#
-RUBY18_PATCH_DATE= 20060906
+# patch date
+RUBY18_PATCH_DATE= 20061205
# RUBY_VERSION_DEFAULT defines default version for Ruby related
# packages and user can define in mk.conf. (1.6 or 1.8)
@@ -23,11 +23,12 @@
#
# Default value is set to ${RUBY_VERSION_DEFAULT}
#
-.if !defined(RUBY_VERSION)
.if ${RUBY_VERSION_DEFAULT} == "1.8"
RUBY_VERSION?= ${RUBY18_VERSION}
+RUBY_PATCH_DATE?= ${RUBY18_PATCH_DATE}
.endif
-.endif
+
+RUBY_VERSION_SUFFIX= ${RUBY_VERSION}.${RUBY_PATCH_DATE}
# RUBY_VERSION_SUPPORTED defines the list of ${RUBY_VER} which is
# supported by the package. It should be defined by the packages
@@ -50,13 +51,15 @@
#
RUBY_NOVERSION?= No
-# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VERS_TEENY is defined from
-# version of Ruby. It could be used in packages' Makefile but
-# it isn't recommended.
+# _RUBY_VER_MAJOR, _RUBY_VER_MINOR, _RUBY_VER_TEENY and _RUBY_PATCHLEVEL
+# is defined from version of Ruby. It should not be used in packages'
+# Makefile.
#
-_RUBY_VER_MAJOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
-_RUBY_VER_MINOR= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
-_RUBY_VERS_TEENY= ${RUBY_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
+_RUBY_VER= ${RUBY_VERSION:C/(-.*)//}
+_RUBY_VER_MAJOR= ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\1/}
+_RUBY_VER_MINOR= ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\2/}
+_RUBY_VER_TEENY= ${_RUBY_VER:C/([0-9]+)\.([0-9]+)\.([0-9]+)/\3/}
+_RUBY_PATCHLEVEL= ${RUBY_VERSION:C/(.*-)//}
# RUBY_VER defines Ruby base release.
#
@@ -128,13 +131,13 @@
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "Interix"
RUBY_SHLIBMAJOR= ${RUBY_VER}
-RUBY_SHLIBVER= ${RUBY_VER}.${_RUBY_VERS_TEENY}
+RUBY_SHLIBVER= ${RUBY_VER}.${_RUBY_VER_TEENY}
.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
RUBY_SHLIBMAJOR= # unused
RUBY_SHLIBVER= ${RUBY_VER}
.elif ${OPSYS} == "OpenBSD"
RUBY_SHLIBMAJOR= # unused
-RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_VERS_TEENY}
+RUBY_SHLIBVER= ${_RUBY_VER_MAJOR}.${_RUBY_VER_MINOR}${_RUBY_VER_TEENY}
.elif ${OPSYS} == "IRIX"
RUBY_SHLIBMAJOR= # unused
.elif ${OPSYS} == "Linux"
diff -r 99463d40a38c -r 54da02cb4ffb lang/ruby18-base/Makefile
--- a/lang/ruby18-base/Makefile Sat Dec 09 09:24:16 2006 +0000
+++ b/lang/ruby18-base/Makefile Sat Dec 09 10:17:46 2006 +0000
@@ -1,32 +1,33 @@
-# $NetBSD: Makefile,v 1.26.2.2 2006/11/05 19:28:55 salo Exp $
+# $NetBSD: Makefile,v 1.26.2.3 2006/12/09 10:17:47 salo Exp $
#
DISTNAME= ${RUBY_DISTNAME}
-PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION= 3
+PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_SUFFIX}
+#PKGREVISION=
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCHFILES= ruby-1.8.5-base-${RUBY18_PATCH_DATE}.patch.bz2
+PATCH_DIST_STRIP= -p1
MAINTAINER= taca%NetBSD.org@localhost
HOMEPAGE= ${RUBY_HOMEPAGE}
COMMENT= Ruby 1.8 based release minimum package
-RUBY_VERSION= ${RUBY18_VERSION}
-RUBY_DYNAMIC_DIRS= ${RUBY_RIDIR:S,${PREFIX}/,,}
+RUBY_VERSION= ${RUBY18_VERSION}
-CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \
- ${RUBY_PKGPREFIX}-digest-[0-9]* \
- ${RUBY_PKGPREFIX}-iconv-[0-9]* \
- ${RUBY_PKGPREFIX}-openssl-[0-9]* \
- ${RUBY_PKGPREFIX}-tcltk-[0-9]*
+CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \
+ ${RUBY_PKGPREFIX}-digest-[0-9]* \
+ ${RUBY_PKGPREFIX}-iconv-[0-9]* \
+ ${RUBY_PKGPREFIX}-openssl-[0-9]* \
+ ${RUBY_PKGPREFIX}-tcltk-[0-9]*
-USE_LANGUAGES= c
-GNU_CONFIGURE= yes
-TEST_TARGET= test
-CONFIGURE_ARGS+= --enable-shared --enable-install-doc \
Home |
Main Index |
Thread Index |
Old Index