From aea0f8c2a4a972ba8ed6eea6eb9dfb1114dcdba4 Mon Sep 17 00:00:00 2001 From: espie Date: Thu, 18 May 2000 18:37:59 +0000 Subject: [PATCH] Version 1.4.4 Set patches according to update-patches. Redo PLIST according to newer bsd.port.mk. Remove patch that's now part of ruby proper. --- lang/ruby/Makefile | 20 +--- lang/ruby/files/PLIST.template | 10 +- lang/ruby/files/md5 | 12 +-- lang/ruby/patches/patch-dln | 11 -- lang/ruby/patches/patch-findtcltk | 1 + lang/ruby/patches/patch-mkstemp1 | 1 + lang/ruby/patches/patch-mkstemp2 | 7 +- lang/ruby/patches/patch-socket | 1 + lang/ruby/pkg/PFRAG.shared | 15 +++ lang/ruby/pkg/PLIST.sed | 164 ++++++++++++++++++++++++++++++ 10 files changed, 203 insertions(+), 39 deletions(-) delete mode 100644 lang/ruby/patches/patch-dln create mode 100644 lang/ruby/pkg/PFRAG.shared create mode 100644 lang/ruby/pkg/PLIST.sed diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 406ab6131d9..1aff001c799 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2000/03/28 13:16:02 espie Exp $ +# $OpenBSD: Makefile,v 1.2 2000/05/18 18:37:59 espie Exp $ -DISTNAME=ruby-1.4.3 +DISTNAME=ruby-1.4.4 CATEGORIES = lang MASTER_SITES=ftp://ftp.netlab.co.jp/pub/lang/ruby/ \ ftp://ftp.iij.ad.jp/pub/lang/ruby/ \ @@ -10,7 +10,7 @@ MASTER_SITES=ftp://ftp.netlab.co.jp/pub/lang/ruby/ \ MASTER_SITES0=${MASTER_SITES:C,$,doc/,} BINARCH=${DISTNAME}.tar.gz -MANARCH=ruby-man-1.4.3.tar.gz +MANARCH=ruby-man-1.4.4.tar.gz DISTFILES=${BINARCH} ${MANARCH}:0 EXTRACT_ONLY=${BINARCH} @@ -50,18 +50,8 @@ post-install: cd ${PREFIX}/share/doc && \ tar -s/ruby-man-1.4/ruby/ -zxf ${FULLDISTDIR}/${MANARCH} -PLIST=${WRKBUILD}/PLIST - -M4FLAGS=-Uinclude -Uindex -DSUB=${ARCH}-openbsd${OSREV} -DREV=1.4 -pre-package: - @cd ${.CURDIR} && make ${PLIST} - .include -.if !defined(NO_SHARED_LIBS) -M4FLAGS+= -DDYNAMIC -.endif - -${PLIST}: ${FILESDIR}/PLIST.template - m4 ${M4FLAGS} <${FILESDIR}/PLIST.template >${PLIST} +# Need to do this late, because I want to substitute the fragment as well. +SED_PLIST+=|sed -e 's/REV/1.4/' -e 's/SUB/${ARCH}-openbsd${OSREV}/' diff --git a/lang/ruby/files/PLIST.template b/lang/ruby/files/PLIST.template index d6a2da07ded..36bd6d7a6be 100644 --- a/lang/ruby/files/PLIST.template +++ b/lang/ruby/files/PLIST.template @@ -1,5 +1,6 @@ +@comment $OpenBSD: PLIST.template,v 1.2 2000/05/18 18:37:59 espie Exp $ bin/ruby -@exec mkdir -p %D/lib/ruby/REV/site_ruby/SUB +@exec mkdir -p %D/lib/ruby/site_ruby/REV/SUB lib/ruby/REV/English.rb lib/ruby/REV/Env.rb lib/ruby/REV/base64.rb @@ -23,7 +24,7 @@ lib/ruby/REV/getoptlong.rb lib/ruby/REV/getopts.rb ifdef(`DYNAMIC',dnl lib/libruby.so -lib/libruby.so.1.4.3 +lib/libruby.so.1.4.4 @exec /sbin/ldconfig -m %B lib/ruby/REV/SUB/curses.so lib/ruby/REV/SUB/dbm.so @@ -164,8 +165,9 @@ share/doc/ruby/bundle.html share/doc/ruby/kconv.html share/doc/ruby/thread.html @dirrm share/doc/ruby -@dirrm lib/ruby/REV/site_ruby/SUB -@dirrm lib/ruby/REV/site_ruby +@dirrm lib/ruby/site_ruby +@dirrm lib/ruby/site_ruby/REV/SUB +@dirrm lib/ruby/site_ruby/REV @dirrm lib/ruby/REV/net @dirrm lib/ruby/REV/irb @dirrm lib/ruby/REV/cgi diff --git a/lang/ruby/files/md5 b/lang/ruby/files/md5 index 3eedb7b5f1c..c31cbdd42b0 100644 --- a/lang/ruby/files/md5 +++ b/lang/ruby/files/md5 @@ -1,6 +1,6 @@ -MD5 (ruby-1.4.3.tar.gz) = ff2df3fa6855e087998bf5d1fb6dfbd9 -MD5 (ruby-man-1.4.3.tar.gz) = b5666c8d9133bcaf32a8dbce93a62d09 -RMD160 (ruby-1.4.3.tar.gz) = 06d36d2e64e322a3936296a02f579dcb208c5b20 -RMD160 (ruby-man-1.4.3.tar.gz) = 9910d85ee83b6fa0e2cc7a6570cc487034d119e3 -SHA1 (ruby-1.4.3.tar.gz) = 69ef8c94a443602b47428dc43c35fa27561410ca -SHA1 (ruby-man-1.4.3.tar.gz) = 97a4aee8bb30ecf73b0737aeb896fc37f2fb53fb +MD5 (ruby-1.4.4.tar.gz) = 066f5270077eac7737426a688354017f +MD5 (ruby-man-1.4.4.tar.gz) = b6cf191fa7a9b527f183a057feeaeeb4 +RMD160 (ruby-1.4.4.tar.gz) = 6501f8022582948eb5195b0a1d1e52be101eab1d +RMD160 (ruby-man-1.4.4.tar.gz) = 095e3b5a3ea2083dc125b0e2eb4925f5e5ab86ab +SHA1 (ruby-1.4.4.tar.gz) = 921d3ca6e521191e7724fd009f9a57617f7c8f77 +SHA1 (ruby-man-1.4.4.tar.gz) = 6d809953d7ab4cbdcb857731c133eb6adaff16b4 diff --git a/lang/ruby/patches/patch-dln b/lang/ruby/patches/patch-dln deleted file mode 100644 index d85ee58a56b..00000000000 --- a/lang/ruby/patches/patch-dln +++ /dev/null @@ -1,11 +0,0 @@ ---- dln.c.orig Wed Nov 10 09:54:41 1999 -+++ dln.c Tue Dec 14 01:37:34 1999 -@@ -80,7 +80,7 @@ int eaccess(); - #endif - - #ifndef FUNCNAME_PATTERN --# if defined(__hp9000s300) || (defined(__NetBSD__) && (!defined(__alpha__) && !defined(__mips__))) || defined(__BORLANDC__) || (defined(__FreeBSD__) && __FreeBSD__ < 3) || defined(__OpenBSD__) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__) -+# if defined(__hp9000s300) || (defined(__NetBSD__) && (!defined(__alpha__) && !defined(__mips__))) || defined(__BORLANDC__) || (defined(__FreeBSD__) && __FreeBSD__ < 3) || (defined(__OpenBSD__) && !defined(__mips)) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__) - # define FUNCNAME_PATTERN "_Init_%.200s" - # else - # define FUNCNAME_PATTERN "Init_%.200s" diff --git a/lang/ruby/patches/patch-findtcltk b/lang/ruby/patches/patch-findtcltk index 0568be71b50..882f79d57e7 100644 --- a/lang/ruby/patches/patch-findtcltk +++ b/lang/ruby/patches/patch-findtcltk @@ -1,3 +1,4 @@ +$OpenBSD: patch-findtcltk,v 1.2 2000/05/18 18:37:59 espie Exp $ --- ext/tcltklib/extconf.rb.orig Sat Oct 30 15:39:17 1999 +++ ext/tcltklib/extconf.rb Tue Dec 14 01:38:33 1999 @@ -21,6 +21,7 @@ def find_tcl(tcllib) diff --git a/lang/ruby/patches/patch-mkstemp1 b/lang/ruby/patches/patch-mkstemp1 index 694f48acd0a..41b6fdd6c6a 100644 --- a/lang/ruby/patches/patch-mkstemp1 +++ b/lang/ruby/patches/patch-mkstemp1 @@ -1,3 +1,4 @@ +$OpenBSD: patch-mkstemp1,v 1.2 2000/05/18 18:37:59 espie Exp $ --- util.c.orig Fri Aug 13 07:45:15 1999 +++ util.c Mon Dec 13 03:14:01 1999 @@ -19,6 +19,7 @@ diff --git a/lang/ruby/patches/patch-mkstemp2 b/lang/ruby/patches/patch-mkstemp2 index 2ce512c00d9..ae566fab04b 100644 --- a/lang/ruby/patches/patch-mkstemp2 +++ b/lang/ruby/patches/patch-mkstemp2 @@ -1,6 +1,7 @@ ---- configure.in.orig Sun Dec 12 21:45:32 1999 -+++ configure.in Sun Dec 12 21:47:28 1999 -@@ -180,7 +180,7 @@ AC_CHECK_FUNCS(fmod killpg drand48 rando +$OpenBSD: patch-mkstemp2,v 1.2 2000/05/18 18:37:59 espie Exp $ +--- configure.in.orig Tue Apr 11 18:13:32 2000 ++++ configure.in Thu May 18 18:44:08 2000 +@@ -183,7 +183,7 @@ AC_CHECK_FUNCS(fmod killpg drand48 rando truncate chsize times utimes fcntl lockf setitimer\ setruid seteuid setreuid setrgid setegid setregid\ getpgrp setpgrp getpgid setpgid getgroups getpriority\ diff --git a/lang/ruby/patches/patch-socket b/lang/ruby/patches/patch-socket index 806d7c128fb..b35d62bbada 100644 --- a/lang/ruby/patches/patch-socket +++ b/lang/ruby/patches/patch-socket @@ -1,3 +1,4 @@ +$OpenBSD: patch-socket,v 1.2 2000/05/18 18:38:00 espie Exp $ --- ext/socket/addrinfo.h.orig Wed Dec 8 14:26:11 1999 +++ ext/socket/addrinfo.h Wed Dec 8 14:26:22 1999 @@ -113,12 +113,6 @@ diff --git a/lang/ruby/pkg/PFRAG.shared b/lang/ruby/pkg/PFRAG.shared new file mode 100644 index 00000000000..84fa3c66b62 --- /dev/null +++ b/lang/ruby/pkg/PFRAG.shared @@ -0,0 +1,15 @@ +@comment $OpenBSD: PFRAG.shared,v 1.1 2000/05/18 18:38:00 espie Exp $ +lib/libruby.so +lib/libruby.so.1.4.4 +@exec /sbin/ldconfig -m %B +lib/ruby/REV/SUB/curses.so +lib/ruby/REV/SUB/dbm.so +lib/ruby/REV/SUB/etc.so +lib/ruby/REV/SUB/fcntl.so +lib/ruby/REV/SUB/md5.so +lib/ruby/REV/SUB/nkf.so +lib/ruby/REV/SUB/pty.so +lib/ruby/REV/SUB/sdbm.so +lib/ruby/REV/SUB/socket.so +lib/ruby/REV/SUB/tcltklib.so +lib/ruby/REV/SUB/tkutil.so diff --git a/lang/ruby/pkg/PLIST.sed b/lang/ruby/pkg/PLIST.sed new file mode 100644 index 00000000000..d89078591f9 --- /dev/null +++ b/lang/ruby/pkg/PLIST.sed @@ -0,0 +1,164 @@ +@comment $OpenBSD: PLIST.sed,v 1.1 2000/05/18 18:38:00 espie Exp $ +bin/ruby +@exec mkdir -p %D/lib/ruby/site_ruby/REV/SUB +lib/ruby/REV/English.rb +lib/ruby/REV/Env.rb +lib/ruby/REV/base64.rb +lib/ruby/REV/cgi-lib.rb +lib/ruby/REV/cgi.rb +lib/ruby/REV/cgi/session.rb +lib/ruby/REV/complex.rb +lib/ruby/REV/date.rb +lib/ruby/REV/date2.rb +lib/ruby/REV/debug.rb +lib/ruby/REV/delegate.rb +lib/ruby/REV/e2mmap.rb +lib/ruby/REV/eregex.rb +lib/ruby/REV/expect.rb +lib/ruby/REV/final.rb +lib/ruby/REV/finalize.rb +lib/ruby/REV/find.rb +lib/ruby/REV/ftools.rb +lib/ruby/REV/ftplib.rb +lib/ruby/REV/getoptlong.rb +lib/ruby/REV/getopts.rb +lib/ruby/REV/SUB/config.h +lib/ruby/REV/SUB/defines.h +lib/ruby/REV/SUB/dln.h +lib/ruby/REV/SUB/env.h +lib/ruby/REV/SUB/intern.h +lib/ruby/REV/SUB/libruby.a +lib/ruby/REV/SUB/node.h +lib/ruby/REV/SUB/rbconfig.rb +lib/ruby/REV/SUB/re.h +lib/ruby/REV/SUB/regex.h +lib/ruby/REV/SUB/ruby.h +lib/ruby/REV/SUB/rubyio.h +lib/ruby/REV/SUB/rubysig.h +lib/ruby/REV/SUB/st.h +lib/ruby/REV/SUB/util.h +lib/ruby/REV/SUB/version.h +lib/ruby/REV/importenv.rb +lib/ruby/REV/irb/completion.rb +lib/ruby/REV/irb/frame.rb +lib/ruby/REV/irb/input-method.rb +lib/ruby/REV/irb/loader.rb +lib/ruby/REV/irb/main.rb +lib/ruby/REV/irb/multi-irb.rb +lib/ruby/REV/irb/ruby-lex.rb +lib/ruby/REV/irb/ruby-token.rb +lib/ruby/REV/irb/slex.rb +lib/ruby/REV/irb/version.rb +lib/ruby/REV/irb/workspace-binding-2.rb +lib/ruby/REV/irb/workspace-binding.rb +lib/ruby/REV/irb/xmp.rb +lib/ruby/REV/jcode.rb +lib/ruby/REV/kconv.rb +lib/ruby/REV/mailread.rb +lib/ruby/REV/mathn.rb +lib/ruby/REV/matrix.rb +lib/ruby/REV/mkmf.rb +lib/ruby/REV/monitor.rb +lib/ruby/REV/mutex_m.rb +lib/ruby/REV/net/pop.rb +lib/ruby/REV/net/ftp.rb +lib/ruby/REV/net/http.rb +lib/ruby/REV/net/protocol.rb +lib/ruby/REV/net/smtp.rb +lib/ruby/REV/net/telnet.rb +lib/ruby/REV/observer.rb +lib/ruby/REV/open3.rb +lib/ruby/REV/ostruct.rb +lib/ruby/REV/parsearg.rb +lib/ruby/REV/parsedate.rb +lib/ruby/REV/ping.rb +lib/ruby/REV/profile.rb +lib/ruby/REV/pstore.rb +lib/ruby/REV/rational.rb +lib/ruby/REV/readbytes.rb +lib/ruby/REV/shellwords.rb +lib/ruby/REV/singleton.rb +lib/ruby/REV/sync.rb +lib/ruby/REV/tcltk.rb +lib/ruby/REV/telnet.rb +lib/ruby/REV/tempfile.rb +lib/ruby/REV/thread.rb +lib/ruby/REV/thwait.rb +lib/ruby/REV/timeout.rb +lib/ruby/REV/tk.rb +lib/ruby/REV/tkafter.rb +lib/ruby/REV/tkbgerror.rb +lib/ruby/REV/tkcanvas.rb +lib/ruby/REV/tkclass.rb +lib/ruby/REV/tkdialog.rb +lib/ruby/REV/tkentry.rb +lib/ruby/REV/tkfont.rb +lib/ruby/REV/tkmenubar.rb +lib/ruby/REV/tkmngfocus.rb +lib/ruby/REV/tkpalette.rb +lib/ruby/REV/tkscrollbox.rb +lib/ruby/REV/tktext.rb +lib/ruby/REV/tkvirtevent.rb +lib/ruby/REV/tracer.rb +lib/ruby/REV/weakref.rb +%%SHARED%% +man/man1/ruby.1 +share/doc/ruby/NilClass.html +share/doc/ruby/Exception.html +share/doc/ruby/Errno.html +share/doc/ruby/classes.html +share/doc/ruby/Bignum.html +share/doc/ruby/Numeric.html +share/doc/ruby/Time.html +share/doc/ruby/ENV.html +share/doc/ruby/function.html +share/doc/ruby/Hash.html +share/doc/ruby/options.html +share/doc/ruby/Kernel.html +share/doc/ruby/Enum.html +share/doc/ruby/index.html +share/doc/ruby/Class.html +share/doc/ruby/Compar.html +share/doc/ruby/Float.html +share/doc/ruby/FileTest.html +share/doc/ruby/File.html +share/doc/ruby/Fixnum.html +share/doc/ruby/IO.html +share/doc/ruby/Integer.html +share/doc/ruby/Object.html +share/doc/ruby/ObSpace.html +share/doc/ruby/Range.html +share/doc/ruby/Regexp.html +share/doc/ruby/dbm.html +share/doc/ruby/glossary.html +share/doc/ruby/preface.html +share/doc/ruby/socket.html +share/doc/ruby/syntax.html +share/doc/ruby/variable.html +share/doc/ruby/yacc.html +share/doc/ruby/Array.html +share/doc/ruby/Dir.html +share/doc/ruby/Data.html +share/doc/ruby/GC.html +share/doc/ruby/Module.html +share/doc/ruby/Marshal.html +share/doc/ruby/Match.html +share/doc/ruby/Math.html +share/doc/ruby/Proc.html +share/doc/ruby/Process.html +share/doc/ruby/Prec.html +share/doc/ruby/Struct.html +share/doc/ruby/String.html +share/doc/ruby/bundle.html +share/doc/ruby/kconv.html +share/doc/ruby/thread.html +@dirrm share/doc/ruby +@dirrm lib/ruby/site_ruby +@dirrm lib/ruby/site_ruby/REV/SUB +@dirrm lib/ruby/site_ruby/REV +@dirrm lib/ruby/REV/net +@dirrm lib/ruby/REV/irb +@dirrm lib/ruby/REV/cgi +@dirrm lib/ruby/REV/SUB +@dirrm lib/ruby/REV +@dirrm lib/ruby