[pkgsrc/pkgsrc-2004Q1]: pkgsrc Pull up revision 1.12 of the Makefile to the p...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/301d83dcb127
branches:  pkgsrc-2004Q1
changeset: 471390:301d83dcb127
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Apr 27 07:27:59 2004 +0000

description:
Pull up revision 1.12 of the Makefile to the pkgsrc-2004Q1 branch.

Requested by taca in ticket pkgsrc-6.

Necessary for correct compilation and running.

diffstat:

 security/openssl/DESCR     |  11 ++++++++++-
 x11/ruby-tcltklib/Makefile |  15 +++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r 1ffb500311ec -r 301d83dcb127 security/openssl/DESCR
--- a/security/openssl/DESCR    Sun Mar 28 18:35:45 2004 +0000
+++ b/security/openssl/DESCR    Tue Apr 27 07:27:59 2004 +0000
@@ -1,1 +1,10 @@
-This is a Ruby module for OpenSSL, handling SSL sockets and more.
+OpenSSL is a descendant of SSLeay, the SSL library by Eric A. Young
+and Tim J. Hudson, maintained by a group of volunteers.
+
+The OpenSSL Project is a collaborative effort to develop a robust,
+commercial-grade, full-featured, and Open Source toolkit implementing
+the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
+v1) protocols as well as a full-strength general purpose cryptography
+library.  The project is managed by a worldwide community of
+volunteers that use the Internet to communicate, plan, and develop the
+OpenSSL toolkit and its related documentation.
diff -r 1ffb500311ec -r 301d83dcb127 x11/ruby-tcltklib/Makefile
--- a/x11/ruby-tcltklib/Makefile        Sun Mar 28 18:35:45 2004 +0000
+++ b/x11/ruby-tcltklib/Makefile        Tue Apr 27 07:27:59 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2004/03/16 23:54:25 minskim Exp $
+# $NetBSD: Makefile,v 1.11.2.1 2004/04/27 07:27:59 agc Exp $
 # FreeBSD: ports/lang/ruby-tcltklib/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGNAMEPREFIX}tcltklib-${RUBY_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    x11 ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
@@ -11,8 +11,11 @@
 HOMEPAGE=      http://www.ruby-lang.org/en/
 COMMENT=       Ruby interface to Tcl/Tk libraries
 
-DEPENDS+=      tcl>=8.4:../../lang/tcl
-DEPENDS+=      tk>=8.4:../../x11/tk
+# Ruby can work with tcl 8.4 but can't coexist with thread library.
+# Since tcl-8.4.6nb1 enabled linking with thread library, ruby couldn't
+# use it any more.
+DEPENDS+=      tcl>=8.3:../../lang/tcl83
+DEPENDS+=      tk>=8.3:../../x11/tk83
 
 WRKSRC=                ${RUBY_WRKSRC}/ext/tcltklib
 DIST_SUBDIR=   ruby
@@ -31,8 +34,8 @@
 # Set these vars as the version numbers (without decimal points) of Tcl/Tk
 # you want to use with Ruby/Tk.
 # e.g.: make TCL_VERSION=42 TK_VERSION=76 WITH_TCL_JP=yes build
-TCL_VERSION?=  84
-TK_VERSION?=   84
+TCL_VERSION?=  83
+TK_VERSION?=   83
 #.if defined(WITH_TCLTK_JP)
 #TCL_CATEGORY= japanese
 #TK_CATEGORY=  japanese