diff options
| author | wiz <wiz@pkgsrc.org> | 2006-04-08 23:41:44 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2006-04-08 23:41:44 +0000 |
| commit | b493aca91fe2e62ec6b518fd2f44971ef3f2d7ba (patch) | |
| tree | 230400276de89b7fccb3c4305e23f6035125ec50 /devel | |
| parent | 18145f9b1350f1eeaa8bb34c23df2be620fe1903 (diff) | |
| download | pkgsrc-b493aca91fe2e62ec6b518fd2f44971ef3f2d7ba.tar.gz | |
Use glib2 instead of glib. Bump PKGREVISION.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/g-wrap/Makefile | 6 | ||||
| -rw-r--r-- | devel/g-wrap/distinfo | 3 | ||||
| -rw-r--r-- | devel/g-wrap/patches/patch-ac | 35 |
3 files changed, 40 insertions, 4 deletions
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index 8b076fc6b0a..d6be2a0f440 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -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 @@ INFO_FILES= # PLIST 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 --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo index 166ea473447..b71b0630730 100644 --- a/devel/g-wrap/distinfo +++ b/devel/g-wrap/distinfo @@ -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 --git a/devel/g-wrap/patches/patch-ac b/devel/g-wrap/patches/patch-ac new file mode 100644 index 00000000000..0b8db703107 --- /dev/null +++ b/devel/g-wrap/patches/patch-ac @@ -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 + |