diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile
index 4b2a4ba9146..775201d92f4 100644
--- a/x11/rep-gtk/Makefile
+++ b/x11/rep-gtk/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2006/01/22 23:21:46 sturm Exp $
+# $OpenBSD: Makefile,v 1.18 2006/04/30 12:47:16 pedro Exp $
 
 COMMENT=	"GTK+ binding for librep Lisp environment"
 
 VERSION=	0.18
 DISTNAME=	rep-gtk-${VERSION}
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=     x11
 
 HOMEPAGE=       http://rep-gtk.sourceforge.net/
diff --git a/x11/rep-gtk/patches/patch-gtk-compat_c b/x11/rep-gtk/patches/patch-gtk-compat_c
index 1e3885b8420..b600c16822e 100644
--- a/x11/rep-gtk/patches/patch-gtk-compat_c
+++ b/x11/rep-gtk/patches/patch-gtk-compat_c
@@ -1,19 +1,21 @@
-$OpenBSD: patch-gtk-compat_c,v 1.1 2005/06/03 19:08:30 sturm Exp $
---- gtk-compat.c.orig	Fri Jun  3 12:02:25 2005
-+++ gtk-compat.c	Fri Jun  3 12:02:47 2005
-@@ -62,6 +62,7 @@ gtk_menu_popup_interp (GtkMenu *menu,
- 		  func, func_data, button, activate_time);
- }
+$OpenBSD: patch-gtk-compat_c,v 1.2 2006/04/30 12:47:16 pedro Exp $
+--- gtk-compat.c.orig	Fri Jul 12 01:19:22 2002
++++ gtk-compat.c	Fri Apr 28 20:35:19 2006
+@@ -64,7 +64,7 @@ gtk_menu_popup_interp (GtkMenu *menu,
  
-+#if 0
  GtkWidget*
  gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
- 						gchar            *label)
-@@ -77,6 +78,7 @@ gtk_radio_menu_item_new_with_mnemonic_fr
+-						gchar            *label)
++						const gchar            *label)
+ {
    GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
-   return gtk_radio_menu_item_new_with_mnemonic (g, label);
- }
-+#endif
+   return gtk_radio_menu_item_new_with_label (g, label);
+@@ -72,7 +72,7 @@ gtk_radio_menu_item_new_with_label_from_
  
  GtkWidget*
- gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group)
+ gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
+-						   gchar            *label)
++						   const gchar            *label)
+ {
+   GSList *g = group? gtk_radio_menu_item_group (group) : NULL;
+   return gtk_radio_menu_item_new_with_mnemonic (g, label);
diff --git a/x11/rep-gtk/patches/patch-rep-gtk_h b/x11/rep-gtk/patches/patch-rep-gtk_h
index 1ec770a7d92..2d1a6bd65f2 100644
--- a/x11/rep-gtk/patches/patch-rep-gtk_h
+++ b/x11/rep-gtk/patches/patch-rep-gtk_h
@@ -1,18 +1,16 @@
-$OpenBSD: patch-rep-gtk_h,v 1.1 2005/06/03 19:08:30 sturm Exp $
---- rep-gtk.h.orig	Fri Jun  3 12:03:02 2005
-+++ rep-gtk.h	Fri Jun  3 12:03:31 2005
-@@ -289,12 +289,15 @@ void gtk_menu_popup_interp (GtkMenu *men
- 			    guint32 activate_time,
- 			    repv position);
+$OpenBSD: patch-rep-gtk_h,v 1.2 2006/04/30 12:47:16 pedro Exp $
+--- rep-gtk.h.orig	Wed Feb 12 06:51:45 2003
++++ rep-gtk.h	Fri Apr 28 20:35:59 2006
+@@ -291,10 +291,11 @@ void gtk_menu_popup_interp (GtkMenu *men
  
-+#if 0
  GtkWidget*
  gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
- 						gchar            *label);
+-						gchar            *label);
++						const gchar            *label);
  GtkWidget*
  gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
- 						   gchar            *label);
-+#endif
+-						   gchar            *label);
++						   const gchar            *label);
 +
  GtkWidget* gtk_radio_menu_item_new_from_widget (GtkRadioMenuItem *group);
  GtkWidget* gtk_pixmap_new_interp (char *file, GtkWidget *intended_parent);