cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle changes caused by splitting the ruby port and bump

Browse Source 
OK jcs@, landry@, jasper@, sthen@
This commit is contained in:
jeremy 2010-09-23 22:10:28 +00:00
parent 255b948e1a
commit f3ba7fefc2
24 changed files with 354 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/amarok/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.37 2010/09/05 22:00:13 sthen Exp $
# $OpenBSD: Makefile,v 1.38 2010/09/23 22:10:28 jeremy Exp $
CATEGORIES = audio x11 x11/kde
COMMENT = music player for KDE
@ -7,7 +7,7 @@ HOMEPAGE = http://amarok.kde.org/
V = 1.4.10
MASTER_SITES = ${MASTER_SITE_KDE:=stable/amarok/$V/src/}
DISTNAME = amarok-$V
REVISION = 6
REVISION = 7
EXTRACT_SUFX = .tar.bz2
# GPLv2/LGPLv2/GFDL
@ -25,7 +25,7 @@ WANTLIB += pcreposix png pthread stdc++ usb util xml2 z
WANTLIB += pthread-stubs xcb lib/qt3/qt-mt.>=3.33 konqsidebarplugin
WANTLIB += kdecore.>=6 DCOP khtml kwalletclient kdefx kdeprint
WANTLIB += kutils kdeui kparts kio kdesu kjs knewstuff kdnssd tag.>=5.0
WANTLIB += xine sqlite3 gpod njb ruby mtp
WANTLIB += xine sqlite3 gpod njb ruby18 mtp
RUN_DEPENDS = :desktop-file-utils-*:devel/desktop-file-utils
LIB_DEPENDS += ::x11/qt3 \
@ -37,7 +37,7 @@ LIB_DEPENDS += ::x11/qt3 \
::databases/sqlite3 \
::audio/libgpod \
::audio/libnjb \
::lang/ruby \
:ruby->=1.8,<=1.9:lang/ruby/1.8 \
::devel/libmtp
SHARED_LIBS += amarok 0.0 # .0.0

15
audio/amarok/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.6 2008/04/28 00:39:10 sthen Exp $
--- configure.in.orig Thu Apr 10 16:16:39 2008
+++ configure.in Tue Apr 22 04:40:16 2008
$OpenBSD: patch-configure_in,v 1.7 2010/09/23 22:10:28 jeremy Exp $
--- configure.in.orig Wed Aug 13 14:21:52 2008
+++ configure.in Mon Sep 13 13:02:05 2010
@@ -794,7 +794,7 @@ AC_MSG_RESULT($amarok_glibcsched_works)
###############################################################################
@ -10,3 +10,12 @@ $OpenBSD: patch-configure_in,v 1.6 2008/04/28 00:39:10 sthen Exp $
AM_CONDITIONAL(with_konqsidebar, [test x$have_konqsidebar = xyes])
@@ -1160,7 +1160,7 @@ AC_CHECK_TYPES([uint8_t, u_int8_t, uint16_t, u_int16_t
# BEGIN DAAP MONGREL RUBY VARIABLE
###############################################################################
-AC_PATH_PROG(RUBY, ruby, no)
+AC_PATH_PROG(RUBY, ruby18, no)
ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`]
ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`]

7
devel/eclipse/plugins/rdt/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.3 2008/06/14 23:46:37 landry Exp $
# $OpenBSD: Makefile,v 1.4 2010/09/23 22:11:13 jeremy Exp $
COMMENT= Ruby Development Tools for Eclipse IDE
V= 0.8.0
DISTNAME= org.rubypeople.rdt-0.8.0.604272100PRD
PKGNAME= eclipse-plugin-rdt-${V}p0
PKGNAME= eclipse-plugin-rdt-${V}
REVISION= 1
CATEGORIES= devel/eclipse/plugins lang/ruby
HOMEPAGE= http://rubyeclipse.sourceforge.net/
@ -22,7 +23,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rubyeclipse/}
RUN_DEPENDS= :eclipse-sdk->=3.1:devel/eclipse/sdk\
:ruby-*:lang/ruby
:ruby-*:lang/ruby/1.8,-main
USE_ZIP= Yes
NO_BUILD= Yes

4
devel/subversion/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.75 2010/08/30 22:09:45 jasper Exp $
# $OpenBSD: Makefile,v 1.76 2010/09/23 22:12:10 jeremy Exp $
COMMENT-main= subversion revision control system
COMMENT-perl= perl interface to subversion
@ -18,7 +18,7 @@ FULLPKGPATH-python= devel/subversion,-python
REVISION-python= 0
FULLPKGNAME-ruby= ruby-subversion-${VERSION}
FULLPKGPATH-ruby= devel/subversion,-ruby
REVISION-ruby= 1
REVISION-ruby= 2
FULLPKGNAME-ap2= ap2-subversion-${VERSION}
FULLPKGPATH-ap2= devel/subversion,-ap2
REVISION-ap2= 0

14
devel/subversion/patches/patch-Makefile_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.10 2009/04/28 23:43:56 stsp Exp $
--- Makefile.in.orig Mon Feb 16 16:10:48 2009
+++ Makefile.in Thu Feb 19 19:36:18 2009
$OpenBSD: patch-Makefile_in,v 1.11 2010/09/23 22:12:10 jeremy Exp $
--- Makefile.in.orig Mon Feb 16 08:10:48 2009
+++ Makefile.in Thu Sep 16 14:04:24 2010
@@ -76,12 +76,12 @@ swig_pl_libdir = @libdir@
swig_rb_libdir = @libdir@
@ -17,7 +17,7 @@ $OpenBSD: patch-Makefile_in,v 1.10 2009/04/28 23:43:56 stsp Exp $
javahl_javadir = @libdir@/svn-javahl
javahl_javahdir = @libdir@/svn-javahl/include
@@ -122,8 +122,8 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@
@@ -122,13 +122,13 @@ APACHE_LDFLAGS = @APACHE_LDFLAGS@
SWIG = @SWIG@
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
SWIG_PY_COMPILE = @SWIG_PY_COMPILE@
@ -28,3 +28,9 @@ $OpenBSD: patch-Makefile_in,v 1.10 2009/04/28 23:43:56 stsp Exp $
SWIG_PL_INCLUDES = @SWIG_PL_INCLUDES@
SWIG_RB_INCLUDES = @SWIG_RB_INCLUDES@ -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
SWIG_RB_COMPILE = @SWIG_RB_COMPILE@
SWIG_RB_LINK = @SWIG_RB_LINK@
-SWIG_RB_LIBS = @SWIG_RB_LIBS@
+SWIG_RB_LIBS = -lruby18
SWIG_RB_SITE_LIB_DIR = @SWIG_RB_SITE_LIB_DIR@
SWIG_RB_SITE_ARCH_DIR = @SWIG_RB_SITE_ARCH_DIR@
SWIG_RB_TEST_VERBOSE = @SWIG_RB_TEST_VERBOSE@

19
devel/subversion/patches/patch-configure_ac
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.5 2010/09/03 19:49:12 sthen Exp $
--- configure.ac.orig Tue Oct 13 17:09:30 2009
+++ configure.ac Fri Sep 3 20:48:24 2010
$OpenBSD: patch-configure_ac,v 1.6 2010/09/23 22:12:10 jeremy Exp $
--- configure.ac.orig Tue Oct 13 09:09:30 2009
+++ configure.ac Thu Sep 16 14:06:25 2010
@@ -6,7 +6,7 @@ AC_PREREQ(2.58)
dnl Get the version of Subversion, using m4's esyscmd() command to do this
dnl at m4-time, since AC_INIT() requires it then.
@ -28,3 +28,16 @@ $OpenBSD: patch-configure_ac,v 1.5 2010/09/03 19:49:12 sthen Exp $
if test -z "$PYTHON"; then
AC_MSG_WARN([Python 2.4 or later is required to run the testsuite])
AC_MSG_WARN([or to use the Subversion Python bindings])
@@ -787,10 +787,10 @@ SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
AC_PATH_PROG(PERL, perl, none)
-AC_PATH_PROG(RUBY, ruby, none)
+AC_PATH_PROG(RUBY, ruby18, none)
if test "$RUBY" != "none"; then
if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)'; then
- AC_PATH_PROG(RDOC, rdoc, none)
+ AC_PATH_PROG(RDOC, rdoc18, none)
AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'`"
])

6
devel/subversion/patches/patch-subversion_libsvn_subr_auth_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-subversion_libsvn_subr_auth_c,v 1.1 2009/04/28 23:43:56 stsp Exp $
--- subversion/libsvn_subr/auth.c.orig Fri Feb 20 01:59:30 2009
+++ subversion/libsvn_subr/auth.c Fri Feb 20 02:05:05 2009
$OpenBSD: patch-subversion_libsvn_subr_auth_c,v 1.2 2010/09/23 22:12:10 jeremy Exp $
--- subversion/libsvn_subr/auth.c.orig Fri Jan 23 10:30:04 2009
+++ subversion/libsvn_subr/auth.c Thu Sep 16 14:07:10 2010
@@ -393,7 +393,7 @@ svn_auth_get_platform_specific_provider
const char *library_label, *library_name;
const char *provider_function_name, *version_function_name;

6
devel/swig/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.47 2010/08/30 22:09:45 jasper Exp $
# $OpenBSD: Makefile,v 1.48 2010/09/23 22:12:50 jeremy Exp $
COMMENT-main= simplified wrapper and interface generator
@ -7,7 +7,7 @@ VERSION= 1.3.36
DISTNAME= swig-${VERSION}
PKGNAME-main= ${DISTNAME}
REVISION-main = 2
REVISION-main = 3
MULTI_PACKAGES= -main
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=swig/}
@ -25,7 +25,7 @@ WANTLIB= c m stdc++
MODULES= lang/python lang/tcl
RUN_DEPENDS-main=
BUILD_DEPENDS= ${MODTCL_BUILD_DEPENDS} \
::lang/ruby \
:ruby->=1.8,<=1.9:lang/ruby/1.8,-main \
::lang/guile

4
net/rrdtool/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.51 2010/08/30 21:21:54 sthen Exp $
# $OpenBSD: Makefile,v 1.52 2010/09/23 22:13:26 jeremy Exp $
SHARED_ONLY= Yes
@ -15,7 +15,7 @@ PKGNAME-python= py-rrd-${VERSION}
PKGNAME-ruby= ruby-rrd-${VERSION}
REVISION-main= 1
REVISION-python=1
REVISION-ruby= 1
REVISION-ruby= 2
SHARED_LIBS+= rrd 3.0
SHARED_LIBS+= rrd_th 3.0

12
net/rrdtool/patches/patch-configure Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.6 2010/09/23 22:13:26 jeremy Exp $
--- configure.orig Mon Sep 13 13:03:32 2010
+++ configure Mon Sep 13 13:04:46 2010
@@ -28654,7 +28654,7 @@ fi
# Extract the first word of "ruby", so it can be a program name with args.
-set dummy ruby; ac_word=$2
+set dummy ruby18; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_RUBY+set}" = set; then

4
textproc/eruby/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.12 2010/07/24 23:05:08 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2010/09/23 22:14:09 jeremy Exp $
SHARED_ONLY= Yes
COMMENT= interprets Ruby code embedded in a text file
DISTNAME= eruby-1.0.5
REVISION= 8
REVISION= 9
CATEGORIES= textproc
SHARED_LIBS= eruby 1.05

21
textproc/eruby/patches/patch-configure_rb
View File

@ -1,6 +1,21 @@
$OpenBSD: patch-configure_rb,v 1.1.1.1 2006/10/31 14:38:17 dhill Exp $
--- configure.rb.orig Mon Feb 10 04:18:10 2003
+++ configure.rb Thu Oct 26 22:21:26 2006
$OpenBSD: patch-configure_rb,v 1.2 2010/09/23 22:14:09 jeremy Exp $
--- configure.rb.orig Sun Feb 9 19:18:10 2003
+++ configure.rb Wed Sep 15 18:04:56 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby18
# Generated automatically using autoconf.rb version 0.2.4
@@ -306,7 +306,7 @@ if $LDFLAGS.to_s.empty? && /mswin32/ =~ RUBY_PLATFORM
$LDFLAGS = "-link -incremental:no -pdb:none"
end
$LIBS = CONFIG["LIBS"]
-$XLDFLAGS = CONFIG["XLDFLAGS"]
+$XLDFLAGS = CONFIG["LDFLAGS"]
$XLDFLAGS.gsub!(/-L\./, "")
if /mswin32/ !~ RUBY_PLATFORM
$XLDFLAGS += " -L$(libdir)"
@@ -443,7 +443,7 @@ $LIBERUBY_A = "liberuby.a"
$LIBERUBY = "${LIBERUBY_A}"
$LIBERUBYARG="$(LIBERUBY_A)"

4
textproc/eruby/pkg/PLIST
View File

@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/10/31 14:38:17 dhill Exp $
bin/eruby
@comment $OpenBSD: PLIST,v 1.2 2010/09/23 22:14:09 jeremy Exp $
@bin bin/eruby
include/eruby.h
lib/liberuby.a
@lib lib/liberuby.so.${LIBeruby_VERSION}

6
textproc/gonzui/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2010/07/24 23:05:08 naddy Exp $
# $OpenBSD: Makefile,v 1.15 2010/09/23 22:14:53 jeremy Exp $
SHARED_ONLY= Yes
@ -7,7 +7,7 @@ NOT_FOR_ARCHS= mips64 mips64el
COMMENT= source code search engine
DISTNAME= gonzui-1.2
REVISION= 10
REVISION= 11
CATEGORIES= textproc www
HOMEPAGE= http://gonzui.sourceforge.net/
@ -27,7 +27,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gonzui/}
BUILD_DEPENDS= ::databases/db/v4 \
::databases/ruby-bdb \
:ruby-iconv->=1.8.4:lang/ruby,-iconv
${MODRUBY_ICONV_DEPENDS}
RUN_DEPENDS= ::archivers/bzip2 \
::archivers/unzip \
::textproc/p5-PPI

20
textproc/gonzui/patches/patch-Makefile_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/01/11 15:18:43 jasper Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2010/09/23 22:14:53 jeremy Exp $
--- Makefile.in.orig Mon Jul 4 17:08:41 2005
+++ Makefile.in Mon Dec 18 12:58:08 2006
@@ -610,9 +610,9 @@ info: info-recursive
@ -13,3 +13,21 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/01/11 15:18:43 jasper Exp $
install-info: install-info-recursive
@@ -672,7 +672,7 @@ gonzui.rb: gonzui.rb.in Makefile
chmod -w gonzui.rb
gonzuirc.sample.in: gonzuirc.sample.in.in
- ruby gonzui-db --gonzuirc gonzuirc.sample.in.in --dump-config \
+ ruby18 gonzui-db --gonzuirc gonzuirc.sample.in.in --dump-config \
> gonzuirc.sample.in
gonzuirc.sample: gonzuirc.sample.in Makefile
@@ -696,7 +696,7 @@ install-data-local:
chmod 750 $(DESTDIR)$(gonzuistatedir)
gettext:
- @ruby gonzui/gettext.rb catalog \
+ @ruby18 gonzui/gettext.rb catalog \
gonzui/*.rb gonzui/webapp/*.rb langscan/*.rb |\
grep -v "^tests"

98
textproc/gonzui/patches/patch-configure Normal file
View File

@ -0,0 +1,98 @@
$OpenBSD: patch-configure,v 1.1 2010/09/23 22:14:53 jeremy Exp $
--- configure.orig Mon Sep 13 11:36:05 2010
+++ configure Mon Sep 13 11:38:11 2010
@@ -2956,7 +2956,7 @@ fi;
echo $ECHO_N "checking where .rb files should go... $ECHO_C" >&6
if test "x$rubydir" = x; then
- rubydir=`ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]'`
+ rubydir=`ruby18 -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]'`
fi
echo "$as_me:$LINENO: result: $rubydir" >&5
@@ -2981,7 +2981,7 @@ fi;
echo $ECHO_N "checking where .rb files should go... $ECHO_C" >&6
if test "x$rubyarchdir" = x; then
- rubyarchdir=`ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]'`
+ rubyarchdir=`ruby18 -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]'`
fi
echo "$as_me:$LINENO: result: $rubyarchdir" >&5
@@ -2989,13 +2989,13 @@ echo "${ECHO_T}$rubyarchdir" >&6
- RUBY_CC="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CC"]'`"
- RUBY_LDSHARED="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LDSHARED"]'`"
- RUBY_CFLAGS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CFLAGS"]'`"
- RUBY_DLEXT="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLEXT"]'`"
- RUBY_DLDFLAGS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLDFLAGS"]'`"
- RUBY_LIBS="`ruby -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LIBS"]'`"
- RUBY_HDRHDIR="`ruby -rmkmf -e 'puts Config::CONFIG["archdir"]'`"
+ RUBY_CC="`ruby18 -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CC"]'`"
+ RUBY_LDSHARED="`ruby18 -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LDSHARED"]'`"
+ RUBY_CFLAGS="`ruby18 -rmkmf -e 'puts Config::MAKEFILE_CONFIG["CFLAGS"]'`"
+ RUBY_DLEXT="`ruby18 -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLEXT"]'`"
+ RUBY_DLDFLAGS="`ruby18 -rmkmf -e 'puts Config::MAKEFILE_CONFIG["DLDFLAGS"]'`"
+ RUBY_LIBS="`ruby18 -rmkmf -e 'puts Config::MAKEFILE_CONFIG["LIBS"]'`"
+ RUBY_HDRHDIR="`ruby18 -rmkmf -e 'puts Config::CONFIG["archdir"]'`"
RUBY_CPPFLAGS='-I. -I$(RUBY_HDRHDIR)'
@@ -3055,8 +3055,8 @@ fi;
REQUIRED_VERSION="1.8.2"
echo "$as_me:$LINENO: checking ruby version..." >&5
echo $ECHO_N "checking ruby version...... $ECHO_C" >&6
- RUBY_VERSION="`ruby -e "puts RUBY_VERSION"`"
- if ruby -e "exit(RUBY_VERSION >= '$REQUIRED_VERSION')" >/dev/null; then
+ RUBY_VERSION="`ruby18 -e "puts RUBY_VERSION"`"
+ if ruby18 -e "exit(RUBY_VERSION >= '$REQUIRED_VERSION')" >/dev/null; then
echo "$as_me:$LINENO: result: $RUBY_VERSION found" >&5
echo "${ECHO_T}$RUBY_VERSION found" >&6
else
@@ -3070,7 +3070,7 @@ echo "$as_me: error: $REQUIRED_VERSION or later is nee
URL="http://raa.ruby-lang.org/project/bdb"
echo "$as_me:$LINENO: checking $LIB for ruby..." >&5
echo $ECHO_N "checking $LIB for ruby...... $ECHO_C" >&6
- if ruby -r$LIB -e '' 2>/dev/null; then
+ if ruby18 -r$LIB -e '' 2>/dev/null; then
echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
else
@@ -3088,7 +3088,7 @@ echo "$as_me: error: $LIB for ruby not found" >&2;}
URL="http://raa.ruby-lang.org/project/webrick"
echo "$as_me:$LINENO: checking $LIB for ruby..." >&5
echo $ECHO_N "checking $LIB for ruby...... $ECHO_C" >&6
- if ruby -r$LIB -e '' 2>/dev/null; then
+ if ruby18 -r$LIB -e '' 2>/dev/null; then
echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
else
@@ -3106,7 +3106,7 @@ echo "$as_me: error: $LIB for ruby not found" >&2;}
URL=""
echo "$as_me:$LINENO: checking $LIB for ruby..." >&5
echo $ECHO_N "checking $LIB for ruby...... $ECHO_C" >&6
- if ruby -r$LIB -e '' 2>/dev/null; then
+ if ruby18 -r$LIB -e '' 2>/dev/null; then
echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
else
@@ -3124,7 +3124,7 @@ echo "$as_me: error: $LIB for ruby not found" >&2;}
URL="http://raa.ruby-lang.org/project/ruby-zlib"
echo "$as_me:$LINENO: checking $LIB for ruby..." >&5
echo $ECHO_N "checking $LIB for ruby...... $ECHO_C" >&6
- if ruby -r$LIB -e '' 2>/dev/null; then
+ if ruby18 -r$LIB -e '' 2>/dev/null; then
echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
else
@@ -3142,7 +3142,7 @@ echo "$as_me: error: $LIB for ruby not found" >&2;}
URL="http://raa.ruby-lang.org/project/strscan"
echo "$as_me:$LINENO: checking $LIB for ruby..." >&5
echo $ECHO_N "checking $LIB for ruby...... $ECHO_C" >&6
- if ruby -r$LIB -e '' 2>/dev/null; then
+ if ruby18 -r$LIB -e '' 2>/dev/null; then
echo "$as_me:$LINENO: result: found" >&5
echo "${ECHO_T}found" >&6
else

16
textproc/gonzui/patches/patch-langscan_c_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-langscan_c_Makefile_in,v 1.1 2010/09/23 22:14:53 jeremy Exp $
--- langscan/c/Makefile.in.orig Mon Jul 4 08:08:38 2005
+++ langscan/c/Makefile.in Mon Sep 13 13:17:51 2010
@@ -497,10 +497,10 @@ uninstall-info: uninstall-info-recursive
c.h: ../_template.h tokenlist.txt
- ruby ../_make_h.rb ../_template.h tokenlist.txt c C
+ ruby18 ../_make_h.rb ../_template.h tokenlist.txt c C
c.c: ../_template.c
- ruby ../_make_c.rb ../_template.c c C
+ ruby18 ../_make_c.rb ../_template.c c C
# We do this to workaround flex 2.5.4 issue because our .l
# file could not be processed with flex 2.5.4.

16
textproc/gonzui/patches/patch-langscan_java_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-langscan_java_Makefile_in,v 1.1 2010/09/23 22:14:53 jeremy Exp $
--- langscan/java/Makefile.in.orig Mon Jul 4 08:08:38 2005
+++ langscan/java/Makefile.in Mon Sep 13 13:17:51 2010
@@ -497,10 +497,10 @@ uninstall-info: uninstall-info-recursive
java.h: ../_template.h tokenlist.txt
- ruby ../_make_h.rb ../_template.h tokenlist.txt java Java
+ ruby18 ../_make_h.rb ../_template.h tokenlist.txt java Java
java.c: ../_template.c
- ruby ../_make_c.rb ../_template.c java Java
+ ruby18 ../_make_c.rb ../_template.c java Java
# We do this to workaround flex 2.5.4 issue because our .l
# file could not be processed with flex 2.5.4.

16
textproc/gonzui/patches/patch-langscan_javascript_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-langscan_javascript_Makefile_in,v 1.1 2010/09/23 22:14:53 jeremy Exp $
--- langscan/javascript/Makefile.in.orig Mon Jul 4 08:08:39 2005
+++ langscan/javascript/Makefile.in Mon Sep 13 13:17:51 2010
@@ -497,10 +497,10 @@ uninstall-info: uninstall-info-recursive
javascript.h: ../_template.h tokenlist.txt
- ruby ../_make_h.rb ../_template.h tokenlist.txt javascript JavaScript
+ ruby18 ../_make_h.rb ../_template.h tokenlist.txt javascript JavaScript
javascript.c: ../_template.c
- ruby ../_make_c.rb ../_template.c javascript JavaScript
+ ruby18 ../_make_c.rb ../_template.c javascript JavaScript
# We do this to workaround flex 2.5.4 issue because our .l
# file could not be processed with flex 2.5.4.

16
textproc/gonzui/patches/patch-langscan_php_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-langscan_php_Makefile_in,v 1.1 2010/09/23 22:14:53 jeremy Exp $
--- langscan/php/Makefile.in.orig Mon Jul 4 08:08:39 2005
+++ langscan/php/Makefile.in Mon Sep 13 13:17:51 2010
@@ -497,10 +497,10 @@ uninstall-info: uninstall-info-recursive
php.h: ../_template.h tokenlist.txt
- ruby ../_make_h.rb ../_template.h tokenlist.txt php PHP
+ ruby18 ../_make_h.rb ../_template.h tokenlist.txt php PHP
php.c: ../_template.c
- ruby ../_make_c.rb ../_template.c php PHP
+ ruby18 ../_make_c.rb ../_template.c php PHP
# We do this to workaround flex 2.5.4 issue because our .l
# file could not be processed with flex 2.5.4.

16
textproc/gonzui/patches/patch-langscan_python_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-langscan_python_Makefile_in,v 1.1 2010/09/23 22:14:53 jeremy Exp $
--- langscan/python/Makefile.in.orig Mon Jul 4 08:08:40 2005
+++ langscan/python/Makefile.in Mon Sep 13 13:17:51 2010
@@ -497,10 +497,10 @@ uninstall-info: uninstall-info-recursive
python.h: ../_template.h tokenlist.txt
- ruby ../_make_h.rb ../_template.h tokenlist.txt python Python
+ ruby18 ../_make_h.rb ../_template.h tokenlist.txt python Python
python.c: ../_template.c
- ruby ../_make_c.rb ../_template.c python Python
+ ruby18 ../_make_c.rb ../_template.c python Python
# We do this to workaround flex 2.5.4 issue because our .l
# file could not be processed with flex 2.5.4.

16
textproc/gonzui/patches/patch-langscan_sh_Makefile_in Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-langscan_sh_Makefile_in,v 1.1 2010/09/23 22:14:53 jeremy Exp $
--- langscan/sh/Makefile.in.orig Mon Jul 4 08:08:40 2005
+++ langscan/sh/Makefile.in Mon Sep 13 13:17:52 2010
@@ -497,10 +497,10 @@ uninstall-info: uninstall-info-recursive
sh.h: ../_template.h tokenlist.txt
- ruby ../_make_h.rb ../_template.h tokenlist.txt sh Shell
+ ruby18 ../_make_h.rb ../_template.h tokenlist.txt sh Shell
sh.c: ../_template.c
- ruby ../_make_c.rb ../_template.c sh Shell
+ ruby18 ../_make_c.rb ../_template.c sh Shell
# We do this to workaround flex 2.5.4 issue because our .l
# file could not be processed with flex 2.5.4.

8
textproc/ruby-hyperestraier/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2010/07/24 23:05:08 naddy Exp $
# $OpenBSD: Makefile,v 1.19 2010/09/23 22:15:32 jeremy Exp $
SHARED_ONLY= Yes
@ -6,12 +6,12 @@ COMMENT= Ruby interface to hyperestraier
DISTNAME= hyperestraier-1.4.13
PKGNAME= ruby-hyperestraier-1.0.0
REVISION= 14
REVISION= 15
CATEGORIES= textproc
HOMEPAGE= http://hyperestraier.sourceforge.net/
MAINTAINER= Jeremy Evans <openbsd@jeremyevans.net>
MAINTAINER= Jeremy Evans <jeremy@openbsd.org>
# LGPL
PERMIT_PACKAGE_CDROM= Yes
@ -36,7 +36,7 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ruby-hyperestraier
${INSTALL_DATA} ${WRKSRC}/example/*.rb \
${PREFIX}/share/examples/ruby-hyperestraier
cd ${WRKSRC} && ${LOCALBASE}/bin/rdoc -o ${PREFIX}/share/doc/ruby-hyperestraier \
cd ${WRKSRC} && ${LOCALBASE}/bin/rdoc18 -o ${PREFIX}/share/doc/ruby-hyperestraier \
estraier-doc.rb
.include <bsd.port.mk>

49
textproc/ruby-hyperestraier/patches/patch-rubynative_configure
View File

@ -1,12 +1,51 @@
$OpenBSD: patch-rubynative_configure,v 1.1.1.1 2007/01/18 10:38:47 bernd Exp $
--- rubynative/configure.orig Fri Jan 5 19:24:11 2007
+++ rubynative/configure Fri Jan 5 19:24:21 2007
@@ -1285,7 +1285,7 @@ fi
$OpenBSD: patch-rubynative_configure,v 1.2 2010/09/23 22:15:32 jeremy Exp $
--- rubynative/configure.orig Mon Dec 24 17:53:40 2007
+++ rubynative/configure Mon Sep 13 12:44:01 2010
@@ -1228,8 +1228,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Export variables
-RUBY="ruby"
-RDOC="rdoc"
+RUBY="ruby18"
+RDOC="rdoc18"
MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
MYRUNPATH=""
@@ -1258,7 +1258,7 @@ fi
# Setting the default prefix
if test "$prefix" = NONE
then
- prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'`
+ prefix=`ruby18 -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'`
fi
@@ -1270,22 +1270,22 @@ fi
# Ruby interpreter
printf 'checking RUBY... '
-if which ruby > /dev/null
+if which ruby18 > /dev/null
then
- RUBY=`which ruby`
+ RUBY=`which ruby18`
fi
printf '%s\n' "$RUBY"
# Other building tools
printf 'checking RDOC... '
-if which rdoc > /dev/null
+if which rdoc18 > /dev/null
then
- RDOC=`which rdoc`
+ RDOC=`which rdoc18`
fi
printf '%s\n' "$RDOC"
# Librarh path
-myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'`
+myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitearchdir"))'`
+myrblibdir=`ruby18 -rrbconfig -e 'puts(Config::CONFIG.fetch("sitearchdir"))'`
if test -n "$myrblibdir"
then
MYRBLIBDIR="$myrblibdir"