Bump libglib11d's version to 2.0,

and fix some configure problem(include pkg/PLIST).

3 files changed, 40 insertions, 9 deletions

diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 729f6990e366..a5080415d9e7 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.19 1998/12/22 07:50:32 asami Exp $
+# $Id: Makefile,v 1.20 1999/01/01 02:47:11 vanilla Exp $
 #
 
 DISTNAME=	gnome-libs-0.99.1
@@ -15,8 +15,7 @@ MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
 MAINTAINER=	Nakai@technologist.com
 
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext \
-		${PREFIX}/share/gnome/sounds/startup1.wav:${PORTSDIR}/audio/gnomeaudio
+RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	gdk_imlib.1:${PORTSDIR}/graphics/imlib \
 		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa
index 23d457e24e87..76f17beb6e33 100644
--- a/x11/libgnome/files/patch-aa
+++ b/x11/libgnome/files/patch-aa
@@ -1,12 +1,34 @@
 --- configure.orig	Thu Dec 31 01:51:28 1998
-+++ configure	Fri Jan  1 03:48:08 1999
++++ configure	Mon Jan  4 10:02:57 1999
 @@ -1,4 +1,4 @@
 -#! /bin/sh
-+/#! /bin/sh
++#!/bin/sh
  
  # Guess values for system-dependent variables and create Makefiles.
  # Generated automatically using autoconf version 2.12 
-@@ -5352,8 +5352,8 @@
+@@ -4119,7 +4119,9 @@
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  cat > conftest.$ac_ext <<EOF
++  ac_save_LIBS="$LIBS"
++LIBS="-lintl $LIBS"
++cat > conftest.$ac_ext <<EOF
+ #line 4124 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -5297,7 +5299,9 @@
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+-  cat > conftest.$ac_ext <<EOF
++  ac_save_LIBS="$LIBS"
++LIBS="-lutil $LIBS"
++cat > conftest.$ac_ext <<EOF
+ #line 5302 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -5352,8 +5356,8 @@
  #include "confdefs.h"
  
  #include <stdio.h>
@@ -16,7 +38,16 @@
  
  int main() {
  
-@@ -6053,16 +6053,16 @@
+@@ -5799,7 +5803,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"
+ #include "confdefs.h"
+@@ -6053,16 +6057,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -37,7 +68,7 @@
  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 +6129,16 @@
+@@ -6129,16 +6133,16 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -58,7 +89,7 @@
  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 +8845,7 @@
+@@ -8845,7 +8849,7 @@
  ZVT_LIBS="-lzvt $GTK_LIBS"
  
  GNOME_LIBDIR='-L${libdir}'
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index c3bf35eb0dcb..9134921a6308 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -222,3 +222,4 @@ share/locale/sv/LC_MESSAGES/gnome-libs.mo
 @dirrm share/gnome/idl
 @dirrm share/gnome/mime-info
 @dirrm share/gnome/pixmaps
+@dirrm share/gnome