Update to 1.0.55

12 files changed, 48 insertions, 96 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 058f59fecb95..17120179563b 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomelibs
-# Version required:			1.0.54
+# Version required:			1.0.55
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnome-libs-1.0.54
-PKGNAME=	gnomelibs-1.0.54
+DISTNAME=	gnome-libs-1.0.55
+PKGNAME=	gnomelibs-1.0.55
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-libs
diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index 5299b3247834..972f840929a3 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-1.0.54.tar.gz) = 5a1bab7b742974e98dd2c637225d3138
+MD5 (gnome-libs-1.0.55.tar.gz) = be8779341d598b4d5656b2383028b36c
diff --git a/x11/gnome-libs/files/patch-ac b/x11/gnome-libs/files/patch-ac
index 5663f237f4e2..ae93b100fb68 100644
--- a/x11/gnome-libs/files/patch-ac
+++ b/x11/gnome-libs/files/patch-ac
@@ -1,26 +1,26 @@
---- gnome-config.in.orig	Sat Sep 11 03:25:18 1999
-+++ gnome-config.in	Mon Oct 18 11:43:01 1999
+--- gnome-config.in.orig	Thu Jan 13 13:36:11 2000
++++ gnome-config.in	Thu Jan 13 13:42:44 2000
 @@ -19,7 +19,7 @@
  pkglibdir=${libdir}/@PACKAGE@
  pkgincludedir=${includedir}/@PACKAGE@
  MODULE_VERSION=@PACKAGE@-@VERSION@
 -module_dirs="$libdir"
-+module_dirs="$sysconfdir"
++module_dirs="$sysconfdir:/usr/local/etc"
  
  # stolen from autoconf
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-@@ -65,18 +65,18 @@
+@@ -65,20 +65,21 @@
  
  Known values for LIBRARY are:
  
 -    glib	(calls glib-config)
-+    glib	(calls GLIB_CONFIG)
++    glib	(calls glib12-config)
      idl         (to be used with orbit-idl)
      gnome
      gnomeui
      gnorba
 -    gtk		(calls gtk-config)
-+    gtk		(calls GTK_CONFIG)
++    gtk		(calls gtk12-config)
      gtkxmhtml	(only --libs)
      zvt		(only --libs)
  
@@ -28,10 +28,14 @@
      
 -    ${libdir}/<LIBRARY>Conf.sh
 +    ${sysconfdir}/<LIBRARY>Conf.sh
++and /usr/local/etc/<LIBRARY>Conf.sh
  
- is looked in for the necessary information.  Those currently installed 
+-is looked in for the necessary information.  Those currently installed 
++are looked in for the necessary information.  Those currently installed 
  appear to be:
-@@ -161,19 +161,19 @@
+ 
+ EOF
+@@ -161,19 +162,19 @@
  	usage 1
  	;;
      glib)
diff --git a/x11/gnome-libs/files/patch-bj b/x11/gnome-libs/files/patch-bj
deleted file mode 100644
index 79eab1570aaf..000000000000
--- a/x11/gnome-libs/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-about.c.orig	Mon Oct 25 13:34:06 1999
-+++ libgnomeui/gnome-about.c	Mon Oct 25 13:58:13 1999
-@@ -1,6 +1,6 @@
- /* GNOME GUI Library
-  * Copyright (C) 1998 Cesar Miquel <miquel@df.uba.ar>
-- * Based in gnome-about, copyright (C) 1998 Horacio J. Peņa
-+ * Based in gnome-about, copyright (C) 1998 Horacio J. Pe$Bqa(B
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Library General Public
-@@ -414,6 +414,9 @@
- 	/* FIXME: dirty hack, but it solves i18n problem without rewriting the
- 	   drawing code..  */
- 	style = gtk_style_ref (widget->style);
-+
-+	/* For true i18n */
-+	gtk_widget_ensure_style(widget);
- 
- 	gtk_widget_set_name (widget, "Title");
- 	gai->font_title = gdk_font_ref (widget->style->font);
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 058f59fecb95..17120179563b 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomelibs
-# Version required:			1.0.54
+# Version required:			1.0.55
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnome-libs-1.0.54
-PKGNAME=	gnomelibs-1.0.54
+DISTNAME=	gnome-libs-1.0.55
+PKGNAME=	gnomelibs-1.0.55
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-libs
diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo
index 5299b3247834..972f840929a3 100644
--- a/x11/gnomelibs/distinfo
+++ b/x11/gnomelibs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-1.0.54.tar.gz) = 5a1bab7b742974e98dd2c637225d3138
+MD5 (gnome-libs-1.0.55.tar.gz) = be8779341d598b4d5656b2383028b36c
diff --git a/x11/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac
index 5663f237f4e2..ae93b100fb68 100644
--- a/x11/gnomelibs/files/patch-ac
+++ b/x11/gnomelibs/files/patch-ac
@@ -1,26 +1,26 @@
---- gnome-config.in.orig	Sat Sep 11 03:25:18 1999
-+++ gnome-config.in	Mon Oct 18 11:43:01 1999
+--- gnome-config.in.orig	Thu Jan 13 13:36:11 2000
++++ gnome-config.in	Thu Jan 13 13:42:44 2000
 @@ -19,7 +19,7 @@
  pkglibdir=${libdir}/@PACKAGE@
  pkgincludedir=${includedir}/@PACKAGE@
  MODULE_VERSION=@PACKAGE@-@VERSION@
 -module_dirs="$libdir"
-+module_dirs="$sysconfdir"
++module_dirs="$sysconfdir:/usr/local/etc"
  
  # stolen from autoconf
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-@@ -65,18 +65,18 @@
+@@ -65,20 +65,21 @@
  
  Known values for LIBRARY are:
  
 -    glib	(calls glib-config)
-+    glib	(calls GLIB_CONFIG)
++    glib	(calls glib12-config)
      idl         (to be used with orbit-idl)
      gnome
      gnomeui
      gnorba
 -    gtk		(calls gtk-config)
-+    gtk		(calls GTK_CONFIG)
++    gtk		(calls gtk12-config)
      gtkxmhtml	(only --libs)
      zvt		(only --libs)
  
@@ -28,10 +28,14 @@
      
 -    ${libdir}/<LIBRARY>Conf.sh
 +    ${sysconfdir}/<LIBRARY>Conf.sh
++and /usr/local/etc/<LIBRARY>Conf.sh
  
- is looked in for the necessary information.  Those currently installed 
+-is looked in for the necessary information.  Those currently installed 
++are looked in for the necessary information.  Those currently installed 
  appear to be:
-@@ -161,19 +161,19 @@
+ 
+ EOF
+@@ -161,19 +162,19 @@
  	usage 1
  	;;
      glib)
diff --git a/x11/gnomelibs/files/patch-bj b/x11/gnomelibs/files/patch-bj
deleted file mode 100644
index 79eab1570aaf..000000000000
--- a/x11/gnomelibs/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-about.c.orig	Mon Oct 25 13:34:06 1999
-+++ libgnomeui/gnome-about.c	Mon Oct 25 13:58:13 1999
-@@ -1,6 +1,6 @@
- /* GNOME GUI Library
-  * Copyright (C) 1998 Cesar Miquel <miquel@df.uba.ar>
-- * Based in gnome-about, copyright (C) 1998 Horacio J. Peņa
-+ * Based in gnome-about, copyright (C) 1998 Horacio J. Pe$Bqa(B
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Library General Public
-@@ -414,6 +414,9 @@
- 	/* FIXME: dirty hack, but it solves i18n problem without rewriting the
- 	   drawing code..  */
- 	style = gtk_style_ref (widget->style);
-+
-+	/* For true i18n */
-+	gtk_widget_ensure_style(widget);
- 
- 	gtk_widget_set_name (widget, "Title");
- 	gai->font_title = gdk_font_ref (widget->style->font);
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 058f59fecb95..17120179563b 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	gnomelibs
-# Version required:			1.0.54
+# Version required:			1.0.55
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gnome-libs-1.0.54
-PKGNAME=	gnomelibs-1.0.54
+DISTNAME=	gnome-libs-1.0.55
+PKGNAME=	gnomelibs-1.0.55
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-libs
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 5299b3247834..972f840929a3 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-1.0.54.tar.gz) = 5a1bab7b742974e98dd2c637225d3138
+MD5 (gnome-libs-1.0.55.tar.gz) = be8779341d598b4d5656b2383028b36c
diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac
index 5663f237f4e2..ae93b100fb68 100644
--- a/x11/libgnome/files/patch-ac
+++ b/x11/libgnome/files/patch-ac
@@ -1,26 +1,26 @@
---- gnome-config.in.orig	Sat Sep 11 03:25:18 1999
-+++ gnome-config.in	Mon Oct 18 11:43:01 1999
+--- gnome-config.in.orig	Thu Jan 13 13:36:11 2000
++++ gnome-config.in	Thu Jan 13 13:42:44 2000
 @@ -19,7 +19,7 @@
  pkglibdir=${libdir}/@PACKAGE@
  pkgincludedir=${includedir}/@PACKAGE@
  MODULE_VERSION=@PACKAGE@-@VERSION@
 -module_dirs="$libdir"
-+module_dirs="$sysconfdir"
++module_dirs="$sysconfdir:/usr/local/etc"
  
  # stolen from autoconf
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-@@ -65,18 +65,18 @@
+@@ -65,20 +65,21 @@
  
  Known values for LIBRARY are:
  
 -    glib	(calls glib-config)
-+    glib	(calls GLIB_CONFIG)
++    glib	(calls glib12-config)
      idl         (to be used with orbit-idl)
      gnome
      gnomeui
      gnorba
 -    gtk		(calls gtk-config)
-+    gtk		(calls GTK_CONFIG)
++    gtk		(calls gtk12-config)
      gtkxmhtml	(only --libs)
      zvt		(only --libs)
  
@@ -28,10 +28,14 @@
      
 -    ${libdir}/<LIBRARY>Conf.sh
 +    ${sysconfdir}/<LIBRARY>Conf.sh
++and /usr/local/etc/<LIBRARY>Conf.sh
  
- is looked in for the necessary information.  Those currently installed 
+-is looked in for the necessary information.  Those currently installed 
++are looked in for the necessary information.  Those currently installed 
  appear to be:
-@@ -161,19 +161,19 @@
+ 
+ EOF
+@@ -161,19 +162,19 @@
  	usage 1
  	;;
      glib)
diff --git a/x11/libgnome/files/patch-bj b/x11/libgnome/files/patch-bj
deleted file mode 100644
index 79eab1570aaf..000000000000
--- a/x11/libgnome/files/patch-bj
+++ /dev/null
@@ -1,20 +0,0 @@
---- libgnomeui/gnome-about.c.orig	Mon Oct 25 13:34:06 1999
-+++ libgnomeui/gnome-about.c	Mon Oct 25 13:58:13 1999
-@@ -1,6 +1,6 @@
- /* GNOME GUI Library
-  * Copyright (C) 1998 Cesar Miquel <miquel@df.uba.ar>
-- * Based in gnome-about, copyright (C) 1998 Horacio J. Peņa
-+ * Based in gnome-about, copyright (C) 1998 Horacio J. Pe$Bqa(B
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Library General Public
-@@ -414,6 +414,9 @@
- 	/* FIXME: dirty hack, but it solves i18n problem without rewriting the
- 	   drawing code..  */
- 	style = gtk_style_ref (widget->style);
-+
-+	/* For true i18n */
-+	gtk_widget_ensure_style(widget);
- 
- 	gtk_widget_set_name (widget, "Title");
- 	gai->font_title = gdk_font_ref (widget->style->font);