[Midnightbsd-cvs] mports: databases/sqlite3: update to 3.6.10

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Mar 14 11:23:32 EDT 2009 

Log Message:
-----------
update to 3.6.10

Modified Files:
--------------
    mports/databases/sqlite3:
        Makefile (r1.6 -> r1.7)
        distinfo (r1.6 -> r1.7)
    mports/databases/sqlite3/files:
        patch-Makefile.in (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/sqlite3/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L databases/sqlite3/Makefile -L databases/sqlite3/Makefile -u -r1.6 -r1.7
--- databases/sqlite3/Makefile
+++ databases/sqlite3/Makefile
@@ -1,14 +1,7 @@
-# ex:ts=8
-# New ports collection makefile for:	sqlite
-# Date created:			Feb 21, 2001
-# Whom:				Ying-Chieh Liao <ijliao at FreeBSD.org>
-#
-# $FreeBSD: ports/databases/sqlite3/Makefile,v 1.21 2006/11/21 12:25:46 mnag Exp $
 # $MidnightBSD$
-#
 
 PORTNAME=	sqlite
-PORTVERSION=	3.5.6
+PORTVERSION=	3.6.10
 CATEGORIES=	databases lang tcl
 MASTER_SITES=	http://www.sqlite.org/
 .if defined(USE_THOL)
@@ -25,25 +18,16 @@
 USE_GMAKE=	YES
 USE_GNOME=	pkgconfig
 USE_AUTOTOOLS=	libtool:15
-USE_DOS2UNIX=	*.pc.in
 USE_LDCONFIG=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=		--prefix=${PREFIX} --with-hints=freebsd.hints
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.0
-
-DOCSDIR=	${PREFIX}/share/doc/sqlite3
-EXAMPLESDIR=	${PREFIX}/share/examples/sqlite3
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.1
 
 OPTIONS=	DEBUG		"Enable debugging & verbose explain"	off \
-		DOCS		"Building docs (depends on TCL)"	on \
 		FTS3            "Enable FTS3 (Full Text Search) module" off \
 		RAMTABLE	"Store temporary tables in RAM"		off \
-		TCLWRAPPER	"TCL wrapper for SQLITE"		off 
-
-# Defaults, for building the docs:
-TCL_V?=		8.4
-MAKE_ARGS+=	TCLSH=tclsh${TCL_V}
-MAKE_ENV+=	TCL_VER=${TCL_V}
+		TCLWRAPPER	"TCL wrapper for SQLITE"		off \
+		METADATA	"Enable column metadata"		on
 
 .if !defined(USE_THOL)
 OPTIONS+=	THREADS		"Enable threads support"		off
@@ -63,14 +47,9 @@
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
-.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
-BUILD_DEPENDS+=		tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
-ALL_TARGET+=		all doc
-PORTDOCS=		*
-.endif
-
 .if defined(WITH_FTS3)
-CFLAGS+=		-DSQLITE_CORE=1 -DSQLITE_ENABLE_FTS3
+CFLAGS+=		-DSQLITE_CORE=1 -DSQLITE_ENABLE_FTS3=1
+EXTRA_PATCHES+=		${FILESDIR}/fts3_patch-Makefile.in
 .endif
 
 .if defined(WITH_RAMTABLE)
@@ -78,7 +57,9 @@
 .endif
 
 .if defined(WITH_TCLWRAPPER)
-ALL_TARGET+=		tclsqlite3
+TCL_V?=			8.4
+MAKE_ARGS+=		TCLSH=tclsh${TCL_V}
+MAKE_ENV+=		TCL_VER=${TCL_V}
 LIB_DEPENDS+=		tcl${TCL_V:S/.//}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
 CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_V}
 PLIST_SUB+=		WITH_TCLWRAPPER=""
@@ -87,6 +68,10 @@
 PLIST_SUB+=		WITH_TCLWRAPPER="@comment "
 .endif
 
+.if !defined(WITHOUT_METADATA)
+CFLAGS+=		-DSQLITE_ENABLE_COLUMN_METADATA=1
+.endif
+
 post-extract:
 	@${FIND} ${WRKSRC} -type d -name 'CVS' | ${XARGS} rm -r
 
@@ -102,6 +87,8 @@
 		> ${WRKSRC}/freebsd.hints
 	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_V:S/.//}\"" \
 		>> ${WRKSRC}/freebsd.hints
+	${REINPLACE_CMD} -e "slfts3.cllg" \
+		-e "slfts3_expr.cllg" ${WRKSRC}/tool/mksqlite3c.tcl
 
 pre-configure:
 .if defined(WITH_THREADS) || defined(USE_THOL)
@@ -122,10 +109,6 @@
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
 .endif
-.if !defined(NOPORTDOCS) && !defined(WITHOUT_DOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
 .if defined(USE_THOL)
 	@${MKDIR} ${DATADIR}
 	@${TOUCH} ${DATADIR}/sqlite3_with_threads-override-locks
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/databases/sqlite3/distinfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -L databases/sqlite3/distinfo -L databases/sqlite3/distinfo -u -r1.6 -r1.7
--- databases/sqlite3/distinfo
+++ databases/sqlite3/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-3.5.6.tar.gz) = 903c9e935c538af392364a9172a3d98d
-SHA256 (sqlite-3.5.6.tar.gz) = 1673b9218ec318067a662315c161ae123088cad319231ec079018acb4717e8bb
-SIZE (sqlite-3.5.6.tar.gz) = 2543979
+MD5 (sqlite-3.6.10.tar.gz) = a03bdc86df4025b6881d58557e4b5bd3
+SHA256 (sqlite-3.6.10.tar.gz) = 2157db34aa0aace8d5a1a5c723280f2840b3383498a225cab36014f0a45faa01
+SIZE (sqlite-3.6.10.tar.gz) = 2763053
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/databases/sqlite3/files/patch-Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L databases/sqlite3/files/patch-Makefile.in -L databases/sqlite3/files/patch-Makefile.in -u -r1.2 -r1.3
--- databases/sqlite3/files/patch-Makefile.in
+++ databases/sqlite3/files/patch-Makefile.in
@@ -1,13 +1,20 @@
---- ./Makefile.in.orig	Thu May 10 02:17:59 2007
-+++ ./Makefile.in	Thu May 10 02:18:37 2007
-@@ -672,8 +672,8 @@
- 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
- 	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include
- 	$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(prefix)/include
--	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; 
--	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig; 
-+	$(INSTALL) -d $(DESTDIR)$(prefix)/libdata/pkgconfig; 
-+	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(prefix)/libdata/pkgconfig; 
+--- Makefile.in.orig	2008-10-14 15:07:37.000000000 -0300
++++ Makefile.in	2008-10-29 11:06:53.000000000 -0200
+@@ -135,7 +135,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ libdir = @libdir@
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(exec_prefix)/libdata/pkgconfig
+ bindir = @bindir@
+ includedir = @includedir@
+ INSTALL = @INSTALL@
+@@ -426,7 +426,7 @@
+ # This is the default Makefile target.  The objects listed here
+ # are what get build when you type just "make" with no arguments.
+ #
+-all:	sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
++all:	sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la tclsqlite3)
  
- tcl_install:	libtclsqlite3.la
- 	$(TCLSH) $(TOP)/tclinstaller.tcl $(VERSION)
+ Makefile: $(TOP)/Makefile.in
+ 	./config.status

More information about the Midnightbsd-cvs mailing list