diff options
| author | Steve Wills <swills@FreeBSD.org> | 2011-07-29 01:50:34 +0000 |
|---|---|---|
| committer | Steve Wills <swills@FreeBSD.org> | 2011-07-29 01:50:34 +0000 |
| commit | 03280f5b5d3513ee1eed18fa06c7b4e9d8403573 (patch) | |
| tree | edfe81711340c1e2ccb7a6ff6c9cfecdee747587 /sysutils/usbhotkey | |
| parent | b548d7318559690e0c8b334f00a4870aef0faf5d (diff) | |
| download | ports-03280f5b5d3513ee1eed18fa06c7b4e9d8403573.tar.gz ports-03280f5b5d3513ee1eed18fa06c7b4e9d8403573.zip | |
- Fix build with Ruby 1.9
PR: ports/159198
Approved by: Nikos Ntarmos <ntarmos@cs.uoi.gr> (maintainer)
Notes
Notes:
svn path=/head/; revision=278510
Diffstat (limited to 'sysutils/usbhotkey')
| -rw-r--r-- | sysutils/usbhotkey/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/usbhotkey/files/extra-patch-main.c | 26 |
2 files changed, 35 insertions, 3 deletions
diff --git a/sysutils/usbhotkey/Makefile b/sysutils/usbhotkey/Makefile index 5fbbf7821c93..11388bbd364c 100644 --- a/sysutils/usbhotkey/Makefile +++ b/sysutils/usbhotkey/Makefile @@ -7,7 +7,7 @@ PORTNAME= usbhotkey PORTVERSION= 0.3.1 -PORTREVISION= 5 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -26,10 +26,12 @@ HAS_CONFIGURE= yes .include <bsd.port.pre.mk> .if !defined(WITHOUT_PTHREADS) -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/ruby-${RUBY_VER} -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \ LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${LOCALBASE}/lib" .else -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \ + -I${LOCALBASE}/include/ruby-${RUBY_VER} -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" .endif @@ -39,4 +41,8 @@ LIB_DEPENDS+= Imlib.5:${PORTSDIR}/graphics/imlib CONFIGURE_ARGS+= --without-Imlib .endif +.if ${RUBY_VER} == 1.9 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-main.c +.endif + .include <bsd.port.post.mk> diff --git a/sysutils/usbhotkey/files/extra-patch-main.c b/sysutils/usbhotkey/files/extra-patch-main.c new file mode 100644 index 000000000000..5b3d40754718 --- /dev/null +++ b/sysutils/usbhotkey/files/extra-patch-main.c @@ -0,0 +1,26 @@ +--- main.c.orig 2011-07-26 02:17:43.000000000 +0000 ++++ main.c 2011-07-26 02:20:01.000000000 +0000 +@@ -167,18 +167,18 @@ + unsigned c; + VALUE lasterr = rb_gv_get("$!"); + VALUE message = rb_obj_as_string(lasterr); +- VALUE ary = rb_funcall( ruby_errinfo, rb_intern("backtrace"), 0); ++ VALUE ary = rb_funcall( rb_errinfo, rb_intern("backtrace"), 0); + +- if( ! strcmp(RSTRING(message)->ptr, "exit")) ++ if( ! strcmp(RSTRING_PTR(message), "exit")) + { + quitMe(1); + return; + } + +- printf( "usbhotkey: %s\n", RSTRING(message)->ptr); ++ printf( "usbhotkey: %s\n", RSTRING_PTR(message)); + printf( "usbhotkey: Backtrace:\n"); +- for( c=0; c<RARRAY(ary)->len; c++) +- printf( "usbhotkey: \tfrom %s\n", RSTRING(RARRAY(ary)->ptr[c])->ptr); ++ for( c=0; c<RARRAY_LEN(ary); c++) ++ printf( "usbhotkey: \tfrom %s\n", RSTRING_PTR(RARRAY_PTR(ary)[c])); + errorHelp( "Error executing start script\n"); + } + } |