- Update to 0.18.5

8 files changed, 22 insertions, 149 deletions

diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index efb037e2f57b..4047c220e54a 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -6,8 +6,7 @@
 #    $MCom: ports/x11-toolkits/rep-gtk2/Makefile,v 1.8 2006/07/18 16:50:28 ahze Exp $
 
 PORTNAME=	rep-gtk2
-PORTVERSION=	0.18
-PORTREVISION=	9
+PORTVERSION=	0.18.5
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -22,22 +21,12 @@ LIB_DEPENDS=	rep.13:${PORTSDIR}/lang/librep
 PLIST_SUB=	GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
 USE_GMAKE=	yes
-USE_GNOME=	libglade2
-WANT_GNOME=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libglade
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
-
-.include <bsd.port.pre.mk>
+		LDFLAGS="-L${LOCALBASE}/lib" \
 
-.if ${HAVE_GNOME:Mlibgnomeui}!=""
-USE_GNOME+=		libgnomeui
-CONFIGURE_ARGS+=	--with-gnome
-PKGNAMESUFFIX=		-gnome
-.else
-CONFIGURE_ARGS+=	--without-gnome
-.endif
+CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/rep-gtk2/distinfo b/x11-toolkits/rep-gtk2/distinfo
index 30f2eb5b60c2..8ab695a71dff 100644
--- a/x11-toolkits/rep-gtk2/distinfo
+++ b/x11-toolkits/rep-gtk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (rep-gtk-0.18.tar.gz) = 220b0d728656472c068e40823f0a3b22
-SHA256 (rep-gtk-0.18.tar.gz) = 837e4c0e15d146388e0e1b83d792c02d4e54f46cf9702664a3878bd23a4ea045
-SIZE (rep-gtk-0.18.tar.gz) = 147665
+MD5 (rep-gtk-0.18.5.tar.bz2) = da2560cff3363ea6d580f7dfc277e365
+SHA256 (rep-gtk-0.18.5.tar.bz2) = eab6655b00e4449b2b9d20f8a37abc0cb856395f100e6ac68ce3a24419b65be5
+SIZE (rep-gtk-0.18.5.tar.bz2) = 332895
diff --git a/x11-toolkits/rep-gtk2/files/patch-Makefile.in b/x11-toolkits/rep-gtk2/files/patch-Makefile.in
new file mode 100644
index 000000000000..a5ffac2f24e4
--- /dev/null
+++ b/x11-toolkits/rep-gtk2/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	2009-01-18 23:17:15.000000000 +0200
++++ Makefile.in	2009-03-29 00:45:17.000000000 +0200
+@@ -72,8 +72,7 @@
+ 	  printf "\nrep_open_globally=yes\n" >>$(DESTDIR)$(installdir)/$$f; \
+ 	done
+ 	$(rep_INSTALL_ALIASES) -c . $(DESTDIR)$(installdir)
+-	install -d $(DESTDIR)$(libdir)/pkgconfig/
+-	install -m644 rep-gtk.pc $(DESTDIR)$(libdir)/pkgconfig/
++	install -m644 rep-gtk.pc $(DESTDIR)$(PREFIX)/libdata/pkgconfig/
+ 
+ installdirs : $(top_srcdir)/mkinstalldirs
+ 	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(installdir)/gui/gtk-2
diff --git a/x11-toolkits/rep-gtk2/files/patch-gnome-canvas.defs b/x11-toolkits/rep-gtk2/files/patch-gnome-canvas.defs
deleted file mode 100644
index 06a547e90e6a..000000000000
--- a/x11-toolkits/rep-gtk2/files/patch-gnome-canvas.defs
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnome-canvas.defs.orig	Thu Mar 18 15:02:22 2004
-+++ gnome-canvas.defs	Thu Mar 18 15:02:26 2004
-@@ -295,11 +295,6 @@
- 
- ;; GnomeCanvasGroup
- 
--(define-func gnome_canvas_group_child_bounds
--  none
--  ((GnomeCanvasGroup group)
--   (GnomeCanvasItem item)))
--
- 
- ;; gnome-canvas-util
- 
diff --git a/x11-toolkits/rep-gtk2/files/patch-gnomeui.defs b/x11-toolkits/rep-gtk2/files/patch-gnomeui.defs
deleted file mode 100644
index 6d963c35e226..000000000000
--- a/x11-toolkits/rep-gtk2/files/patch-gnomeui.defs
+++ /dev/null
@@ -1,72 +0,0 @@
---- gnomeui.defs.orig	Thu Mar 18 15:03:51 2004
-+++ gnomeui.defs	Thu Mar 18 15:04:41 2004
-@@ -228,42 +228,6 @@
-   (protection *result*))
- 
- 
--;; gnome-geometry
--
--(define-func gnome_parse_geometry
--  bool
--  ((string geom)
--   ((ret int) xpos)
--   ((ret int) ypos)
--   ((ret int) width)
--   ((ret int) height)))
--
--(define-func gnome_geometry_string
--  string
--  ((GdkWindow window)))
--
--
--;; gtkcauldron
--
--;; [the interface isn't suited to lisp anyway..]
--
--
--;; GnomeAbout
--
--(define-object GnomeAbout (GtkDialog))
--
--(define-func gnome_about_new
--  GtkWidget
--  ((string name)
--   (string version)
--   (string copyright)
--   (string comments)
--   ((tvec string) authors)
--   ((tvec string) documentors)
--   (string translator_credits)
--   (GdkPixbuf logo (null-ok))))
--
--
- ;; GnomeApp
- 
- (define-object GnomeApp (GtkWindow))
-@@ -327,11 +291,6 @@
-   none
-   ((GnomeAppBar appbar)))
- 
--(define-func gnome_appbar_set_progress
--  none
--  ((GnomeAppBar appbar)
--   (float percentage)))
--
- (define-func gnome_appbar_get_progress
-   GtkProgress
-   ((GnomeAppBar appbar)))
-@@ -675,14 +634,6 @@
-   ((GnomeEntry ge)
-    (int save)
-    (string text)))
--
--(define-func gnome_entry_load_history
--  none
--  ((GnomeEntry ge)))
--
--(define-func gnome_entry_save_history
--  none
--  ((GnomeEntry ge)))
- 
- 
- ;; GnomeFileEntry
diff --git a/x11-toolkits/rep-gtk2/files/patch-gtk-compat.c b/x11-toolkits/rep-gtk2/files/patch-gtk-compat.c
deleted file mode 100644
index 7ee510da51b5..000000000000
--- a/x11-toolkits/rep-gtk2/files/patch-gtk-compat.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- gtk-compat.c.orig	Thu Mar 18 16:17:34 2004
-+++ gtk-compat.c	Thu Mar 18 16:17:49 2004
-@@ -64,7 +64,7 @@
- 
- GtkWidget*
- gtk_radio_menu_item_new_with_label_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_label (g, label);
-@@ -72,7 +72,7 @@
- 
- GtkWidget*
- 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-toolkits/rep-gtk2/files/patch-rep-gtk.h b/x11-toolkits/rep-gtk2/files/patch-rep-gtk.h
deleted file mode 100644
index d08df121e00e..000000000000
--- a/x11-toolkits/rep-gtk2/files/patch-rep-gtk.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- rep-gtk.h.orig	Thu Mar 18 16:17:18 2004
-+++ rep-gtk.h	Thu Mar 18 16:17:29 2004
-@@ -291,10 +291,10 @@
- 
- GtkWidget*
- gtk_radio_menu_item_new_with_label_from_widget (GtkRadioMenuItem *group,
--						gchar            *label);
-+						const gchar            *label);
- GtkWidget*
- gtk_radio_menu_item_new_with_mnemonic_from_widget (GtkRadioMenuItem *group,
--						   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);
- 
diff --git a/x11-toolkits/rep-gtk2/pkg-plist b/x11-toolkits/rep-gtk2/pkg-plist
index 57f4fd56e377..bb702af48aaa 100644
--- a/x11-toolkits/rep-gtk2/pkg-plist
+++ b/x11-toolkits/rep-gtk2/pkg-plist
@@ -1,14 +1,7 @@
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-canvas.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-canvas.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-lib.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-lib.so
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-ui.la
-%%GNOME:%%libexec/rep/%%GNUHOST%%/gui/gtk-2/gnome-ui.so
 libexec/rep/%%GNUHOST%%/gui/gtk-2/gtk.la
 libexec/rep/%%GNUHOST%%/gui/gtk-2/gtk.so
-libexec/rep/%%GNUHOST%%/gui/gtk-2/libglade.la
-libexec/rep/%%GNUHOST%%/gui/gtk-2/libglade.so
 libexec/rep/%%GNUHOST%%/gui/gtk-2/types.la
 libexec/rep/%%GNUHOST%%/gui/gtk-2/types.so
+libdata/pkgconfig/rep-gtk.pc
 @dirrm libexec/rep/%%GNUHOST%%/gui/gtk-2
 @dirrm libexec/rep/%%GNUHOST%%/gui