Update to 1.2.5

5 files changed, 18 insertions, 43 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 25604554e90c..c7ca730007f3 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomelibs
-PORTVERSION= 	1.2.4
-PORTREVISION=	2
+PORTVERSION= 	1.2.5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/gnome-libs
@@ -25,7 +24,7 @@ USE_IMLIB=	yes
 USE_ESOUND=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-LIBTOOLFILES=	configure libart_lgpl/configure
+LIBTOOLFILES=	configure libart_lgpl/configure devel-docs/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--disable-test-gnome
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index f6410bcffd96..638cb496e472 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-1.2.4.tar.gz) = 53c929ab70307364c1486934bf340bfc
+MD5 (gnome-libs-1.2.5.tar.gz) = c996aada882f4e0828f9a9f6a1e1f1c6
diff --git a/x11/libgnome/files/patch-bc b/x11/libgnome/files/patch-bc
index 648706058bfe..d6f08c348bc4 100644
--- a/x11/libgnome/files/patch-bc
+++ b/x11/libgnome/files/patch-bc
@@ -1,11 +1,7 @@
---- libgnome/Makefile.in.orig	Tue May  9 16:36:28 2000
-+++ libgnome/Makefile.in	Mon May 15 18:12:49 2000
-@@ -168,7 +168,7 @@
+--- libgnome/Makefile.in.orig	Thu Oct 12 22:03:30 2000
++++ libgnome/Makefile.in	Fri Oct 13 10:07:06 2000
+@@ -170,3 +170,3 @@
  
- EXTRA_DIST = parse-path.cP 
- 
--libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir)
+-libgnome_la_LDFLAGS = -version-info 35:12:3 #-rpath $(libdir)
 +libgnome_la_LDFLAGS = -version-info 4:0:0 #-rpath $(libdir)
  libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB)
- 
- bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
diff --git a/x11/libgnome/files/patch-bd b/x11/libgnome/files/patch-bd
index 01dbd38f34ff..f95b2a073c41 100644
--- a/x11/libgnome/files/patch-bd
+++ b/x11/libgnome/files/patch-bd
@@ -1,20 +1,12 @@
---- libgnomeui/Makefile.in.orig	Mon May 15 15:11:14 2000
-+++ libgnomeui/Makefile.in	Mon May 15 22:43:32 2000
-@@ -199,7 +199,7 @@
- EXTRA_DIST =  	$(SGML)						$(gtkrc_DATA)					AUTHORS						gnome.defs 					maketypes.awk					makeenums.pl					gnome-boxed.defs				gnometypebuiltins_vars.c			gnometypebuiltins_ids.c				gnometypebuiltins_evals.c
+--- libgnomeui/Makefile.in.orig	Thu Oct 12 22:03:38 2000
++++ libgnomeui/Makefile.in	Fri Oct 13 10:08:00 2000
+@@ -201,3 +201,3 @@
  
- 
--libgnomeui_la_LDFLAGS = -version-info 43:3:11 -rpath $(libdir)
+-libgnomeui_la_LDFLAGS = -version-info 43:4:11 -rpath $(libdir)
 +libgnomeui_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir)
  libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS)
- 
- gnome_segv_LDADD =  	libgnomeui.la 						$(top_builddir)/libgnome/libgnome.la 			$(top_builddir)/libart_lgpl/libart_lgpl.la 		@LIBSUPPORT@ $(LIBGNOMEUI_LIBS) 	$(INTLLIBS)
-@@ -258,7 +258,7 @@
- gnome-paper-selector.lo gnome-procbar.lo gnome-window-icon.lo \
- gnometypes.lo gtkcauldron.lo gtk-clock.lo gtk-ted.lo gtkdial.lo \
+@@ -260,3 +260,3 @@
  gtkpixmapmenuitem.lo
 -PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
 +PROGRAMS =  $(bin_PROGRAMS)
  
- gnome_segv_OBJECTS =  gnome_segv.o
- gnome_segv_DEPENDENCIES =  libgnomeui.la \
diff --git a/x11/libgnome/files/patch-bg b/x11/libgnome/files/patch-bg
index 5405ccdf4607..703cb15a23af 100644
--- a/x11/libgnome/files/patch-bg
+++ b/x11/libgnome/files/patch-bg
@@ -1,29 +1,17 @@
---- zvt/Makefile.in.orig	Mon May 15 15:11:19 2000
-+++ zvt/Makefile.in	Mon May 15 22:44:35 2000
-@@ -20,7 +20,7 @@
- exec_prefix = @exec_prefix@
- 
+--- zvt/Makefile.in.orig	Thu Oct 12 22:03:51 2000
++++ zvt/Makefile.in	Fri Oct 13 10:08:57 2000
+@@ -22,3 +22,3 @@
  bindir = @bindir@
 -sbindir = @sbindir@
 +sbindir = @bindir@
  libexecdir = @libexecdir@
- datadir = @datadir@
- sysconfdir = @sysconfdir@
-@@ -156,7 +156,7 @@
- libzvt_la_SOURCES =  	gnome-login-support.h		gnome-login-support.c		lists.c				subshell.h			subshell.c			subshell-includes.h		update.c			vt.c				zvtterm.c
- 
+@@ -158,3 +158,3 @@
  
--libzvt_la_LDFLAGS = -version-info 4:7:2 -rpath $(libdir)
+-libzvt_la_LDFLAGS = -version-info 4:8:2 -rpath $(libdir)
 +libzvt_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir)
  
- libzvtinclude_HEADERS =  	lists.h				vt.h				vtx.h				zvtterm.h
- 
-@@ -192,7 +192,7 @@
- libzvt_la_LIBADD = 
- libzvt_la_OBJECTS =  gnome-login-support.lo lists.lo subshell.lo \
+@@ -194,3 +194,3 @@
  update.lo vt.lo zvtterm.lo
 -PROGRAMS =  $(noinst_PROGRAMS) $(sbin_PROGRAMS)
 +PROGRAMS =  $(sbin_PROGRAMS)
  
- zterm_OBJECTS =  zterm.o
- zterm_DEPENDENCIES =  libzvt.la