<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/352eee559051076b04d269234b3246aef96fa0ba">https://github.com/macports/macports-ports/commit/352eee559051076b04d269234b3246aef96fa0ba</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 352eee5 libglui: update version 2.36->2.37; add x11 variant
</span>352eee5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 352eee559051076b04d269234b3246aef96fa0ba
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Aug 19 05:24:21 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> libglui: update version 2.36->2.37; add x11 variant
</span>---
x11/glui/Portfile | 63 ++++++++++++++----------------
x11/glui/files/patch-CMakeLists.txt.diff | 36 +++++++++++++++++
x11/glui/files/patch-glui.diff | 47 ----------------------
x11/glui/files/patch-glui_filebrowser.diff | 46 ----------------------
x11/glui/files/patch-makefile.diff | 44 ---------------------
5 files changed, 66 insertions(+), 170 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/glui/Portfile b/x11/glui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a0a664..de0917e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/glui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/glui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +1,48 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name glui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libglui glui 2.37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> categories x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {mcalhoun @MarcusCalhoun-Lopez}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
</span> description A GLUT-based C++ user interface library.
long_description \
GLUI is a GLUT-based C++ user interface library \
which provides controls such as buttons, checkboxes, radio buttons, and spinners to OpenGL applications.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://glui.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:glui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}-${version}/src
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- md5 9e8d506af9a9428dac09e8cd7bda7c1e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 00e6a4a8a331ccfde951966526c63b0f37c7d8f3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f39fe98e3e215816b0af2089ab7ac460df5701b8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-makefile.diff patch-glui.diff patch-glui_filebrowser.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags -framework GLUT -framework OpenGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__CONFIGURE_CXX__|${configure.cxx}|" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__CONFIGURE_CXXFLAGS__|${configure.cxxflags}|" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__CONFIGURE_LDFLAGS__|${configure.ldflags}|" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__CONFIGURE_CPPFLAGS__|${configure.cppflags}|" ${worksrcpath}/makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 44cb8c9e30e8dbdfee6ed0ae609029c1ca449211 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2f505a5320b6002f940a33d88e59d52333164cc0f2de8d6bd55b7d4d83664dfe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 487960
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mesa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libGLU \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:freeglut
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENGL_gl_LIBRARY=${prefix}/lib/libGL.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENGL_glu_LIBRARY=${prefix}/lib/libGLU.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGLUT_glut_LIBRARY=${prefix}/lib/libglut.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGLUT_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENGL_INCLUDE_DIR=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGLUT_cocoa_LIBRARY=""
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +x11
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/include/GL/glui.h ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/lib/libglui.a ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${worksrcpath}/bin/ppm2array ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGLUT_glut_LIBRARY=/System/Library/Frameworks/GLUT.framework
</span> }
post-destroot {
xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 ${worksrcpath}/doc/glui_manual.pdf ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${destroot}${prefix}/share/doc/${name}/examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval xinstall -m 644 [glob ${worksrcpath}/example/example*.cpp] ${destroot}${prefix}/share/doc/${name}/examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eval xinstall -m 755 [glob ${worksrcpath}/bin/example*] ${destroot}${prefix}/share/doc/${name}/examples
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.distname Source
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/glui/files/patch-CMakeLists.txt.diff b/x11/glui/files/patch-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3161c1e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/glui/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2015-09-25 02:35:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2018-08-19 04:17:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,23 +49,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_property(TARGET glui_obj PROPERTY POSITION_INDEPENDENT_CODE 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(glui SHARED $<TARGET_OBJECTS:glui_obj>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(glui ${GLUT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_link_libraries(glui ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS glui DESTINATION lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(glui_static STATIC $<TARGET_OBJECTS:glui_obj>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(glui_static ${GLUT_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS glui_static DESTINATION lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(ppm2array tools/ppm.cpp tools/ppm2array.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(ppm2array)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS ppm2array DESTINATION bin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(example1 example/example1.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(example1 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS example1 DESTINATION share/examples/glui)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(example2 example/example2.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(example2 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS example2 DESTINATION share/examples/glui)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(example3 example/example3.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(example3 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS example3 DESTINATION share/examples/glui)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(example4 example/example4.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(example4 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS example4 DESTINATION share/examples/glui)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(example5 example/example5.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(example5 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS example5 DESTINATION share/examples/glui)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(example6 example/example6.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(example6 glui_static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS example6 DESTINATION share/examples/glui)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/glui/files/patch-glui.diff b/x11/glui/files/patch-glui.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4190906..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/glui/files/patch-glui.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/GL/glui.h.orig 2006-07-06 09:08:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/GL/glui.h 2007-10-31 13:30:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -700,7 +700,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *font;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int curr_modifiers;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void adjust_glut_xy( int &x, int &y ) { y = h-y; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void adjust_glut_xy( int &/*x*/, int &y ) { y = h-y; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void activate_control( GLUI_Control *control, int how );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void align_controls( GLUI_Control *control );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void deactivate_current_control( void );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -824,19 +824,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual int get_id( void ) const { return user_id; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void set_id( int id ) { user_id=id; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual int mouse_down_handler( int local_x, int local_y ) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual int mouse_up_handler( int local_x, int local_y, bool inside ) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual int mouse_held_down_handler( int local_x, int local_y, bool inside) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual int key_handler( unsigned char key, int modifiers ) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual int special_handler( int key,int modifiers ) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual int mouse_down_handler( int /*local_x*/, int /*local_y*/ ) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual int mouse_up_handler( int /*local_x*/, int /*local_y*/, bool /*inside*/ ) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual int mouse_held_down_handler( int /*local_x*/, int /*local_y*/, bool /*inside*/) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual int key_handler( unsigned char /*key*/, int /*modifiers*/ ) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual int special_handler( int /*key*/,int /*modifiers*/ ) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void update_size( void ) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void idle( void ) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual int mouse_over( int state, int x, int y ) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual int mouse_over( int /*state*/, int /*x*/, int /*y*/ ) { return false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void enable( void );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void disable( void );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual void activate( int how ) { active = true; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual void activate( int /*how*/ ) { active = true; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void deactivate( void ) { active = false; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** Hide (shrink into a rollout) and unhide (expose from a rollout) */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -894,7 +894,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void sync_live( int recurse, int draw ); /* Reads live variable */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void init_live( void );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void output_live( int update_main_gfx ); /** Writes live variable **/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- virtual void set_text( const char *t ) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ virtual void set_text( const char */*t*/ ) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void execute_callback( void );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void get_this_column_dims( int *col_x, int *col_y,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int *col_w, int *col_h,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/glui/files/patch-glui_filebrowser.diff b/x11/glui/files/patch-glui_filebrowser.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e1e2b65..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/glui/files/patch-glui_filebrowser.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- glui_filebrowser.cpp.orig 2007-11-08 01:36:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ glui_filebrowser.cpp 2007-11-08 01:44:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,17 +74,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!me)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int this_item;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const char *selected;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this_item = list->get_current_item();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (this_item > 0) { /* file or directory selected */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- selected = list->get_item_ptr( this_item )->text.c_str();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (selected[0] == '/' || selected[0] == '\\') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const GLUI_String selected = list->get_item_ptr( this_item )->text.c_str();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*selected.rbegin() == '/' || selected[0] == '\\') {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (me->allow_change_dir) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- chdir(selected+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ chdir(selected.substr(0,selected.size()-1u).c_str());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SetCurrentDirectory(selected+1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SetCurrentDirectory(selected.substr(1).c_str());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- me->fbreaddir(".");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -113,8 +112,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hFind = FindFirstFile("*.*", &FN);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (list) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list->delete_all();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (hFind != INVALID_HANDLE_VALUE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list->delete_all();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int len = strlen(FN.cFileName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (FN.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,10 +140,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct stat dr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (list) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list->delete_all();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((dir = opendir(d)) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- perror("fbreaddir:");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list->delete_all();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while ((dirp = readdir(dir)) != NULL) /* open directory */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!lstat(dirp->d_name,&dr) && S_ISDIR(dr.st_mode)) /* dir is directory */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/glui/files/patch-makefile.diff b/x11/glui/files/patch-makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e32613d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/glui/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.orig 2007-08-20 21:59:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile 2008-08-05 17:54:27.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,24 +5,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #CC=gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Compiler options
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OPTS=-g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OPTS=-O0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#OPTS=-O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--UNAME = $(shell uname)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(UNAME), Linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXX = g++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CPPFLAGS += $(OPTS) -Wall -pedantic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OPTS=__CONFIGURE_CXXFLAGS__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXX = __CONFIGURE_CXX__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPPFLAGS += $(OPTS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #######################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS += -I./ -I./include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBGLUI = -L./lib -lglui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBGL = -lGLU -lGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS = -lXmu -lXext -lX11 -lXi -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBGL =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS = __CONFIGURE_LDFLAGS__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # One of the following options only...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,8 +29,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CPPFLAGS += -I/usr/X11R6/include -DGLUI_FREEGLUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (3) GLUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBGLUT = -L/usr/X11R6/lib -lglut
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CPPFLAGS += -I/usr/X11R6/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBGLUT =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPPFLAGS += __CONFIGURE_CPPFLAGS__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #######################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>