[pkgsrc/trunk]: pkgsrc/devel/g-wrap Use glib2 instead of glib. Bump PKGREVISION.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/587a5c5fe112
branches:  trunk
changeset: 511091:587a5c5fe112
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Apr 08 23:41:44 2006 +0000

description:
Use glib2 instead of glib. Bump PKGREVISION.

diffstat:

 devel/g-wrap/Makefile         |   6 +++---
 devel/g-wrap/distinfo         |   3 ++-
 devel/g-wrap/patches/patch-ac |  35 +++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

diffs (73 lines):

diff -r 6d0463d129b8 -r 587a5c5fe112 devel/g-wrap/Makefile
--- a/devel/g-wrap/Makefile     Sat Apr 08 23:41:06 2006 +0000
+++ b/devel/g-wrap/Makefile     Sat Apr 08 23:41:44 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2006/03/30 03:44:42 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2006/04/08 23:41:44 wiz Exp $
 
 DISTNAME=      g-wrap-1.9.6
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  http://savannah.nongnu.org/download/g-wrap/
 
@@ -21,6 +21,6 @@
 pre-install:
        ${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site/g-wrap/guile/ws
 
-.include "../../devel/glib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/guile/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6d0463d129b8 -r 587a5c5fe112 devel/g-wrap/distinfo
--- a/devel/g-wrap/distinfo     Sat Apr 08 23:41:06 2006 +0000
+++ b/devel/g-wrap/distinfo     Sat Apr 08 23:41:44 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.14 2005/12/07 15:22:50 joerg Exp $
+$NetBSD: distinfo,v 1.15 2006/04/08 23:41:44 wiz Exp $
 
 SHA1 (g-wrap-1.9.6.tar.gz) = 754116dd5d9af2fe0e1f8386e69721618e0eefdf
 RMD160 (g-wrap-1.9.6.tar.gz) = 1e3d86e38061a217b9dde06885301f4a46433d39
 Size (g-wrap-1.9.6.tar.gz) = 826045 bytes
 SHA1 (patch-aa) = 57ee87da372c0d43f384767d7b585a7d09b87b8b
 SHA1 (patch-ab) = 0b19af560b7fdebdf9a6379eb0e2b9e3980071c8
+SHA1 (patch-ac) = 2ba8274c02993c0036da498cf76238a923468f86
diff -r 6d0463d129b8 -r 587a5c5fe112 devel/g-wrap/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/g-wrap/patches/patch-ac     Sat Apr 08 23:41:44 2006 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-ac,v 1.6 2006/04/08 23:41:44 wiz Exp $
+
+--- configure.orig     2005-04-14 14:57:14.000000000 +0000
++++ configure
+@@ -21699,8 +21699,8 @@ else
+   if test "x$ac_cv_env_GLIB_CFLAGS_set" = "xset"; then
+       pkg_cv_GLIB_CFLAGS=$ac_cv_env_GLIB_CFLAGS_value
+ elif test -n "$PKG_CONFIG"; then
+-      if $PKG_CONFIG --exists "glib" >/dev/null 2>&1; then
+-              pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib" 2>/dev/null`
++      if $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then
++              pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
+       else
+               pkg_failed=yes
+       fi
+@@ -21718,8 +21718,8 @@ else
+   if test "x$ac_cv_env_GLIB_LIBS_set" = "xset"; then
+       pkg_cv_GLIB_LIBS=$ac_cv_env_GLIB_LIBS_value
+ elif test -n "$PKG_CONFIG"; then
+-      if $PKG_CONFIG --exists "glib" >/dev/null 2>&1; then
+-              pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib" 2>/dev/null`
++      if $PKG_CONFIG --exists "glib-2.0" >/dev/null 2>&1; then
++              pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
+       else
+               pkg_failed=yes
+       fi
+@@ -21731,7 +21731,7 @@ echo "$as_me:$LINENO: result: $pkg_cv_GL
+ echo "${ECHO_T}$pkg_cv_GLIB_LIBS" >&6
+ 
+ if test $pkg_failed = yes; then
+-      GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib"`
++      GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"`
+       # Put the nasty error message in config.log where it belongs
+       echo "$GLIB_PKG_ERRORS" 1>&5
+