4 files changed, 101 insertions, 9 deletions

diff --git a/x11-toolkits/flu/Makefile b/x11-toolkits/flu/Makefile
index 233ec597bc53..59686b013e83 100644
--- a/x11-toolkits/flu/Makefile
+++ b/x11-toolkits/flu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flu
 PORTVERSION=	2.14
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.osc.edu/archive/FLU/
 DISTNAME=	FLU_${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	FLU_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library containing extra widgets for FLTK
 
-LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 USE_GL=		gl
 USE_LDCONFIG=	yes
@@ -39,10 +39,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/flu/files/patch-FLU_Flu_Tree_Browser.h b/x11-toolkits/flu/files/patch-FLU_Flu_Tree_Browser.h
new file mode 100644
index 000000000000..171e5c916247
--- /dev/null
+++ b/x11-toolkits/flu/files/patch-FLU_Flu_Tree_Browser.h
@@ -0,0 +1,51 @@
+--- FLU/Flu_Tree_Browser.h.orig	2010-01-15 11:50:51.000000000 +0100
++++ FLU/Flu_Tree_Browser.h	2010-01-15 11:55:24.000000000 +0100
+@@ -346,7 +346,7 @@
+     { return rdata.insertionMode; }
+ 
+   //! \return whether the point \c (x,y) is inside the entry area (not on the scrollbars)
+-  bool Flu_Tree_Browser :: inside_entry_area( int x, int y );
++  bool inside_entry_area( int x, int y );
+ 
+   //! Set the title of the Tree (also the label for the root entry)
+   inline void label( const char *l )
+@@ -436,23 +436,23 @@
+ 
+   //! Remove the entry identified by path \b fullpath from the tree
+   /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
+-  unsigned int remove( const char *fullpath );
++  unsigned long remove( const char *fullpath );
+ 
+   //! Remove entry \b name in path \b path from the tree
+   /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
+-  unsigned int remove( const char *path, const char *name );
++  unsigned long remove( const char *path, const char *name );
+ 
+   //! Remove the entry identified by unique id \b id from the tree
+   /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
+-  unsigned int remove( unsigned int id );
++  unsigned long remove( unsigned int id );
+ 
+   //! Remove the entry containing the widget \b w from the tree. Note that the widget is automatically destroyed
+   /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
+-  unsigned int remove( Fl_Widget *w );
++  unsigned long remove( Fl_Widget *w );
+ 
+   //! Remove Node \b n from the tree
+   /*! \return the id of \b n on successful removal, or \c 0 if \b n is not in the tree */
+-  inline unsigned int remove( Node* n )
++  inline unsigned long remove( Node* n )
+     { if( !n ) return 0; else return remove( n->id() ); }
+ 
+   //! Override of Fl_Widget::resize
+@@ -1077,8 +1077,8 @@
+ 
+       //! Remove the entry identified by path \b fullpath from this node
+       /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
+-      inline unsigned int remove( const char *fullpath )
+-	{ return( (unsigned int)modify( fullpath, REMOVE, tree->rdata ) ); }
++      inline unsigned long remove( const char *fullpath )
++	{ return( (unsigned long )modify( fullpath, REMOVE, tree->rdata ) ); }
+ 
+       //! Remove the entry identified by unique id \b id from this node
+       /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
diff --git a/x11-toolkits/flu/files/patch-src_Flu_File_Chooser.cpp b/x11-toolkits/flu/files/patch-src_Flu_File_Chooser.cpp
new file mode 100644
index 000000000000..27f24070a9dd
--- /dev/null
+++ b/x11-toolkits/flu/files/patch-src_Flu_File_Chooser.cpp
@@ -0,0 +1,11 @@
+--- src/Flu_File_Chooser.cpp.orig	2010-01-15 11:52:23.000000000 +0100
++++ src/Flu_File_Chooser.cpp	2010-01-15 11:52:55.000000000 +0100
+@@ -2773,7 +2773,7 @@
+   const Fl_Menu_Item *selection = entryPopup.popup();
+   if( selection )
+     {
+-      int handler = (int)selection->user_data();
++      long handler = (long)selection->user_data();
+       switch( handler )
+ 	{
+ 	case ACTION_NEW_FOLDER:
diff --git a/x11-toolkits/flu/files/patch-src_Flu_Tree_Browser.cpp b/x11-toolkits/flu/files/patch-src_Flu_Tree_Browser.cpp
new file mode 100644
index 000000000000..1bbd5a10def0
--- /dev/null
+++ b/x11-toolkits/flu/files/patch-src_Flu_Tree_Browser.cpp
@@ -0,0 +1,36 @@
+--- src/Flu_Tree_Browser.cpp.orig	2010-01-15 11:54:00.000000000 +0100
++++ src/Flu_Tree_Browser.cpp	2010-01-15 11:57:06.000000000 +0100
+@@ -2981,12 +2981,12 @@
+   return add( path, p.c_str(), w, showLabel );
+ }
+ 
+-unsigned int Flu_Tree_Browser :: remove( const char *fullpath )
++unsigned long Flu_Tree_Browser :: remove( const char *fullpath )
+ {
+-  return( (unsigned int)root.modify( fullpath, Node::REMOVE, rdata ) );
++  return( (unsigned long)root.modify( fullpath, Node::REMOVE, rdata ) );
+ }
+ 
+-unsigned int Flu_Tree_Browser :: remove( const char *path, const char *text )
++unsigned long Flu_Tree_Browser :: remove( const char *path, const char *text )
+ {
+   // if the path does not end in '/', add it
+   FluSimpleString s = path;
+@@ -2996,7 +2996,7 @@
+   return remove( s.c_str() );
+ }
+ 
+-unsigned int Flu_Tree_Browser :: remove( unsigned int id )
++unsigned long Flu_Tree_Browser :: remove( unsigned int id )
+ {
+   return root.remove( id );
+ }
+@@ -3028,7 +3028,7 @@
+   return 0;
+ }
+ 
+-unsigned int Flu_Tree_Browser :: remove( Fl_Widget *w )
++unsigned long Flu_Tree_Browser :: remove( Fl_Widget *w )
+ {
+   return root.remove( w );
+ }