Clean up out-of-srcdir build handling.

4 files changed, 14 insertions, 17 deletions

diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index 20a121aed66..a00d9022d40 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2012/10/02 21:25:53 asau Exp $
+# $NetBSD: Makefile,v 1.43 2013/01/04 13:33:42 jperkin Exp $
 
 DISTNAME=		sqlite-2.8.17
 CATEGORIES=		databases
@@ -9,16 +9,13 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.hwaci.com/sw/sqlite/
 COMMENT=		SQL Database Engine in a C Library
 
-WRKSRC=			${WRKDIR}/sqlite-build
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	../sqlite-2.8.17/configure
+OBJDIR=			../sqlite-build
 CONFIGURE_ARGS+=	--without-tcl
 CONFIGURE_ENV+=		config_TARGET_READLINE_INC="-I${BUILDLINK_PREFIX.readline}/include"
-CONFIG_GUESS_OVERRIDE=	../sqlite-2.8.17/config.guess
-CONFIG_SUB_OVERRIDE=	../sqlite-2.8.17/config.sub
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -30,15 +27,15 @@ CFLAGS+=		-DUINT32_TYPE=u_int32_t -DUINT16_TYPE=u_int16_t \
 			-DUINT8_TYPE=u_int8_t -DINTPTR_TYPE=long
 .endif
 
-PKGCONFIG_OVERRIDE=	${WRKDIR}/sqlite-2.8.17/sqlite.pc.in
+PKGCONFIG_OVERRIDE=	sqlite.pc.in
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man1
 
 post-extract:
-	${MKDIR} ${WRKSRC}
+	${RUN} cd ${WRKSRC} && ${MKDIR} ${OBJDIR}
 
 post-install:
-	${INSTALL_MAN} ${WRKDIR}/sqlite-2.8.17/sqlite.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_MAN} ${WRKSRC}/sqlite.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqlite/distinfo b/databases/sqlite/distinfo
index 510ec2e61cb..763530fc3be 100644
--- a/databases/sqlite/distinfo
+++ b/databases/sqlite/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2009/07/22 16:37:26 drochner Exp $
+$NetBSD: distinfo,v 1.22 2013/01/04 13:33:42 jperkin Exp $
 
 SHA1 (sqlite-2.8.17.tar.gz) = 75db1cf3b00ea18ae8528e676fc9fdf698e2fe58
 RMD160 (sqlite-2.8.17.tar.gz) = f13edcb0c2f7246e97ea7443de1758b4442a9483
 Size (sqlite-2.8.17.tar.gz) = 969805 bytes
-SHA1 (patch-aa) = f24da2bc43dbd79a0c2ff03aabfd95e1cf1e5e5b
-SHA1 (patch-ab) = c3988a59d50b245d982aa1eb3d9a9b08d532e4ee
+SHA1 (patch-aa) = 4df2eff8c92b3e2bff86c710ef1a803d54201559
+SHA1 (patch-ab) = 00b7de05589fb62d511e26d0d864a8b5545967c8
diff --git a/databases/sqlite/patches/patch-aa b/databases/sqlite/patches/patch-aa
index 98078a9a0d0..bee66655a43 100644
--- a/databases/sqlite/patches/patch-aa
+++ b/databases/sqlite/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.9 2009/07/22 16:37:26 drochner Exp $
+$NetBSD: patch-aa,v 1.10 2013/01/04 13:33:43 jperkin Exp $
 
---- ../sqlite-2.8.17/src/sqliteInt.h.orig	2005-02-14 01:22:06.000000000 +0100
-+++ ../sqlite-2.8.17/src/sqliteInt.h
+--- src/sqliteInt.h.orig	2005-02-14 01:22:06.000000000 +0100
++++ src/sqliteInt.h
 @@ -15,4 +15,5 @@
  */
  #include "config.h"
diff --git a/databases/sqlite/patches/patch-ab b/databases/sqlite/patches/patch-ab
index 358ffdd7ddf..7b9e4a08479 100644
--- a/databases/sqlite/patches/patch-ab
+++ b/databases/sqlite/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.9 2009/07/22 16:37:26 drochner Exp $
+$NetBSD: patch-ab,v 1.10 2013/01/04 13:33:43 jperkin Exp $
 
---- ../sqlite-2.8.17/configure.orig	2005-02-14 01:22:04.000000000 +0100
-+++ ../sqlite-2.8.17/configure
+--- configure.orig	2005-02-14 01:22:04.000000000 +0100
++++ configure
 @@ -18376,8 +18376,8 @@ if test "$program_prefix" = "NONE"; then
  fi