Use new gnome libs and set USE_LIBTOOL=yes.

PR:             11844
Submitted by:   Jeremy Lea <reg@shale.csir.co.za>

33 files changed, 261 insertions, 345 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 81a6751..118947d 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -3,7 +3,7 @@
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.39 1999/05/01 03:20:33 steve Exp $
+# $Id: Makefile,v 1.40 1999/05/09 17:13:15 steve Exp $
 #
 
 DISTNAME=	gnome-libs-1.0.9
@@ -14,28 +14,27 @@ MASTER_SITE_SUBDIR=	sources/gnome-libs
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gdk_imlib.3:${PORTSDIR}/graphics/imlib \
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib \
 		Xpm.4:${PORTSDIR}/graphics/xpm \
-		ORBit.1:${PORTSDIR}/devel/ORBit \
+		ORBit.2:${PORTSDIR}/devel/ORBit \
 		esd.1:${PORTSDIR}/audio/esound
 
-# implicit dependencies:
-# gettext, gtk12, tiff34, jpeg, giflib, png
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libart_lgpl/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--disable-gnome-hello \
 		--disable-test-gnome
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/giflib" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+MAN1=		gnome.1	
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa
index 02ba2b3..d0b27f2 100644
--- a/x11/gnome-libs/files/patch-aa
+++ b/x11/gnome-libs/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig	Mon Mar  1 21:51:08 1999
-+++ configure	Sat Mar  6 13:33:05 1999
-@@ -5149,7 +5149,7 @@
+--- configure.orig	Tue Apr 27 21:24:19 1999
++++ configure	Sat May 22 21:16:46 1999
+@@ -2521,7 +2521,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  PTHREAD_LIB="-lc_r"
++  PTHREAD_LIB=""
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
+@@ -5215,7 +5215,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -9,16 +18,16 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7233,7 +7233,7 @@
+@@ -7372,7 +7372,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 7239 "configure"
+ #line 7378 "configure"
  #include "confdefs.h"
-@@ -10704,7 +10704,7 @@
+@@ -10859,7 +10859,7 @@
  ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
  
  GNOME_LIBDIR='-L${libdir}'
@@ -27,7 +36,7 @@
  GNOME_IDLDIR='-I${datadir}/idl'
  
  
-@@ -11548,10 +11548,6 @@
+@@ -11724,10 +11724,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/x11/gnome-libs/files/patch-ac b/x11/gnome-libs/files/patch-ac
index be621cf..184d5e7 100644
--- a/x11/gnome-libs/files/patch-ac
+++ b/x11/gnome-libs/files/patch-ac
@@ -1,5 +1,5 @@
---- gnome-config.in.orig	Mon Feb 15 20:05:33 1999
-+++ gnome-config.in	Tue Mar  2 09:00:51 1999
+--- gnome-config.in.orig	Thu Apr 15 13:59:46 1999
++++ gnome-config.in	Sat May  8 17:32:13 1999
 @@ -43,25 +43,25 @@
  
  Known values for LIBRARY are:
@@ -30,7 +30,7 @@
  
      if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then
  	echo "    <NONE>"
-@@ -146,36 +146,36 @@
+@@ -146,19 +146,19 @@
  	usage 1
  	;;
      glib)
@@ -46,30 +46,17 @@
 +	the_flags="$the_flags `gtk12-config --cflags`"
  	;;
      gnome)
--       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
-+       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@ -lintl"
+        	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
    	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gnomeui)
 -	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@ -lintl"
++	the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@"
  	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gtkxmhtml)
--	the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@ -lintl"
- 	;;
-     gnorba)
--        the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@"
-+        the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@ -lintl"
- 	the_flags="$the_flags @GNOME_INCLUDEDIR@ @ORBIT_CFLAGS@"
-         ;;
-     idl)
-         the_flags="@GNOME_IDLDIR@"
- 	;;
-     zvt)
--	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl"
+@@ -175,7 +175,7 @@
+ 	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@"
  	;;
      *)
 -	cnf_sh=${libdir}/${1}Conf.sh
diff --git a/x11/gnome-libs/files/patch-ba b/x11/gnome-libs/files/patch-ba
index 3d04ba5..ab4a059 100644
--- a/x11/gnome-libs/files/patch-ba
+++ b/x11/gnome-libs/files/patch-ba
@@ -5,7 +5,7 @@
  @FALSE_TRUE@libvfs = libvfs
  
 -SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) devel-docs gnome-data $(libvfs) man 	gnome-faq
-+SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) gnome-data $(libvfs)
++SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) gnome-data $(libvfs) man
  
  
  include_HEADERS = gnome.h
diff --git a/x11/gnome-libs/files/patch-bc b/x11/gnome-libs/files/patch-bc
index d643ed9..d77e125 100644
--- a/x11/gnome-libs/files/patch-bc
+++ b/x11/gnome-libs/files/patch-bc
@@ -1,15 +1,11 @@
 --- libgnome/Makefile.in.orig	Wed Apr  7 21:33:54 1999
 +++ libgnome/Makefile.in	Fri Apr 30 17:35:08 1999
-@@ -172,10 +172,10 @@
+@@ -172,7 +172,7 @@
  
  EXTRA_DIST = parse-path.cP 
  
 -libgnome_la_LDFLAGS = -version-info 35:3:3 #-rpath $(libdir)
-+libgnome_la_LDFLAGS = -version-info 1:0:0 #-rpath $(libdir)
++libgnome_la_LDFLAGS = -version-info 2: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
-+bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
- 
- 
- dns_helper_SOURCES = dns-helper.c
+ bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
diff --git a/x11/gnome-libs/files/patch-bd b/x11/gnome-libs/files/patch-bd
index 0742d83..dc9615a 100644
--- a/x11/gnome-libs/files/patch-bd
+++ b/x11/gnome-libs/files/patch-bd
@@ -5,25 +5,16 @@
  
  
 -libgnomeui_la_LDFLAGS = -version-info 41:1:9 -rpath $(libdir)
-+libgnomeui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
++libgnomeui_la_LDFLAGS = -version-info 2: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)
-@@ -1478,7 +1478,7 @@
- check: check-recursive
- installcheck-am:
- installcheck: installcheck-recursive
--install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
-+install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-recursive
+@@ -258,7 +258,7 @@
+ gnome-startup.lo gnome-stock.lo gnome-winhints.lo \
+ gnome-paper-selector.lo gnome-procbar.lo gnometypes.lo gtkcauldron.lo \
+ gtk-clock.lo gtk-ted.lo gtkdial.lo gtkpixmapmenuitem.lo
+-PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
++PROGRAMS =  $(bin_PROGRAMS)
  
- install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS
-@@ -1490,7 +1490,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
- 		uninstall-gtkrcDATA uninstall-libgnomeuiincludeHEADERS
- uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
- all-redirect: all-recursive
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ gnome_segv_OBJECTS =  gnome_segv.o
+ gnome_segv_DEPENDENCIES =  libgnomeui.la \
diff --git a/x11/gnome-libs/files/patch-be b/x11/gnome-libs/files/patch-be
index f5bdd3c..478ed9a 100644
--- a/x11/gnome-libs/files/patch-be
+++ b/x11/gnome-libs/files/patch-be
@@ -5,7 +5,7 @@
  
  
 -libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir)
-+libgnorba_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
++libgnorba_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir)
  libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
  
  loadshlib_SOURCES = loadshlib.c
diff --git a/x11/gnome-libs/files/patch-bf b/x11/gnome-libs/files/patch-bf
index 2676088..bdb9856 100644
--- a/x11/gnome-libs/files/patch-bf
+++ b/x11/gnome-libs/files/patch-bf
@@ -14,7 +14,7 @@
  libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
  libgnomesupport_la_LIBADD = @LTLIBOBJS@
 -libgnomesupport_la_LDFLAGS = -version-info 0:0:0
-+libgnomesupport_la_LDFLAGS = -version-info 1:0:0
++libgnomesupport_la_LDFLAGS = -version-info 2:0:0
  
  BUILT_SOURCES = gnomesupport.h
  
diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg
index 15a50ea..5a793e0 100644
--- a/x11/gnome-libs/files/patch-bg
+++ b/x11/gnome-libs/files/patch-bg
@@ -1,30 +1,29 @@
---- zvt/Makefile.in.orig	Wed Apr  7 21:34:27 1999
-+++ zvt/Makefile.in	Fri Apr 30 17:53:45 1999
+--- zvt/Makefile.in.orig	Wed Apr 28 02:58:32 1999
++++ zvt/Makefile.in	Sat May  8 22:50:50 1999
+@@ -20,7 +20,7 @@
+ exec_prefix = @exec_prefix@
+ 
+ bindir = @bindir@
+-sbindir = @sbindir@
++sbindir = @bindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+ sysconfdir = @sysconfdir@
 @@ -160,7 +160,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
  
  
 -libzvt_la_LDFLAGS = -version-info 4:3:2 -rpath $(libdir)
-+libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
++libzvt_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir)
  
  libzvtinclude_HEADERS =  	lists.h				vt.h				vtx.h				zvtterm.h
  
-@@ -435,8 +435,7 @@
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
--install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS \
--		install-exec-local
-+install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-am
+@@ -200,7 +200,7 @@
+ libzvt_la_LIBADD = 
+ libzvt_la_OBJECTS =  gnome-login-support.lo lists.lo subshell.lo \
+ update.lo vt.lo zvtterm.lo
+-PROGRAMS =  $(noinst_PROGRAMS) $(sbin_PROGRAMS)
++PROGRAMS =  $(sbin_PROGRAMS)
  
- install-data-am: install-libzvtincludeHEADERS
-@@ -448,7 +447,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS \
- 		uninstall-libzvtincludeHEADERS
- uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ zterm_OBJECTS =  zterm.o
+ zterm_DEPENDENCIES =  libzvt.la
diff --git a/x11/gnome-libs/files/patch-bi b/x11/gnome-libs/files/patch-bi
index 8d49b031..09749e8 100644
--- a/x11/gnome-libs/files/patch-bi
+++ b/x11/gnome-libs/files/patch-bi
@@ -1,16 +1,20 @@
---- libart_lgpl/Makefile.in.orig	Tue Feb 16 01:09:07 1999
-+++ libart_lgpl/Makefile.in	Fri Feb 19 00:20:20 1999
+--- libart_lgpl/Makefile.in.orig	Wed Apr 28 02:57:51 1999
++++ libart_lgpl/Makefile.in	Fri Apr 30 00:19:41 1999
 @@ -94,7 +94,7 @@
  libart_lgpl_la_SOURCES =  	art_affine.c 	art_alphagamma.c 	art_bpath.c 	art_gray_svp.c 	art_misc.c 	art_pixbuf.c 	art_rect.c 	art_rect_svp.c 	art_rect_uta.c 	art_rgb.c 	art_rgb_affine.c 	art_rgb_affine_private.c 	art_rgb_affine_private.h 	art_rgb_bitmap_affine.c 	art_rgb_pixbuf_affine.c 	art_rgb_rgba_affine.c 	art_rgb_svp.c 	art_svp.c 	art_svp_ops.c 	art_svp_render_aa.c 	art_svp_vpath.c 	art_svp_vpath_stroke.c 	art_svp_wind.c 	art_svp_wind.h 	art_uta.c 	art_uta_ops.c 	art_uta_rect.c 	art_uta_vpath.c 	art_uta_svp.c 	art_vpath.c 	art_vpath_bpath.c 	art_vpath_svp.c
  
  
 -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@
-+libart_lgpl_la_LDFLAGS = -version-info 1:0:0
++libart_lgpl_la_LDFLAGS = -version-info 2:0:0
  
  libart_lgplincdir = $(includedir)/libart_lgpl
  libart_lgplinc_HEADERS =  	art_affine.h 	art_alphagamma.h 	art_bpath.h 	art_filterlevel.h 	art_gray_svp.h 	art_misc.h 	art_pathcode.h 	art_pixbuf.h 	art_point.h 	art_rect.h 	art_rect_svp.h 	art_rect_uta.h 	art_rgb.h 	art_rgb_affine.h 	art_rgb_bitmap_affine.h 	art_rgb_pixbuf_affine.h 	art_rgb_rgba_affine.h 	art_rgb_svp.h 	art_svp.h 	art_svp_ops.h 	art_svp_render_aa.h 	art_svp_vpath.h 	art_svp_vpath_stroke.h 	art_uta.h 	art_uta_ops.h 	art_uta_rect.h 	art_uta_vpath.h 	art_uta_svp.h 	art_vpath.h 	art_vpath_bpath.h 	art_vpath_svp.h
-@@ -118,7 +118,7 @@
- m4datadir = $(datadir)/aclocal
+@@ -115,10 +115,10 @@
+ testuta_DEPENDENCIES = $(DEPS)
+ testuta_LDADD = $(LDADDS) -lm
+ 
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
  m4data_DATA = libart.m4
  
 -confexecdir = $(libdir)
@@ -18,15 +22,6 @@
  confexec_DATA = libartConf.sh
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-@@ -559,7 +559,7 @@
- 		install-confexecDATA
- install-exec: install-exec-am
- 
--install-data-am: install-m4dataDATA install-libart_lgplincHEADERS
-+install-data-am: install-libart_lgplincHEADERS
- install-data: install-data-am
- 
- install-am: all-am
 @@ -569,7 +569,7 @@
  		uninstall-confexecDATA uninstall-m4dataDATA \
  		uninstall-libart_lgplincHEADERS
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index 923390c..56dd10d 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -1,3 +1,4 @@
+bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
 bin/gnome-config
@@ -5,6 +6,8 @@ bin/gnome-dump-metadata
 bin/gnome-gen-mimedb
 bin/gnome-moz-remote
 bin/gnome-name-service
+bin/gnome-pty-helper
+bin/gnome_segv
 bin/goad-browser
 bin/libart-config
 bin/loadshlib
@@ -162,39 +165,32 @@ include/zvt/vt.h
 include/zvt/vtx.h
 include/zvt/zvtterm.h
 lib/libart_lgpl.a
-lib/libart_lgpl.la
 lib/libart_lgpl.so
-lib/libart_lgpl.so.1
+lib/libart_lgpl.so.2
 lib/libgnome.a
-lib/libgnome.la
 lib/libgnome.so
-lib/libgnome.so.1
+lib/libgnome.so.2
 lib/libgnomesupport.a
-lib/libgnomesupport.la
 lib/libgnomesupport.so
-lib/libgnomesupport.so.1
+lib/libgnomesupport.so.2
 lib/libgnomeui.a
-lib/libgnomeui.la
 lib/libgnomeui.so
-lib/libgnomeui.so.1
+lib/libgnomeui.so.2
 lib/libgnorba.a
-lib/libgnorba.la
 lib/libgnorba.so
-lib/libgnorba.so.1
+lib/libgnorba.so.2
 lib/libgnorbagtk.a
-lib/libgnorbagtk.la
 lib/libgnorbagtk.so
 lib/libgnorbagtk.so.0
 lib/libgtkxmhtml.a
-lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so
 lib/libgtkxmhtml.so.1
 lib/libzvt.a
-lib/libzvt.la
 lib/libzvt.so
-lib/libzvt.so.1
+lib/libzvt.so.2
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/libart.m4
 share/gnome/gtkrc
 share/gnome/gtkrc.ja
 share/gnome/gtkrc.ko
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 81a6751..118947d 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -3,7 +3,7 @@
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.39 1999/05/01 03:20:33 steve Exp $
+# $Id: Makefile,v 1.40 1999/05/09 17:13:15 steve Exp $
 #
 
 DISTNAME=	gnome-libs-1.0.9
@@ -14,28 +14,27 @@ MASTER_SITE_SUBDIR=	sources/gnome-libs
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gdk_imlib.3:${PORTSDIR}/graphics/imlib \
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib \
 		Xpm.4:${PORTSDIR}/graphics/xpm \
-		ORBit.1:${PORTSDIR}/devel/ORBit \
+		ORBit.2:${PORTSDIR}/devel/ORBit \
 		esd.1:${PORTSDIR}/audio/esound
 
-# implicit dependencies:
-# gettext, gtk12, tiff34, jpeg, giflib, png
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libart_lgpl/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--disable-gnome-hello \
 		--disable-test-gnome
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/giflib" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+MAN1=		gnome.1	
 
 .include <bsd.port.mk>
diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa
index 02ba2b3..d0b27f2 100644
--- a/x11/gnomelibs/files/patch-aa
+++ b/x11/gnomelibs/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig	Mon Mar  1 21:51:08 1999
-+++ configure	Sat Mar  6 13:33:05 1999
-@@ -5149,7 +5149,7 @@
+--- configure.orig	Tue Apr 27 21:24:19 1999
++++ configure	Sat May 22 21:16:46 1999
+@@ -2521,7 +2521,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  PTHREAD_LIB="-lc_r"
++  PTHREAD_LIB=""
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
+@@ -5215,7 +5215,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -9,16 +18,16 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7233,7 +7233,7 @@
+@@ -7372,7 +7372,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 7239 "configure"
+ #line 7378 "configure"
  #include "confdefs.h"
-@@ -10704,7 +10704,7 @@
+@@ -10859,7 +10859,7 @@
  ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
  
  GNOME_LIBDIR='-L${libdir}'
@@ -27,7 +36,7 @@
  GNOME_IDLDIR='-I${datadir}/idl'
  
  
-@@ -11548,10 +11548,6 @@
+@@ -11724,10 +11724,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/x11/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac
index be621cf..184d5e7 100644
--- a/x11/gnomelibs/files/patch-ac
+++ b/x11/gnomelibs/files/patch-ac
@@ -1,5 +1,5 @@
---- gnome-config.in.orig	Mon Feb 15 20:05:33 1999
-+++ gnome-config.in	Tue Mar  2 09:00:51 1999
+--- gnome-config.in.orig	Thu Apr 15 13:59:46 1999
++++ gnome-config.in	Sat May  8 17:32:13 1999
 @@ -43,25 +43,25 @@
  
  Known values for LIBRARY are:
@@ -30,7 +30,7 @@
  
      if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then
  	echo "    <NONE>"
-@@ -146,36 +146,36 @@
+@@ -146,19 +146,19 @@
  	usage 1
  	;;
      glib)
@@ -46,30 +46,17 @@
 +	the_flags="$the_flags `gtk12-config --cflags`"
  	;;
      gnome)
--       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
-+       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@ -lintl"
+        	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
    	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gnomeui)
 -	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@ -lintl"
++	the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@"
  	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gtkxmhtml)
--	the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@ -lintl"
- 	;;
-     gnorba)
--        the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@"
-+        the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@ -lintl"
- 	the_flags="$the_flags @GNOME_INCLUDEDIR@ @ORBIT_CFLAGS@"
-         ;;
-     idl)
-         the_flags="@GNOME_IDLDIR@"
- 	;;
-     zvt)
--	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl"
+@@ -175,7 +175,7 @@
+ 	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@"
  	;;
      *)
 -	cnf_sh=${libdir}/${1}Conf.sh
diff --git a/x11/gnomelibs/files/patch-ba b/x11/gnomelibs/files/patch-ba
index 3d04ba5..ab4a059 100644
--- a/x11/gnomelibs/files/patch-ba
+++ b/x11/gnomelibs/files/patch-ba
@@ -5,7 +5,7 @@
  @FALSE_TRUE@libvfs = libvfs
  
 -SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) devel-docs gnome-data $(libvfs) man 	gnome-faq
-+SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) gnome-data $(libvfs)
++SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) gnome-data $(libvfs) man
  
  
  include_HEADERS = gnome.h
diff --git a/x11/gnomelibs/files/patch-bc b/x11/gnomelibs/files/patch-bc
index d643ed9..d77e125 100644
--- a/x11/gnomelibs/files/patch-bc
+++ b/x11/gnomelibs/files/patch-bc
@@ -1,15 +1,11 @@
 --- libgnome/Makefile.in.orig	Wed Apr  7 21:33:54 1999
 +++ libgnome/Makefile.in	Fri Apr 30 17:35:08 1999
-@@ -172,10 +172,10 @@
+@@ -172,7 +172,7 @@
  
  EXTRA_DIST = parse-path.cP 
  
 -libgnome_la_LDFLAGS = -version-info 35:3:3 #-rpath $(libdir)
-+libgnome_la_LDFLAGS = -version-info 1:0:0 #-rpath $(libdir)
++libgnome_la_LDFLAGS = -version-info 2: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
-+bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
- 
- 
- dns_helper_SOURCES = dns-helper.c
+ bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
diff --git a/x11/gnomelibs/files/patch-bd b/x11/gnomelibs/files/patch-bd
index 0742d83..dc9615a 100644
--- a/x11/gnomelibs/files/patch-bd
+++ b/x11/gnomelibs/files/patch-bd
@@ -5,25 +5,16 @@
  
  
 -libgnomeui_la_LDFLAGS = -version-info 41:1:9 -rpath $(libdir)
-+libgnomeui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
++libgnomeui_la_LDFLAGS = -version-info 2: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)
-@@ -1478,7 +1478,7 @@
- check: check-recursive
- installcheck-am:
- installcheck: installcheck-recursive
--install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
-+install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-recursive
+@@ -258,7 +258,7 @@
+ gnome-startup.lo gnome-stock.lo gnome-winhints.lo \
+ gnome-paper-selector.lo gnome-procbar.lo gnometypes.lo gtkcauldron.lo \
+ gtk-clock.lo gtk-ted.lo gtkdial.lo gtkpixmapmenuitem.lo
+-PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
++PROGRAMS =  $(bin_PROGRAMS)
  
- install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS
-@@ -1490,7 +1490,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
- 		uninstall-gtkrcDATA uninstall-libgnomeuiincludeHEADERS
- uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
- all-redirect: all-recursive
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ gnome_segv_OBJECTS =  gnome_segv.o
+ gnome_segv_DEPENDENCIES =  libgnomeui.la \
diff --git a/x11/gnomelibs/files/patch-be b/x11/gnomelibs/files/patch-be
index f5bdd3c..478ed9a 100644
--- a/x11/gnomelibs/files/patch-be
+++ b/x11/gnomelibs/files/patch-be
@@ -5,7 +5,7 @@
  
  
 -libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir)
-+libgnorba_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
++libgnorba_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir)
  libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
  
  loadshlib_SOURCES = loadshlib.c
diff --git a/x11/gnomelibs/files/patch-bf b/x11/gnomelibs/files/patch-bf
index 2676088..bdb9856 100644
--- a/x11/gnomelibs/files/patch-bf
+++ b/x11/gnomelibs/files/patch-bf
@@ -14,7 +14,7 @@
  libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
  libgnomesupport_la_LIBADD = @LTLIBOBJS@
 -libgnomesupport_la_LDFLAGS = -version-info 0:0:0
-+libgnomesupport_la_LDFLAGS = -version-info 1:0:0
++libgnomesupport_la_LDFLAGS = -version-info 2:0:0
  
  BUILT_SOURCES = gnomesupport.h
  
diff --git a/x11/gnomelibs/files/patch-bg b/x11/gnomelibs/files/patch-bg
index 15a50ea..5a793e0 100644
--- a/x11/gnomelibs/files/patch-bg
+++ b/x11/gnomelibs/files/patch-bg
@@ -1,30 +1,29 @@
---- zvt/Makefile.in.orig	Wed Apr  7 21:34:27 1999
-+++ zvt/Makefile.in	Fri Apr 30 17:53:45 1999
+--- zvt/Makefile.in.orig	Wed Apr 28 02:58:32 1999
++++ zvt/Makefile.in	Sat May  8 22:50:50 1999
+@@ -20,7 +20,7 @@
+ exec_prefix = @exec_prefix@
+ 
+ bindir = @bindir@
+-sbindir = @sbindir@
++sbindir = @bindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+ sysconfdir = @sysconfdir@
 @@ -160,7 +160,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
  
  
 -libzvt_la_LDFLAGS = -version-info 4:3:2 -rpath $(libdir)
-+libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
++libzvt_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir)
  
  libzvtinclude_HEADERS =  	lists.h				vt.h				vtx.h				zvtterm.h
  
-@@ -435,8 +435,7 @@
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
--install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS \
--		install-exec-local
-+install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-am
+@@ -200,7 +200,7 @@
+ libzvt_la_LIBADD = 
+ libzvt_la_OBJECTS =  gnome-login-support.lo lists.lo subshell.lo \
+ update.lo vt.lo zvtterm.lo
+-PROGRAMS =  $(noinst_PROGRAMS) $(sbin_PROGRAMS)
++PROGRAMS =  $(sbin_PROGRAMS)
  
- install-data-am: install-libzvtincludeHEADERS
-@@ -448,7 +447,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS \
- 		uninstall-libzvtincludeHEADERS
- uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ zterm_OBJECTS =  zterm.o
+ zterm_DEPENDENCIES =  libzvt.la
diff --git a/x11/gnomelibs/files/patch-bi b/x11/gnomelibs/files/patch-bi
index 8d49b031..09749e8 100644
--- a/x11/gnomelibs/files/patch-bi
+++ b/x11/gnomelibs/files/patch-bi
@@ -1,16 +1,20 @@
---- libart_lgpl/Makefile.in.orig	Tue Feb 16 01:09:07 1999
-+++ libart_lgpl/Makefile.in	Fri Feb 19 00:20:20 1999
+--- libart_lgpl/Makefile.in.orig	Wed Apr 28 02:57:51 1999
++++ libart_lgpl/Makefile.in	Fri Apr 30 00:19:41 1999
 @@ -94,7 +94,7 @@
  libart_lgpl_la_SOURCES =  	art_affine.c 	art_alphagamma.c 	art_bpath.c 	art_gray_svp.c 	art_misc.c 	art_pixbuf.c 	art_rect.c 	art_rect_svp.c 	art_rect_uta.c 	art_rgb.c 	art_rgb_affine.c 	art_rgb_affine_private.c 	art_rgb_affine_private.h 	art_rgb_bitmap_affine.c 	art_rgb_pixbuf_affine.c 	art_rgb_rgba_affine.c 	art_rgb_svp.c 	art_svp.c 	art_svp_ops.c 	art_svp_render_aa.c 	art_svp_vpath.c 	art_svp_vpath_stroke.c 	art_svp_wind.c 	art_svp_wind.h 	art_uta.c 	art_uta_ops.c 	art_uta_rect.c 	art_uta_vpath.c 	art_uta_svp.c 	art_vpath.c 	art_vpath_bpath.c 	art_vpath_svp.c
  
  
 -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@
-+libart_lgpl_la_LDFLAGS = -version-info 1:0:0
++libart_lgpl_la_LDFLAGS = -version-info 2:0:0
  
  libart_lgplincdir = $(includedir)/libart_lgpl
  libart_lgplinc_HEADERS =  	art_affine.h 	art_alphagamma.h 	art_bpath.h 	art_filterlevel.h 	art_gray_svp.h 	art_misc.h 	art_pathcode.h 	art_pixbuf.h 	art_point.h 	art_rect.h 	art_rect_svp.h 	art_rect_uta.h 	art_rgb.h 	art_rgb_affine.h 	art_rgb_bitmap_affine.h 	art_rgb_pixbuf_affine.h 	art_rgb_rgba_affine.h 	art_rgb_svp.h 	art_svp.h 	art_svp_ops.h 	art_svp_render_aa.h 	art_svp_vpath.h 	art_svp_vpath_stroke.h 	art_uta.h 	art_uta_ops.h 	art_uta_rect.h 	art_uta_vpath.h 	art_uta_svp.h 	art_vpath.h 	art_vpath_bpath.h 	art_vpath_svp.h
-@@ -118,7 +118,7 @@
- m4datadir = $(datadir)/aclocal
+@@ -115,10 +115,10 @@
+ testuta_DEPENDENCIES = $(DEPS)
+ testuta_LDADD = $(LDADDS) -lm
+ 
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
  m4data_DATA = libart.m4
  
 -confexecdir = $(libdir)
@@ -18,15 +22,6 @@
  confexec_DATA = libartConf.sh
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-@@ -559,7 +559,7 @@
- 		install-confexecDATA
- install-exec: install-exec-am
- 
--install-data-am: install-m4dataDATA install-libart_lgplincHEADERS
-+install-data-am: install-libart_lgplincHEADERS
- install-data: install-data-am
- 
- install-am: all-am
 @@ -569,7 +569,7 @@
  		uninstall-confexecDATA uninstall-m4dataDATA \
  		uninstall-libart_lgplincHEADERS
diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index 923390c..56dd10d 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/pkg-plist
@@ -1,3 +1,4 @@
+bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
 bin/gnome-config
@@ -5,6 +6,8 @@ bin/gnome-dump-metadata
 bin/gnome-gen-mimedb
 bin/gnome-moz-remote
 bin/gnome-name-service
+bin/gnome-pty-helper
+bin/gnome_segv
 bin/goad-browser
 bin/libart-config
 bin/loadshlib
@@ -162,39 +165,32 @@ include/zvt/vt.h
 include/zvt/vtx.h
 include/zvt/zvtterm.h
 lib/libart_lgpl.a
-lib/libart_lgpl.la
 lib/libart_lgpl.so
-lib/libart_lgpl.so.1
+lib/libart_lgpl.so.2
 lib/libgnome.a
-lib/libgnome.la
 lib/libgnome.so
-lib/libgnome.so.1
+lib/libgnome.so.2
 lib/libgnomesupport.a
-lib/libgnomesupport.la
 lib/libgnomesupport.so
-lib/libgnomesupport.so.1
+lib/libgnomesupport.so.2
 lib/libgnomeui.a
-lib/libgnomeui.la
 lib/libgnomeui.so
-lib/libgnomeui.so.1
+lib/libgnomeui.so.2
 lib/libgnorba.a
-lib/libgnorba.la
 lib/libgnorba.so
-lib/libgnorba.so.1
+lib/libgnorba.so.2
 lib/libgnorbagtk.a
-lib/libgnorbagtk.la
 lib/libgnorbagtk.so
 lib/libgnorbagtk.so.0
 lib/libgtkxmhtml.a
-lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so
 lib/libgtkxmhtml.so.1
 lib/libzvt.a
-lib/libzvt.la
 lib/libzvt.so
-lib/libzvt.so.1
+lib/libzvt.so.2
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/libart.m4
 share/gnome/gtkrc
 share/gnome/gtkrc.ja
 share/gnome/gtkrc.ko
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 81a6751..118947d 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,7 +3,7 @@
 # Date created:				17 June 1998
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.39 1999/05/01 03:20:33 steve Exp $
+# $Id: Makefile,v 1.40 1999/05/09 17:13:15 steve Exp $
 #
 
 DISTNAME=	gnome-libs-1.0.9
@@ -14,28 +14,27 @@ MASTER_SITE_SUBDIR=	sources/gnome-libs
 
 MAINTAINER=	nacai@iname.com
 
-LIB_DEPENDS=	gdk_imlib.3:${PORTSDIR}/graphics/imlib \
+LIB_DEPENDS=	gdk_imlib.4:${PORTSDIR}/graphics/imlib \
 		Xpm.4:${PORTSDIR}/graphics/xpm \
-		ORBit.1:${PORTSDIR}/devel/ORBit \
+		ORBit.2:${PORTSDIR}/devel/ORBit \
 		esd.1:${PORTSDIR}/audio/esound
 
-# implicit dependencies:
-# gettext, gtk12, tiff34, jpeg, giflib, png
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure libart_lgpl/configure
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
 		--datadir=${PREFIX}/share/gnome \
 		--disable-gnome-hello \
 		--disable-test-gnome
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/giflib" \
-		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
+		GTK_CONFIG="${GTK_CONFIG}" \
+		LIBS="-L${LOCALBASE}/lib"
 
-post-install:
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+MAN1=		gnome.1	
 
 .include <bsd.port.mk>
diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa
index 02ba2b3..d0b27f2 100644
--- a/x11/libgnome/files/patch-aa
+++ b/x11/libgnome/files/patch-aa
@@ -1,6 +1,15 @@
---- configure.orig	Mon Mar  1 21:51:08 1999
-+++ configure	Sat Mar  6 13:33:05 1999
-@@ -5149,7 +5149,7 @@
+--- configure.orig	Tue Apr 27 21:24:19 1999
++++ configure	Sat May 22 21:16:46 1999
+@@ -2521,7 +2521,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  PTHREAD_LIB="-lc_r"
++  PTHREAD_LIB=""
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
+@@ -5215,7 +5215,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -9,16 +18,16 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7233,7 +7233,7 @@
+@@ -7372,7 +7372,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 7239 "configure"
+ #line 7378 "configure"
  #include "confdefs.h"
-@@ -10704,7 +10704,7 @@
+@@ -10859,7 +10859,7 @@
  ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
  
  GNOME_LIBDIR='-L${libdir}'
@@ -27,7 +36,7 @@
  GNOME_IDLDIR='-I${datadir}/idl'
  
  
-@@ -11548,10 +11548,6 @@
+@@ -11724,10 +11724,6 @@
        *) # Relative path.
          ac_sub_cache_file="$ac_dots$cache_file" ;;
        esac
diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac
index be621cf..184d5e7 100644
--- a/x11/libgnome/files/patch-ac
+++ b/x11/libgnome/files/patch-ac
@@ -1,5 +1,5 @@
---- gnome-config.in.orig	Mon Feb 15 20:05:33 1999
-+++ gnome-config.in	Tue Mar  2 09:00:51 1999
+--- gnome-config.in.orig	Thu Apr 15 13:59:46 1999
++++ gnome-config.in	Sat May  8 17:32:13 1999
 @@ -43,25 +43,25 @@
  
  Known values for LIBRARY are:
@@ -30,7 +30,7 @@
  
      if test "x$conf_shs" = x || test "x$conf_shs" = 'x*Conf.sh'; then
  	echo "    <NONE>"
-@@ -146,36 +146,36 @@
+@@ -146,19 +146,19 @@
  	usage 1
  	;;
      glib)
@@ -46,30 +46,17 @@
 +	the_flags="$the_flags `gtk12-config --cflags`"
  	;;
      gnome)
--       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
-+       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@ -lintl"
+        	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
    	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gnomeui)
 -	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@ -lintl"
++	the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@"
  	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gtkxmhtml)
--	the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@ -lintl"
- 	;;
-     gnorba)
--        the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@"
-+        the_libs="$the_libs @GNOME_LIBDIR@ -lgnorba @ORBIT_LIBS@ -lintl"
- 	the_flags="$the_flags @GNOME_INCLUDEDIR@ @ORBIT_CFLAGS@"
-         ;;
-     idl)
-         the_flags="@GNOME_IDLDIR@"
- 	;;
-     zvt)
--	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@"
-+	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@ -lintl"
+@@ -175,7 +175,7 @@
+ 	the_libs="$the_libs @GNOME_LIBDIR@ @ZVT_LIBS@"
  	;;
      *)
 -	cnf_sh=${libdir}/${1}Conf.sh
diff --git a/x11/libgnome/files/patch-ba b/x11/libgnome/files/patch-ba
index 3d04ba5..ab4a059 100644
--- a/x11/libgnome/files/patch-ba
+++ b/x11/libgnome/files/patch-ba
@@ -5,7 +5,7 @@
  @FALSE_TRUE@libvfs = libvfs
  
 -SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) devel-docs gnome-data $(libvfs) man 	gnome-faq
-+SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) gnome-data $(libvfs)
++SUBDIRS = po intl support macros 	tools 	images 	libart_lgpl 	libgnome libgnomeui gtk-xmhtml $(gnome_hello) zvt 	libgnorba idl $(test_gnome) gnome-data $(libvfs) man
  
  
  include_HEADERS = gnome.h
diff --git a/x11/libgnome/files/patch-bc b/x11/libgnome/files/patch-bc
index d643ed9..d77e125 100644
--- a/x11/libgnome/files/patch-bc
+++ b/x11/libgnome/files/patch-bc
@@ -1,15 +1,11 @@
 --- libgnome/Makefile.in.orig	Wed Apr  7 21:33:54 1999
 +++ libgnome/Makefile.in	Fri Apr 30 17:35:08 1999
-@@ -172,10 +172,10 @@
+@@ -172,7 +172,7 @@
  
  EXTRA_DIST = parse-path.cP 
  
 -libgnome_la_LDFLAGS = -version-info 35:3:3 #-rpath $(libdir)
-+libgnome_la_LDFLAGS = -version-info 1:0:0 #-rpath $(libdir)
++libgnome_la_LDFLAGS = -version-info 2: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
-+bin_PROGRAMS = gnome-dump-metadata gnome-moz-remote 	gconfigger gnome-gen-mimedb
- 
- 
- dns_helper_SOURCES = dns-helper.c
+ 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 0742d83..dc9615a 100644
--- a/x11/libgnome/files/patch-bd
+++ b/x11/libgnome/files/patch-bd
@@ -5,25 +5,16 @@
  
  
 -libgnomeui_la_LDFLAGS = -version-info 41:1:9 -rpath $(libdir)
-+libgnomeui_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
++libgnomeui_la_LDFLAGS = -version-info 2: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)
-@@ -1478,7 +1478,7 @@
- check: check-recursive
- installcheck-am:
- installcheck: installcheck-recursive
--install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
-+install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-recursive
+@@ -258,7 +258,7 @@
+ gnome-startup.lo gnome-stock.lo gnome-winhints.lo \
+ gnome-paper-selector.lo gnome-procbar.lo gnometypes.lo gtkcauldron.lo \
+ gtk-clock.lo gtk-ted.lo gtkdial.lo gtkpixmapmenuitem.lo
+-PROGRAMS =  $(bin_PROGRAMS) $(noinst_PROGRAMS)
++PROGRAMS =  $(bin_PROGRAMS)
  
- install-data-am: install-gtkrcDATA install-libgnomeuiincludeHEADERS
-@@ -1490,7 +1490,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
- 		uninstall-gtkrcDATA uninstall-libgnomeuiincludeHEADERS
- uninstall: uninstall-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
- all-redirect: all-recursive
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ gnome_segv_OBJECTS =  gnome_segv.o
+ gnome_segv_DEPENDENCIES =  libgnomeui.la \
diff --git a/x11/libgnome/files/patch-be b/x11/libgnome/files/patch-be
index f5bdd3c..478ed9a 100644
--- a/x11/libgnome/files/patch-be
+++ b/x11/libgnome/files/patch-be
@@ -5,7 +5,7 @@
  
  
 -libgnorba_la_LDFLAGS = -version-info 28:5:1 -rpath $(libdir)
-+libgnorba_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
++libgnorba_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir)
  libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm
  
  loadshlib_SOURCES = loadshlib.c
diff --git a/x11/libgnome/files/patch-bf b/x11/libgnome/files/patch-bf
index 2676088..bdb9856 100644
--- a/x11/libgnome/files/patch-bf
+++ b/x11/libgnome/files/patch-bf
@@ -14,7 +14,7 @@
  libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c
  libgnomesupport_la_LIBADD = @LTLIBOBJS@
 -libgnomesupport_la_LDFLAGS = -version-info 0:0:0
-+libgnomesupport_la_LDFLAGS = -version-info 1:0:0
++libgnomesupport_la_LDFLAGS = -version-info 2:0:0
  
  BUILT_SOURCES = gnomesupport.h
  
diff --git a/x11/libgnome/files/patch-bg b/x11/libgnome/files/patch-bg
index 15a50ea..5a793e0 100644
--- a/x11/libgnome/files/patch-bg
+++ b/x11/libgnome/files/patch-bg
@@ -1,30 +1,29 @@
---- zvt/Makefile.in.orig	Wed Apr  7 21:34:27 1999
-+++ zvt/Makefile.in	Fri Apr 30 17:53:45 1999
+--- zvt/Makefile.in.orig	Wed Apr 28 02:58:32 1999
++++ zvt/Makefile.in	Sat May  8 22:50:50 1999
+@@ -20,7 +20,7 @@
+ exec_prefix = @exec_prefix@
+ 
+ bindir = @bindir@
+-sbindir = @sbindir@
++sbindir = @bindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+ sysconfdir = @sysconfdir@
 @@ -160,7 +160,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
  
  
 -libzvt_la_LDFLAGS = -version-info 4:3:2 -rpath $(libdir)
-+libzvt_la_LDFLAGS = -version-info 1:0:0 -rpath $(libdir)
++libzvt_la_LDFLAGS = -version-info 2:0:0 -rpath $(libdir)
  
  libzvtinclude_HEADERS =  	lists.h				vt.h				vtx.h				zvtterm.h
  
-@@ -435,8 +435,7 @@
- check: check-am
- installcheck-am:
- installcheck: installcheck-am
--install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS \
--		install-exec-local
-+install-exec-am: install-libLTLIBRARIES
- install-exec: install-exec-am
+@@ -200,7 +200,7 @@
+ libzvt_la_LIBADD = 
+ libzvt_la_OBJECTS =  gnome-login-support.lo lists.lo subshell.lo \
+ update.lo vt.lo zvtterm.lo
+-PROGRAMS =  $(noinst_PROGRAMS) $(sbin_PROGRAMS)
++PROGRAMS =  $(sbin_PROGRAMS)
  
- install-data-am: install-libzvtincludeHEADERS
-@@ -448,7 +447,7 @@
- uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS \
- 		uninstall-libzvtincludeHEADERS
- uninstall: uninstall-am
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
-+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- all-redirect: all-am
- install-strip:
- 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ zterm_OBJECTS =  zterm.o
+ zterm_DEPENDENCIES =  libzvt.la
diff --git a/x11/libgnome/files/patch-bi b/x11/libgnome/files/patch-bi
index 8d49b031..09749e8 100644
--- a/x11/libgnome/files/patch-bi
+++ b/x11/libgnome/files/patch-bi
@@ -1,16 +1,20 @@
---- libart_lgpl/Makefile.in.orig	Tue Feb 16 01:09:07 1999
-+++ libart_lgpl/Makefile.in	Fri Feb 19 00:20:20 1999
+--- libart_lgpl/Makefile.in.orig	Wed Apr 28 02:57:51 1999
++++ libart_lgpl/Makefile.in	Fri Apr 30 00:19:41 1999
 @@ -94,7 +94,7 @@
  libart_lgpl_la_SOURCES =  	art_affine.c 	art_alphagamma.c 	art_bpath.c 	art_gray_svp.c 	art_misc.c 	art_pixbuf.c 	art_rect.c 	art_rect_svp.c 	art_rect_uta.c 	art_rgb.c 	art_rgb_affine.c 	art_rgb_affine_private.c 	art_rgb_affine_private.h 	art_rgb_bitmap_affine.c 	art_rgb_pixbuf_affine.c 	art_rgb_rgba_affine.c 	art_rgb_svp.c 	art_svp.c 	art_svp_ops.c 	art_svp_render_aa.c 	art_svp_vpath.c 	art_svp_vpath_stroke.c 	art_svp_wind.c 	art_svp_wind.h 	art_uta.c 	art_uta_ops.c 	art_uta_rect.c 	art_uta_vpath.c 	art_uta_svp.c 	art_vpath.c 	art_vpath_bpath.c 	art_vpath_svp.c
  
  
 -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@
-+libart_lgpl_la_LDFLAGS = -version-info 1:0:0
++libart_lgpl_la_LDFLAGS = -version-info 2:0:0
  
  libart_lgplincdir = $(includedir)/libart_lgpl
  libart_lgplinc_HEADERS =  	art_affine.h 	art_alphagamma.h 	art_bpath.h 	art_filterlevel.h 	art_gray_svp.h 	art_misc.h 	art_pathcode.h 	art_pixbuf.h 	art_point.h 	art_rect.h 	art_rect_svp.h 	art_rect_uta.h 	art_rgb.h 	art_rgb_affine.h 	art_rgb_bitmap_affine.h 	art_rgb_pixbuf_affine.h 	art_rgb_rgba_affine.h 	art_rgb_svp.h 	art_svp.h 	art_svp_ops.h 	art_svp_render_aa.h 	art_svp_vpath.h 	art_svp_vpath_stroke.h 	art_uta.h 	art_uta_ops.h 	art_uta_rect.h 	art_uta_vpath.h 	art_uta_svp.h 	art_vpath.h 	art_vpath_bpath.h 	art_vpath_svp.h
-@@ -118,7 +118,7 @@
- m4datadir = $(datadir)/aclocal
+@@ -115,10 +115,10 @@
+ testuta_DEPENDENCIES = $(DEPS)
+ testuta_LDADD = $(LDADDS) -lm
+ 
+-m4datadir = $(datadir)/aclocal
++m4datadir = $(prefix)/share/aclocal
  m4data_DATA = libart.m4
  
 -confexecdir = $(libdir)
@@ -18,15 +22,6 @@
  confexec_DATA = libartConf.sh
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-@@ -559,7 +559,7 @@
- 		install-confexecDATA
- install-exec: install-exec-am
- 
--install-data-am: install-m4dataDATA install-libart_lgplincHEADERS
-+install-data-am: install-libart_lgplincHEADERS
- install-data: install-data-am
- 
- install-am: all-am
 @@ -569,7 +569,7 @@
  		uninstall-confexecDATA uninstall-m4dataDATA \
  		uninstall-libart_lgplincHEADERS
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 923390c..56dd10d 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -1,3 +1,4 @@
+bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
 bin/gnome-config
@@ -5,6 +6,8 @@ bin/gnome-dump-metadata
 bin/gnome-gen-mimedb
 bin/gnome-moz-remote
 bin/gnome-name-service
+bin/gnome-pty-helper
+bin/gnome_segv
 bin/goad-browser
 bin/libart-config
 bin/loadshlib
@@ -162,39 +165,32 @@ include/zvt/vt.h
 include/zvt/vtx.h
 include/zvt/zvtterm.h
 lib/libart_lgpl.a
-lib/libart_lgpl.la
 lib/libart_lgpl.so
-lib/libart_lgpl.so.1
+lib/libart_lgpl.so.2
 lib/libgnome.a
-lib/libgnome.la
 lib/libgnome.so
-lib/libgnome.so.1
+lib/libgnome.so.2
 lib/libgnomesupport.a
-lib/libgnomesupport.la
 lib/libgnomesupport.so
-lib/libgnomesupport.so.1
+lib/libgnomesupport.so.2
 lib/libgnomeui.a
-lib/libgnomeui.la
 lib/libgnomeui.so
-lib/libgnomeui.so.1
+lib/libgnomeui.so.2
 lib/libgnorba.a
-lib/libgnorba.la
 lib/libgnorba.so
-lib/libgnorba.so.1
+lib/libgnorba.so.2
 lib/libgnorbagtk.a
-lib/libgnorbagtk.la
 lib/libgnorbagtk.so
 lib/libgnorbagtk.so.0
 lib/libgtkxmhtml.a
-lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so
 lib/libgtkxmhtml.so.1
 lib/libzvt.a
-lib/libzvt.la
 lib/libzvt.so
-lib/libzvt.so.1
+lib/libzvt.so.2
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+share/aclocal/libart.m4
 share/gnome/gtkrc
 share/gnome/gtkrc.ja
 share/gnome/gtkrc.ko