12 files changed, 162 insertions, 99 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index efabf6c08c90..af752928b7b3 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,15 +1,17 @@
 # New ports collection makefile for:   gnomelibs
-# Version required:    0.99.1
+# Version required:    0.99.2
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.21 1999/01/04 08:43:06 vanilla Exp $
+# $Id: Makefile,v 1.22 1999/01/05 02:23:53 vanilla Exp $
 #
 
-DISTNAME=	gnome-libs-0.99.1
-PKGNAME=	gnomelibs-0.99.1
+DISTNAME=	gnome-libs-0.99.2
+PKGNAME=	gnomelibs-0.99.2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
+		ftp://ftp.geo.net/pub/gnome/sources/ \
+		ftp://gnomeftp.wgn.net/pub/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/
 
 MAINTAINER=	Nakai@technologist.com
@@ -27,6 +29,11 @@ LIB_DEPENDS=	gdk_imlib.1:${PORTSDIR}/graphics/imlib \
 		esd.1:${PORTSDIR}/audio/esound
 
 USE_X_PREFIX=	yes
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} <= 300000
+USE_PERL5=	yes
+.endif
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
@@ -45,4 +52,4 @@ pre-build:
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index 9b46cdfa20fb..ebd1dd3192b8 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.99.1.tar.gz) = 61e047346860885d2e05620bb51066bc
+MD5 (gnome-libs-0.99.2.tar.gz) = 2c14da8d622a8ae63ac9f17d3eb46bc1
diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa
index 76f17beb6e33..2cf4a27a5e20 100644
--- a/x11/gnome-libs/files/patch-aa
+++ b/x11/gnome-libs/files/patch-aa
@@ -1,12 +1,12 @@
---- configure.orig	Thu Dec 31 01:51:28 1998
-+++ configure	Mon Jan  4 10:02:57 1999
+--- configure.orig	Tue Jan  5 08:52:35 1999
++++ configure	Wed Jan  6 21:16:02 1999
 @@ -1,4 +1,4 @@
 -#! /bin/sh
 +#!/bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
  # Generated automatically using autoconf version 2.12 
-@@ -4119,7 +4119,9 @@
+@@ -4237,7 +4237,9 @@
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -14,10 +14,21 @@
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lintl $LIBS"
 +cat > conftest.$ac_ext <<EOF
- #line 4124 "configure"
+ #line 4242 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5297,7 +5299,9 @@
+@@ -4350,8 +4352,8 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+-
+-		cat > conftest.$ac_ext <<EOF
++LIBS="-lintl $LIBS"
++cat > conftest.$ac_ext <<EOF
+ #line 4356 "configure"
+ #include "confdefs.h"
+ 
+@@ -5415,7 +5417,9 @@
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -25,10 +36,10 @@
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lutil $LIBS"
 +cat > conftest.$ac_ext <<EOF
- #line 5302 "configure"
+ #line 5420 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5352,8 +5356,8 @@
+@@ -5470,8 +5474,8 @@
  #include "confdefs.h"
  
  #include <stdio.h>
@@ -38,58 +49,58 @@
  
  int main() {
  
-@@ -5799,7 +5803,7 @@
+@@ -5917,7 +5921,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 5805 "configure"
+ #line 5923 "configure"
  #include "confdefs.h"
-@@ -6053,16 +6057,16 @@
+@@ -6171,16 +6175,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6059: checking for gif_lib.h" >&5
+-echo "configure:6177: checking for gif_lib.h" >&5
 +  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6059: checking for giflib/gif_lib.h" >&5
++echo "configure:6177: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6064 "configure"
+ #line 6182 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6129,16 +6133,16 @@
+ { (eval echo configure:6187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6247,16 +6251,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6135: checking for gif_lib.h" >&5
+-echo "configure:6253: checking for gif_lib.h" >&5
 +  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6135: checking for giflib/gif_lib.h" >&5
++echo "configure:6253: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6140 "configure"
+ #line 6258 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -8845,7 +8849,7 @@
+ { (eval echo configure:6263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -8963,7 +8967,7 @@
  ZVT_LIBS="-lzvt $GTK_LIBS"
  
  GNOME_LIBDIR='-L${libdir}'
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index 9134921a6308..c5bdde0008ed 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -86,6 +86,7 @@ include/libgnomeui/gnome-appbar.h
 include/libgnomeui/gnome-calculator.h
 include/libgnomeui/gnome-canvas-image.h
 include/libgnomeui/gnome-canvas-line.h
+include/libgnomeui/gnome-canvas-load.h
 include/libgnomeui/gnome-canvas-polygon.h
 include/libgnomeui/gnome-canvas-rect-ellipse.h
 include/libgnomeui/gnome-canvas-text.h
@@ -157,31 +158,31 @@ include/zvt/zvtterm.h
 lib/libart_lgpl.a
 lib/libart_lgpl.la
 lib/libart_lgpl.so
-lib/libart_lgpl.so.0.99
+lib/libart_lgpl.so.1
 lib/libgnome.a
 lib/libgnome.la
 lib/libgnome.so
-lib/libgnome.so.0.99
+lib/libgnome.so.1
 lib/libgnomesupport.a
 lib/libgnomesupport.la
 lib/libgnomesupport.so
-lib/libgnomesupport.so.0.99
+lib/libgnomesupport.so.1
 lib/libgnomeui.a
 lib/libgnomeui.la
 lib/libgnomeui.so
-lib/libgnomeui.so.0.99
+lib/libgnomeui.so.1
 lib/libgnorba.a
 lib/libgnorba.la
 lib/libgnorba.so
-lib/libgnorba.so.0.99
+lib/libgnorba.so.1
 lib/libgtkxmhtml.a
 lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so
-lib/libgtkxmhtml.so.0.99
+lib/libgtkxmhtml.so.1
 lib/libzvt.a
 lib/libzvt.la
 lib/libzvt.so
-lib/libzvt.so.0.99
+lib/libzvt.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/gnomeConf.sh
@@ -206,9 +207,11 @@ share/locale/hu/LC_MESSAGES/gnome-libs.mo
 share/locale/it/LC_MESSAGES/gnome-libs.mo
 share/locale/ja/LC_MESSAGES/gnome-libs.mo
 share/locale/ko/LC_MESSAGES/gnome-libs.mo
+share/locale/nl/LC_MESSAGES/gnome-libs.mo
 share/locale/no/LC_MESSAGES/gnome-libs.mo
 share/locale/pl/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
+share/locale/ru/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
 @dirrm etc/sound/events
 @dirrm etc/sound
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index efabf6c08c90..af752928b7b3 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -1,15 +1,17 @@
 # New ports collection makefile for:   gnomelibs
-# Version required:    0.99.1
+# Version required:    0.99.2
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.21 1999/01/04 08:43:06 vanilla Exp $
+# $Id: Makefile,v 1.22 1999/01/05 02:23:53 vanilla Exp $
 #
 
-DISTNAME=	gnome-libs-0.99.1
-PKGNAME=	gnomelibs-0.99.1
+DISTNAME=	gnome-libs-0.99.2
+PKGNAME=	gnomelibs-0.99.2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
+		ftp://ftp.geo.net/pub/gnome/sources/ \
+		ftp://gnomeftp.wgn.net/pub/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/
 
 MAINTAINER=	Nakai@technologist.com
@@ -27,6 +29,11 @@ LIB_DEPENDS=	gdk_imlib.1:${PORTSDIR}/graphics/imlib \
 		esd.1:${PORTSDIR}/audio/esound
 
 USE_X_PREFIX=	yes
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} <= 300000
+USE_PERL5=	yes
+.endif
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
@@ -45,4 +52,4 @@ pre-build:
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo
index 9b46cdfa20fb..ebd1dd3192b8 100644
--- a/x11/gnomelibs/distinfo
+++ b/x11/gnomelibs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.99.1.tar.gz) = 61e047346860885d2e05620bb51066bc
+MD5 (gnome-libs-0.99.2.tar.gz) = 2c14da8d622a8ae63ac9f17d3eb46bc1
diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa
index 76f17beb6e33..2cf4a27a5e20 100644
--- a/x11/gnomelibs/files/patch-aa
+++ b/x11/gnomelibs/files/patch-aa
@@ -1,12 +1,12 @@
---- configure.orig	Thu Dec 31 01:51:28 1998
-+++ configure	Mon Jan  4 10:02:57 1999
+--- configure.orig	Tue Jan  5 08:52:35 1999
++++ configure	Wed Jan  6 21:16:02 1999
 @@ -1,4 +1,4 @@
 -#! /bin/sh
 +#!/bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
  # Generated automatically using autoconf version 2.12 
-@@ -4119,7 +4119,9 @@
+@@ -4237,7 +4237,9 @@
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -14,10 +14,21 @@
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lintl $LIBS"
 +cat > conftest.$ac_ext <<EOF
- #line 4124 "configure"
+ #line 4242 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5297,7 +5299,9 @@
+@@ -4350,8 +4352,8 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+-
+-		cat > conftest.$ac_ext <<EOF
++LIBS="-lintl $LIBS"
++cat > conftest.$ac_ext <<EOF
+ #line 4356 "configure"
+ #include "confdefs.h"
+ 
+@@ -5415,7 +5417,9 @@
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -25,10 +36,10 @@
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lutil $LIBS"
 +cat > conftest.$ac_ext <<EOF
- #line 5302 "configure"
+ #line 5420 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5352,8 +5356,8 @@
+@@ -5470,8 +5474,8 @@
  #include "confdefs.h"
  
  #include <stdio.h>
@@ -38,58 +49,58 @@
  
  int main() {
  
-@@ -5799,7 +5803,7 @@
+@@ -5917,7 +5921,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 5805 "configure"
+ #line 5923 "configure"
  #include "confdefs.h"
-@@ -6053,16 +6057,16 @@
+@@ -6171,16 +6175,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6059: checking for gif_lib.h" >&5
+-echo "configure:6177: checking for gif_lib.h" >&5
 +  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6059: checking for giflib/gif_lib.h" >&5
++echo "configure:6177: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6064 "configure"
+ #line 6182 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6129,16 +6133,16 @@
+ { (eval echo configure:6187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6247,16 +6251,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6135: checking for gif_lib.h" >&5
+-echo "configure:6253: checking for gif_lib.h" >&5
 +  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6135: checking for giflib/gif_lib.h" >&5
++echo "configure:6253: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6140 "configure"
+ #line 6258 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -8845,7 +8849,7 @@
+ { (eval echo configure:6263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -8963,7 +8967,7 @@
  ZVT_LIBS="-lzvt $GTK_LIBS"
  
  GNOME_LIBDIR='-L${libdir}'
diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index 9134921a6308..c5bdde0008ed 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/pkg-plist
@@ -86,6 +86,7 @@ include/libgnomeui/gnome-appbar.h
 include/libgnomeui/gnome-calculator.h
 include/libgnomeui/gnome-canvas-image.h
 include/libgnomeui/gnome-canvas-line.h
+include/libgnomeui/gnome-canvas-load.h
 include/libgnomeui/gnome-canvas-polygon.h
 include/libgnomeui/gnome-canvas-rect-ellipse.h
 include/libgnomeui/gnome-canvas-text.h
@@ -157,31 +158,31 @@ include/zvt/zvtterm.h
 lib/libart_lgpl.a
 lib/libart_lgpl.la
 lib/libart_lgpl.so
-lib/libart_lgpl.so.0.99
+lib/libart_lgpl.so.1
 lib/libgnome.a
 lib/libgnome.la
 lib/libgnome.so
-lib/libgnome.so.0.99
+lib/libgnome.so.1
 lib/libgnomesupport.a
 lib/libgnomesupport.la
 lib/libgnomesupport.so
-lib/libgnomesupport.so.0.99
+lib/libgnomesupport.so.1
 lib/libgnomeui.a
 lib/libgnomeui.la
 lib/libgnomeui.so
-lib/libgnomeui.so.0.99
+lib/libgnomeui.so.1
 lib/libgnorba.a
 lib/libgnorba.la
 lib/libgnorba.so
-lib/libgnorba.so.0.99
+lib/libgnorba.so.1
 lib/libgtkxmhtml.a
 lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so
-lib/libgtkxmhtml.so.0.99
+lib/libgtkxmhtml.so.1
 lib/libzvt.a
 lib/libzvt.la
 lib/libzvt.so
-lib/libzvt.so.0.99
+lib/libzvt.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/gnomeConf.sh
@@ -206,9 +207,11 @@ share/locale/hu/LC_MESSAGES/gnome-libs.mo
 share/locale/it/LC_MESSAGES/gnome-libs.mo
 share/locale/ja/LC_MESSAGES/gnome-libs.mo
 share/locale/ko/LC_MESSAGES/gnome-libs.mo
+share/locale/nl/LC_MESSAGES/gnome-libs.mo
 share/locale/no/LC_MESSAGES/gnome-libs.mo
 share/locale/pl/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
+share/locale/ru/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
 @dirrm etc/sound/events
 @dirrm etc/sound
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index efabf6c08c90..af752928b7b3 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -1,15 +1,17 @@
 # New ports collection makefile for:   gnomelibs
-# Version required:    0.99.1
+# Version required:    0.99.2
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.21 1999/01/04 08:43:06 vanilla Exp $
+# $Id: Makefile,v 1.22 1999/01/05 02:23:53 vanilla Exp $
 #
 
-DISTNAME=	gnome-libs-0.99.1
-PKGNAME=	gnomelibs-0.99.1
+DISTNAME=	gnome-libs-0.99.2
+PKGNAME=	gnomelibs-0.99.2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
+		ftp://ftp.geo.net/pub/gnome/sources/ \
+		ftp://gnomeftp.wgn.net/pub/gnome/sources/ \
 		ftp://ftp.gnome.org/pub/GNOME/sources/
 
 MAINTAINER=	Nakai@technologist.com
@@ -27,6 +29,11 @@ LIB_DEPENDS=	gdk_imlib.1:${PORTSDIR}/graphics/imlib \
 		esd.1:${PORTSDIR}/audio/esound
 
 USE_X_PREFIX=	yes
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} <= 300000
+USE_PERL5=	yes
+.endif
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
@@ -45,4 +52,4 @@ pre-build:
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 9b46cdfa20fb..ebd1dd3192b8 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.99.1.tar.gz) = 61e047346860885d2e05620bb51066bc
+MD5 (gnome-libs-0.99.2.tar.gz) = 2c14da8d622a8ae63ac9f17d3eb46bc1
diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa
index 76f17beb6e33..2cf4a27a5e20 100644
--- a/x11/libgnome/files/patch-aa
+++ b/x11/libgnome/files/patch-aa
@@ -1,12 +1,12 @@
---- configure.orig	Thu Dec 31 01:51:28 1998
-+++ configure	Mon Jan  4 10:02:57 1999
+--- configure.orig	Tue Jan  5 08:52:35 1999
++++ configure	Wed Jan  6 21:16:02 1999
 @@ -1,4 +1,4 @@
 -#! /bin/sh
 +#!/bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
  # Generated automatically using autoconf version 2.12 
-@@ -4119,7 +4119,9 @@
+@@ -4237,7 +4237,9 @@
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -14,10 +14,21 @@
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lintl $LIBS"
 +cat > conftest.$ac_ext <<EOF
- #line 4124 "configure"
+ #line 4242 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5297,7 +5299,9 @@
+@@ -4350,8 +4352,8 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+-
+-		cat > conftest.$ac_ext <<EOF
++LIBS="-lintl $LIBS"
++cat > conftest.$ac_ext <<EOF
+ #line 4356 "configure"
+ #include "confdefs.h"
+ 
+@@ -5415,7 +5417,9 @@
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -25,10 +36,10 @@
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lutil $LIBS"
 +cat > conftest.$ac_ext <<EOF
- #line 5302 "configure"
+ #line 5420 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5352,8 +5356,8 @@
+@@ -5470,8 +5474,8 @@
  #include "confdefs.h"
  
  #include <stdio.h>
@@ -38,58 +49,58 @@
  
  int main() {
  
-@@ -5799,7 +5803,7 @@
+@@ -5917,7 +5921,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 5805 "configure"
+ #line 5923 "configure"
  #include "confdefs.h"
-@@ -6053,16 +6057,16 @@
+@@ -6171,16 +6175,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6059: checking for gif_lib.h" >&5
+-echo "configure:6177: checking for gif_lib.h" >&5
 +  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6059: checking for giflib/gif_lib.h" >&5
++echo "configure:6177: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6064 "configure"
+ #line 6182 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6129,16 +6133,16 @@
+ { (eval echo configure:6187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6247,16 +6251,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -  ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:6135: checking for gif_lib.h" >&5
+-echo "configure:6253: checking for gif_lib.h" >&5
 +  ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:6135: checking for giflib/gif_lib.h" >&5
++echo "configure:6253: checking for giflib/gif_lib.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
- #line 6140 "configure"
+ #line 6258 "configure"
  #include "confdefs.h"
 -#include <gif_lib.h>
 +#include <giflib/gif_lib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:6145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -8845,7 +8849,7 @@
+ { (eval echo configure:6263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -8963,7 +8967,7 @@
  ZVT_LIBS="-lzvt $GTK_LIBS"
  
  GNOME_LIBDIR='-L${libdir}'
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 9134921a6308..c5bdde0008ed 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -86,6 +86,7 @@ include/libgnomeui/gnome-appbar.h
 include/libgnomeui/gnome-calculator.h
 include/libgnomeui/gnome-canvas-image.h
 include/libgnomeui/gnome-canvas-line.h
+include/libgnomeui/gnome-canvas-load.h
 include/libgnomeui/gnome-canvas-polygon.h
 include/libgnomeui/gnome-canvas-rect-ellipse.h
 include/libgnomeui/gnome-canvas-text.h
@@ -157,31 +158,31 @@ include/zvt/zvtterm.h
 lib/libart_lgpl.a
 lib/libart_lgpl.la
 lib/libart_lgpl.so
-lib/libart_lgpl.so.0.99
+lib/libart_lgpl.so.1
 lib/libgnome.a
 lib/libgnome.la
 lib/libgnome.so
-lib/libgnome.so.0.99
+lib/libgnome.so.1
 lib/libgnomesupport.a
 lib/libgnomesupport.la
 lib/libgnomesupport.so
-lib/libgnomesupport.so.0.99
+lib/libgnomesupport.so.1
 lib/libgnomeui.a
 lib/libgnomeui.la
 lib/libgnomeui.so
-lib/libgnomeui.so.0.99
+lib/libgnomeui.so.1
 lib/libgnorba.a
 lib/libgnorba.la
 lib/libgnorba.so
-lib/libgnorba.so.0.99
+lib/libgnorba.so.1
 lib/libgtkxmhtml.a
 lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so
-lib/libgtkxmhtml.so.0.99
+lib/libgtkxmhtml.so.1
 lib/libzvt.a
 lib/libzvt.la
 lib/libzvt.so
-lib/libzvt.so.0.99
+lib/libzvt.so.1
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/gnomeConf.sh
@@ -206,9 +207,11 @@ share/locale/hu/LC_MESSAGES/gnome-libs.mo
 share/locale/it/LC_MESSAGES/gnome-libs.mo
 share/locale/ja/LC_MESSAGES/gnome-libs.mo
 share/locale/ko/LC_MESSAGES/gnome-libs.mo
+share/locale/nl/LC_MESSAGES/gnome-libs.mo
 share/locale/no/LC_MESSAGES/gnome-libs.mo
 share/locale/pl/LC_MESSAGES/gnome-libs.mo
 share/locale/pt/LC_MESSAGES/gnome-libs.mo
+share/locale/ru/LC_MESSAGES/gnome-libs.mo
 share/locale/sv/LC_MESSAGES/gnome-libs.mo
 @dirrm etc/sound/events
 @dirrm etc/sound