From e2c19051071b49cd1df79ac58dfdc86fc23617fb Mon Sep 17 00:00:00 2001
From: rh <rh@pkgsrc.org>
Date: Sun, 7 Oct 2001 10:13:11 +0000
Subject: Don't derive GLIB_LDFLAGS from GTK_LDFLAGS as they may install in
 different locations.  Fixes PRs 14133 and 14178.

---
 x11/gnome-libs/distinfo         |  4 ++--
 x11/gnome-libs/patches/patch-aa | 28 ++++++++++++++++++++++------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index 9570eb93d8a..fccd858f950 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2001/09/30 21:14:34 rh Exp $
+$NetBSD: distinfo,v 1.7 2001/10/07 10:13:11 rh Exp $
 
 SHA1 (gnome-libs-1.4.1.2.tar.gz) = 90798f5d8ba6091ddd26236f12ecdb6797233d44
 Size (gnome-libs-1.4.1.2.tar.gz) = 3748372 bytes
-SHA1 (patch-aa) = 9475ac31c08d3aa547874d932fe5c2a3d01873bc
+SHA1 (patch-aa) = 5305588fe9b532369277d7a15e708510256658be
 SHA1 (patch-ac) = ab679a82e30e97d08bfbedae1487c271ac13a407
 SHA1 (patch-ad) = fff2bbe36ba7f0ed588cbaf2efc646909511ad03
 SHA1 (patch-ae) = 98fe6bb0850778702bbe0b3d0a3810d551b7d695
diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 1974c717431..e710caf1e5b 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,8 +1,24 @@
-$NetBSD: patch-aa,v 1.13 2001/06/16 20:03:19 jlam Exp $
+$NetBSD: patch-aa,v 1.14 2001/10/07 10:13:11 rh Exp $
 
---- configure.orig	Fri Mar 16 14:46:20 2001
-+++ configure	Sat Jun 16 01:11:24 2001
-@@ -5312,6 +5312,11 @@
+--- configure.orig	Tue Aug 21 23:41:20 2001
++++ configure
+@@ -3471,12 +3471,9 @@
+ 
+ 
+ 
+-GLIB_CFLAGS=`echo $GTK_CFLAGS | sed 's/^.*\(-I[^ ]*glib[^ ]*  *-I[^ ]*\).*$/\1/'`
+-GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/^.*-lgdk[^ ]* *\(-L[^ ]*\).*$/\1/' -e 's/^.* -lgdk[^ ]* .*$//'`
+-if test -z "$GLIB_LDFLAGS" ; then
+-  GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/\(-L[^ ]*\) .*$/\1/' -e 's/^.*\(-L[^ ]*\)$/\1/'`
+-fi 
+-GLIB_LIBS="$GLIB_LDFLAGS `echo $GTK_LIBS | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`"
++GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
++GLIB_LIBS="`$GLIB_CONFIG --libs`"
++GLIB_LDFLAGS="$GLIB_LIBS"
+ 
+ 
+ 
+@@ -5314,6 +5311,11 @@
     rm -f po/POTFILES
     sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
  	< $srcdir/po/POTFILES.in > po/POTFILES
@@ -14,7 +30,7 @@ $NetBSD: patch-aa,v 1.13 2001/06/16 20:03:19 jlam Exp $
    
  # AM_GNOME_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
-@@ -10358,7 +10363,7 @@
+@@ -10116,7 +10118,7 @@
  GTKXMHTML_LIBS="-lgtkxmhtml $LIBGTKXMHTML_LIBS"
  ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
  
@@ -23,7 +39,7 @@ $NetBSD: patch-aa,v 1.13 2001/06/16 20:03:19 jlam Exp $
  GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
  GNOME_IDLDIR='-I${datadir}/idl'
  
-@@ -10462,8 +10467,8 @@
+@@ -10220,8 +10222,8 @@
  fi
  	if test x$gnome_cv_orbit_found = xyes; then
  		
-- 
cgit v1.2.3