diff options
author | wiz <wiz> | 2007-01-21 12:52:44 +0000 |
---|---|---|
committer | wiz <wiz> | 2007-01-21 12:52:44 +0000 |
commit | 262c49d549bbf1c544b818bc95fac10584897264 (patch) | |
tree | eb4e9a9cbd818fd77c3027aa3db6e76cfde47837 /devel/g-wrap | |
parent | 8c038a34934943b0e59697e5657c798646e4dc63 (diff) | |
download | pkgsrc-262c49d549bbf1c544b818bc95fac10584897264.tar.gz |
Revert update to 1.9.7, since it breaks gnucash (at least 2.0.[0-4]).
Welcome back, g-wrap-1.9.6nb2!
Diffstat (limited to 'devel/g-wrap')
-rw-r--r-- | devel/g-wrap/Makefile | 7 | ||||
-rw-r--r-- | devel/g-wrap/PLIST | 12 | ||||
-rw-r--r-- | devel/g-wrap/distinfo | 12 | ||||
-rw-r--r-- | devel/g-wrap/patches/patch-ab | 10 | ||||
-rw-r--r-- | devel/g-wrap/patches/patch-ac | 77 |
5 files changed, 50 insertions, 68 deletions
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index 3618cb25caa..3696f92159e 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.45 2007/01/14 14:24:31 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2007/01/21 12:52:44 wiz Exp $ -DISTNAME= g-wrap-1.9.7 +DISTNAME= g-wrap-1.9.6 +PKGREVISION= 2 CATEGORIES= devel MASTER_SITES= http://savannah.nongnu.org/download/g-wrap/ @@ -10,12 +11,12 @@ COMMENT= Tool for generating guile wrappers for C code DEPENDS+= guile-lib>=0.1.2:../../devel/guile-lib + GNU_CONFIGURE= YES USE_TOOLS+= gmake makeinfo pkg-config USE_LIBTOOL= YES TEST_TARGET= check INFO_FILES= # PLIST -CONFIGURE_ENV+= ac_cv_prog_have_glib=yes pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site/g-wrap/guile/ws diff --git a/devel/g-wrap/PLIST b/devel/g-wrap/PLIST index 8ae73d7f453..8db07bad318 100644 --- a/devel/g-wrap/PLIST +++ b/devel/g-wrap/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2007/01/14 14:24:31 wiz Exp $ +@comment $NetBSD: PLIST,v 1.14 2007/01/21 12:52:44 wiz Exp $ bin/g-wrap-config include/ffi.h include/ffitarget.h @@ -9,18 +9,15 @@ include/g-wrap/guile-compatibility.h include/g-wrap/guile-runtime.h include/g-wrap/guile-wct.h info/g-wrap.info -lib/g-wrap/modules/libgw-guile-standard.la -lib/g-wrap/modules/libgw-guile-gw-glib.la lib/libffi.la +lib/libgw-guile-gw-glib.la +lib/libgw-guile-standard.la lib/libgwrap-core-runtime.la lib/libgwrap-guile-runtime.la lib/pkgconfig/g-wrap-2.0-guile.pc -share/aclocal/g-wrap.m4 share/guile/site/g-wrap.scm -share/guile/site/g-wrap/c-codegen.scm share/guile/site/g-wrap/c-types.scm share/guile/site/g-wrap/compat.scm -share/guile/site/g-wrap/config.scm share/guile/site/g-wrap/enumeration.scm share/guile/site/g-wrap/guile.scm share/guile/site/g-wrap/guile/ws/standard.scm @@ -31,7 +28,6 @@ share/guile/site/g-wrap/gw-wct-spec.scm share/guile/site/g-wrap/gw-wct.scm share/guile/site/g-wrap/gw/standard.scm share/guile/site/g-wrap/rti.scm -share/guile/site/g-wrap/scm-codegen.scm share/guile/site/g-wrap/simple-type.scm share/guile/site/g-wrap/util.scm share/guile/site/g-wrap/ws/standard.scm @@ -40,6 +36,4 @@ share/guile/site/g-wrap/ws/standard.scm @dirrm share/guile/site/g-wrap/guile/ws @dirrm share/guile/site/g-wrap/guile @dirrm share/guile/site/g-wrap -@dirrm lib/g-wrap/modules -@dirrm lib/g-wrap @dirrm include/g-wrap diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo index 5d93a757a55..176a11913bf 100644 --- a/devel/g-wrap/distinfo +++ b/devel/g-wrap/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.16 2007/01/14 14:24:31 wiz Exp $ +$NetBSD: distinfo,v 1.17 2007/01/21 12:52:44 wiz Exp $ -SHA1 (g-wrap-1.9.7.tar.gz) = 403434170d0302f8dbce1c4f85116fa8cd0bba0d -RMD160 (g-wrap-1.9.7.tar.gz) = ffe665feb1a4f9b527a5e173d697ba2890680dc7 -Size (g-wrap-1.9.7.tar.gz) = 917706 bytes +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) = d27d8777ed66f66932ddf85c00e0fb7376f0e11c -SHA1 (patch-ac) = 93143e1b62a3f3d350d72db25416e9e11573a8d4 +SHA1 (patch-ab) = 0b19af560b7fdebdf9a6379eb0e2b9e3980071c8 +SHA1 (patch-ac) = 2ba8274c02993c0036da498cf76238a923468f86 diff --git a/devel/g-wrap/patches/patch-ab b/devel/g-wrap/patches/patch-ab index 9e4c8ab02c1..621cd4ac7ac 100644 --- a/devel/g-wrap/patches/patch-ab +++ b/devel/g-wrap/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.8 2007/01/14 14:24:31 wiz Exp $ +$NetBSD: patch-ab,v 1.9 2007/01/21 12:52:44 wiz Exp $ ---- libffi/configure.orig 2006-11-07 19:59:34.000000000 +0000 +--- libffi/configure.orig 2005-03-01 18:52:45.000000000 +0100 +++ libffi/configure -@@ -20654,6 +20654,7 @@ case "$host" in +@@ -19903,6 +19903,7 @@ case "$host" in i*86-*-linux*) TARGET=X86; TARGETDIR=x86;; i*86-*-solaris*) TARGET=X86; TARGETDIR=x86;; i*86-*-beos*) TARGET=X86; TARGETDIR=x86;; @@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.8 2007/01/14 14:24:31 wiz Exp $ i*86-*-freebsd* | i*86-*-kfreebsd*-gnu) TARGET=X86; TARGETDIR=x86;; i*86-*-netbsdelf* | i*86-*-knetbsd*-gnu) TARGET=X86; TARGETDIR=x86;; i*86-*-win32*) TARGET=X86_WIN32; TARGETDIR=x86;; -@@ -20671,7 +20672,7 @@ m68k-*-linux*) TARGET=M68K; TARGETDIR=m6 +@@ -19920,7 +19921,7 @@ m68k-*-linux*) TARGET=M68K; TARGETDIR=m6 mips64*-*);; mips-sgi-irix5.* | mips-sgi-irix6.*) TARGET=MIPS_IRIX; TARGETDIR=mips;; mips*-*-linux*) TARGET=MIPS_LINUX; TARGETDIR=mips;; @@ -19,7 +19,7 @@ $NetBSD: patch-ab,v 1.8 2007/01/14 14:24:31 wiz Exp $ powerpc-*-beos*) TARGET=POWERPC; TARGETDIR=powerpc;; powerpc-*-darwin*) TARGET=POWERPC_DARWIN; TARGETDIR=powerpc;; powerpc-*-aix*) TARGET=POWERPC_AIX; TARGETDIR=powerpc;; -@@ -20680,7 +20681,7 @@ arm*-*-linux-*) TARGET=ARM; TARGETDIR=ar +@@ -19929,7 +19930,7 @@ arm*-*-linux-*) TARGET=ARM; TARGETDIR=ar arm*-*-netbsdelf* | arm*-*-knetbsd*-gnu) TARGET=ARM; TARGETDIR=arm;; s390-*-linux-*) TARGET=S390; TARGETDIR=s390;; s390x-*-linux-*) TARGET=S390; TARGETDIR=s390;; diff --git a/devel/g-wrap/patches/patch-ac b/devel/g-wrap/patches/patch-ac index 3c32a994a1e..cf484b3a384 100644 --- a/devel/g-wrap/patches/patch-ac +++ b/devel/g-wrap/patches/patch-ac @@ -1,48 +1,35 @@ -$NetBSD: patch-ac,v 1.7 2007/01/14 14:24:31 wiz Exp $ +$NetBSD: patch-ac,v 1.8 2007/01/21 12:52:44 wiz Exp $ ---- configure.orig 2006-11-07 19:59:16.000000000 +0000 +--- configure.orig 2005-04-14 14:57:14.000000000 +0000 +++ configure -@@ -22859,12 +22859,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib" 2>/dev/null` -+ pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -22877,12 +22877,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib\"") >&5 -- ($PKG_CONFIG --exists --print-errors "glib") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib" 2>/dev/null` -+ pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -22901,9 +22901,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib"` -+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0"` - else -- GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib"` -+ GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0"` - fi +@@ -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" >&5 + echo "$GLIB_PKG_ERRORS" 1>&5 + |