6 files changed, 77 insertions, 63 deletions

diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 18045344a77c..286ac075150b 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:   gnomelibs
-# Version required:    0.99.2
+# Version required:    0.99.3
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.23 1999/01/07 10:45:06 vanilla Exp $
+# $Id: Makefile,v 1.24 1999/01/12 16:50:35 vanilla Exp $
 #
 
-DISTNAME=	gnome-libs-0.99.2
-PKGNAME=	gnomelibs-0.99.2
+DISTNAME=	gnome-libs-0.99.3
+PKGNAME=	gnomelibs-0.99.3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 		ftp://ftp.geo.net/pub/gnome/sources/ \
@@ -18,7 +18,7 @@ MAINTAINER=	nacai@iname.com
 
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	gdk_imlib.1:${PORTSDIR}/graphics/imlib \
+LIB_DEPENDS=	gdk_imlib.2:${PORTSDIR}/graphics/imlib \
 		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo
index ebd1dd3192b8..5881bdaf779d 100644
--- a/x11/gnomelibs/distinfo
+++ b/x11/gnomelibs/distinfo
@@ -1 +1 @@
-MD5 (gnome-libs-0.99.2.tar.gz) = 2c14da8d622a8ae63ac9f17d3eb46bc1
+MD5 (gnome-libs-0.99.3.tar.gz) = c93b22148650f9bca02cc066aebcbcf4
diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa
index 2cf4a27a5e20..1ea9e366b28b 100644
--- a/x11/gnomelibs/files/patch-aa
+++ b/x11/gnomelibs/files/patch-aa
@@ -1,12 +1,12 @@
---- configure.orig	Tue Jan  5 08:52:35 1999
-+++ configure	Wed Jan  6 21:16:02 1999
+--- configure.orig	Wed Jan 13 09:30:53 1999
++++ configure	Fri Jan 15 00:03:57 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 
-@@ -4237,7 +4237,9 @@
+@@ -4727,7 +4727,9 @@
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -14,21 +14,10 @@
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lintl $LIBS"
 +cat > conftest.$ac_ext <<EOF
- #line 4242 "configure"
+ #line 4732 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -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 @@
+@@ -5905,7 +5907,9 @@
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -36,10 +25,10 @@
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lutil $LIBS"
 +cat > conftest.$ac_ext <<EOF
- #line 5420 "configure"
+ #line 5910 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
-@@ -5470,8 +5474,8 @@
+@@ -5960,8 +5964,8 @@
  #include "confdefs.h"
  
  #include <stdio.h>
@@ -49,58 +38,58 @@
  
  int main() {
  
-@@ -5917,7 +5921,7 @@
+@@ -6407,7 +6411,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 5923 "configure"
+ #line 6413 "configure"
  #include "confdefs.h"
-@@ -6171,16 +6175,16 @@
+@@ -6661,16 +6665,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:6177: checking for gif_lib.h" >&5
+-echo "configure:6667: 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:6177: checking for giflib/gif_lib.h" >&5
++echo "configure:6667: 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 6182 "configure"
+ #line 6672 "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:6187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -6247,16 +6251,16 @@
+ { (eval echo configure:6677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -6737,16 +6741,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:6253: checking for gif_lib.h" >&5
+-echo "configure:6743: 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:6253: checking for giflib/gif_lib.h" >&5
++echo "configure:6743: 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 6258 "configure"
+ #line 6748 "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:6263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-@@ -8963,7 +8967,7 @@
+ { (eval echo configure:6753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -9674,7 +9678,7 @@
  ZVT_LIBS="-lzvt $GTK_LIBS"
  
  GNOME_LIBDIR='-L${libdir}'
diff --git a/x11/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac
index 46768613fcbb..91dbb7fa8ed8 100644
--- a/x11/gnomelibs/files/patch-ac
+++ b/x11/gnomelibs/files/patch-ac
@@ -1,34 +1,52 @@
---- gnome-config.in.orig	Thu Dec 24 03:42:13 1998
-+++ gnome-config.in	Thu Dec 24 03:43:19 1998
-@@ -46,7 +46,7 @@
+--- gnome-config.in.orig	Wed Jan 13 07:42:48 1999
++++ gnome-config.in	Fri Jan 15 00:02:56 1999
+@@ -41,18 +41,18 @@
+ 
+ Known values for LIBRARY are:
+ 
+-    glib	(calls glib-config)
++    glib11d	(calls glib11d-config)
+     idl         (to be used with orbit-idl)
      gnome
      gnomeui
      gnorba
 -    gtk		(calls gtk-config)
-+    gtk11		(calls gtk11-config)
++    gtk11d		(calls gtk11d-config)
      gtkxmhtml	(only --libs)
      zvt		(only --libs)
  
-@@ -117,30 +117,30 @@
- 	the_libs="$the_libs `glib-config --libs`"
- 	the_flags="$the_flags `glib-config --cflags`"
+ If LIBRARY is none of these,
+     
+-    ${libdir}/<LIBRARY>Conf.sh
++    ${datadir}/<LIBRARY>Conf.sh
+ 
+ is looked in for the necessary information. 
+ EOF
+@@ -114,33 +114,33 @@
+ 	usage 1
+ 	;;
+     glib)
+-	the_libs="$the_libs `glib-config --libs`"
+-	the_flags="$the_flags `glib-config --cflags`"
++	the_libs="$the_libs `glib11d-config --libs`"
++	the_flags="$the_flags `glib11d-config --cflags`"
  	;;
 -    gtk)
 -	the_libs="$the_libs `gtk-config --libs`"
 -	the_flags="$the_flags `gtk-config --cflags`"
 +    gtk11)
-+	the_libs="$the_libs `gtk11-config --libs`"
-+	the_flags="$the_flags `gtk11-config --cflags`"
++	the_libs="$the_libs `gtk11d-config --libs`"
++	the_flags="$the_flags `gtk11d-config --cflags`"
  	;;
      gnome)
-        	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
--  	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
-+  	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@ -lintl"
+-       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
++       	the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@ -lintl"
+   	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gnomeui)
- 	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
--	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
-+	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@ -lintl"
+-	the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
++	the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@ -lintl"
+ 	the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
  	;;
      gtkxmhtml)
 -	the_libs="$the_libs @GNOME_LIBDIR@ @GTKXMHTML_LIBS@"
diff --git a/x11/gnomelibs/files/patch-ad b/x11/gnomelibs/files/patch-ad
index 9c1aa83d936b..0a913989a542 100644
--- a/x11/gnomelibs/files/patch-ad
+++ b/x11/gnomelibs/files/patch-ad
@@ -1,11 +1,11 @@
---- libgnome/gnome-help.c.orig	Wed Dec 16 14:48:42 1998
-+++ libgnome/gnome-help.c	Thu Dec 24 03:44:05 1998
-@@ -43,7 +43,7 @@
-       lang= language_list->data;
- 
-       buf= g_string_new (NULL);
--      g_string_sprintf (buf, "gnome/help/%s/%s/%s", app, lang, path);
-+      g_string_sprintf (buf, "help/%s/%s/%s", app, lang, path);
-       res= (gchar *)gnome_unconditional_datadir_file (buf->str);
-       p = strrchr(res, '#');
-       if (p)
+--- libgnome/gnome-help.c.orig	Wed Jan 13 07:43:11 1999
++++ libgnome/gnome-help.c	Thu Jan 14 19:13:33 1999
+@@ -57,7 +57,7 @@
+ 		lang= language_list->data;
+ 		
+ 		buf= g_string_new (NULL);
+-		g_string_sprintf (buf, "gnome/help/%s/%s/%s", app, lang, path);
++		g_string_sprintf (buf, "help/%s/%s/%s", app, lang, path);
+ 		res= (gchar *)gnome_unconditional_datadir_file (buf->str);
+ 		p = strrchr(res, '#');
+ 		if (p)
diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist
index c5bdde0008ed..bdc9515a7d43 100644
--- a/x11/gnomelibs/pkg-plist
+++ b/x11/gnomelibs/pkg-plist
@@ -64,6 +64,7 @@ include/libgnome/gnome-fileconvert.h
 include/libgnome/gnome-help.h
 include/libgnome/gnome-history.h
 include/libgnome/gnome-i18n.h
+include/libgnome/gnome-magic.h
 include/libgnome/gnome-metadata.h
 include/libgnome/gnome-mime-info.h
 include/libgnome/gnome-mime.h
@@ -175,6 +176,10 @@ lib/libgnorba.a
 lib/libgnorba.la
 lib/libgnorba.so
 lib/libgnorba.so.1
+lib/libgnorbagtk.a
+lib/libgnorbagtk.la
+lib/libgnorbagtk.so
+lib/libgnorbagtk.so.0
 lib/libgtkxmhtml.a
 lib/libgtkxmhtml.la
 lib/libgtkxmhtml.so
@@ -187,6 +192,8 @@ lib/libzvt.so.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/gnome/gnomeConf.sh
 share/gnome/gtkrc
+share/gnome/gtkrc.ja
+share/gnome/gtkrc.ko
 share/gnome/idl/Table.idl
 share/gnome/idl/gnome-factory.idl
 share/gnome/idl/name-service.idl