Subject: pkg/24093: update guile-pg to 0.16 (pkgsrc version is ancient)
To: None <gnats-bugs@gnats.netbsd.org>
From: None <gdt@ir.bbn.com>
List: netbsd-bugs
Date: 01/14/2004 11:49:29
>Number: 24093
>Category: pkg
>Synopsis: update guile-pg to 0.16 (pkgsrc version is ancient)
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed Jan 14 16:50:00 UTC 2004
>Closed-Date:
>Last-Modified:
>Originator: Greg Troxel
>Release: NetBSD 1.6.1_STABLE
>Organization:
Greg Troxel <gdt@ir.bbn.com>
>Environment:
System: NetBSD fnord.ir.bbn.com 1.6.1_STABLE NetBSD 1.6.1_STABLE (FNORD) #7: Mon Oct 6 15:46:22 EDT 2003 root@fnord.ir.bbn.com:/home/gdt/QUIST-current/netbsd/src/sys/arch/i386/compile/FNORD i386
Architecture: i386
Machine: i386
>Description:
The guile-pg package has been vastly updated, and the maintainer and
site have changed. pkgsrc still has the old version.
Also, Chris Jones says he hasn't had time to work on this, and that it
was ok with him for me to become maintainer.
Also, the package uses guile14, which is more or less obsolete.
The patch below uses guile (which is 16)
>How-To-Repeat:
Inspection, but it is not obvious that change has happened, because
the sourceforge website doesn't mention the maintainer change. It is
obvious from the sourceforge site that the version on sourceforge is
unmaintained.
>Fix:
Apply the following patch. I believe it is pkglint-clean except for
trouble via .include. (The intent is to replace patch-aa with
something completely different and remove the rest of the patches.)
make check works on i386 (which makes and uses a db and large objects)!
Index: Makefile
===================================================================
RCS file: /NETBSD-CVS/pkgsrc/databases/guile-pg/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 9 Aug 2003 10:38:24 -0000 1.10
+++ Makefile 14 Jan 2004 16:49:07 -0000
@@ -1,13 +1,12 @@
# $NetBSD: Makefile,v 1.10 2003/08/09 10:38:24 seb Exp $
#
-DISTNAME= guile-pg-0.07
-PKGREVISION= 3
+DISTNAME= guile-pg-0.16
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
DEPENDS+= postgresql-lib>=7.3.1:../../databases/postgresql-lib
@@ -22,5 +21,5 @@
INFO_FILES= guile-pg.info
.include "../../databases/postgresql-lib/buildlink2.mk"
-.include "../../lang/guile14/buildlink2.mk"
+.include "../../lang/guile/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /NETBSD-CVS/pkgsrc/databases/guile-pg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST 29 Jun 2003 13:11:19 -0000 1.2
+++ PLIST 14 Jan 2004 16:49:07 -0000
@@ -1,8 +1,15 @@
@comment $NetBSD: PLIST,v 1.2 2003/06/29 13:11:19 seb Exp $
+lib/guile-pg/${PKGVERSION}/libpostgres.a
+lib/guile-pg/${PKGVERSION}/libpostgres.la
+lib/guile-pg/${PKGVERSION}/libpostgres.so
+lib/guile-pg/${PKGVERSION}/libpostgres.so.4
+lib/guile-pg/${PKGVERSION}/libpostgres.so.4.0
+share/guile/database/postgres-col-defs.scm
+share/guile/database/postgres-meta.scm
+share/guile/database/postgres-resx.scm
+share/guile/database/postgres-table.scm
+share/guile/database/postgres-types.scm
share/guile/database/postgres.scm
@dirrm share/guile/database
-info/guile-pg.info
-lib/libpostgres.a
-lib/libpostgres.la
-lib/libpostgres.so.2.0
-bin/guile-pg
+@dirrm lib/guile-pg/${PKGVERSION}
+@dirrm lib/guile-pg
Index: distinfo
===================================================================
RCS file: /NETBSD-CVS/pkgsrc/databases/guile-pg/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 29 Jun 2003 13:11:20 -0000 1.2
+++ distinfo 14 Jan 2004 16:49:07 -0000
@@ -1,9 +1,5 @@
$NetBSD: distinfo,v 1.2 2003/06/29 13:11:20 seb 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.16.tar.gz) = 0f3d53b9bdc6d7247e448cb0164c39bbad019333
+Size (guile-pg-0.16.tar.gz) = 393303 bytes
+SHA1 (patch-aa) = 07c56454c1102277ae11aa26900dd3b82accb1ff
Index: patches/patch-aa
===================================================================
RCS file: /NETBSD-CVS/pkgsrc/databases/guile-pg/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patches/patch-aa 27 Oct 2002 01:14:10 -0000 1.1.1.1
+++ patches/patch-aa 14 Jan 2004 16:49:07 -0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/10/27 01:14:10 cjones Exp $
+$NetBSD$
---- Makefile.am.orig Sat Oct 26 12:41:49 2002
-+++ Makefile.am
-@@ -43,7 +43,7 @@ libpostgres_la_LDFLAGS = -export-dynamic
+--- test/guile-pg-lo-tests.scm.orig Wed Aug 13 06:19:15 2003
++++ test/guile-pg-lo-tests.scm
+@@ -43,7 +43,7 @@
+ (let ((form (read port)))
+ (if (eof-object? form)
+ result
+- (iter (eval form)))))
++ (iter (eval form (current-module))))))
+ (iter #f))
- SUFFIXES = .x
- .c.x:
-- guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
-+ guile-snarf $< $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) > $@
-
- ## Add -MG to make the .x magic work with auto-dep code.
- MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+ ;; We want to keep one connection hanging around for the duration of all the
Index: patches/patch-ab
===================================================================
RCS file: patches/patch-ab
diff -N patches/patch-ab
--- patches/patch-ab 27 Oct 2002 01:14:10 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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.
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- patches/patch-ac 27 Oct 2002 01:14:10 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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>
Index: patches/patch-ad
===================================================================
RCS file: patches/patch-ad
diff -N patches/patch-ad
--- patches/patch-ad 29 Jun 2003 13:11:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: patches/patch-ae
===================================================================
RCS file: patches/patch-ae
diff -N patches/patch-ae
--- patches/patch-ae 29 Jun 2003 13:11:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted: