pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang Update Ruby to 1.8.5 (+ ruby-1-8 branch on 2006-0...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d5f039cca38d
branches: trunk
changeset: 518361:d5f039cca38d
user: taca <taca%pkgsrc.org@localhost>
date: Thu Sep 07 15:40:00 2006 +0000
description:
Update Ruby to 1.8.5 (+ ruby-1-8 branch on 2006-09-07).
pkgsrc changes:
* Add RUBY_DYNAMIC_DIRS which cause generating dynamic PLIST entries.
* Move using buildlinks to rubyversion.mk.
* Merge converters/ruby-iconv to ruby18-base.
Ruby changes:
* too may, see ChangeLog file or
http://eigenclass.org/hiki.rb?ruby+1.8.5+changelog
diffstat:
lang/ruby/Makefile.common | 15 +-
lang/ruby/rubyversion.mk | 68 +-
lang/ruby18-base/MESSAGE | 3 +-
lang/ruby18-base/Makefile | 16 +-
lang/ruby18-base/PLIST | 4898 +------------------------------------
lang/ruby18-base/PLIST.common_end | 91 +
lang/ruby18-base/distinfo | 27 +-
lang/ruby18-base/patches/patch-aa | 36 +-
lang/ruby18-base/patches/patch-ab | 299 ++-
lang/ruby18-base/patches/patch-ad | 105 -
lang/ruby18-base/patches/patch-ag | 16 -
lang/ruby18-base/patches/patch-ah | 13 -
lang/ruby18-base/patches/patch-bj | 33 -
lang/ruby18-base/patches/patch-bz | 25 -
lang/ruby18-base/patches/patch-cc | 35 -
lang/ruby18-base/patches/patch-ck | 34 -
lang/ruby18-base/patches/patch-cl | 52 -
lang/ruby18-base/patches/patch-cm | 223 -
lang/ruby18-base/patches/patch-cn | 21 -
lang/ruby18-base/patches/patch-co | 52 -
lang/ruby18-base/patches/patch-cp | 14 -
lang/ruby18/DESCR | 4 +-
lang/ruby18/Makefile | 5 +-
23 files changed, 452 insertions(+), 5633 deletions(-)
diffs (truncated from 6369 to 300 lines):
diff -r 61972f88e781 -r d5f039cca38d lang/ruby/Makefile.common
--- a/lang/ruby/Makefile.common Thu Sep 07 14:18:38 2006 +0000
+++ b/lang/ruby/Makefile.common Thu Sep 07 15:40:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2006/01/03 14:29:58 taca Exp $
+# $NetBSD: Makefile.common,v 1.11 2006/09/07 15:40:00 taca Exp $
#
# Ruby base distribution common definition
@@ -39,17 +39,4 @@
RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR} \
RUBY_NAME=${RUBY_NAME:Q}
-# Common macros.
-.if ${OPSYS} == "NetBSD"
-.if empty(OS_VERSION:M1.[0-9].*)
-PTHREAD_OPTS+= native
-.include "../../mk/pthread.buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
-CONFIGURE_ARGS+= --disable-pthread
-.else
-CONFIGURE_ARGS+= --enable-pthread
-.endif
-.endif
-.endif
-
.include "replace.mk"
diff -r 61972f88e781 -r d5f039cca38d lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk Thu Sep 07 14:18:38 2006 +0000
+++ b/lang/ruby/rubyversion.mk Thu Sep 07 15:40:00 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.22 2006/09/03 02:53:13 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.23 2006/09/07 15:40:00 taca Exp $
#
.if !defined(_RUBYVERSION_MK)
@@ -7,7 +7,10 @@
.include "../../mk/bsd.prefs.mk"
# current supported Ruby's version
-RUBY18_VERSION?= 1.8.4
+RUBY18_VERSION?= 1.8.5
+
+#
+RUBY18_PATCH_DATE= 20060906
# RUBY_VERSION_DEFAULT defines default version for Ruby related
# packages and user can define in mk.conf. (1.6 or 1.8)
@@ -154,12 +157,17 @@
.endif
#
+# Dynamic PLIST directories
+#
+RUBY_DYNAMIC_DIRS?= # empty
+
+#
# source directory
#
RUBY_SRCDIR?= ${_PKGSRC_TOPDIR}/lang/${RUBY_BASE}
#
-# common PATH
+# common paths
#
RUBY_LIBDIR?= ${PREFIX}/lib/ruby/${RUBY_VER_DIR}
RUBY_ARCHLIBDIR?= ${RUBY_LIBDIR}/${RUBY_ARCH}
@@ -214,17 +222,59 @@
RUBY_DLEXT=${RUBY_DLEXT:Q} \
${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
-.if !empty(RUBY_NOVERSION:M[nN][oO])
#
-# Use Berkley DB unless a system has real ndbm(3).
+# make dynamic PLIST
#
-.include "../../mk/dlopen.buildlink3.mk"
-.if !exists(/usr/include/ndbm.h)
+.if !empty(RUBY_DYNAMIC_DIRS)
+
+RUBY_PLIST_DYNAMIC= ${WRKDIR}/PLIST.work
+
+.if !defined(PLIST_SRC)
+. if exists(${PKGDIR}/PLIST.common)
+PLIST_SRC+= ${PKGDIR}/PLIST.common
+. elif exists(${PKGDIR}/PLIST)
+PLIST_SRC+= ${PKGDIR}/PLIST
+. endif
+
+PLIST_SRC+= ${RUBY_PLIST_DYNAMIC}
+
+. if exists(${PKGDIR}/PLIST.common_end)
+PLIST_SRC+= ${PKGDIR}/PLIST.common_end
+. endif
+
+.endif
+
+RUBY_PLIST_COMMENT_CMD= \
+ ${ECHO} "@comment The following lines are automatically generated"
+RUBY_PLIST_FILES_CMD= ( cd ${PREFIX}; \
+ ${FIND} ${RUBY_DYNAMIC_DIRS} \( -type f -o -type l \) -print ) | \
+ ${SORT} -u
+RUBY_PLIST_DIRS_CMD= ( cd ${PREFIX}; \
+ ${FIND} ${RUBY_DYNAMIC_DIRS} -type d -print ) | ${SORT} -ru | \
+ ${SED} -e 's|^|@dirrm |'
+RUBY_GENERATE_PLIST = ( \
+ ${RUBY_PLIST_COMMENT_CMD}; \
+ ${RUBY_PLIST_FILES_CMD}; \
+ ${RUBY_PLIST_DIRS_CMD} ) > ${RUBY_PLIST_DYNAMIC}
+.endif
+
+.if !empty(RUBY_NOVERSION:M[nN][oO])
+# Common macros.
+.if ${OPSYS} == "NetBSD"
+.if empty(OS_VERSION:M1.[0-9].*)
+PTHREAD_OPTS+= native
+.include "../../mk/pthread.buildlink3.mk"
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
+CONFIGURE_ARGS+= --disable-pthread
+.else
+CONFIGURE_ARGS+= --enable-pthread
+.endif
+.endif
+.endif
.include "../../mk/bdb.buildlink3.mk"
-.endif
-.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
.endif
.endif # _RUBY_MK
diff -r 61972f88e781 -r d5f039cca38d lang/ruby18-base/MESSAGE
--- a/lang/ruby18-base/MESSAGE Thu Sep 07 14:18:38 2006 +0000
+++ b/lang/ruby18-base/MESSAGE Thu Sep 07 15:40:00 2006 +0000
@@ -1,12 +1,11 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/01/03 14:37:24 taca Exp $
+$NetBSD: MESSAGE,v 1.5 2006/09/07 15:40:00 taca Exp $
Note that this is a minimal package.
The original Ruby ${RUBY_VERSION} distribution includes more extension
libraries, some of which are provided as separate packages:
- converters/ruby-iconv: Iconv module
databases/ruby-gdbm: GDBM module
devel/ruby-curses: Curses module
devel/ruby-readline: readline module
diff -r 61972f88e781 -r d5f039cca38d lang/ruby18-base/Makefile
--- a/lang/ruby18-base/Makefile Thu Sep 07 14:18:38 2006 +0000
+++ b/lang/ruby18-base/Makefile Thu Sep 07 15:40:00 2006 +0000
@@ -1,32 +1,34 @@
-# $NetBSD: Makefile,v 1.24 2006/09/03 02:53:13 taca Exp $
+# $NetBSD: Makefile,v 1.25 2006/09/07 15:40:00 taca Exp $
#
DISTNAME= ${RUBY_DISTNAME}
PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
-PKGREVISION= 4
CATEGORIES= lang ruby
MASTER_SITES= ${MASTER_SITE_RUBY}
+PATCH_SITES= ${MASTER_SITE_LOCAL}
+PATCHFILES= ruby-1.8.5-base-${RUBY18_PATCH_DATE}.patch.bz2
+
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}/,,}
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
-USE_TOOLS+= yacc
GNU_CONFIGURE= yes
TEST_TARGET= test
-CONFIGURE_ARGS+= --enable-shared \
+CONFIGURE_ARGS+= --enable-shared --enable-install-doc \
--with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
--with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib"
CONFIGURE_ENV+= PREFIX=${PREFIX:Q}
-INSTALL_TARGET= install install-doc
WRKSRC= ${RUBY_WRKSRC}
# Ruby build process depends on config.status's content
@@ -85,16 +87,13 @@
pre-configure:
${RM} -f ${WRKSRC}/ext/curses/extconf.rb
${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb
- ${RM} -f ${WRKSRC}/ext/iconv/extconf.rb
${RM} -f ${WRKSRC}/ext/readline/extconf.rb
- ${RM} -f ${WRKSRC}/ext/tcltklib/extconf.rb
${RM} -f ${WRKSRC}/ext/tk/extconf.rb
pre-install:
cd ${WRKSRC}; ${FIND} . -name '*.orig' -exec ${RM} -f {} \;
post-install:
- ${STRIP} ${RUBY}
${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/irb
${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/pty
${INSTALL_DATA} ${FILESDIR}/CHANGES.pkgsrc ${RUBY_DOCDIR}
@@ -126,6 +125,7 @@
.for f in ${PTY_EXAMPLES}
${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${RUBY_EXAMPLESDIR}/pty
.endfor
+ ${RUBY_GENERATE_PLIST}
.include "../../lang/ruby/Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 61972f88e781 -r d5f039cca38d lang/ruby18-base/PLIST
--- a/lang/ruby18-base/PLIST Thu Sep 07 14:18:38 2006 +0000
+++ b/lang/ruby18-base/PLIST Thu Sep 07 15:40:00 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/07/31 11:29:01 taca Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/09/07 15:40:00 taca Exp $
bin/erb${RUBY_VER}
bin/h2rb${RUBY_VER}
bin/irb${RUBY_VER}
@@ -77,6 +77,7 @@
${RUBY_ARCHLIBDIR}/env.h
${RUBY_ARCHLIBDIR}/etc.${RUBY_DLEXT}
${RUBY_ARCHLIBDIR}/fcntl.${RUBY_DLEXT}
+${RUBY_ARCHLIBDIR}/iconv.${RUBY_DLEXT}
${RUBY_ARCHLIBDIR}/intern.h
${HAS_IO}${RUBY_ARCHLIBDIR}/io/wait.${RUBY_DLEXT}
${RUBY_ARCHLIBDIR}/missing.h
@@ -317,6 +318,7 @@
${RUBY_LIBDIR}/rss/maker/dublincore.rb
${RUBY_LIBDIR}/rss/maker/image.rb
${RUBY_LIBDIR}/rss/maker/syndication.rb
+${RUBY_LIBDIR}/rss/maker/taxonomy.rb
${RUBY_LIBDIR}/rss/maker/trackback.rb
${RUBY_LIBDIR}/rss/maker.rb
${RUBY_LIBDIR}/rss/parser.rb
@@ -723,6 +725,7 @@
${RUBY_EXAMPLESDIR}/rcs.rb
${RUBY_EXAMPLESDIR}/regx.rb
${RUBY_EXAMPLESDIR}/rss/blend.rb
+${RUBY_EXAMPLESDIR}/rss/convert.rb
${RUBY_EXAMPLESDIR}/rss/list_description.rb
${RUBY_EXAMPLESDIR}/rss/re_read.rb
${RUBY_EXAMPLESDIR}/rss/rss_recent.rb
@@ -747,4896 +750,3 @@
${RUBY_EXAMPLESDIR}/webrick/httpd.rb
${RUBY_EXAMPLESDIR}/webrick/httpproxy.rb
${RUBY_EXAMPLESDIR}/webrick/httpsd.rb
-${RUBY_SYSRIDIR}/ACL/ACLEntry/cdesc-ACLEntry.yaml
-${RUBY_SYSRIDIR}/ACL/ACLEntry/dot_pat-i.yaml
-${RUBY_SYSRIDIR}/ACL/ACLEntry/dot_pat_str-i.yaml
-${RUBY_SYSRIDIR}/ACL/ACLEntry/match-i.yaml
-${RUBY_SYSRIDIR}/ACL/ACLEntry/new-c.yaml
-${RUBY_SYSRIDIR}/ACL/ACLList/add-i.yaml
-${RUBY_SYSRIDIR}/ACL/ACLList/cdesc-ACLList.yaml
-${RUBY_SYSRIDIR}/ACL/ACLList/match-i.yaml
-${RUBY_SYSRIDIR}/ACL/ACLList/new-c.yaml
-${RUBY_SYSRIDIR}/ACL/allow_addr%3f-i.yaml
-${RUBY_SYSRIDIR}/ACL/allow_socket%3f-i.yaml
-${RUBY_SYSRIDIR}/ACL/cdesc-ACL.yaml
-${RUBY_SYSRIDIR}/ACL/install_list-i.yaml
-${RUBY_SYSRIDIR}/ACL/new-c.yaml
-${RUBY_SYSRIDIR}/Abbrev/abbrev-i.yaml
-${RUBY_SYSRIDIR}/Abbrev/cdesc-Abbrev.yaml
-${RUBY_SYSRIDIR}/ArgumentError/cdesc-ArgumentError.yaml
-${RUBY_SYSRIDIR}/Array/%26-i.yaml
-${RUBY_SYSRIDIR}/Array/%2a-i.yaml
-${RUBY_SYSRIDIR}/Array/%2b-i.yaml
-${RUBY_SYSRIDIR}/Array/%2d-i.yaml
-${RUBY_SYSRIDIR}/Array/%3c%3c-i.yaml
-${RUBY_SYSRIDIR}/Array/%3c%3d%3e-i.yaml
-${RUBY_SYSRIDIR}/Array/%3d%3d-i.yaml
-${RUBY_SYSRIDIR}/Array/%5b%5d%3d-i.yaml
-${RUBY_SYSRIDIR}/Array/%5b%5d-c.yaml
-${RUBY_SYSRIDIR}/Array/%5b%5d-i.yaml
-${RUBY_SYSRIDIR}/Array/%7c-i.yaml
-${RUBY_SYSRIDIR}/Array/abbrev-i.yaml
-${RUBY_SYSRIDIR}/Array/assoc-i.yaml
-${RUBY_SYSRIDIR}/Array/at-i.yaml
-${RUBY_SYSRIDIR}/Array/cdesc-Array.yaml
-${RUBY_SYSRIDIR}/Array/clear-i.yaml
-${RUBY_SYSRIDIR}/Array/collect%21-i.yaml
-${RUBY_SYSRIDIR}/Array/collect-i.yaml
-${RUBY_SYSRIDIR}/Array/compact%21-i.yaml
-${RUBY_SYSRIDIR}/Array/compact-i.yaml
-${RUBY_SYSRIDIR}/Array/concat-i.yaml
-${RUBY_SYSRIDIR}/Array/dclone-i.yaml
-${RUBY_SYSRIDIR}/Array/delete-i.yaml
-${RUBY_SYSRIDIR}/Array/delete_at-i.yaml
-${RUBY_SYSRIDIR}/Array/delete_if-i.yaml
-${RUBY_SYSRIDIR}/Array/each-i.yaml
-${RUBY_SYSRIDIR}/Array/each_index-i.yaml
-${RUBY_SYSRIDIR}/Array/empty%3f-i.yaml
Home |
Main Index |
Thread Index |
Old Index