pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ruby18-base - Update to Ruby 1.8.3 with several f...
details: https://anonhg.NetBSD.org/pkgsrc/rev/adcd4e5402cf
branches: trunk
changeset: 502084:adcd4e5402cf
user: taca <taca%pkgsrc.org@localhost>
date: Wed Nov 02 08:56:39 2005 +0000
description:
- Update to Ruby 1.8.3 with several fixes after its release
(see CHANGES.pkgsrc file).
- Merge databases/ruby-dbm, devel/ruby-zlib, security/ruby-digest and
ruby-openssl, conflicting with these packages.
- Better handling for RI directories.
- Use pkgsrc's TOOLS framework.
diffstat:
lang/ruby18-base/ALTERNATIVES | 7 +
lang/ruby18-base/DEINSTALL | 11 +
lang/ruby18-base/INSTALL | 12 +
lang/ruby18-base/MESSAGE | 6 +-
lang/ruby18-base/Makefile | 100 +-
lang/ruby18-base/PLIST | 4825 ++++++++++++++++----------------
lang/ruby18-base/distinfo | 71 +-
lang/ruby18-base/files/CHANGES.pkgsrc | 263 +
lang/ruby18-base/patches/patch-aa | 23 +-
lang/ruby18-base/patches/patch-ab | 23 +-
lang/ruby18-base/patches/patch-ad | 189 +
lang/ruby18-base/patches/patch-ae | 15 +
lang/ruby18-base/patches/patch-al | 36 -
lang/ruby18-base/patches/patch-am | 46 -
lang/ruby18-base/patches/patch-an | 13 -
lang/ruby18-base/patches/patch-ao | 13 -
lang/ruby18-base/patches/patch-ap | 13 -
lang/ruby18-base/patches/patch-aq | 28 -
lang/ruby18-base/patches/patch-ar | 21 -
lang/ruby18-base/patches/patch-as | 24 -
lang/ruby18-base/patches/patch-at | 40 +-
lang/ruby18-base/patches/patch-au | 12 -
lang/ruby18-base/patches/patch-av | 52 -
lang/ruby18-base/patches/patch-aw | 13 -
lang/ruby18-base/patches/patch-ax | 13 -
lang/ruby18-base/patches/patch-ay | 16 +-
lang/ruby18-base/patches/patch-az | 48 +-
lang/ruby18-base/patches/patch-ba | 22 +
lang/ruby18-base/patches/patch-bb | 41 +
lang/ruby18-base/patches/patch-bc | 12 +
lang/ruby18-base/patches/patch-bd | 28 +
lang/ruby18-base/patches/patch-be | 14 +
lang/ruby18-base/patches/patch-bf | 19 +
lang/ruby18-base/patches/patch-bg | 22 +
lang/ruby18-base/patches/patch-bh | 12 +
lang/ruby18-base/patches/patch-bi | 317 ++
lang/ruby18-base/patches/patch-bj | 48 +
lang/ruby18-base/patches/patch-bk | 29 +
lang/ruby18-base/patches/patch-bl | 13 +
lang/ruby18-base/patches/patch-bm | 70 +
lang/ruby18-base/patches/patch-bn | 13 +
lang/ruby18-base/patches/patch-bo | 19 +
lang/ruby18-base/patches/patch-bp | 14 +
lang/ruby18-base/patches/patch-bq | 12 +
lang/ruby18-base/patches/patch-br | 13 +
lang/ruby18-base/patches/patch-bs | 34 +
lang/ruby18-base/patches/patch-bt | 15 +
lang/ruby18-base/patches/patch-bu | 17 +
lang/ruby18-base/patches/patch-bv | 22 +
lang/ruby18-base/patches/patch-bw | 22 +
lang/ruby18-base/patches/patch-bx | 31 +
lang/ruby18-base/patches/patch-by | 38 +
lang/ruby18-base/patches/patch-bz | 14 +
lang/ruby18-base/patches/patch-ca | 39 +
lang/ruby18-base/patches/patch-cb | 28 +
lang/ruby18-base/patches/patch-cc | 372 ++
lang/ruby18-base/patches/patch-cd | 12 +
lang/ruby18-base/patches/patch-ce | 19 +
lang/ruby18-base/patches/patch-cf | 42 +
lang/ruby18-base/patches/patch-cg | 76 +
lang/ruby18-base/patches/patch-ch | 13 +
lang/ruby18-base/patches/patch-ci | 81 +
lang/ruby18-base/patches/patch-cj | 12 +
63 files changed, 4785 insertions(+), 2753 deletions(-)
diffs (truncated from 8147 to 300 lines):
diff -r e60987ed4416 -r adcd4e5402cf lang/ruby18-base/ALTERNATIVES
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby18-base/ALTERNATIVES Wed Nov 02 08:56:39 2005 +0000
@@ -0,0 +1,7 @@
+bin/erb @PREFIX@/bin/erb@RUBY_VER@
+bin/h2rb @PREFIX@/bin/h2rb@RUBY_VER@
+bin/irb @PREFIX@/bin/irb@RUBY_VER@
+bin/rdoc @PREFIX@/bin/rdoc@RUBY_VER@
+bin/ri @PREFIX@/bin/ri@RUBY_VER@
+bin/ruby @PREFIX@/bin/@RUBY_NAME@
+bin/testrb @PREFIX@/bin/testrb@RUBY_VER@
diff -r e60987ed4416 -r adcd4e5402cf lang/ruby18-base/DEINSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby18-base/DEINSTALL Wed Nov 02 08:56:39 2005 +0000
@@ -0,0 +1,11 @@
+# $NetBSD: DEINSTALL,v 1.1 2005/11/02 08:56:39 taca Exp $
+
+RUBY_SITERIDIR="@RUBY_SITERIDIR@"
+rid="${RUBY_SITERIDIR}/created.rid"
+
+case ${STAGE} in
+DEINSTALL)
+ rm -f ${rid}
+ ;;
+esac
+exit
diff -r e60987ed4416 -r adcd4e5402cf lang/ruby18-base/INSTALL
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/ruby18-base/INSTALL Wed Nov 02 08:56:39 2005 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: INSTALL,v 1.1 2005/11/02 08:56:39 taca Exp $
+
+DATE="@DATE@"
+RUBY_SITERIDIR="@RUBY_SITERIDIR@"
+rid="${RUBY_SITERIDIR}/created.rid"
+
+case ${STAGE} in
+POST-INSTALL)
+ ${DATE} > ${rid}
+ ;;
+esac
+exit
diff -r e60987ed4416 -r adcd4e5402cf lang/ruby18-base/MESSAGE
--- a/lang/ruby18-base/MESSAGE Wed Nov 02 08:56:17 2005 +0000
+++ b/lang/ruby18-base/MESSAGE Wed Nov 02 08:56:39 2005 +0000
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2005/03/06 16:36:56 taca Exp $
+$NetBSD: MESSAGE,v 1.2 2005/11/02 08:56:39 taca Exp $
Note that this is minimum package.
@@ -7,13 +7,9 @@
some of them are provided as separate packages:
converters/ruby-iconv: Iconv module
- databases/ruby-dbm: DBM module
databases/ruby-gdbm: GDBM module
devel/ruby-curses: Curses module
devel/ruby-readline: readline module
- devel/ruby-zlib: Zlib module
- security/ruby-digest: message digest module
- security/ruby-openssl: OpenSSL module
x11/ruby-tcltklib: Tcl/Tk libraries
x11/ruby-tk: Tk modules
diff -r e60987ed4416 -r adcd4e5402cf lang/ruby18-base/Makefile
--- a/lang/ruby18-base/Makefile Wed Nov 02 08:56:17 2005 +0000
+++ b/lang/ruby18-base/Makefile Wed Nov 02 08:56:39 2005 +0000
@@ -1,38 +1,52 @@
-# $NetBSD: Makefile,v 1.9 2005/09/23 12:01:44 taca Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/02 08:56:39 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_RUBY}
-PATCHFILES= 1.8.2-patch1.gz
-
MAINTAINER= taca%NetBSD.org@localhost
HOMEPAGE= ${RUBY_HOMEPAGE}
COMMENT= Ruby 1.8 based release minimum package
RUBY_VERSION= ${RUBY18_VERSION}
+
+CONFLICTS= ${RUBY_PKGPREFIX}-dbm-[0-9]* \
+ ${RUBY_PKGPREFIX}-digest-[0-9]* \
+ ${RUBY_PKGPREFIX}-openssl-[0-9]*
+
+USE_PKGINSTALL= yes
+USE_LANGUAGES= c
+USE_TOOLS+= yacc
GNU_CONFIGURE= yes
TEST_TARGET= test
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+= --enable-shared \
+ --with-ssl-include="${BUILDLINK_PREFIX.openssl}/include" \
+ --with-ssl-lib="${BUILDLINK_PREFIX.openssl}/lib"
CONFIGURE_ENV+= PREFIX="${PREFIX}"
INSTALL_TARGET= install install-doc
WRKSRC= ${RUBY_WRKSRC}
+DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL
+
# Ruby build process depends on config.status's content
CONFIG_STATUS_OVERRIDE= # empty
+MAKE_DIRS+= ${RUBY_SITERIDIR}
+
.include "../../lang/ruby/rubyversion.mk"
.if !empty(RUBY_SUFFIX)
CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
.endif
-.include "../../mk/bsd.prefs.mk"
+FILES_SUBST+= DATE=${DATE}
+#
+# IRIX work around should be fixed.
+#
.if ${OPSYS} == "IRIX"
PLIST_SUBST+= HAS_IO="@comment "
.else
@@ -46,68 +60,46 @@
doc/shell.rd doc/shell.rd.ja doc/irb/irb-tools.rd.ja \
doc/irb/irb.rd doc/irb/irb.rd.ja
EXT_DOCS= bigdecimal/bigdecimal_en.html bigdecimal/bigdecimal_ja.html \
+ digest/digest.txt digest/digest.txt.ja \
dl/doc/dl.txt enumerator/enumerator.txt \
- etc/etc.txt etc/etc.txt.ja syslog/syslog.txt
+ etc/etc.txt etc/etc.txt.ja syslog/syslog.txt \
+ zlib/doc/zlib.rd
BIGDECIMAL_EXAMPLES= linear.rb nlsolve.rb pi.rb
DL_EXAMPLES= c++sample.C c++sample.rb drives.rb getch.rb libc.rb \
msgbox.rb msgbox2.rb stream.rb
+OPENSSL_EXAMPLES= c_rehash.rb cert2text.rb cert_store_view.rb \
+ certstore.rb cipher.rb crlstore.rb echo_cli.rb \
+ echo_svr.rb gen_csr.rb smime_read.rb smime_write.rb \
+ wget.rb
PTY_EXAMPLES= expect_sample.rb script.rb shl.rb
-REPLACE_RUBY= bin/erb bin/irb bin/rdoc bin/ri bin/testrb \
- ext/bigdecimal/sample/linear.rb \
- ext/bigdecimal/sample/nlsolve.rb \
- ext/bigdecimal/sample/pi.rb \
- lib/rdoc/markup/sample/rdoc2latex.rb \
- sample/biorhythm.rb sample/cal.rb sample/exyacc.rb \
- sample/fullpath.rb sample/less.rb sample/from.rb \
- sample/goodfriday.rb sample/logger/shifting.rb \
- sample/logger/app.rb sample/logger/log.rb sample/mine.rb \
- sample/mpart.rb sample/observ.rb sample/optparse/opttest.rb \
- sample/openssl/c_rehash.rb sample/openssl/cert2text.rb \
- sample/openssl/cert_store_view.rb \
- sample/openssl/certstore.rb sample/openssl/cipher.rb \
- sample/openssl/crlstore.rb sample/openssl/echo_cli.rb \
- sample/openssl/echo_svr.rb sample/openssl/gen_csr.rb \
- sample/openssl/smime_read.rb sample/openssl/smime_write.rb \
- sample/openssl/wget.rb \
- sample/soap/calc/httpd.rb sample/soap/calc/server.rb \
- sample/soap/calc/server2.rb sample/soap/icd/icd.rb \
- sample/soap/babelfish.rb sample/soap/exchange/client.rb \
- sample/soap/exchange/httpd.rb sample/soap/exchange/server.rb \
- sample/soap/raa/soap4r.rb sample/soap/sampleStruct/httpd.rb \
- sample/soap/sampleStruct/server.rb sample/pi.rb \
- sample/wsdl/amazon/sampleClient.rb \
- sample/wsdl/googleSearch/sampleClient.rb \
- sample/wsdl/googleSearch/httpd.rb sample/wsdl/raa/soap4r.rb \
- sample/test.rb sample/trojan.rb sample/time.rb \
- sample/uumerge.rb
+REPLACE_RUBY_DIRS= ${WRKSRC}/bin ${WRKSRC}/ext ${WRKSRC}/lib \
+ ${WRKSRC}/sample
pre-configure:
${RM} -f ${WRKSRC}/ext/curses/extconf.rb
- ${RM} -f ${WRKSRC}/ext/dbm/extconf.rb
- ${RM} -f ${WRKSRC}/ext/digest/extconf.rb
- ${RM} -f ${WRKSRC}/ext/digest/md5/extconf.rb
- ${RM} -f ${WRKSRC}/ext/digest/rmd160/extconf.rb
- ${RM} -f ${WRKSRC}/ext/digest/sha1/extconf.rb
- ${RM} -f ${WRKSRC}/ext/digest/sha2/extconf.rb
${RM} -f ${WRKSRC}/ext/gdbm/extconf.rb
${RM} -f ${WRKSRC}/ext/iconv/extconf.rb
- ${RM} -f ${WRKSRC}/ext/openssl/extconf.rb
${RM} -f ${WRKSRC}/ext/readline/extconf.rb
${RM} -f ${WRKSRC}/ext/tcltklib/extconf.rb
${RM} -f ${WRKSRC}/ext/tk/extconf.rb
- ${RM} -f ${WRKSRC}/ext/zlib/extconf.rb
- ${RM} -f ${WRKSRC}/sample/dbmtest.rb
- ${RM} -fr ${WRKSRC}/sample/openssl
pre-build:
@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
+#
+# XXX: Ruby 1.8.3 create extra directories.
+#
+post-build:
+ @cd ${WRKSRC}/.ext; \
+ ${FIND} . -type d -print \
+ -exec ${RMDIR} {} \; > /dev/null 2>&1; ${TRUE}
post-install:
${STRIP} ${RUBY}
${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/irb
${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/pty
+ ${INSTALL_DATA} ${FILESDIR}/CHANGES.pkgsrc ${RUBY_DOCDIR}
.for f in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^doc\///}
.endfor
@@ -128,9 +120,25 @@
${INSTALL_DATA} ${RUBY_WRKSRC}/ext/dl/sample/${f} \
${RUBY_EXAMPLESDIR}/dl
.endfor
+ ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/openssl
+.for f in ${OPENSSL_EXAMPLES}
+ ${INSTALL_DATA} ${RUBY_WRKSRC}/sample/openssl/${f} \
+ ${RUBY_EXAMPLESDIR}/openssl
+.endfor
.for f in ${PTY_EXAMPLES}
${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${RUBY_EXAMPLESDIR}/pty
.endfor
+#
+# XXX: Ruby extconf shuld select native ndbm(3) or Berkley DB's
+# ndbm(3) compatible support.
+#
+.if ${OPSYS} != "IRIX" && ${OPSYS} != "SunOS"
+BDB_ACCEPTED?= db1
+.include "../../mk/bdb.buildlink3.mk"
+.endif
+
.include "../../lang/ruby/Makefile.common"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r e60987ed4416 -r adcd4e5402cf lang/ruby18-base/PLIST
--- a/lang/ruby18-base/PLIST Wed Nov 02 08:56:17 2005 +0000
+++ b/lang/ruby18-base/PLIST Wed Nov 02 08:56:39 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2005/05/31 02:19:48 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/11/02 08:56:39 taca Exp $
bin/erb${RUBY_VER}
bin/h2rb${RUBY_VER}
bin/irb${RUBY_VER}
@@ -19,7 +19,6 @@
${RUBY_LIBDIR}/bigdecimal/ludcmp.rb
${RUBY_LIBDIR}/bigdecimal/math.rb
${RUBY_LIBDIR}/bigdecimal/newton.rb
-${RUBY_LIBDIR}/bigdecimal/nlsolve.rb
${RUBY_LIBDIR}/bigdecimal/util.rb
@dirrm ${RUBY_LIBDIR}/bigdecimal
${RUBY_LIBDIR}/cgi/session/pstore.rb
@@ -70,6 +69,13 @@
${RUBY_ARCHLIBDIR}/bigdecimal.${RUBY_DLEXT}
${RUBY_ARCHLIBDIR}/config.h
${RUBY_ARCHLIBDIR}/defines.h
+${RUBY_ARCHLIBDIR}/dbm.${RUBY_DLEXT}
+${RUBY_ARCHLIBDIR}/digest.${RUBY_DLEXT}
+${RUBY_ARCHLIBDIR}/digest/md5.${RUBY_DLEXT}
+${RUBY_ARCHLIBDIR}/digest/rmd160.${RUBY_DLEXT}
+${RUBY_ARCHLIBDIR}/digest/sha1.${RUBY_DLEXT}
+${RUBY_ARCHLIBDIR}/digest/sha2.${RUBY_DLEXT}
+@dirrm ${RUBY_ARCHLIBDIR}/digest
${RUBY_ARCHLIBDIR}/dl.${RUBY_DLEXT}
${RUBY_ARCHLIBDIR}/dl.h
${RUBY_ARCHLIBDIR}/dlconfig.h
@@ -84,6 +90,7 @@
${RUBY_ARCHLIBDIR}/missing.h
${RUBY_ARCHLIBDIR}/nkf.${RUBY_DLEXT}
${RUBY_ARCHLIBDIR}/node.h
+${RUBY_ARCHLIBDIR}/openssl.${RUBY_DLEXT}
${RUBY_ARCHLIBDIR}/pty.${RUBY_DLEXT}
${RUBY_ARCHLIBDIR}/racc/cparse.${RUBY_DLEXT}
@dirrm ${RUBY_ARCHLIBDIR}/racc
@@ -102,6 +109,7 @@
${RUBY_ARCHLIBDIR}/syslog.${RUBY_DLEXT}
${RUBY_ARCHLIBDIR}/util.h
${RUBY_ARCHLIBDIR}/version.h
+${RUBY_ARCHLIBDIR}/zlib.${RUBY_DLEXT}
@dirrm ${RUBY_ARCHLIBDIR}
@exec ${MKDIR} %D/${RUBY_SITEARCHLIBDIR}
@dirrm ${RUBY_SITEARCHLIBDIR}
@@ -113,6 +121,7 @@
${RUBY_LIBDIR}/ipaddr.rb
${RUBY_LIBDIR}/irb/cmd/chws.rb
${RUBY_LIBDIR}/irb/cmd/fork.rb
+${RUBY_LIBDIR}/irb/cmd/help.rb
${RUBY_LIBDIR}/irb/cmd/load.rb
${RUBY_LIBDIR}/irb/cmd/nop.rb
${RUBY_LIBDIR}/irb/cmd/pushws.rb
@@ -125,6 +134,7 @@
${RUBY_LIBDIR}/irb/ext/loader.rb
${RUBY_LIBDIR}/irb/ext/math-mode.rb
${RUBY_LIBDIR}/irb/ext/multi-irb.rb
Home |
Main Index |
Thread Index |
Old Index