Update to 1.9.12. Only listed change is pkgconfig bugfix that was in

patch-ab.

4 files changed, 15 insertions, 26 deletions

diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index bec6ed34a24..ca1e08c09fc 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2009/02/20 01:16:27 gdt Exp $
+# $NetBSD: Makefile,v 1.54 2009/02/24 02:30:23 gdt Exp $
 
-DISTNAME=	g-wrap-1.9.11
-PKGREVISION=	2
+DISTNAME=	g-wrap-1.9.12
 CATEGORIES=	devel
 MASTER_SITES=	http://savannah.nongnu.org/download/g-wrap/
 
diff --git a/devel/g-wrap/distinfo b/devel/g-wrap/distinfo
index 3bf0e9e9446..1b1228fecc0 100644
--- a/devel/g-wrap/distinfo
+++ b/devel/g-wrap/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.20 2009/02/20 01:16:27 gdt Exp $
+$NetBSD: distinfo,v 1.21 2009/02/24 02:30:23 gdt Exp $
 
-SHA1 (g-wrap-1.9.11.tar.gz) = 7d7dcc808cb4f60932869cb14fa65f92dcdea65b
-RMD160 (g-wrap-1.9.11.tar.gz) = 410bdc829c814fb534185934cff55052cf1ff711
-Size (g-wrap-1.9.11.tar.gz) = 625359 bytes
-SHA1 (patch-aa) = 57ee87da372c0d43f384767d7b585a7d09b87b8b
-SHA1 (patch-ab) = 3ea250c0119e65b68a67fdf82439b1898aaf37e1
+SHA1 (g-wrap-1.9.12.tar.gz) = eef8be1f4a7f97d5765c64f152b6795c56c6cdde
+RMD160 (g-wrap-1.9.12.tar.gz) = fd0606e249dd3649f5e0ab3f66b31f344736e73e
+Size (g-wrap-1.9.12.tar.gz) = 628088 bytes
+SHA1 (patch-aa) = d8e980b3fbf234f29a0d51177d36544a99b3e947
diff --git a/devel/g-wrap/patches/patch-aa b/devel/g-wrap/patches/patch-aa
index 49ecec1a0f3..04e29baa90e 100644
--- a/devel/g-wrap/patches/patch-aa
+++ b/devel/g-wrap/patches/patch-aa
@@ -1,12 +1,15 @@
-$NetBSD: patch-aa,v 1.7 2005/02/27 13:19:20 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2009/02/24 02:30:23 gdt Exp $
 
---- g-wrap/Makefile.in.orig	2005-01-25 13:35:45.000000000 +0100
+As of 20090223, patch not yet sent upstream.  It is not clear why it
+is needed, and if it's recovering from a Makefile.am bug.
+
+--- g-wrap/Makefile.in.orig	2009-02-20 09:27:40.000000000 -0500
 +++ g-wrap/Makefile.in
-@@ -352,6 +352,7 @@ uninstall-info-am:
+@@ -416,6 +416,7 @@ clean-libtool:
  install-nobase_gwrapmoduleDATA: $(nobase_gwrapmodule_DATA)
  	@$(NORMAL_INSTALL)
- 	test -z "$(gwrapmoduledir)" || $(mkdir_p) "$(DESTDIR)$(gwrapmoduledir)"
-+	test -z "$(gwrapmoduledir)/ws" || $(mkdir_p) "$(DESTDIR)$(gwrapmoduledir)/ws"
+ 	test -z "$(gwrapmoduledir)" || $(MKDIR_P) "$(DESTDIR)$(gwrapmoduledir)"
++	test -z "$(gwrapmoduledir)/ws" || $(MKDIR_P) "$(DESTDIR)$(gwrapmoduledir)/ws"
  	@$(am__vpath_adj_setup) \
  	list='$(nobase_gwrapmodule_DATA)'; for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
diff --git a/devel/g-wrap/patches/patch-ab b/devel/g-wrap/patches/patch-ab
deleted file mode 100644
index 4eccff91b8c..00000000000
--- a/devel/g-wrap/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.11 2009/02/20 01:16:27 gdt Exp $
-
---- guile/g-wrap-2.0-guile.pc.in.orig	2007-08-14 09:21:29.000000000 -0400
-+++ guile/g-wrap-2.0-guile.pc.in
-@@ -11,5 +11,5 @@ module_directory=@GUILEMODDIR@
- Name: G-Wrap
- Description: A Guile wrapper generator
- Version: @VERSION@
--Libs: -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ @LIBFFI_LIBS_INSTALLED@
--Cflags: @STD_CFLAGS@ -I${includedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS_INSTALLED@
-+Libs: -L${libdir} -lgwrap-guile-runtime -lgwrap-core-runtime @GUILE_LDFLAGS@ @LIBFFI_LIBS@
-+Cflags: @STD_CFLAGS@ -I${includedir} @GUILE_CFLAGS@ @LIBFFI_CFLAGS@