Update to 0.5.10.

PR:		22765
Submitted by:	maintainer

5 files changed, 37 insertions, 48 deletions

diff --git a/devel/glade--/Makefile b/devel/glade--/Makefile
index ce563023eac3..cdc0a7e9708d 100644
--- a/devel/glade--/Makefile
+++ b/devel/glade--/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	glademm
-PORTVERSION=	0.5.9
+PORTVERSION=	0.5.10
 CATEGORIES=	devel gnome
 MASTER_SITES=   http://home.wtal.de/petig/Gtk/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/5./5_/}
 
 MAINTAINER=     fujie@tk.elec.waseda.ac.jp
 
diff --git a/devel/glade--/distinfo b/devel/glade--/distinfo
index 17547c3229ad..5a60def10024 100644
--- a/devel/glade--/distinfo
+++ b/devel/glade--/distinfo
@@ -1 +1 @@
-MD5 (glademm-0.5.9.tar.gz) = af9f95c6778a47969f6377dcae004498
+MD5 (glademm-0.5_10.tar.gz) = 6461ffe90a844e032f0e4702a724ce1e
diff --git a/devel/glade--/files/patch-aa b/devel/glade--/files/patch-aa
index 091fe2201bd4..834637cdd164 100644
--- a/devel/glade--/files/patch-aa
+++ b/devel/glade--/files/patch-aa
@@ -1,9 +1,9 @@
---- configure.orig	Wed Jun  7 02:49:17 2000
-+++ configure	Tue Oct 10 12:34:46 2000
-@@ -2065,11 +2065,11 @@
+--- configure.orig	Mon Nov  6 19:46:11 2000
++++ configure	Sat Nov 11 16:40:59 2000
+@@ -2080,11 +2080,11 @@
  
  echo $ac_n "checking your gtk version""... $ac_c" 1>&6
- echo "configure:2068: checking your gtk version" >&5
+ echo "configure:2083: checking your gtk version" >&5
 -case `gtk-config --version` in
 +case `$GTK_CONFIG --version` in
    *.*.*)
diff --git a/devel/glade--/files/patch-ab b/devel/glade--/files/patch-ab
index 128593b9be65..bd6153d69973 100644
--- a/devel/glade--/files/patch-ab
+++ b/devel/glade--/files/patch-ab
@@ -1,17 +1,25 @@
---- src/glade--.cc.orig	Thu May  4 06:02:30 2000
-+++ src/glade--.cc	Tue Oct 10 12:36:14 2000
-@@ -89,3 +89,3 @@
+--- src/glade--.cc.orig	Wed Oct 11 15:43:35 2000
++++ src/glade--.cc	Sat Nov 11 16:42:44 2000
+@@ -86,7 +86,7 @@
+ 
+ static void call_gtkmm_config()
  {  char buf[80];
 -   FILE *f=popen("gtk-config --version","r");
-+   FILE *f=popen("%%GTK_CONFIG%% --version","r");
++   FILE *f=popen("/usr/X11R6/bin/gtk12-config --version","r");
     if (f)
-@@ -98,3 +98,3 @@
+    {  if (fgets(buf,sizeof(buf),f))
+       {  for (unsigned char *s=(unsigned char*)buf;*s;s++)
+@@ -95,11 +95,11 @@
+          Gtk_Version v;
+          if (parse_version(buf,v))
              Configuration.gtk_version=v;
 -         else cerr << "gtk-config --version: strange result '" << buf << "'\n";
-+         else cerr << "%%GTK_CONFIG%% --version: strange result '" << buf << "'\n";
++         else cerr << "/usr/X11R6/bin/gtk12-config --version: strange result '" << buf << "'\n";
        }
-@@ -102,3 +102,3 @@
+       pclose(f);
     }
 -   else perror("gtk-config");
-+   else perror("%%GTK_CONFIG%%");
++   else perror("/usr/X11R6/bin/gtk12-config");
     f=popen("gtkmm-config --version","r");
+    if (f)
+    {  if (fgets(buf,sizeof(buf),f))
diff --git a/devel/glade--/files/patch-ac b/devel/glade--/files/patch-ac
index a21b642c4b64..f7adc36ec5bf 100644
--- a/devel/glade--/files/patch-ac
+++ b/devel/glade--/files/patch-ac
@@ -1,34 +1,14 @@
---- src/Cxx.cc.orig	Wed May  3 10:13:56 2000
-+++ src/Cxx.cc	Tue Oct 10 12:50:19 2000
-@@ -491,10 +491,3 @@
- 	if (Configuration.gnome_support)
--	    f << "if test -r /usr/lib/gnomemmConf.sh ; then\n"
--	    	 "  source /usr/lib/gnomemmConf.sh\n"
--	    	 "elif test -r /opt/gnome/lib/gnomemmConf.sh ; then\n"
--	    	 "  source /opt/gnome/lib/gnomemmConf.sh\n"
--	    	 "elif test -r /usr/local/lib/gnomemmConf.sh ; then\n"
--	    	 "  source /usr/local/lib/gnomemmConf.sh\n"
--	    	 "else echo \"Cant find gnomemmConf.sh.\"\n"
--	    	 "fi\n"
-+	    f << "source %%X11BASE%%/etc/gnomemmConf.sh\n"
- 	         "AC_SUBST(GNOMEMM_INCLUDEDIR)\n"
-@@ -540,17 +533,5 @@
- 	if (Configuration.gnome_support)
--	   f << "# Search for glade\\'s gnome.m4 directory (contains gnome macros).\n"
--	        "# If you include gnome-common/macros in your application (recommended)\n"
--	        "# also replace this autogen.sh.\n"
--	        "if [ -r /opt/gnome/share/glade/gnome/gnome.m4 ]\n"
--                "then \n"
--                "  aclocal -I /opt/gnome/share/glade/gnome\n"
--                "elif [ -r /usr/local/share/glade/gnome/gnome.m4 ]\n"
--                "then\n"
--                "  aclocal -I /usr/local/share/glade/gnome\n"
--                "else\n"
--                "  echo \"Can't find glade's gnome.m4 directory (gnome macros)\"\n"
--                "  exit 2\n"
--                "fi\n";
-+	   f << "aclocal -I %%X11BASE%%/share/aclocal -I %%X11BASE%%/share/gnome/glade/gnome\n";
- 	else
--	   f << "aclocal\n";
-+	   f << "aclocal -I %%X11BASE%%/share/aclocal\n";
- 	f << 	"automake --add-missing --copy --gnu\n"
+*** src/Cxx.cc.orig	Mon Oct 16 18:42:09 2000
+--- src/Cxx.cc	Tue Nov  7 16:54:19 2000
+***************
+*** 538,543 ****
+--- 538,546 ----
+                  "  elif [ -r /usr/local/share/glade/gnome/gnome.m4 ]\n"
+                  "  then\n"
+                  "    cp -r /usr/local/share/glade/gnome macros\n"
++                 "  elif [ -r %%X11BASE%%/share/gnome/glade/gnome/gnome.m4 ]\n"
++                 "  then\n"
++                 "    cp -r %%X11BASE%%/share/gnome/glade/gnome macros\n"
+                  "  else\n"
+                  "    echo \"I can't find the gnome macros. Please copy them to macros and retry.\"\n"
+                  "    exit 2\n"