Fix void usage.

7 files changed, 127 insertions, 4 deletions

diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index fea5e98c8c8..f30fb11688b 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2011/02/17 08:46:49 markd Exp $
+$NetBSD: distinfo,v 1.26 2012/12/24 21:12:36 joerg Exp $
 
 SHA1 (xfig.3.2.5b.full.tar.gz) = 0730d7e6bc217c0de02682efb0078821512bb542
 RMD160 (xfig.3.2.5b.full.tar.gz) = aad4cfd808c116d34218e9890a898652e4f52ab6
@@ -6,7 +6,7 @@ Size (xfig.3.2.5b.full.tar.gz) = 5821049 bytes
 SHA1 (patch-aa) = c931f4735f7502cc9d7c116378dcd3b420a40c6f
 SHA1 (patch-ab) = e3c240cc325804ec466e7ef77754791b18fd4338
 SHA1 (patch-ac) = b43b811dce9aa3cdb5d18dc7c403a4a2e503fd44
-SHA1 (patch-ad) = b75238284164fe1e8365c21fab1a5e9102c467d0
+SHA1 (patch-ad) = fc686b6509ff45f6aa8ba235b95eb85e1dbead88
 SHA1 (patch-ae) = 8bb5d1c01faae34a6ad2cd1eaddf794cbf39a02e
 SHA1 (patch-ag) = 021f15be1fd36adc80c638bbb485e2f3753ac11b
 SHA1 (patch-ai) = bd3f0c40e542aae1cfd739dbe0c0f096ddfdefcf
@@ -17,3 +17,8 @@ SHA1 (patch-an) = 4bfce8dbd420bc4b4d8efa5b01a39e3a9ce03ca6
 SHA1 (patch-ao) = 4b3878cd2a5ef57dd34d51604e204bd106261ad2
 SHA1 (patch-ap) = 84a453de2badd82eb31d950981f086e48310d66f
 SHA1 (patch-aq) = 83c15caff521ab857b0a2744590cbd17f678c107
+SHA1 (patch-d__text.c) = f57cb3c7d0b68a9d27e87538db17ae106acb0ba5
+SHA1 (patch-d__text.h) = 3816e30a21c5c4dfd41a8e43d785babc2c8c7789
+SHA1 (patch-w__export.c) = 2787cb59a692d5e435249fea21d6978877db7ea7
+SHA1 (patch-w__print.c) = 1856279ad76a2e71ea896a66d874a0b72330acd0
+SHA1 (patch-w__util.c) = 35f2cfe73697c0b6005e3a8c3e46b44b2ed8f721
diff --git a/graphics/xfig/patches/patch-ad b/graphics/xfig/patches/patch-ad
index 34d5d447137..a8edd20a49f 100644
--- a/graphics/xfig/patches/patch-ad
+++ b/graphics/xfig/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.5 2009/06/22 18:29:33 drochner Exp $
+$NetBSD: patch-ad,v 1.6 2012/12/24 21:12:36 joerg Exp $
 
---- w_cmdpanel.c.orig	2008-07-17 17:50:06.000000000 +0200
+--- w_cmdpanel.c.orig	2008-07-17 15:50:06.000000000 +0000
 +++ w_cmdpanel.c
 @@ -375,7 +375,7 @@ rebuild_file_menu(Widget menu)
  	for (j = 0; j < MAX_RECENT_FILES; j++) {
diff --git a/graphics/xfig/patches/patch-d__text.c b/graphics/xfig/patches/patch-d__text.c
new file mode 100644
index 00000000000..047ce458eb2
--- /dev/null
+++ b/graphics/xfig/patches/patch-d__text.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-d__text.c,v 1.1 2012/12/24 21:12:36 joerg Exp $
+
+--- d_text.c.orig	2012-12-23 17:34:56.000000000 +0000
++++ d_text.c
+@@ -1880,10 +1880,7 @@ SetGeometry(ic, name, area)
+   XFree(list);
+ }
+ 
+-xim_set_ic_geometry(ic, width, height)
+-     XIC ic;
+-     int width;
+-     int height;
++void xim_set_ic_geometry(XIC ic, int width, int height)
+ {
+   XRectangle preedit_area, *preedit_area_ptr;
+   XRectangle status_area, *status_area_ptr;
+@@ -1951,7 +1948,7 @@ xim_initialize(w)
+   else if (strncasecmp(appres.xim_input_style, "None", 3) != 0)
+     fprintf(stderr, "xfig: inputStyle should OverTheSpot, OffTheSpot, or Root\n");
+ 
+-  if (preferred_style == style_notuseful) return;
++  if (preferred_style == style_notuseful) return True;
+ 
+   if (appres.DEBUG) fprintf(stderr, "initialize_input_method()...\n");
+   if ((modifier_list = XSetLocaleModifiers("")) == NULL || *modifier_list == '\0') {
diff --git a/graphics/xfig/patches/patch-d__text.h b/graphics/xfig/patches/patch-d__text.h
new file mode 100644
index 00000000000..2d37309cf78
--- /dev/null
+++ b/graphics/xfig/patches/patch-d__text.h
@@ -0,0 +1,9 @@
+$NetBSD: patch-d__text.h,v 1.1 2012/12/24 21:12:36 joerg Exp $
+
+--- d_text.h.orig	2012-12-23 17:37:02.000000000 +0000
++++ d_text.h
+@@ -36,3 +36,4 @@ extern		kill_preedit();
+ #endif  /* I18N_USE_PREEDIT */
+ #endif  /* I18N */
+ extern void text_drawing_selected (void);
++extern void xim_set_ic_geometry(XIC ic, int width, int height);
diff --git a/graphics/xfig/patches/patch-w__export.c b/graphics/xfig/patches/patch-w__export.c
new file mode 100644
index 00000000000..27a020218b6
--- /dev/null
+++ b/graphics/xfig/patches/patch-w__export.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-w__export.c,v 1.1 2012/12/24 21:12:36 joerg Exp $
+
+--- w_export.c.orig	2012-12-23 17:39:22.000000000 +0000
++++ w_export.c
+@@ -1016,7 +1016,7 @@ toggle_hpgl_pcl_switch(Widget w, XtPoint
+     /* set global state */
+     print_hpgl_pcl_switch = state;
+ 
+-    return;
++    return 0;
+ }
+ 
+ static XtCallbackProc
+@@ -1038,7 +1038,7 @@ toggle_hpgl_font(Widget w, XtPointer clo
+     /* set global state */
+     hpgl_specified_font = state;
+ 
+-    return;
++    return 0;
+ }
+ 
+ void create_export_panel(Widget w)
diff --git a/graphics/xfig/patches/patch-w__print.c b/graphics/xfig/patches/patch-w__print.c
new file mode 100644
index 00000000000..9ad8522f868
--- /dev/null
+++ b/graphics/xfig/patches/patch-w__print.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-w__print.c,v 1.1 2012/12/24 21:12:36 joerg Exp $
+
+--- w_print.c.orig	2012-12-23 17:41:12.000000000 +0000
++++ w_print.c
+@@ -1185,7 +1185,7 @@ switch_print_layers(Widget w, XtPointer 
+     /* which button */
+     which = (int) XawToggleGetCurrent(w);
+     if (which == 0)		/* no buttons on, in transition so return now */
+-	return;
++	return 0;
+     if (which == 2)		/* "blank" button, invert state */
+ 	state = !state;
+ 
+@@ -1193,7 +1193,7 @@ switch_print_layers(Widget w, XtPointer 
+     print_all_layers = state;
+     update_figure_size();
+ 
+-    return;
++    return 0;
+ }
+ 
+ /* when user toggles between printing all or only active layers */
diff --git a/graphics/xfig/patches/patch-w__util.c b/graphics/xfig/patches/patch-w__util.c
new file mode 100644
index 00000000000..ee61e439680
--- /dev/null
+++ b/graphics/xfig/patches/patch-w__util.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-w__util.c,v 1.1 2012/12/24 21:12:36 joerg Exp $
+
+--- w_util.c.orig	2012-12-23 17:41:50.000000000 +0000
++++ w_util.c
+@@ -710,7 +710,7 @@ start_spin_timer(Widget widget, XtPointe
+     /* keep track of which one the user is pressing */
+     cur_spin = widget;
+ 
+-    return;
++    return 0;
+ }
+ 
+ static XtEventHandler
+@@ -718,7 +718,7 @@ stop_spin_timer(int widget, int data, in
+ {
+     XtRemoveTimeOut(auto_spinid);
+ 
+-    return;
++    return 0;
+ }
+ 
+ static	XtTimerCallbackProc
+@@ -729,7 +729,7 @@ auto_spin(XtPointer client_data, XtInter
+     /* call the proper spinup/down routine */
+     XtCallCallbacks(cur_spin, XtNcallback, 0);
+ 
+-    return;
++    return 0;
+ }
+ 
+ /***************************/
+@@ -1412,7 +1412,7 @@ toggle_checkbutton(Widget w, XtPointer d
+     }
+     SetValues(w);
+ 
+-    return;
++    return 0;
+ }
+ 
+ /* assemble main window title bar with xfig title and (base) file name */