Index: branches/2017Q1/devel/ruby-qtruby/Makefile =================================================================== --- branches/2017Q1/devel/ruby-qtruby/Makefile (revision 432024) +++ branches/2017Q1/devel/ruby-qtruby/Makefile (revision 432025) @@ -1,42 +1,42 @@ # $FreeBSD$ PORTNAME= qtruby PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel kde kde-kde4 ruby PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} MAINTAINER= kde@FreeBSD.org COMMENT= Ruby bindings for Qt LIB_DEPENDS= libqwt.so:x11-toolkits/qwt5 \ libqscintilla2.so:devel/qscintilla2 USES= cmake:outsource kde:4 tar:xz USE_KDE= smokeqt USE_QT4= corelib dbus declarative gui network phonon script webkit xml \ qmake_build moc_build uic_build rcc_build USE_RUBY= yes USE_LDCONFIG= yes SUB_FILES= ruby-kdebindings-env.sh pkg-message SUB_LIST+= RUBY_SITELIBDIR=${RUBY_SITELIBDIR} \ RUBY_SITEARCHLIBDIR=${RUBY_SITEARCHLIBDIR} CMAKE_ARGS+= -DRUBY_LIBRARY=${LOCALBASE}/lib/lib${RUBY_NAME}.so \ -DRUBY_INCLUDE_PATH=${LOCALBASE}/lib/ruby/${RUBY_VER}/${RUBY_ARCH} \ -DCUSTOM_RUBY_SITE_LIB_DIR=${RUBY_SITELIBDIR} \ -DCUSTOM_RUBY_SITE_ARCH_DIR=${RUBY_SITEARCHLIBDIR} post-patch: ${REINPLACE_CMD} -e 's|QWT_FOUND|Qwt5_FOUND|g' \ ${WRKSRC}/src/CMakeLists.txt ${REINPLACE_CMD} -e 's|share/qtruby4/cmake|lib/cmake/qtruby4|g' \ ${WRKSRC}/cmake/CMakeLists.txt \ ${WRKSRC}/src/CMakeLists.txt post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/env ${INSTALL_SCRIPT} ${WRKDIR}/ruby-kdebindings-env.sh ${STAGEDIR}${PREFIX}/env .include Index: branches/2017Q1/devel/ruby-qtruby/files/patch-src_qtruby.cpp =================================================================== --- branches/2017Q1/devel/ruby-qtruby/files/patch-src_qtruby.cpp (nonexistent) +++ branches/2017Q1/devel/ruby-qtruby/files/patch-src_qtruby.cpp (revision 432025) @@ -0,0 +1,13 @@ +Fix bogus pointer comparison. + +--- src/qtruby.cpp.orig 2017-01-18 20:21:44 UTC ++++ src/qtruby.cpp +@@ -2094,7 +2094,7 @@ isObject(VALUE /*self*/, VALUE obj) + { + void * ptr = 0; + ptr = value_to_ptr(obj); +- return (ptr > 0 ? Qtrue : Qfalse); ++ return (ptr ? Qtrue : Qfalse); + } + + static VALUE Property changes on: branches/2017Q1/devel/ruby-qtruby/files/patch-src_qtruby.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2017Q1 =================================================================== --- branches/2017Q1 (revision 432024) +++ branches/2017Q1 (revision 432025) Property changes on: branches/2017Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r431952