guile-sqlite3: finish package

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon Jan 21 12:44:57 2019 +0100
Changeset:	3dd10e5209caf3cfb336f8a8a1b055bb437e6b64

Modified Files:
	guile-sqlite3/Makefile
	guile-sqlite3/PLIST
	guile-sqlite3/distinfo
Added Files:
	guile-sqlite3/patches/patch-configure.ac

Log Message:
guile-sqlite3: finish package

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3dd10e5209caf3cfb336f8a8a1b055bb437e6b64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 guile-sqlite3/Makefile                   | 22 ++++++++--------------
 guile-sqlite3/PLIST                      |  2 ++
 guile-sqlite3/distinfo                   |  1 +
 guile-sqlite3/patches/patch-configure.ac | 15 +++++++++++++++
 4 files changed, 26 insertions(+), 14 deletions(-)

diffs:
diff --git a/guile-sqlite3/Makefile b/guile-sqlite3/Makefile
index 1abf2425b7..9d33c1163d 100644
--- a/guile-sqlite3/Makefile
+++ b/guile-sqlite3/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	v0.1.0
-PKGNAME=        guile-sqlite3
+PKGNAME=        guile-sqlite3-${DISTNAME:S/v//}
 CATEGORIES=	databases
 MASTER_SITES=	https://notabug.org/guile-sqlite3/guile-sqlite3/archive/
 
@@ -11,22 +11,16 @@ COMMENT=	Guile bindings for the SQLite3 database engine
 LICENSE=	gnu-lgpl-v3 AND gnu-gpl-v2
 
 WRKSRC=		${WRKDIR}/guile-sqlite3
-USE_LANGUAGES=	guile c
-# USE_LIBTOOL=    YES
-
-CONFIGURE_ARGS+= --prefix=${PREFIX}
-GNU_CONFIGURE=  YES
+USE_LANGUAGES=	c
 USE_TOOLS+=     automake autoconf autoreconf pkg-config
+GNU_CONFIGURE=  YES
 
-# CONFIGURE_ENV+= SQLITE_LIBS="${PREFIX}/lib"
-# CONFIGURE_ENV+= SQLITE_LIBS=${BUILDLINK_PREFIX.sqlite3}
-#CONFIGURE_ARGS+=   --with-sqlite-incdir=${BUILDLINK_PREFIX.sqlite}/include
-#CONFIGURE_ARGS+=   --with-sqlite-libdir=${BUILDLINK_PREFIX.sqlite}/lib
-pre-configure:
-	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -I${LOCALBASE}/guile/2.2/share/aclocal -vif
+# not all sqlite3.pc files provide the pkg-config variable, set path manually
+# see also patch-configure.ac
+CONFIGURE_ARGS+=	SQLITE_LIBDIR=${BUILDLINK_PREFIX.sqlite3}/lib
 
-DEPENDS+= guile>=2.2:../../lang/guile22
-DEPENDS+= sqlite3:../../databases/sqlite3
+pre-configure:
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} autoreconf -I${PREFIX}/guile/2.2/share/aclocal -vif
 
 .include "../../lang/guile22/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/guile-sqlite3/PLIST b/guile-sqlite3/PLIST
index 48d96a5493..ecffce3fb7 100644
--- a/guile-sqlite3/PLIST
+++ b/guile-sqlite3/PLIST
@@ -1 +1,3 @@
 @comment $NetBSD$
+lib/guile/2.2/site-ccache/sqlite3.go
+share/guile/site/2.2/sqlite3.scm
diff --git a/guile-sqlite3/distinfo b/guile-sqlite3/distinfo
index ae728ae9cf..b68719a67e 100644
--- a/guile-sqlite3/distinfo
+++ b/guile-sqlite3/distinfo
@@ -4,3 +4,4 @@ SHA1 (v0.1.0.tar.gz) = faee70ad63a55709fa057b54968fc62872d366fe
 RMD160 (v0.1.0.tar.gz) = 78865cb43aca970e107a258a74964f69a0bb8e20
 SHA512 (v0.1.0.tar.gz) = 8c1f58024c464e5628162e3ba1bf129809403bcc5d2329b55b6628f419ff8d5ead21d87f0bdcbb458ce5798d62184af177616bbfbeb653c34450c716f6b3ab26
 Size (v0.1.0.tar.gz) = 23832 bytes
+SHA1 (patch-configure.ac) = c848428774814382fd9147835efca397aa0682e8
diff --git a/guile-sqlite3/patches/patch-configure.ac b/guile-sqlite3/patches/patch-configure.ac
new file mode 100644
index 0000000000..95443e74f7
--- /dev/null
+++ b/guile-sqlite3/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Override SQLITE_LIBDIR detection.
+
+--- configure.ac.orig	2018-06-27 07:44:03.000000000 +0000
++++ configure.ac
+@@ -18,7 +18,7 @@ GUILE_PKG([2.2 2.0])
+ GUILE_PROGS
+ 
+ PKG_CHECK_MODULES([SQLITE], [sqlite3])
+-SQLITE_LIBDIR="`"$PKG_CONFIG" sqlite3 --variable libdir`"
++#SQLITE_LIBDIR="`"$PKG_CONFIG" sqlite3 --variable libdir`"
+ AC_SUBST([SQLITE_LIBDIR])
+ 
+ AC_MSG_CHECKING([whether '$SQLITE_LIBDIR/libsqlite3' is usable])