diff --git a/x11-toolkits/fltk-devel/Makefile b/x11-toolkits/fltk-devel/Makefile index 08e483628a8a..afeaf27730df 100644 --- a/x11-toolkits/fltk-devel/Makefile +++ b/x11-toolkits/fltk-devel/Makefile @@ -1,46 +1,46 @@ # Created by: gahr # $FreeBSD$ PORTNAME= fltk DISTVERSION= 1.3.x-r${SNAPSHOT_VERS} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= http://fltk.org/pub/${PORTNAME}/snapshots/ PKGNAMESUFFIX= -devel MAINTAINER= ports@FreeBSD.org COMMENT= Cross-platform C++ graphical user interface toolkit LICENSE= LGPL20 LIB_DEPENDS= libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig OPTIONS_DEFINE= EXAMPLES EXAMPLES_CMAKE_OFF= -DOPTION_BUILD_EXAMPLES:BOOL=OFF USE_XORG= xft USE_GL= glu USE_LDCONFIG= ${PREFIX}/lib/fltk-devel USES+= cmake:outsource jpeg LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS+= -DOPTION_BUILD_SHARED_LIBS:BOOL=ON \ -DPREFIX_BIN:PATH=${PREFIX}/bin/fltk-devel \ -DPREFIX_DATA:PATH=${PREFIX}/share/fltk-devel \ -DPREFIX_DOC:PATH=${PREFIX}/share/examples/fltk-devel \ -DPREFIX_INCLUDE:PATH=${PREFIX}/include/fltk-devel \ -DPREFIX_LIB:PATH=${PREFIX}/lib/fltk-devel SNAPSHOT_VERS= 10370 PORTEXAMPLES= * EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME}${PKGNAMESUFFIX} PORTSCOUT= limit:1.3.* post-install: ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/fltk-config ${STAGEDIR}${PREFIX}/bin/fltk-devel ${LN} -sf fltk-devel/libfltk.so ${STAGEDIR}${PREFIX}/lib/libfltk-devel.so .include diff --git a/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx b/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx new file mode 100644 index 000000000000..08a2c4a364a9 --- /dev/null +++ b/x11-toolkits/fltk-devel/files/patch-src_Fl__Tree__Item.cxx @@ -0,0 +1,16 @@ +------------------------------------------------------------------------ +r10699 | greg.ercolano | 2015-04-13 16:55:27 +0000 (Mon, 13 Apr 2015) | 3 lines + +Fix return value test, as pointed out by Albrecht. + +--- src/Fl_Tree_Item.cxx.orig 2014-09-05 02:59:00 UTC ++++ src/Fl_Tree_Item.cxx +@@ -549,7 +549,7 @@ int Fl_Tree_Item::move(Fl_Tree_Item *ite + } else { // different parent? + if ( to > to_parent->children() ) // try to prevent a reparent() error + return -4; +- if ( from_parent->deparent(from) < 0 ) // deparent self from current parent ++ if ( from_parent->deparent(from) == NULL ) // deparent self from current parent + return -5; + if ( to_parent->reparent(this, to) < 0 ) { // reparent self to new parent at position 'to' + to_parent->reparent(this, 0); // failed? shouldn't happen, reparent at 0