Date: Sun, 22 Aug 1999 07:09:25 +0900 From: yasuf@big.or.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/13305: Update: x11-toolkits/rubytk Message-ID: <19990822070925B.yasuf@big.or.jp>
next in thread | raw e-mail | index | archive | help
>Number: 13305
>Category: ports
>Synopsis: Update: x11-toolkits/rubytk
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Aug 21 15:10:02 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Yasuhiro Fukuma
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:
>Description:
This patch contains:
- Updates for ruby-1.4.0.
Removed file: patches/patch-aa
>How-To-Repeat:
>Fix:
Index: rubytk/Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/rubytk/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 1999/04/27 12:39:46 1.1.1.1
+++ Makefile 1999/08/13 18:31:59
@@ -1,5 +1,5 @@
# New ports collection makefile for: rubytk
-# Version required: 1.2.5
+# Version required: 1.4.0
# Date created: 15 March 1999
# Whom: Yasuhiro Fukuma <yasuf@big.or.jp>
#
@@ -25,14 +25,19 @@
USE_XLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/ext
-CONFIGURE_ENV+= TCL_LIB="${TCL_LIB}" TK_LIB="${TK_LIB}" \
- PREFIX="${PREFIX}" X11BASE="${X11BASE}"
-PLIST_SUB+= RUBY_ARCH="${RUBY_ARCH}"
+CONFIGURE_ARGS+= --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \
+ --with-tcl-lib="${PREFIX}/lib/${TCL_DIR}" \
+ --with-tk-lib="${PREFIX}/lib/${TK_DIR}" \
+ --with-tcl-include="${PREFIX}/include/${TCL_DIR}" \
+ --with-tk-include="${PREFIX}/include/${TK_DIR}" \
+ --with-X11-dir="${X11BASE}"
+PLIST_SUB+= RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
-RUBY_ARCH= ${ARCH}-freebsd${OSREL}
+VERSION= 1.4.0
+BRANCH_NAME= .
-VERSION= 1.2.5
-BRANCH_NAME= 1.2
+RUBY_VER= 1.4
+RUBY_ARCH= ${ARCH}-freebsd${OSREL}
# Set these vars as the version numbers (without decimal points) of Tcl/Tk
# you want to use with Ruby/Tk.
@@ -51,6 +56,8 @@
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/'`
RUBY= ${PREFIX}/bin/ruby
EXTS= tcltklib tk
@@ -58,7 +65,7 @@
do-configure:
.for dir in ${EXTS}
@${ECHO_MSG} "Configuring in ${dir}..."
- @cd ${WRKSRC}/${dir}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb
+ @cd ${WRKSRC}/${dir}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${CONFIGURE_ARGS}
.endfor
do-build:
@@ -71,6 +78,8 @@
.for dir in ${EXTS}
@${ECHO_MSG} "Installing in ${dir}..."
@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
+ ${MKDIR} ${PREFIX}/share/examples/ruby/${dir}
+ ${INSTALL_DATA} ${WRKSRC}/${dir}/sample/* ${PREFIX}/share/examples/ruby/${dir}
.endfor
.include <bsd.port.mk>
Index: rubytk/files/md5
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/rubytk/files/md5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 md5
--- md5 1999/04/27 12:39:46 1.1.1.1
+++ md5 1999/08/13 17:47:47
@@ -1 +1 @@
-MD5 (ruby-1.2.5.tar.gz) = 3ec298b7697843733ea0230f23b626b6
+MD5 (ruby-1.4.0.tar.gz) = e093dcd834caeedd84459d62e09e72ea
Index: rubytk/patches/patch-aa
===================================================================
RCS file: patch-aa
diff -N patch-aa
--- /tmp/cvsC65964 Sun Aug 15 04:28:43 1999
+++ /dev/null Sun Aug 15 03:14:57 1999
@@ -1,55 +0,0 @@
---- tcltklib/extconf.rb.orig Thu Jan 7 13:29:56 1999
-+++ tcltklib/extconf.rb Mon Mar 15 13:31:56 1999
-@@ -2,6 +2,11 @@
-
- require 'mkmf'
-
-+prefix = ENV['PREFIX']
-+x11base = ENV['X11BASE']
-+tcllib = ENV['TCL_LIB']
-+tklib = ENV['TK_LIB']
-+
- have_library("nsl", "t_open")
- have_library("socket", "socket")
- have_library("dl", "dlopen")
-@@ -31,20 +36,11 @@
- end
-
- search_header("tcl.h",
-- "/usr/include/tcl{,8*,7*}",
-- "/usr/include",
-- "/usr/local/include/tcl{,8*,7*}",
-- "/usr/local/include")
-+ "#{prefix}/include/#{tcllib.sub(/(\\d)(\\d)/, '\\1.\\2')}")
- search_header("tk.h",
-- "/usr/include/tk{,8*,4*}",
-- "/usr/include",
-- "/usr/local/include/tk{,8*,4*}",
-- "/usr/local/include")
-+ "#{prefix}/include/#{tklib.sub(/(\\d)(\\d)/, '\\1.\\2')}")
- search_header("X11/Xlib.h",
-- "/usr/include/X11*",
-- "/usr/include",
-- "/usr/openwin/include",
-- "/usr/X11*/include")
-+ "#{x11base}/include")
-
- $CFLAGS = $includes.collect{|path| "-I" + path}.join(" ")
-
-@@ -75,11 +71,11 @@
-
- if have_header("tcl.h") && have_header("tk.h") &&
- search_lib("libX11.{a,so}", "XOpenDisplay",
-- "/usr/lib", "/usr/openwin/lib", "/usr/X11*/lib") &&
-- search_lib("libtcl{,8*,7*}.{a,so}", "Tcl_FindExecutable",
-- "/usr/lib", "/usr/local/lib") &&
-- search_lib("libtk{,8*,4*}.{a,so}", "Tk_Init",
-- "/usr/lib", "/usr/local/lib")
-+ "#{x11base}/lib") &&
-+ search_lib("lib#{tcllib}.{a,so}", "Tcl_FindExecutable",
-+ "#{prefix}/lib") &&
-+ search_lib("lib#{tklib}.{a,so}", "Tk_Init",
-+ "#{prefix}/lib")
- $LDFLAGS = $libraries.collect{|path| "-L" + path}.join(" ")
- create_makefile("tcltklib")
- end
Index: rubytk/pkg/PLIST
===================================================================
RCS file: /home/ncvs/ports/x11-toolkits/rubytk/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- PLIST 1999/04/27 12:39:46 1.1.1.1
+++ PLIST 1999/08/02 14:54:05
@@ -1,17 +1,31 @@
-lib/ruby/%%RUBY_ARCH%%/tcltklib.so
-lib/ruby/%%RUBY_ARCH%%/tkutil.so
-lib/ruby/tcltk.rb
-lib/ruby/tk.rb
-lib/ruby/tkafter.rb
-lib/ruby/tkbgerror.rb
-lib/ruby/tkcanvas.rb
-lib/ruby/tkclass.rb
-lib/ruby/tkdialog.rb
-lib/ruby/tkentry.rb
-lib/ruby/tkfont.rb
-lib/ruby/tkmenubar.rb
-lib/ruby/tkmngfocus.rb
-lib/ruby/tkpalette.rb
-lib/ruby/tkscrollbox.rb
-lib/ruby/tktext.rb
-lib/ruby/tkvirtevent.rb
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tcltklib.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/tkutil.so
+lib/ruby/%%RUBY_VER%%/tcltk.rb
+lib/ruby/%%RUBY_VER%%/tk.rb
+lib/ruby/%%RUBY_VER%%/tkafter.rb
+lib/ruby/%%RUBY_VER%%/tkbgerror.rb
+lib/ruby/%%RUBY_VER%%/tkcanvas.rb
+lib/ruby/%%RUBY_VER%%/tkclass.rb
+lib/ruby/%%RUBY_VER%%/tkdialog.rb
+lib/ruby/%%RUBY_VER%%/tkentry.rb
+lib/ruby/%%RUBY_VER%%/tkfont.rb
+lib/ruby/%%RUBY_VER%%/tkmenubar.rb
+lib/ruby/%%RUBY_VER%%/tkmngfocus.rb
+lib/ruby/%%RUBY_VER%%/tkpalette.rb
+lib/ruby/%%RUBY_VER%%/tkscrollbox.rb
+lib/ruby/%%RUBY_VER%%/tktext.rb
+lib/ruby/%%RUBY_VER%%/tkvirtevent.rb
+share/examples/ruby/tcltklib/batsu.gif
+share/examples/ruby/tcltklib/maru.gif
+share/examples/ruby/tcltklib/sample0.rb
+share/examples/ruby/tcltklib/sample1.rb
+share/examples/ruby/tcltklib/sample2.rb
+@dirrm share/examples/ruby/tcltklib
+share/examples/ruby/tk/tkbiff.rb
+share/examples/ruby/tk/tkbrowse.rb
+share/examples/ruby/tk/tkdialog.rb
+share/examples/ruby/tk/tkfrom.rb
+share/examples/ruby/tk/tkhello.rb
+share/examples/ruby/tk/tkline.rb
+share/examples/ruby/tk/tktimer.rb
+@dirrm share/examples/ruby/tk
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990822070925B.yasuf>