Update to 0.23. Provided by Greg Troxel in pkgsrc-wip.

Uses guile-1.6 and postgresql-7.4.

Four years of development since the previous version: many changes.

XXX: This package includes a hack since pgsql.bl3.mk does
     not provide a way to get the matching -clients package.

9 files changed, 68 insertions, 86 deletions

diff --git a/databases/guile-pg/DESCR b/databases/guile-pg/DESCR
index 912669c01bc..af6d86f9829 100644
--- a/databases/guile-pg/DESCR
+++ b/databases/guile-pg/DESCR
@@ -1,4 +1,5 @@
 Guile-pg is a Guile module providing access and allowing updates to
-PostgreSQL databases from Guile scripts. Guile is the GNU interpreter
+PostgreSQL databases from Guile scripts.  Guile is the GNU interpreter
 for the Scheme language and PostgreSQL is a free relational database
-management system.
+management system.  This package is for Guile 1.6.x and PostgreSQL
+7.4.x.
diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index 96e054aa7fe..4f2a6f6d2d1 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,25 +1,46 @@
-# $NetBSD: Makefile,v 1.18 2004/10/15 14:50:06 tv Exp $
+# $NetBSD: Makefile,v 1.19 2004/12/03 13:41:30 wiz Exp $
 #
 
-DISTNAME=	guile-pg-0.07
-PKGREVISION=	6
+DISTNAME=	guile-pg-0.23
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=guile-pg/}
+MASTER_SITES=	http://www.glug.org/people/ttn/software/guile-pg/
 
-MAINTAINER=	cjones@NetBSD.org
-HOMEPAGE=	http://guile-pg.sourceforge.net/
+MAINTAINER=	gdt@ir.bbn.com
+HOMEPAGE=	http://www.glug.org/people/ttn/software/guile-pg/
 COMMENT=	PostgreSQL interface for Guile
 
+# This is wrong if pgsql.buildlink3.mk chooses otherwise.
+DEPENDS+=	postgresql74-client>=7.4.1:../../databases/postgresql74-client
+
 USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS+=	--with-libpq-includes=${PGSQL_PREFIX}/include/postgresql
+
+TEST_TARGET=	check
 
 INFO_FILES=	guile-pg.info
 
-PGSQL_VERSION_REQD=	73
+# There are several versions of guile; the relevant ones for this
+# module are 1.6.x, which is the current FSF version, and ttn-1.4,
+# which is a forked version of 1.4 by Thien-Thi Nguyen, the maintainer
+# of guile-pg.  fsf-1.4 is considered obsolete by nearly everyone.
+
+# In 1.6 (but not fsf-1.4 or ttn-1.4), binary modules are deprecated.
+# guile-pg uses binary modules, and places them and scheme code in
+# $GUILE_LIBSITE, which is searched by ttn-1.4, but not by 1.6.  The
+# simplest nonproblematic solution is to symlink the installed code to
+# where 1.6 expects it.  We could patch guile-pg to install in 1.6's
+# preferred location ${PREFIX}/share/guile/site, but there is a shared
+# library which of course cannot go in share.
+
+post-install:
+	# guile should make this, but if not
+	${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site
+	cd ${PREFIX}/share/guile/site && ${LN} -sf ../../../lib/guile/site/database .
+
+PGSQL_VERSION_REQD=	74
 
-.include "../../lang/guile14/buildlink3.mk"
+.include "../../lang/guile/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/guile-pg/PLIST b/databases/guile-pg/PLIST
index 3c279051357..5778a2bf87b 100644
--- a/databases/guile-pg/PLIST
+++ b/databases/guile-pg/PLIST
@@ -1,5 +1,12 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:22 jlam Exp $
-share/guile/database/postgres.scm
-@dirrm share/guile/database
-lib/libpostgres.la
-bin/guile-pg
+@comment $NetBSD: PLIST,v 1.5 2004/12/03 13:41:30 wiz Exp $
+lib/guile/site/database/libpostgres.la
+lib/guile/site/database/postgres-col-defs.scm
+lib/guile/site/database/postgres-meta.scm
+lib/guile/site/database/postgres-resx.scm
+lib/guile/site/database/postgres-table.scm
+lib/guile/site/database/postgres-types.scm
+lib/guile/site/database/postgres.la
+share/guile/site/database
+@dirrm lib/guile/site/database
+@dirrm lib/guile/site
+@dirrm lib/guile
diff --git a/databases/guile-pg/distinfo b/databases/guile-pg/distinfo
index 12cb98dd236..63032d59e1c 100644
--- a/databases/guile-pg/distinfo
+++ b/databases/guile-pg/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/06/29 13:11:20 seb Exp $
+$NetBSD: distinfo,v 1.3 2004/12/03 13:41:30 wiz Exp $
 
-SHA1 (guile-pg-0.07.tar.gz) = f232cd752a5640af222de5016d57cc192219091e
-Size (guile-pg-0.07.tar.gz) = 212233 bytes
-SHA1 (patch-aa) = 025a6d3eec84e972f259fb979ae26a42fea1aced
-SHA1 (patch-ab) = 49b7c64f2f8eeb24ae75dd85c627e59327b6db08
-SHA1 (patch-ac) = 90f1dd2d86d532d4b847c4c85e9f54e0d909cef6
-SHA1 (patch-ad) = 056a914c8f35630fdd9546447bbf6c3c2bf138ca
-SHA1 (patch-ae) = 85745986f5438619e4748e72ba772f0eb1b251dd
+SHA1 (guile-pg-0.23.tar.gz) = b2c2e8ff72f905171babbdaac9ad9fd2ead56ce5
+Size (guile-pg-0.23.tar.gz) = 451283 bytes
+SHA1 (patch-aa) = 35b3585f7452adbe42d9a57c670db40da441f2f2
diff --git a/databases/guile-pg/patches/patch-aa b/databases/guile-pg/patches/patch-aa
index be8a2875399..d393ede970f 100644
--- a/databases/guile-pg/patches/patch-aa
+++ b/databases/guile-pg/patches/patch-aa
@@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/27 01:14:10 cjones Exp $
+$NetBSD: patch-aa,v 1.2 2004/12/03 13:41:30 wiz Exp $
 
---- Makefile.am.orig	Sat Oct 26 12:41:49 2002
-+++ Makefile.am
-@@ -43,7 +43,7 @@ libpostgres_la_LDFLAGS = -export-dynamic
+--- libpostgres_lo.c.orig	2004-11-20 12:55:38.000000000 -0500
++++ libpostgres_lo.c
+@@ -247,7 +247,7 @@ lob_mklobport (SCM conn, Oid oid, int al
+     }
+   pt->write_end = pt->write_buf + pt->write_buf_size;
  
- SUFFIXES = .x
- .c.x:
--	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
-+	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
+-  SCM_SETCAR (port, gh_car (port) & ~SCM_BUF0);
++  SCM_SETCAR (port, SCM_CELL_WORD_0 (port) & ~SCM_BUF0);
  
- ## Add -MG to make the .x magic work with auto-dep code.
- MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+   SCM_ALLOW_INTS;
+ 
+@@ -522,7 +522,7 @@ lob_write (SCM port, const void *data, s
+             lob_flush (port);
+         }
+       /* handle line buffering.  */
+-      if ((gh_car (port) & SCM_BUFLINE)
++      if ((SCM_CELL_WORD_0 (port) & SCM_BUFLINE)
+           && memchr (data, '\n', size))
+         lob_flush (port);
+     }
diff --git a/databases/guile-pg/patches/patch-ab b/databases/guile-pg/patches/patch-ab
deleted file mode 100644
index 937de6bab71..00000000000
--- a/databases/guile-pg/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/10/27 01:14:10 cjones Exp $
-
---- Makefile.in.orig	Sat Oct 26 12:42:06 2002
-+++ Makefile.in
-@@ -528,7 +528,7 @@ installdirs mostlyclean-generic distclea
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
- 
- .c.x:
--	guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
-+	guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/databases/guile-pg/patches/patch-ac b/databases/guile-pg/patches/patch-ac
deleted file mode 100644
index bcefacfadac..00000000000
--- a/databases/guile-pg/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/10/27 01:14:10 cjones Exp $
-
---- libpostgres.c.orig	Sat Oct 26 12:46:07 2002
-+++ libpostgres.c	Sat Oct 26 12:46:08 2002
-@@ -37,7 +37,7 @@
- #include <guile/gh.h>
- 
- #include <libpq-fe.h>
--#include <postgres.h>
-+/* #include <postgres.h> */
- #include <libpq/libpq-fs.h>
- 
- #include <libpostgres.h>
diff --git a/databases/guile-pg/patches/patch-ad b/databases/guile-pg/patches/patch-ad
deleted file mode 100644
index 862f1cdef57..00000000000
--- a/databases/guile-pg/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/06/29 13:11:21 seb Exp $
-
---- doc/guile-pg.texi.orig	2000-07-01 08:28:56.000000000 +0000
-+++ doc/guile-pg.texi
-@@ -9,7 +9,7 @@
- 
- @dircategory Guile modules
- @direntry
--* Guile-pg- (guile-pg).           Access to PostgreSQL databases from Guile.
-+* Guile-pg: (guile-pg).           Access to PostgreSQL databases from Guile.
- @end direntry
- 
- @ifinfo
diff --git a/databases/guile-pg/patches/patch-ae b/databases/guile-pg/patches/patch-ae
deleted file mode 100644
index 0072c27b27c..00000000000
--- a/databases/guile-pg/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2003/06/29 13:11:21 seb Exp $
-
---- doc/guile-pg.info.orig	2000-07-08 08:52:29.000000000 +0000
-+++ doc/guile-pg.info
-@@ -5,7 +5,7 @@ guile-pg.texi.
- 
- INFO-DIR-SECTION Guile modules
- START-INFO-DIR-ENTRY
--* Guile-pg- (guile-pg).           Access to PostgreSQL databases from Guile.
-+* Guile-pg: (guile-pg).           Access to PostgreSQL databases from Guile.
- END-INFO-DIR-ENTRY
- 
-    This file is the Guile-pg Command Reference