From ebfdbafd745554b5e0cb8148ec5ad6ed3e89a732 Mon Sep 17 00:00:00 2001 From: jschauma Date: Mon, 24 Feb 2003 20:50:19 +0000 Subject: Update to 1.3.4 using patches provided by roskens at elfin dot net in PR pkg/20270 with minor nitpicks by myself. Some of the changes since 1.2.1: * configure.in: fix minor problem where we used the guile-gtk config program even when it wasn't found. * acconfig.h: deleted since deprecated -- replaced by three arg AC_DEFINEs in configure.in. * doc/.cvsignore: add texinfo.tex. * configure.in (AM_INIT_AUTOMAKE): bump version for release. * bunch of subversion cleanups. * change license to LGPL. * g-wrap/gw-glib-spec.scm: coerce to (gpointer) in gw:glist-of and gw:gslist-of code where needed. * g-wrap/enumeration.scm (gw:wrap-enumeration): make val->int and int->val functions static so they don't cause conflicts. * configure.in (GW_GUILE_GTK_CFLAGS): delete any occurences of -I /usr/include or similar. Newer gcc's don't like that at all. * bin/g-wrap-config.in (c-compile-args): don't output -I if it's /usr/include. The new gcc doesn't like -I /usr/include at all. * test/Makefile.am (gw-test-enumeration.scm gw-test-enumeration.h gw-test-enumeration.c gw-test-enumeration.html gw-test-enumeration-autogen.h): use LD_LIBRARY_PATH. (gw-test-parent.scm gw-test-parent.h gw-test-parent.c gw-test-parent.html gw-test-parent-autogen.h): use LD_LIBRARY_PATH. * doc/g-wrap.texi: minor re-editing -- still needs much more. * configure.in (GW_GUILE_GTK_CFLAGS): add and AC_SUBST. (GW_GUILE_GTK_LIBFLAGS): add and AC_SUBST. * g-wrap/simple-type.scm: new file -- support for simple types. * g-wrap/runtime.scm: new file -- scm support for runtime wrapset database. * g-wrap/gw-wct-spec.scm: new file -- wrapped C pointer types. * g-wrap/gw-standard-spec.scm: new file -- standard wrapped types. * g-wrap/gw-gtk-spec.scm: new file -- wrappers for gtk. * g-wrap/gw-glib-spec.scm: new file -- wrappers for glib. * g-wrap/gtkobj.scm: support for wrapping new C ptr types as gtkobjects. * g-wrap/Makefile.am: major changes -- support gw-glib, gw-wct, gw-gtk, etc. * g-wrap/g-wrap-wct.h: support header for gw-wct. Part of libgwrap-wct. * g-wrap/g-wrap-wct.c: support code for gw-wct. Part of libgwrap-wct. * g-wrap/g-wrap-glib.h: support header for gw-glib. Part of libgwrap-glib. * g-wrap/g-wrap-glib.c: support code for gw-glib. Part of libgwrap-glib. * g-wrap/output-file.scm (flatten-display): make public. * g-wrap/g-wrap-compatibility.h: start guile version compatibility library. * g-wrap/enumeration.scm: break out enumeration support. * g-wrap/dummy-main.c: new file - for link testing. * bin/g-wrap-config.in (c-link-args): add support for glib, wct, etc. * g-wrap.scm: major overhaul -- modules -> wrapsets, ccodegens -> init/decl/lists, etc. * configure.in: remove rscheme (and other dead bits). Add support for glib and gnome-guile. Handle libruntime reorg/removal. * acconfig.h: accomodate reorg/removal of libruntime. * g-wrapped/gw-runtime-spec.scm: switch to use of SCM_FALSEP and SCM_NFALSEP rather than direct SCM_BOOL_* * libruntime-guile/g-wrap-runtime-guile.c: switch to use of SCM_FALSEP and SCM_NFALSEP rather than direct SCM_BOOL_* comparisons. * g-wrap.scm: switch to use of SCM_FALSEP and SCM_NFALSEP rather than direct SCM_BOOL_* comparisons. --- devel/g-wrap/Makefile | 15 +++++---- devel/g-wrap/PLIST | 72 +++++++++++++++++++++++++++++++------------ devel/g-wrap/buildlink2.mk | 9 +++--- devel/g-wrap/distinfo | 8 ++--- devel/g-wrap/patches/patch-ab | 24 +++++++-------- devel/g-wrap/patches/patch-ac | 2 +- 6 files changed, 84 insertions(+), 46 deletions(-) (limited to 'devel/g-wrap') diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index c107ca0ede4..0eccbf048be 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2003/01/24 04:22:42 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2003/02/24 20:50:19 jschauma Exp $ -DISTNAME= g-wrap-1.2.1 -PKGREVISION= 1 +DISTNAME= g-wrap-1.3.4 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=g-wrap/} +MASTER_SITES= ftp://ftp.gnucash.org/pub/g-wrap/source/ MAINTAINER= rh@netbsd.org HOMEPAGE= http://web.mit.edu/chlee/www/Software/g-wrap/index.html @@ -12,16 +11,20 @@ COMMENT= tool for importing types, functions, and constants into guile DEPENDS+= guile-slib>=2.4.2:../../devel/guile-slib USE_BUILDLINK2= YES -USE_GMAKE= YES GNU_CONFIGURE= YES +USE_GMAKE= YES +USE_LIBTOOL= YES + CONFIGURE_ARGS+= --with-modules-dir=${GUILE14_PREFIX}/share/guile CONFIGURE_ENV+= GUILE=${GUILE14} CONFIGURE_ENV+= BUILD_GUILE=${GUILE14_CONFIG} CONFIGURE_ENV+= ac_cv_path_RSCHEME="nope" -USE_LIBTOOL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +.include "../../devel/glib/buildlink2.mk" .include "../../lang/guile14/buildlink2.mk" +.include "../../devel/guile-gtk/buildlink2.mk" +.include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/g-wrap/PLIST b/devel/g-wrap/PLIST index 4df4f0d569d..a58a88888cc 100644 --- a/devel/g-wrap/PLIST +++ b/devel/g-wrap/PLIST @@ -1,25 +1,59 @@ -@comment $NetBSD: PLIST,v 1.3 2003/01/24 04:22:42 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2003/02/24 20:50:19 jschauma Exp $ bin/g-wrap-config -include/g-wrap-runtime-guile.h -info/g-wrap.info -info/g-wrap.info-1 -info/g-wrap.info-2 -lib/libg-wrap-runtime-guile.a -lib/libg-wrap-runtime-guile.la -lib/libg-wrap-runtime-guile.so -lib/libg-wrap-runtime-guile.so.2 -lib/libg-wrap-runtime-guile.so.2.0 -share/aclocal/g-wrap.m4 guile/1.4/share/guile/g-wrap.scm +guile/1.4/share/guile/g-wrap/enumeration.scm guile/1.4/share/guile/g-wrap/g-translate.scm -guile/1.4/share/guile/g-wrap/guile-types.scm +guile/1.4/share/guile/g-wrap/gtkobj.scm +guile/1.4/share/guile/g-wrap/gw-glib-spec.scm +guile/1.4/share/guile/g-wrap/gw-glib.scm +guile/1.4/share/guile/g-wrap/gw-gtk-spec.scm +guile/1.4/share/guile/g-wrap/gw-gtk.scm +guile/1.4/share/guile/g-wrap/gw-standard-spec.scm +guile/1.4/share/guile/g-wrap/gw-standard.scm +guile/1.4/share/guile/g-wrap/gw-wct-spec.scm +guile/1.4/share/guile/g-wrap/gw-wct.scm guile/1.4/share/guile/g-wrap/output-file.scm +guile/1.4/share/guile/g-wrap/runtime.scm +guile/1.4/share/guile/g-wrap/simple-type.scm guile/1.4/share/guile/g-wrap/sorting.scm -guile/1.4/share/guile/g-wrapped/gw-runtime-spec.scm -guile/1.4/share/guile/g-wrapped/libgw-runtime.a -guile/1.4/share/guile/g-wrapped/libgw-runtime.la -guile/1.4/share/guile/g-wrapped/libgw-runtime.so -guile/1.4/share/guile/g-wrapped/libgw-runtime.so.0 -guile/1.4/share/guile/g-wrapped/libgw-runtime.so.0.0 -@dirrm guile/1.4/share/guile/g-wrapped +include/g-wrap/g-wrap-compatibility.h +include/g-wrap/g-wrap-glib.h +include/g-wrap/g-wrap-wct.h +@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/g-wrap.info +info/g-wrap.info +@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/g-wrap.info +info/g-wrap.info-1 +info/g-wrap.info-2 +lib/libgw-glib.a +lib/libgw-glib.la +lib/libgw-glib.so +lib/libgw-glib.so.0 +lib/libgw-glib.so.0.0 +lib/libgw-gtk.a +lib/libgw-gtk.la +lib/libgw-gtk.so +lib/libgw-gtk.so.0 +lib/libgw-gtk.so.0.0 +lib/libgw-standard.a +lib/libgw-standard.la +lib/libgw-standard.so +lib/libgw-standard.so.0 +lib/libgw-standard.so.0.0 +lib/libgw-wct.a +lib/libgw-wct.la +lib/libgw-wct.so +lib/libgw-wct.so.0 +lib/libgw-wct.so.0.0 +lib/libgwrap-glib.a +lib/libgwrap-glib.la +lib/libgwrap-glib.so +lib/libgwrap-glib.so.1 +lib/libgwrap-glib.so.1.0 +lib/libgwrap-wct.a +lib/libgwrap-wct.la +lib/libgwrap-wct.so +lib/libgwrap-wct.so.1 +lib/libgwrap-wct.so.1.0 +share/aclocal/g-wrap.m4 +@dirrm include/g-wrap @dirrm guile/1.4/share/guile/g-wrap diff --git a/devel/g-wrap/buildlink2.mk b/devel/g-wrap/buildlink2.mk index f6b9e9166fb..a7658230d31 100644 --- a/devel/g-wrap/buildlink2.mk +++ b/devel/g-wrap/buildlink2.mk @@ -1,16 +1,17 @@ -# $NetBSD: buildlink2.mk,v 1.4 2003/01/24 04:22:42 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.5 2003/02/24 20:50:19 jschauma Exp $ .if !defined(G_WRAP_BUILDLINK2_MK) G_WRAP_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= g-wrap -BUILDLINK_DEPENDS.g-wrap?= g-wrap>=1.2.1 +BUILDLINK_DEPENDS.g-wrap?= g-wrap>=1.3.4 BUILDLINK_PKGSRCDIR.g-wrap?= ../../devel/g-wrap EVAL_PREFIX+= BUILDLINK_PREFIX.g-wrap=g-wrap BUILDLINK_PREFIX.g-wrap_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.g-wrap= include/g-wrap-runtime-guile.h -BUILDLINK_FILES.g-wrap+= lib/libg-wrap-runtime-guile.* +BUILDLINK_FILES.g-wrap= include/g-wrap/* +BUILDLINK_FILES.g-wrap+= lib/libgw-* +BUILDLINK_FILES.g-wrap+= lib/libgwrap-* .include "../../lang/guile14/buildlink2.mk" diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo index c201f851488..0bfd8a1bb82 100644 --- a/devel/g-wrap/distinfo +++ b/devel/g-wrap/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/08/21 00:21:56 mjl Exp $ +$NetBSD: distinfo,v 1.5 2003/02/24 20:50:19 jschauma Exp $ -SHA1 (g-wrap-1.2.1.tar.gz) = eeb497e8733ca9c98f79e3394e659ac0e714bda4 -Size (g-wrap-1.2.1.tar.gz) = 349469 bytes -SHA1 (patch-ab) = 947f9da5712f9ae562e56242f5844ea6d18436a6 +SHA1 (g-wrap-1.3.4.tar.gz) = 764f1c878e18341bf437f3e1ddc5f8618019bfc2 +Size (g-wrap-1.3.4.tar.gz) = 403570 bytes +SHA1 (patch-ab) = 92f8e1ed55a3ba563837b36e2f39888734aebefe SHA1 (patch-ac) = 098bb2e6c239b38afa40d28362cc553982ac3e38 diff --git a/devel/g-wrap/patches/patch-ab b/devel/g-wrap/patches/patch-ab index 8bda509e808..35d7bb667f0 100644 --- a/devel/g-wrap/patches/patch-ab +++ b/devel/g-wrap/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.2 2001/07/01 15:12:45 tron Exp $ +$NetBSD: patch-ab,v 1.3 2003/02/24 20:50:19 jschauma Exp $ ---- bin/g-wrap-config.in.orig Wed Apr 12 21:06:56 2000 -+++ bin/g-wrap-config.in Mon Jun 26 17:45:02 2000 -@@ -52,7 +52,7 @@ - (begin - (if static? - (stdout "@-libdir-@/lib" (cdr lib) ".a" #\newline) -- (stdout "-L@-libdir-@ -l" (cdr lib) #\newline)) -+ (stdout "-Wl,-R@-libdir-@ -L@-libdir-@ -l" (cdr lib) #\newline)) - #t) - (begin - (stderr *program-name* ": unknown LANGUAGE \"" language "\" given.") +--- bin/g-wrap-config.in.orig Thu Nov 7 17:23:43 2002 ++++ bin/g-wrap-config.in Thu Feb 6 17:23:29 2003 +@@ -56,7 +56,7 @@ + (lambda (lib) (stdout " @-libdir-@/lib" lib ".a")) + (cdr libs)) + (begin +- (stdout "-L@-libdir-@") ++ (stdout "-Wl,-R@-libdir-@ -L@-libdir-@") + (for-each + (lambda (lib) (stdout " -l" lib)) + (cdr libs)))) diff --git a/devel/g-wrap/patches/patch-ac b/devel/g-wrap/patches/patch-ac index dd1ba50b737..94e73c31313 100644 --- a/devel/g-wrap/patches/patch-ac +++ b/devel/g-wrap/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2001/07/01 15:12:45 tron Exp $ +$NetBSD: patch-ac,v 1.3 2003/02/24 20:50:19 jschauma Exp $ --- bin/Makefile.in.orig Thu Apr 12 05:14:14 2001 +++ bin/Makefile.in Sun Jul 1 16:16:37 2001 -- cgit v1.2.3