[pkgsrc/trunk]: pkgsrc/x11/ruby-tcltklib Update ruby-tcltk pacakge to 1.8.1 w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/67b667ed64d8
branches:  trunk
changeset: 484437:67b667ed64d8
user:      taca <taca%pkgsrc.org@localhost>
date:      Sat Nov 27 14:50:12 2004 +0000

description:
Update ruby-tcltk pacakge to 1.8.1 with new framework for Ruby packages.

diffstat:

 x11/ruby-tcltklib/Makefile        |  61 ++++++++++++--------------------------
 x11/ruby-tcltklib/PLIST           |   7 ++-
 x11/ruby-tcltklib/tcltkversion.mk |  13 ++++++++
 3 files changed, 37 insertions(+), 44 deletions(-)

diffs (122 lines):

diff -r f277720395db -r 67b667ed64d8 x11/ruby-tcltklib/Makefile
--- a/x11/ruby-tcltklib/Makefile        Sat Nov 27 14:49:35 2004 +0000
+++ b/x11/ruby-tcltklib/Makefile        Sat Nov 27 14:50:12 2004 +0000
@@ -1,55 +1,30 @@
-# $NetBSD: Makefile,v 1.12 2004/03/29 07:55:25 taca Exp $
+# $NetBSD: Makefile,v 1.13 2004/11/27 14:50:12 taca 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=   4
+PKGNAME=       ${RUBY_PKGPREFIX}-tcltklib-${RUBY_VERSION}
 CATEGORIES=    x11 ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
 MAINTAINER=    taca%NetBSD.org@localhost
-HOMEPAGE=      http://www.ruby-lang.org/en/
+HOMEPAGE=      ${RUBY_HOMEPAGE}
 COMMENT=       Ruby interface to Tcl/Tk libraries
 
-# 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
-DISTINFO_FILE= ${RUBY_DISTINFO}
-
-EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tcltklib
-USE_RUBY_EXTCONF= yes
+RUBY_VERSION_SUPPORTED=        18
+USE_BUILDLINK3=                yes
+USE_RUBY_EXTCONF=      yes
+USE_X11=               yes
+DISTINFO_FILE=         ${RUBY_DISTINFO_FILE}
+EXTRACT_ELEMENTS=      ${RUBY_DISTNAME}/ext/tcltklib
+WRKSRC=                        ${RUBY_WRKSRC}/ext/tcltklib
 
 CONFIGURE_ARGS=        --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
-               --with-tcl-lib="${LOCALBASE}/lib/${TCL_DIR}" \
-               --with-tk-lib="${LOCALBASE}/lib/${TK_DIR}" \
-               --with-tcl-include="${LOCALBASE}/include/${TCL_DIR}" \
-               --with-tk-include="${LOCALBASE}/include/${TK_DIR}" \
+               --with-tcl-lib="${BUILDLINK_PREFIX.tcl}/lib/${TCL_DIR}" \
+               --with-tk-lib="${BUILDLINK_PREFIX.tk}/lib/${TK_DIR}" \
+               --with-tcl-include="${BUILDLINK_PREFIX.tcl}/include/${TCL_DIR}" \
+               --with-tk-include="${BUILDLINK_PREFIX.tk}/include/${TK_DIR}" \
                --with-X11-dir="${X11BASE}"
-
-# 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?=  83
-TK_VERSION?=   83
-#.if defined(WITH_TCLTK_JP)
-#TCL_CATEGORY= japanese
-#TK_CATEGORY=  japanese
-#TCL_JP=               jp
-#.else
-#TCL_CATEGORY= lang
-#TK_CATEGORY=  x11
-TCL_JP=                # empty
-#.endif
-
-TCL_LIB=       tcl${TCL_VERSION}${TCL_JP}
-TK_LIB=                tk${TK_VERSION}${TCL_JP}
-TCL_DIR=       `echo "${TCL_LIB}" | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
-TK_DIR=                `echo "${TK_LIB}"  | ${SED} 's/\([0-9]\)\([0-9]\)/\1.\2/'`
+REPLACE_RUBY=  demo/lines1.rb demo/lines2.rb demo/safeTk.rb
 
 post-install:
        ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/tcltklib
@@ -60,5 +35,9 @@
        ${INSTALL_DATA} ${WRKSRC}/MANUAL.euc ${RUBY_DOCDIR}/tcltklib/MANUAL.ja
        ${INSTALL_DATA} ${WRKSRC}/README.euc ${RUBY_DOCDIR}/tcltklib/README.ja
 
-.include "../../lang/ruby-base/Makefile.common"
+.include "tcltkversion.mk"
+.include "../../lang/ruby/modules.mk"
+.include "../../lang/ruby/Makefile.common"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f277720395db -r 67b667ed64d8 x11/ruby-tcltklib/PLIST
--- a/x11/ruby-tcltklib/PLIST   Sat Nov 27 14:49:35 2004 +0000
+++ b/x11/ruby-tcltklib/PLIST   Sat Nov 27 14:50:12 2004 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/30 16:24:58 taca Exp $
-${RUBY_ARCHLIBDIR}/tcltklib.so
-${RUBY_LIBDIR}/tcltk.rb
+@comment $NetBSD: PLIST,v 1.3 2004/11/27 14:50:12 taca Exp $
+${RUBY_SITEARCHLIBDIR}/tcltklib.so
+${RUBY_SITELIBDIR}/tcltk.rb
 ${RUBY_DOCDIR}/tcltklib/MANUAL.ja
 ${RUBY_DOCDIR}/tcltklib/README.ja
 @dirrm ${RUBY_DOCDIR}/tcltklib
@@ -12,5 +12,6 @@
 ${RUBY_EXAMPLESDIR}/tcltklib/demo/lines0.tcl
 ${RUBY_EXAMPLESDIR}/tcltklib/demo/lines1.rb
 ${RUBY_EXAMPLESDIR}/tcltklib/demo/lines2.rb
+${RUBY_EXAMPLESDIR}/tcltklib/demo/safeTk.rb
 @dirrm ${RUBY_EXAMPLESDIR}/tcltklib/demo
 @dirrm ${RUBY_EXAMPLESDIR}/tcltklib
diff -r f277720395db -r 67b667ed64d8 x11/ruby-tcltklib/tcltkversion.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/ruby-tcltklib/tcltkversion.mk Sat Nov 27 14:50:12 2004 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: tcltkversion.mk,v 1.1 2004/11/27 14:50:12 taca Exp $
+.ifndef _RUBY_TCLTKVERSION_MK
+
+_RUBY_TCLTKVERSION_MK= # defined
+
+TCL_VERSION?=  8.4
+TK_VERSION?=   8.4
+TCL_LIB=       tcl${TCL_VERSION:C/([0-9]+)\.([0-9]+)/\1\2/}
+TK_LIB=                tk${TK_VERSION:C/([0-9]+)\.([0-9]+)/\1\2/}
+TCL_DIR=       tcl${TCL_VERSION}
+TK_DIR=                tk${TK_VERSION}
+
+.endif