Merge databases/ruby-dbm, devel/ruby-zlib, security/ruby-digest and

security/ruby-openssl.

This fix PR pkg/29227 by Curt Sampson.

And install h2rb command for DL extention module.

Bump PKGREVISION.

3 files changed, 63 insertions, 39 deletions

diff --git a/lang/ruby18/MESSAGE b/lang/ruby18/MESSAGE
index d63c57fcc25..4240d6a67de 100644
--- a/lang/ruby18/MESSAGE
+++ b/lang/ruby18/MESSAGE
@@ -1,17 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/11/30 17:16:11 taca Exp $
+$NetBSD: MESSAGE,v 1.3 2005/02/21 15:29:15 taca Exp $
 
 Note that a number of packages which are installed as default with
 the Ruby 1.8 distribution 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
-	security/ruby-digest:		message digest module
-	security/ruby-openssl:		OpenSSL module
 	devel/ruby-readline:		readline module
-	devel/ruby-zlib:		Zlib module
 	x11/ruby-tcltklib:		Tcl/Tk libraries
 	x11/ruby-tk:			Tk modules
 
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index a64a873a86d..0fd83491aa0 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/01/23 17:33:19 taca Exp $
+# $NetBSD: Makefile,v 1.5 2005/02/21 15:29:15 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-${RUBY_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -10,7 +11,9 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby programming language 1.8 based release
 
-CONFLICTS+=		ruby-base-[1-9]*
+CONFLICTS+=	ruby-base-[1-9]*
+CONFLICTS+=	ruby${RUBY_VER}-dbm-* ruby${RUBY_VER}-digest-*
+CONFLICTS+=	ruby${RUBY_VER}-openssl-* ruby${RUBY_VER}-zlib-* 
 
 RUBY_VERSION=		${RUBY18_VERSION}
 USE_BUILDLINK3=		yes
@@ -30,24 +33,6 @@ CONFIG_STATUS_OVERRIDE=	# empty
 CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
 .endif
 
-.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
-
-.if ${OPSYS} == "IRIX"
-# X11BASE, *not* X11PREFIX:  X11PREFIX == PREFIX, but we need to point
-# to the ABI-specific libraries
-CONFIGURE_ENV+=	X11BASE="${X11BASE}"
-.endif
-
 DOCS=		COPYING COPYING.ja ChangeLog README \
 		README.EXT README.EXT.ja README.ja ToDo \
 		doc/ChangeLog-1.8.0 doc/NEWS \
@@ -55,8 +40,9 @@ DOCS=		COPYING COPYING.ja ChangeLog README \
 		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 \
-		dl/doc/dl.txt enumerator/enumerator.txt \
-		etc/etc.txt etc/etc.txt.ja syslog/syslog.txt
+		digest/digest.txt digest/digest.txt.ja dl/doc/dl.txt \
+		enumerator/enumerator.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 \
@@ -66,13 +52,20 @@ 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 \
+		ext/bigdecimal/sample/pi.rb ext/dl/h2rb \
 		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 \
@@ -87,21 +80,11 @@ REPLACE_RUBY=	bin/erb bin/irb bin/rdoc bin/ri bin/testrb \
 
 pre-configure:
 	${RM} -f ${WRKSRC}/ext/curses/extconf.rb
-	${RM} -f ${WRKSRC}/ext/dbm/extconf.rb
 	${RM} -f ${WRKSRC}/ext/gdbm/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/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} -rf ${WRKSRC}/sample/openssl
 
 pre-build:
 	@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
@@ -113,6 +96,7 @@ post-install:
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^doc\///}
 .endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/ext/dl/h2rb ${PREFIX}/bin/h2rb${RUBY_VER}
 .for f in ${EXT_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/ext/${f} ${RUBY_DOCDIR}
 .endfor
@@ -134,4 +118,7 @@ post-install:
 .endfor
 
 .include "../../lang/ruby/Makefile.common"
+.include "../../mk/bdb.buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby18/PLIST b/lang/ruby18/PLIST
index e3e6f2300a8..fea88d3eadb 100644
--- a/lang/ruby18/PLIST
+++ b/lang/ruby18/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2005/01/23 17:33:19 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/02/21 15:29:15 taca Exp $
 bin/erb${RUBY_VER}
+bin/h2rb${RUBY_VER}
 bin/irb${RUBY_VER}
 bin/rdoc${RUBY_VER}
 bin/ri${RUBY_VER}
@@ -17,6 +18,8 @@ ${RUBY_DOCDIR}/README.ja
 ${RUBY_DOCDIR}/ToDo
 ${RUBY_DOCDIR}/bigdecimal_en.html
 ${RUBY_DOCDIR}/bigdecimal_ja.html
+${RUBY_DOCDIR}/digest.txt
+${RUBY_DOCDIR}/digest.txt.ja
 ${RUBY_DOCDIR}/dl.txt
 ${RUBY_DOCDIR}/enumerator.txt
 ${RUBY_DOCDIR}/etc.txt
@@ -34,6 +37,7 @@ ${RUBY_DOCDIR}/pty/README.ja
 ${RUBY_DOCDIR}/shell.rd
 ${RUBY_DOCDIR}/shell.rd.ja
 ${RUBY_DOCDIR}/syslog.txt
+${RUBY_DOCDIR}/zlib.rd
 @dirrm ${RUBY_DOCDIR}
 ${RUBY_EXAMPLESDIR}/README
 ${RUBY_EXAMPLESDIR}/bigdecimal/linear.rb
@@ -44,6 +48,7 @@ ${RUBY_EXAMPLESDIR}/biorhythm.rb
 ${RUBY_EXAMPLESDIR}/cal.rb
 ${RUBY_EXAMPLESDIR}/cbreak.rb
 ${RUBY_EXAMPLESDIR}/clnt.rb
+${RUBY_EXAMPLESDIR}/dbmtest.rb
 ${RUBY_EXAMPLESDIR}/dir.rb
 ${RUBY_EXAMPLESDIR}/dl/c++sample.C
 ${RUBY_EXAMPLESDIR}/dl/c++sample.rb
@@ -134,6 +139,19 @@ ${RUBY_EXAMPLESDIR}/occur2.rb
 ${RUBY_EXAMPLESDIR}/optparse/opttest.rb
 ${RUBY_EXAMPLESDIR}/optparse/subcommand.rb
 @dirrm ${RUBY_EXAMPLESDIR}/optparse
+${RUBY_EXAMPLESDIR}/openssl/c_rehash.rb
+${RUBY_EXAMPLESDIR}/openssl/cert2text.rb
+${RUBY_EXAMPLESDIR}/openssl/cert_store_view.rb
+${RUBY_EXAMPLESDIR}/openssl/certstore.rb
+${RUBY_EXAMPLESDIR}/openssl/cipher.rb
+${RUBY_EXAMPLESDIR}/openssl/crlstore.rb
+${RUBY_EXAMPLESDIR}/openssl/echo_cli.rb
+${RUBY_EXAMPLESDIR}/openssl/echo_svr.rb
+${RUBY_EXAMPLESDIR}/openssl/gen_csr.rb
+${RUBY_EXAMPLESDIR}/openssl/smime_read.rb
+${RUBY_EXAMPLESDIR}/openssl/smime_write.rb
+${RUBY_EXAMPLESDIR}/openssl/wget.rb
+@dirrm ${RUBY_EXAMPLESDIR}/openssl
 ${RUBY_EXAMPLESDIR}/philos.rb
 ${RUBY_EXAMPLESDIR}/pi.rb
 ${RUBY_EXAMPLESDIR}/pty/expect_sample.rb
@@ -336,7 +354,14 @@ ${RUBY_LIBDIR}/getopts.rb
 ${RUBY_LIBDIR}/gserver.rb
 ${RUBY_ARCHLIBDIR}/bigdecimal.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/config.h
+${RUBY_ARCHLIBDIR}/dbm.${RUBY_DLEXT}
 ${RUBY_ARCHLIBDIR}/defines.h
+${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
@@ -351,6 +376,7 @@ ${RUBY_ARCHLIBDIR}/io/wait.${RUBY_DLEXT}
 ${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
@@ -369,6 +395,7 @@ ${RUBY_ARCHLIBDIR}/syck.${RUBY_DLEXT}
 ${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}
@@ -423,19 +450,32 @@ ${RUBY_LIBDIR}/logger.rb
 ${RUBY_LIBDIR}/mailread.rb
 ${RUBY_LIBDIR}/mathn.rb
 ${RUBY_LIBDIR}/matrix.rb
+${RUBY_LIBDIR}/md5.rb
 ${RUBY_LIBDIR}/mkmf.rb
 ${RUBY_LIBDIR}/monitor.rb
 ${RUBY_LIBDIR}/mutex_m.rb
 ${RUBY_LIBDIR}/net/ftp.rb
+${RUBY_LIBDIR}/net/ftptls.rb
 ${RUBY_LIBDIR}/net/http.rb
+${RUBY_LIBDIR}/net/https.rb
 ${RUBY_LIBDIR}/net/imap.rb
 ${RUBY_LIBDIR}/net/pop.rb
 ${RUBY_LIBDIR}/net/protocol.rb
+${RUBY_LIBDIR}/net/protocols.rb
 ${RUBY_LIBDIR}/net/smtp.rb
 ${RUBY_LIBDIR}/net/telnet.rb
+${RUBY_LIBDIR}/net/telnets.rb
 @dirrm ${RUBY_LIBDIR}/net
 ${RUBY_LIBDIR}/observer.rb
 ${RUBY_LIBDIR}/open-uri.rb
+${RUBY_LIBDIR}/openssl.rb
+${RUBY_LIBDIR}/openssl/bn.rb
+${RUBY_LIBDIR}/openssl/buffering.rb
+${RUBY_LIBDIR}/openssl/cipher.rb
+${RUBY_LIBDIR}/openssl/digest.rb
+${RUBY_LIBDIR}/openssl/ssl.rb
+${RUBY_LIBDIR}/openssl/x509.rb
+@dirrm ${RUBY_LIBDIR}/openssl
 ${RUBY_LIBDIR}/open3.rb
 ${RUBY_LIBDIR}/optparse/date.rb
 ${RUBY_LIBDIR}/optparse/shellwords.rb
@@ -625,6 +665,7 @@ ${RUBY_LIBDIR}/runit/topublic.rb
 @dirrm ${RUBY_LIBDIR}/runit
 ${RUBY_LIBDIR}/scanf.rb
 ${RUBY_LIBDIR}/set.rb
+${RUBY_LIBDIR}/sha1.rb
 ${RUBY_LIBDIR}/shell/builtin-command.rb
 ${RUBY_LIBDIR}/shell/command-processor.rb
 ${RUBY_LIBDIR}/shell/error.rb