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:21:03 +00:00
parent f3ba7fefc2
commit 848e9dff50
8 changed files with 148 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/mod_ruby/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.10 2010/02/26 14:45:03 sthen Exp $
# $OpenBSD: Makefile,v 1.11 2010/09/23 22:21:03 jeremy Exp $
COMMENT= module that embeds Ruby into Apache
DISTNAME= mod_ruby-1.2.6
PKGNAME= ${DISTNAME}p2
REVISION= 3
CATEGORIES= www
HOMEPAGE= http://modruby.net/

18
www/mod_ruby/patches/patch-configure_rb Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-configure_rb,v 1.1 2010/09/23 22:21:03 jeremy Exp $
--- configure.rb.orig Mon May 22 15:23:36 2006
+++ configure.rb Mon Sep 13 11:27:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby18
# Generated automatically using autoconf.rb version 0.2.4
@@ -320,7 +320,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)"

7
www/raggle/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2010/07/03 02:44:14 naddy Exp $
# $OpenBSD: Makefile,v 1.3 2010/09/23 22:21:54 jeremy Exp $
COMMENT= console RSS aggregator
DISTNAME= raggle-0.4.4
REVISION= 0
CATEGORIES= www news
@ -17,8 +18,8 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}/files/
BUILD_DEPENDS= ::lang/ruby
RUN_DEPENDS= ::lang/ruby \
BUILD_DEPENDS= :ruby->=1.8,<=1.9:lang/ruby/1.8,-main
RUN_DEPENDS= :ruby->=1.8,<=1.9:lang/ruby/1.8,-main \
::devel/ruby-ncurses
NO_REGRESS= Yes

11
www/raggle/patches/patch-Makefile
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2008/06/08 17:10:04 landry Exp $
$OpenBSD: patch-Makefile,v 1.2 2010/09/23 22:21:54 jeremy Exp $
--- Makefile.orig Wed Mar 16 02:25:03 2005
+++ Makefile Tue Jun 3 00:50:13 2008
@@ -1,6 +1,6 @@
@ -10,3 +10,12 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2008/06/08 17:10:04 landry Exp $
DOCDIR=${PREFIX}/share/doc/raggle
DATADIR=${PREFIX}/share/raggle
DATA=themes extras
@@ -22,7 +22,7 @@ install :
if [ ! -d "${MANDIR}" ]; then \
${mkdir} ${MANDIR}; \
fi && \
- ruby -pe 'gsub(/^(.)DATADIR = ".*"/, "\\1DATADIR = \"${DATADIR}\"")' < ./raggle > ${BINDIR}/raggle && chmod 755 ${BINDIR}/raggle && \
+ ruby18 -pe 'gsub(/^(.)DATADIR = ".*"/, "\\1DATADIR = \"${DATADIR}\"")' < ./raggle > ${BINDIR}/raggle && chmod 755 ${BINDIR}/raggle && \
cp raggle.1 ${MANDIR} && \
cp -r ${DOCS} ${DOCDIR} && \
cp -r ${DATA} ${DATADIR}

8
x11/kde/bindings3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2010/09/22 07:01:56 landry Exp $
# $OpenBSD: Makefile,v 1.68 2010/09/23 22:24:50 jeremy Exp $
COMMENT = K Desktop Environment, extra language support
CATEGORIES = x11 x11/kde devel
@ -14,9 +14,9 @@ MODULES = x11/kde devel/gettext
RUN_DEPENDS += :desktop-file-utils-*:devel/desktop-file-utils
LIB_DEPENDS = ::x11/kde/libs3 \
::x11/qt3 \
::lang/ruby
:ruby->=1.8,<=1.9:lang/ruby/1.8,-main
REVISION = 10
REVISION = 11
#XXX missing -rpath to /usr/local ?
USE_LIBTOOL = gnu
WANTLIB = GL GLU ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c expat fam \
@ -25,7 +25,7 @@ WANTLIB = GL GLU ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c expat fam \
lib/kde3/khtml lib/kde3/kio lib/kde3/kjs lib/kde3/kmdi \
lib/kde3/knewstuff lib/kde3/kparts lib/kde3/kscript lib/kde3/kspell \
lib/kde3/kutils lib/kde3/kwalletclient m pcre pcreposix png pthread \
pthread-stubs qui-mt ruby stdc++ util xcb z
pthread-stubs qui-mt ruby18 stdc++ util xcb z
PYTHON_VER = 2.5
BUILD_DEPENDS = :python->=${PYTHON_VER},<2.6:lang/python/${PYTHON_VER}

32
x11/kde/bindings3/patches/patch-configure_in Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-configure_in,v 1.1 2010/09/23 22:24:50 jeremy Exp $
--- configure.in.orig Sun Sep 12 20:36:10 2010
+++ configure.in Sun Sep 12 20:38:04 2010
@@ -417,15 +417,15 @@ dnl ==================================================
dnl FILE: ./korundum/rubylib/korundum/configure.in.in
dnl =======================================================
-AC_CHECK_PROG(RUBY, ruby, ruby)
+AC_CHECK_PROG(RUBY, ruby18, ruby18)
if test -z "$RUBY"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE korundum"
else
AC_MSG_CHECKING(for ruby dirs)
- RUBY_ARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
- RUBY_SITEARCHDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
- RUBY_SITEDIR=`ruby -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
+ RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
+ RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
+ RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
AC_MSG_RESULT([archdir $RUBY_ARCHDIR, sitearchdir $RUBY_SITEARCHDIR, sitedir $RUBY_SITEDIR])
AC_SUBST(RUBY_ARCHDIR)
AC_SUBST(RUBY_SITEARCHDIR)
@@ -463,7 +463,7 @@ dnl ==================================================
dnl FILE: ./qtruby/rubylib/qtruby/configure.in.in
dnl =======================================================
-AC_CHECK_PROG(RUBY, ruby, ruby)
+AC_CHECK_PROG(RUBY, ruby18, ruby18)
if test -z "$RUBY"; then
DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"

74
x11/kde/bindings3/patches/patch-qtruby_rubylib_qtruby_Qt_cpp Normal file
View File

@ -0,0 +1,74 @@
$OpenBSD: patch-qtruby_rubylib_qtruby_Qt_cpp,v 1.1 2010/09/23 22:24:50 jeremy Exp $
--- qtruby/rubylib/qtruby/Qt.cpp.orig Mon Jan 15 03:19:09 2007
+++ qtruby/rubylib/qtruby/Qt.cpp Fri Sep 3 23:13:18 2010
@@ -950,7 +950,7 @@ cast_object_to(VALUE /*self*/, VALUE object, VALUE new
const char *
get_VALUEtype(VALUE ruby_value)
{
- char * classname = rb_obj_classname(ruby_value);
+ const char * classname = rb_obj_classname(ruby_value);
const char *r = "";
if(ruby_value == Qnil)
r = "u";
@@ -1432,7 +1432,7 @@ static QCString * mcid = 0;
static VALUE
method_missing(int argc, VALUE * argv, VALUE self)
{
- char * methodName = rb_id2name(SYM2ID(argv[0]));
+ const char * methodName = rb_id2name(SYM2ID(argv[0]));
VALUE klass = rb_funcall(self, rb_intern("class"), 0);
// Look for 'thing?' methods, and try to match isThing() or hasThing() in the Smoke runtime
@@ -1475,14 +1475,14 @@ static QString * pred = 0;
}
{
- QCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
+ QCString * mcid = find_cached_selector(argc+3, temp_stack, klass, (char *)methodName);
if (_current_method == -1) {
// Find the C++ method to call. Do that from Ruby for now
VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
if (_current_method == -1) {
- char * op = rb_id2name(SYM2ID(argv[0]));
+ const char * op = rb_id2name(SYM2ID(argv[0]));
if ( qstrcmp(op, "-") == 0
|| qstrcmp(op, "+") == 0
|| qstrcmp(op, "/") == 0
@@ -1557,7 +1557,7 @@ static VALUE
class_method_missing(int argc, VALUE * argv, VALUE klass)
{
VALUE result = Qnil;
- char * methodName = rb_id2name(SYM2ID(argv[0]));
+ const char * methodName = rb_id2name(SYM2ID(argv[0]));
VALUE * temp_stack = (VALUE *) calloc(argc+3, sizeof(VALUE));
temp_stack[0] = rb_str_new2("Qt");
temp_stack[1] = rb_str_new2(methodName);
@@ -1568,7 +1568,7 @@ class_method_missing(int argc, VALUE * argv, VALUE kla
}
{
- QCString * mcid = find_cached_selector(argc+3, temp_stack, klass, methodName);
+ QCString * mcid = find_cached_selector(argc+3, temp_stack, klass, (char *)methodName);
if (_current_method == -1) {
VALUE retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+3, temp_stack);
@@ -1674,7 +1674,7 @@ initialize_qt(int argc, VALUE * argv, VALUE self)
{
// Put this in a C block so that the mcid will be de-allocated at the end of the block,
// rather than on f'n exit, to avoid the longjmp problem described below
- QCString * mcid = find_cached_selector(argc+4, temp_stack, klass, rb_class2name(klass));
+ QCString * mcid = find_cached_selector(argc+4, temp_stack, klass, (char *)rb_class2name(klass));
if (_current_method == -1) {
retval = rb_funcall2(qt_internal_module, rb_intern("do_method_missing"), argc+4, temp_stack);
@@ -1772,7 +1772,7 @@ qapplication_argv(VALUE /*self*/)
VALUE
getmetainfo(VALUE self, int &offset, int &index)
{
- char * signalname = rb_id2name(rb_frame_last_func());
+ const char * signalname = rb_id2name(rb_frame_last_func());
VALUE metaObject_value = rb_funcall(qt_internal_module, rb_intern("getMetaObject"), 1, self);
smokeruby_object *ometa = value_obj_info(metaObject_value);

8
x11/kde/office3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.64 2010/08/30 21:49:54 sthen Exp $
# $OpenBSD: Makefile,v 1.65 2010/09/23 22:25:37 jeremy Exp $
COMMENT= office suite for KDE
@ -85,7 +85,7 @@ LIB_DEPENDS= ::x11/kde/libs3 \
::graphics/ImageMagick \
::graphics/jbigkit \
::databases/mysql \
::lang/ruby \
:ruby->=1.8,<=1.9:lang/ruby/1.8,-main \
::graphics/libexif \
::print/libpaper \
::print/poppler,-qt \
@ -95,7 +95,7 @@ LIB_DEPENDS= ::x11/kde/libs3 \
::databases/postgresql
REVISION = 15
REVISION = 16
WANTLIB= GL GLU GraphicsMagick.>=1 Half ICE Iex IlmImf IlmThread Imath \
MagickCore.>=1 MagickWand.>=1 SM X11 Xau Xcursor Xdamage Xdmcp Xext \
Xfixes Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2.>=5 \
@ -109,7 +109,7 @@ WANTLIB= GL GLU GraphicsMagick.>=1 Half ICE Iex IlmImf IlmThread Imath \
lib/kde3/ktexteditor lib/kde3/kutils lib/kde3/kwalletclient \
lib/kde3/vcard m mad mcop mng mysqlclient ogg openjpeg paper pcre \
pcreposix png poppler poppler-qt pq pqxx pthread pthread-stubs \
python2.5 qtmcop readline ruby sndio soundserver_idl ssl stdc++ \
python2.5 qtmcop readline ruby18 sndio soundserver_idl ssl stdc++ \
termcap tiff util vorbis vorbisenc vorbisfile wmflite wpd \
wv2 xcb xml2 xslt z