Fix LP64 build. This package seems to rely heavily on storing ints in

pointers; at least it's not the other way around.

9 files changed, 137 insertions, 1 deletions

diff --git a/x11/efltk/distinfo b/x11/efltk/distinfo
index ecef41bd195..2d09fda78d0 100644
--- a/x11/efltk/distinfo
+++ b/x11/efltk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2011/05/21 08:18:16 obache Exp $
+$NetBSD: distinfo,v 1.7 2011/10/02 03:44:10 dholland Exp $
 
 SHA1 (efltk-2.0.5.tar.bz2) = 26f7124b384d0bfe3d28a73cbdf0111432b08d99
 RMD160 (efltk-2.0.5.tar.bz2) = 7efa711d0df8a01ee402e1866286265d294778e8
@@ -11,6 +11,14 @@ SHA1 (patch-ae) = 45f32b9d098736443a3d9b405b6fe17da624d9fc
 SHA1 (patch-af) = 2fe44ea57e0579dcfa43ba597e52161c70f67efd
 SHA1 (patch-ag) = 29799b2b0aeffbca82dbc98cb1e06eb62a7e595a
 SHA1 (patch-ah) = 63bacecefa0cece0cbcbf229c886231f2907c0a8
+SHA1 (patch-efltk_Fl__Flags_h) = 589ea469042b1271cc9591680f55db6858025db2
+SHA1 (patch-efltk_Fl__Int__List_h) = 766ae82ee67a90def27e0882b815e918b8cc6ca3
 SHA1 (patch-efltk_Fl__Text__Buffer.h) = 16eb6b48d0f06ac0f2074a0b61a782db7757663e
+SHA1 (patch-efltk_Fl__Widget_h) = a35acb6f3af14bd2fabbe1c67b92e80fe561a366
 SHA1 (patch-efltk_Fl__Window.h) = b97f04435b88e05ec4f642b0615575cf8d279dd7
+SHA1 (patch-efltk_db_Fl__Params_h) = 3e16bd8ddf1b700cc9ba516e312dc797f26e6546
+SHA1 (patch-src_core_fl__draw__pixmap_cpp) = cd31ac6d730b257bb3e76c9525ad92f9ea0fa3aa
 SHA1 (patch-src_images_Fl__Png.cpp) = 0c2d3bf30a5542274048784aaf32256cc5466dea
+SHA1 (patch-src_widgets_Fl__Calendar_cpp) = fc0f83c5f64c074b0e33783cac5aaa072b21c999
+SHA1 (patch-src_widgets_Fl__Input_cpp) = 33c0eb6c582aeae66a40bd993ac7e5616a6fdf72
+SHA1 (patch-src_widgets_Fl__Text__Editor_cpp) = fff83662ee1efe9370e366aa12bf34cb7d26e165
diff --git a/x11/efltk/patches/patch-efltk_Fl__Flags_h b/x11/efltk/patches/patch-efltk_Fl__Flags_h
new file mode 100644
index 00000000000..76a8ba7315f
--- /dev/null
+++ b/x11/efltk/patches/patch-efltk_Fl__Flags_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-efltk_Fl__Flags_h,v 1.1 2011/10/02 03:44:10 dholland Exp $
+
+- fix LP64 build
+
+--- efltk/Fl_Flags.h~	2003-07-03 20:36:35.000000000 +0000
++++ efltk/Fl_Flags.h
+@@ -89,7 +89,7 @@ public:
+     Fl_Flags(long flags) : m_flags(flags) { }
+     Fl_Flags(unsigned flags) : m_flags(flags) { }
+     Fl_Flags(int flags) : m_flags(flags) { }
+-    Fl_Flags(void* flags) : m_flags((int)flags) { }
++    /*Fl_Flags(void* flags) : m_flags((int)flags) { }*/
+     Fl_Flags() : m_flags(0) { }
+ 
+     bool is_set(int flags) const { return (m_flags&flags)!=0; }
diff --git a/x11/efltk/patches/patch-efltk_Fl__Int__List_h b/x11/efltk/patches/patch-efltk_Fl__Int__List_h
new file mode 100644
index 00000000000..f5f47304458
--- /dev/null
+++ b/x11/efltk/patches/patch-efltk_Fl__Int__List_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-efltk_Fl__Int__List_h,v 1.1 2011/10/02 03:44:10 dholland Exp $
+
+- fix LP64 build
+
+--- efltk/Fl_Int_List.h~	2003-07-03 20:36:35.000000000 +0000
++++ efltk/Fl_Int_List.h
+@@ -43,7 +43,7 @@ public:
+     char *to_string(const char *separator=",");
+     void from_string(const char * s, const char * separator=",");
+ 
+-    int item(uint index) const { return (int)Fl_Ptr_List::item(index); }
++    int item(uint index) const { return (int)(intptr_t)Fl_Ptr_List::item(index); }
+     int &operator [](uint ind) const { return (int&)items[ind]; }
+ };
+ 
diff --git a/x11/efltk/patches/patch-efltk_Fl__Widget_h b/x11/efltk/patches/patch-efltk_Fl__Widget_h
new file mode 100644
index 00000000000..12072c66270
--- /dev/null
+++ b/x11/efltk/patches/patch-efltk_Fl__Widget_h
@@ -0,0 +1,17 @@
+$NetBSD: patch-efltk_Fl__Widget_h,v 1.1 2011/10/02 03:44:10 dholland Exp $
+
+- fix LP64 build
+
+--- efltk/Fl_Widget.h~	2003-06-25 10:02:00.000000000 +0000
++++ efltk/Fl_Widget.h
+@@ -363,8 +363,8 @@ private:
+ public:
+     /* Define default slots */
+     DEFSLOT_O(Fl_Widget, Fl_Widget, slot_label, const char *);
+-    DEFSLOT_O(Fl_Widget, Fl_Widget, slot_active, int);
+-    DEFSLOT_O(Fl_Widget, Fl_Widget, slot_visibility, int);
++    DEFSLOT_O(Fl_Widget, Fl_Widget, slot_active, long);
++    DEFSLOT_O(Fl_Widget, Fl_Widget, slot_visibility, long);
+ 
+ 	/**
+ 	 * Change label of widget. This function redraws label also.
diff --git a/x11/efltk/patches/patch-efltk_db_Fl__Params_h b/x11/efltk/patches/patch-efltk_db_Fl__Params_h
new file mode 100644
index 00000000000..9abc3903764
--- /dev/null
+++ b/x11/efltk/patches/patch-efltk_db_Fl__Params_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-efltk_db_Fl__Params_h,v 1.1 2011/10/02 03:44:10 dholland Exp $
+
+- fix LP64 build
+
+--- efltk/db/Fl_Params.h~	2003-04-23 17:56:23.000000000 +0000
++++ efltk/db/Fl_Params.h
+@@ -45,7 +45,7 @@ public:
+     void       bind_clear() { m_bindParamIndexes.clear(); }
+     void       bind_add(unsigned bindIndex);
+     unsigned   bind_count() { return m_bindParamIndexes.count(); }
+-    unsigned   bind_index(unsigned ind) { return (unsigned)m_bindParamIndexes[ind]; }
++    unsigned   bind_index(unsigned ind) { return (unsigned)(uintptr_t)m_bindParamIndexes[ind]; }
+ 
+     // ASSIGNMENT OPERATORS
+     Fl_Variant& operator =(const Fl_Variant &C) {
diff --git a/x11/efltk/patches/patch-src_core_fl__draw__pixmap_cpp b/x11/efltk/patches/patch-src_core_fl__draw__pixmap_cpp
new file mode 100644
index 00000000000..ea32aeebaa4
--- /dev/null
+++ b/x11/efltk/patches/patch-src_core_fl__draw__pixmap_cpp
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_core_fl__draw__pixmap_cpp,v 1.1 2011/10/02 03:44:10 dholland Exp $
+
+- fix LP64 build
+
+--- src/core/fl_draw_pixmap.cpp~	2005-03-25 08:39:25.000000000 +0000
++++ src/core/fl_draw_pixmap.cpp
+@@ -35,6 +35,7 @@
+ 
+ #include <config.h>
+ #include <efltk/Fl_Color.h>
++#include <efltk/Fl_Renderer.h>
+ #include <efltk/fl_draw.h>
+ #include <ctype.h>
+ #include <stdio.h>
diff --git a/x11/efltk/patches/patch-src_widgets_Fl__Calendar_cpp b/x11/efltk/patches/patch-src_widgets_Fl__Calendar_cpp
new file mode 100644
index 00000000000..103f2d65069
--- /dev/null
+++ b/x11/efltk/patches/patch-src_widgets_Fl__Calendar_cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_widgets_Fl__Calendar_cpp,v 1.1 2011/10/02 03:44:10 dholland Exp $
+
+- fix LP64 build
+
+--- src/widgets/Fl_Calendar.cpp~	2003-05-30 08:46:58.000000000 +0000
++++ src/widgets/Fl_Calendar.cpp
+@@ -43,13 +43,13 @@ static const int monthChanges[4] = {
+ // Callback function for day buttons
+ void Fl_Calendar::cbDayButtonClicked(Fl_Widget *button, void *param) {
+     Fl_Calendar *c = (Fl_Calendar *)button->parent()->parent();
+-    c->dayButtonClicked((unsigned)param);
++    c->dayButtonClicked((unsigned)(uintptr_t)param);
+ }
+ 
+ // Callback function for switch buttons
+ void Fl_Calendar::cbSwitchButtonClicked(Fl_Widget *button, void *param) {
+     Fl_Calendar *c = (Fl_Calendar *)button->parent();
+-    c->switchButtonClicked((int)param);
++    c->switchButtonClicked((int)(intptr_t)param);
+ }
+ 
+ void Fl_Calendar::dayButtonClicked(unsigned day) {
diff --git a/x11/efltk/patches/patch-src_widgets_Fl__Input_cpp b/x11/efltk/patches/patch-src_widgets_Fl__Input_cpp
new file mode 100644
index 00000000000..2e09e2f2bb7
--- /dev/null
+++ b/x11/efltk/patches/patch-src_widgets_Fl__Input_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_widgets_Fl__Input_cpp,v 1.1 2011/10/02 03:44:10 dholland Exp $
+
+- fix LP64 build
+
+--- src/widgets/Fl_Input.cpp~	2003-06-22 21:36:13.000000000 +0000
++++ src/widgets/Fl_Input.cpp
+@@ -59,7 +59,7 @@ static Fl_Menu_ *menu_ = &menu;
+ static void cb_menu(Fl_Widget *w, void *d)
+ {
+     if(!menu_widget) return;
+-    switch((int)d) {
++    switch((int)(intptr_t)d) {
+         case CUT:
+             menu_widget->copy(true);
+             menu_widget->cut();
diff --git a/x11/efltk/patches/patch-src_widgets_Fl__Text__Editor_cpp b/x11/efltk/patches/patch-src_widgets_Fl__Text__Editor_cpp
new file mode 100644
index 00000000000..7f998d2b200
--- /dev/null
+++ b/x11/efltk/patches/patch-src_widgets_Fl__Text__Editor_cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_widgets_Fl__Text__Editor_cpp,v 1.1 2011/10/02 03:44:10 dholland Exp $
+
+- fix LP64 build
+
+--- src/widgets/Fl_Text_Editor.cpp~	2003-06-16 19:41:23.000000000 +0000
++++ src/widgets/Fl_Text_Editor.cpp
+@@ -45,7 +45,7 @@ static void cb_menu(Fl_Widget *w, void *
+ {
+     if(!menu_widget) return;
+     char *selection = 0;
+-    switch((int)d) {
++    switch((int)(intptr_t)d) {
+         case COPY:
+             selection = (char *)menu_widget->buffer()->selection_text();
+             if(*selection) {