Merge databases/ruby-dbm and security/ruby-digest to ruby16.

Bump PKGREVISION.

3 files changed, 33 insertions, 43 deletions

diff --git a/lang/ruby16/MESSAGE b/lang/ruby16/MESSAGE
index 9b05518acbd..a7a3acf0007 100644
--- a/lang/ruby16/MESSAGE
+++ b/lang/ruby16/MESSAGE
@@ -1,13 +1,11 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/12/01 00:24:04 cube Exp $
+$NetBSD: MESSAGE,v 1.3 2005/02/21 15:27:35 taca Exp $
 
 Note that a number of packages which are installed as default with
 the Ruby 1.6.8 distribution are provided as separate packages:
 
-	databases/ruby-dbm:		DBM module
 	databases/ruby-gdbm:		GDBM module
 	devel/ruby16-curses:		Curses module
-	security/ruby-digest:		message digest module
 	devel/ruby-readline:		readline module
 	x11/ruby16-tcltklib:		Tcl/Tk libraries
 	x11/ruby16-tk:			Tk modules
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index bd6dbf2a33f..a9251f3129f 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2005/01/21 16:36:41 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/02/21 15:27:35 taca Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
 PKGNAME=	${RUBY_PKGPREFIX}-${RUBY_VERSION}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.ruby-lang.org/en/
 COMMENT=	Ruby programming language 1.6 based release
 
 CONFLICTS+=		ruby-base-[1-9]*
+CONFLICTS+=		ruby${RUBY_VER}-dbm-* ruby${RUBY_VER}-digest-*
 
 RUBY_VERSION=		${RUBY16_VERSION}
 USE_BUILDLINK3=		yes
@@ -33,33 +34,15 @@ CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
 CONFIGURE_ARGS+= --enable-ipv6
 .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=		ChangeLog README README.EXT README.EXT.ja README.ja ToDo \
 		doc/NEWS doc/forwardable.rd doc/forwardable.rd.ja \
 		doc/shell.rd doc/shell.rd.ja doc/irb/irb-tools.rd.ja \
 		doc/irb/irb.rd doc/irb/irb.rd.ja doc/net/http.rd.ja \
 		doc/net/pop.rd.ja doc/net/smtp.rd.ja doc/shell.rd \
 		doc/shell.rd.ja
-EXT_DOCS=	ext/etc/etc.txt ext/etc/etc.txt.ja ext/pty/README \
-		ext/pty/README.expect ext/pty/README.expect.ja \
-		ext/pty/README.ja ext/syslog/syslog.txt
+EXT_DOCS=	digest/digest.txt digest/digest.txt.ja \
+		etc/etc.txt etc/etc.txt.ja syslog/syslog.txt
+PTY_ROCS=	README README.expect README.expect.ja README.ja
 
 REPLACE_RUBY=	bin/irb \
 		lib/matrix.rb sample/biorhythm.rb sample/cal.rb \
@@ -71,30 +54,27 @@ REPLACE_RUBY=	bin/irb \
 
 pre-configure:
 	${RM} -f ${WRKSRC}/ext/curses/MANIFEST
-	${RM} -f ${WRKSRC}/ext/dbm/MANIFEST
 	${RM} -f ${WRKSRC}/ext/gdbm/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/md5/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/rmd160/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/sha1/MANIFEST
-	${RM} -f ${WRKSRC}/ext/digest/sha2/MANIFEST
 	${RM} -f ${WRKSRC}/ext/readline/MANIFEST
 	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
 	${RM} -f ${WRKSRC}/ext/tk/MANIFEST
-	${RM} -f ${WRKSRC}/sample/dbmtest.rb
 
 pre-build:
 	@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
 
 post-install:
 	${STRIP} ${RUBY}
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/etc
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/irb
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/net
 	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/pty
-	${INSTALL_DATA_DIR} ${RUBY_DOCDIR}/syslog
-.for f in ${DOCS} ${EXT_DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^(doc|ext)\///}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${f:C/^doc\///}
+.endfor
+.for f in ${EXT_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/ext/${f} ${RUBY_DOCDIR}
+.endfor
+.for f in ${PTY_ROCS}
+	${INSTALL_DATA} ${WRKSRC}/ext/pty/${f} ${RUBY_DOCDIR}/pty/${f}
 .endfor
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/irb ${PREFIX}/bin/irb16
@@ -104,5 +84,7 @@ post-install:
 		${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb \
 		${RUBY_EXAMPLESDIR}/pty
 
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../lang/ruby/Makefile.common"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ruby16/PLIST b/lang/ruby16/PLIST
index 896fd6ee9a3..7b8b3d38c33 100644
--- a/lang/ruby16/PLIST
+++ b/lang/ruby16/PLIST
@@ -1,10 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/04 17:20:46 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/02/21 15:27:35 taca Exp $
 bin/irb${RUBY_VER}
 bin/${RUBY_NAME}
 lib/libruby${RUBY_VER}.so
 ${RUBY_NOSHLIBMAJOR}lib/libruby${RUBY_VER}.so.${RUBY_SHLIBMAJOR}
 lib/libruby${RUBY_VER}.so.${RUBY_SHLIBVER}
 ${RUBY_ARCHLIBDIR}/config.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}/defines.h
 ${RUBY_ARCHLIBDIR}/dln.h
 ${RUBY_ARCHLIBDIR}/env.h
@@ -82,6 +89,7 @@ ${RUBY_LIBDIR}/kconv.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
@@ -105,6 +113,7 @@ ${RUBY_LIBDIR}/rational.rb
 ${RUBY_LIBDIR}/readbytes.rb
 ${RUBY_LIBDIR}/resolv-replace.rb
 ${RUBY_LIBDIR}/resolv.rb
+${RUBY_LIBDIR}/sha1.rb
 ${RUBY_LIBDIR}/shell.rb
 ${RUBY_LIBDIR}/shell/builtin-command.rb
 ${RUBY_LIBDIR}/shell/command-processor.rb
@@ -148,9 +157,10 @@ ${RUBY_DOCDIR}/README.EXT
 ${RUBY_DOCDIR}/README.EXT.ja
 ${RUBY_DOCDIR}/README.ja
 ${RUBY_DOCDIR}/ToDo
-${RUBY_DOCDIR}/etc/etc.txt
-${RUBY_DOCDIR}/etc/etc.txt.ja
-@dirrm ${RUBY_DOCDIR}/etc
+${RUBY_DOCDIR}/digest.txt
+${RUBY_DOCDIR}/digest.txt.ja
+${RUBY_DOCDIR}/etc.txt
+${RUBY_DOCDIR}/etc.txt.ja
 ${RUBY_DOCDIR}/forwardable.rd
 ${RUBY_DOCDIR}/forwardable.rd.ja
 ${RUBY_DOCDIR}/irb/irb-tools.rd.ja
@@ -168,14 +178,14 @@ ${RUBY_DOCDIR}/pty/README.ja
 @dirrm ${RUBY_DOCDIR}/pty
 ${RUBY_DOCDIR}/shell.rd
 ${RUBY_DOCDIR}/shell.rd.ja
-${RUBY_DOCDIR}/syslog/syslog.txt
-@dirrm ${RUBY_DOCDIR}/syslog
+${RUBY_DOCDIR}/syslog.txt
 @dirrm ${RUBY_DOCDIR}
 ${RUBY_EXAMPLESDIR}/README
 ${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}/dualstack-fetch.rb
 ${RUBY_EXAMPLESDIR}/dualstack-httpd.rb