Index: head/x11-toolkits/fltk/Makefile =================================================================== --- head/x11-toolkits/fltk/Makefile (revision 431751) +++ head/x11-toolkits/fltk/Makefile (revision 431752) @@ -1,47 +1,47 @@ # Created by: Dima Sivachenko # $FreeBSD$ PORTNAME= fltk PORTVERSION= 1.3.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= danfe@FreeBSD.org COMMENT= Cross-platform C++ graphical user interface toolkit LICENSE= LGPL20 LIB_DEPENDS= libpng.so:graphics/png USES= jpeg localbase pkgconfig USE_XORG= x11 xcursor xext xfixes xft xinerama USE_GL= glu USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-shared WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES post-patch: .SILENT prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \ ${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${plength}|;}" \ ${WRKSRC}/src/Fl_Preferences.cxx ${REINPLACE_CMD} -e 's,$$(docdir)/examples,${EXAMPLESDIR},' \ ${WRKSRC}/test/Makefile ${REINPLACE_CMD} -e '/^INSTALL_BIN/s,-m,${STRIP} &, ; \ s,^\.SILENT,#&,' ${WRKSRC}/makeinclude.in ${REINPLACE_CMD} -E \ 's,(.*)LDFLAGS(.*)LINKSHARED(.*),\1LINKSHARED\2LDFLAGS\3,' \ ${WRKSRC}/fluid/Makefile ${REINPLACE_CMD} -e '/Fl_XFont_On_Demand/s,class,& FL_EXPORT,' \ ${WRKSRC}/FL/x.H ${REINPLACE_CMD} -e 's,result = 0;,fl_open_display(); &,' \ ${WRKSRC}/src/Fl_x.cxx .include Index: head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx =================================================================== --- head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx (nonexistent) +++ head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx (revision 431752) @@ -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 Property changes on: head/x11-toolkits/fltk/files/patch-src_Fl__Tree__Item.cxx ___________________________________________________________________ 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