Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Jul 2002 20:32:19 +0200
From:      Gerhard =?iso-8859-1?Q?H=E4ring?= <gerhard.haering@gmx.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/40816: Port update: databases/sqlite
Message-ID:  <20020720183219.GA5216@lilith.my-fqdn.de>

next in thread | raw e-mail | index | archive | help

>Number:         40816
>Category:       ports
>Synopsis:       Port update for databases/sqlite
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 20 11:40:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Gerhard Häring
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
N/A
>Environment:
System: FreeBSD gargamel.hqd-internal 4.6-STABLE FreeBSD 4.6-STABLE #0: Mon Jun 17 00:00:53 CEST 2002 root@gargamel.hqd-internal:/usr/obj/mnt/data/bsd/src/sys/GH i386


>Description:
	Update from outdated sqlite 1.x version to latest sqlite 2.6.1
        version
>How-To-Repeat:
	N/A
>Fix:
Here's my patch. I'm also volunteering to be the new maintainer for this
port. Btw. this is for me mainly a basis for the py-PySQLite port that
I'll shortly be submitting. Well, with this patch the TCL interface is
built, but not installed, yet. The reason is that I currently know zero
about Tcl.

diff -N -C 3 ../sqlite.orig/Makefile ./Makefile
*** ../sqlite.orig/Makefile	Sun Dec  2 19:19:09 2001
--- ./Makefile	Sat Jul 20 20:00:02 2002
***************
*** 1,65 ****
! # ex:ts=8
! # New ports collection makefile for:	sqlite
! # Date created:			Feb 21, 2001
! # Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
! #
! # $FreeBSD: ports/databases/sqlite/Makefile,v 1.7 2001/12/02 18:19:09 steve Exp $
! #
  
  PORTNAME=	sqlite
! PORTVERSION=	1.0.32
  CATEGORIES=	databases
  MASTER_SITES=	http://www.hwaci.com/sw/sqlite/
  
! MAINTAINER=	ports@FreeBSD.org
  
! LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
! 		tcl${TCL_VER:S/.//}:${PORTSDIR}/lang/tcl${TCL_VER:S/.//}
! BUILD_DEPENDS=	lemon:${PORTSDIR}/devel/lemon
  
! MAKEFILE=	${FILESDIR}/Makefile.bsd
! MAKE_ARGS+=	-j2
  MAKE_ENV+=	TCL_VER=${TCL_VER}
  TCL_VER?=	8.3
  
! GDBM_TOOLS=	gdbmdump gdbmstat
! 
! post-build:	test
! .for p in ${GDBM_TOOLS}
! 	cd ${WRKSRC}/tool && ${MAKE} CFLAGS="${CFLAGS} -I${PREFIX}/include" \
! 		LDADD="-L${PREFIX}/lib -lgdbm" PROG=$p NOMAN=1 \
! 		-f bsd.prog.mk
! .endfor
! 	cd ${WRKSRC} && ${MAKE} VPATH=${WRKSRC}/src \
! 		CFLAGS="${CFLAGS} -I${WRKSRC} -I${WRKSRC}/src" \
! 		LDADD="-L${WRKSRC} -lsqlite" PROG=sqlite SRCS=shell.c NOMAN=1 \
! 		-f bsd.prog.mk
! .ifndef NOPORTDOCS
! 	cd ${WRKSRC}/www && ${SETENV} ${MAKE_ENV} \
! 		${MAKE} ${MAKE_ARGS} -f ${FILESDIR}/Makefile.docs
! .endif
  
  post-install:
! .for p in ${GDBM_TOOLS}
! 	cd ${WRKSRC}/tool && ${MAKE} BINDIR="${PREFIX}/bin" \
! 		PROG=$p NOMAN=1 -f bsd.prog.mk install
  .endfor
- 	cd ${WRKSRC} && ${MAKE} PROG=sqlite NOMAN=1 BINDIR="${PREFIX}/bin" \
- 		-f bsd.prog.mk install
- 	${MKDIR} ${PREFIX}/lib/sqlite
- 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
- .ifndef NOPORTDOCS
- 	${MKDIR} ${PREFIX}/share/doc/sqlite
- 	${INSTALL_DATA} ${WRKSRC}/www/*.html ${WRKSRC}/www/*.png \
- 		${PREFIX}/share/doc/sqlite
  .endif
- 
- test:
- 	# -------------------------------------------------------
- 	# Running the vendor's tests -- there should be 0 errors.
- 	# -------------------------------------------------------
- 	cd ${WRKSRC} && ${PREFIX}/bin/tclsh${TCL_VER} ${WRKSRC}/test/all.test \
- 		${WRKSRC}/libsqlite.so
- 	# -------------------------------------------------------
  
  .include <bsd.port.mk>
--- 1,50 ----
! # Note: this package builds the Tcl interface, but doesn't install it, because
! # the maintainer has no idea about Tcl.
  
  PORTNAME=	sqlite
! PORTVERSION=	2.6.1
  CATEGORIES=	databases
  MASTER_SITES=	http://www.hwaci.com/sw/sqlite/
+ DISTNAME=	sqlite-${PORTVERSION}
  
! MAINTAINER=	gerhard.haering@gmx.de
  
! LIB_DEPENDS=	tcl${TCL_VER:S/.//}:${PORTSDIR}/lang/tcl${TCL_VER:S/.//}
! BUILD_DEPENDS=
  
! USE_GMAKE=	YES
! GNU_CONFIGURE=	YES
! CONFIGURE_ARGS= --with-hints=freebsd.hints
! 
! WRKSRC=		${WRKDIR}/sqlite
! MAKE_ARGS+=	TCLSH=tclsh${TCL_VER}
  MAKE_ENV+=	TCL_VER=${TCL_VER}
  TCL_VER?=	8.3
  
! DOCFILES=	arch.html arch.png c_interface.html changes.html \
! 		crosscompile.html download.html faq.html index.html \
! 		lang.html lemon.html mingw.html opcode.html report1.txt \
! 		speed.html sqlite.html tclsqlite.html vdbe.html
! 
! DOCSDIR=	${PREFIX}/share/doc/sqlite
! 
! post-patch:
! 	echo "config_TARGET_TCL_INC=\"-I/usr/local/include/tcl${TCL_VER}\"" >${WRKSRC}/freebsd.hints
! 	echo "config_TARGET_TCL_LIBS=\"-L/usr/local/lib -ltcl${TCL_VER:S/.//}\"" >>${WRKSRC}/freebsd.hints
! 	echo "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
! 
! post-build:
! 	# Build the Tcl interface
! 	cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} libtclsqlite.la
! 	# Build the docs
! 	cd ${WRKSRC} && ${MAKE} ${MAKE_ARGS} doc
  
+ .if !defined(NOPORTDOCS)
  post-install:
! 	@${MKDIR} ${DOCSDIR}
! .for file in ${DOCFILES}
! 	@${INSTALL_DATA} ${WRKSRC}/doc//${file} ${DOCSDIR}
  .endfor
  .endif
  
  .include <bsd.port.mk>
diff -N -C 3 ../sqlite.orig/distinfo ./distinfo
*** ../sqlite.orig/distinfo	Sun Dec  2 19:19:09 2001
--- ./distinfo	Sat Jul 20 20:01:34 2002
***************
*** 1 ****
! MD5 (sqlite-1.0.32.tar.gz) = 308be6d8b9e9514150ef4f89902b2fbc
--- 1 ----
! MD5 (sqlite-2.6.1.tar.gz) = e1d4f6995c4e0114c026942c0f968fa6
Common subdirectories: ../sqlite.orig/files and ./files
diff -N -C 3 ../sqlite.orig/pkg-comment ./pkg-comment
*** ../sqlite.orig/pkg-comment	Thu Feb 22 18:03:20 2001
--- ./pkg-comment	Mon Jun  3 11:27:52 2002
***************
*** 1 ****
! SQL library that uses GDBM as its underlying file storage mechanism
--- 1 ----
! An SQL database engine in a C library.
diff -N -C 3 ../sqlite.orig/pkg-descr ./pkg-descr
*** ../sqlite.orig/pkg-descr	Thu Feb 22 18:03:20 2001
--- ./pkg-descr	Sat Jul 20 19:47:38 2002
***************
*** 1,8 ****
! SQLite is an SQL database library that uses GDBM as its underlying
! file storage mechanism. Programs that link the SQLite library can
! have SQL database access without running a separate RDBMS process.
! The distribution comes with a standalone command-line access program
! (sqlite) that can be used to administer an SQLite database and which
! serves as an example of how to use the SQLite library.
  
  WWW: http://www.hwaci.com/sw/sqlite/
--- 1,7 ----
! SQLite is an SQL database engine in a C library. Programs that link the SQLite
! library can have SQL database access without running a separate RDBMS process.
! The distribution comes with a standalone command-line access program (sqlite)
! that can be used to administer an SQLite database and which serves as an
! example of how to use the SQLite library.
  
  WWW: http://www.hwaci.com/sw/sqlite/
diff -N -C 3 ../sqlite.orig/pkg-plist ./pkg-plist
*** ../sqlite.orig/pkg-plist	Fri Jul  6 10:14:45 2001
--- ./pkg-plist	Sat Jul 20 19:07:45 2002
***************
*** 1,24 ****
  bin/sqlite
! bin/gdbmdump
! bin/gdbmstat
  lib/libsqlite.a
! lib/libsqlite_p.a
  lib/libsqlite.so
! lib/libsqlite.so.1.0
! lib/sqlite/pkgIndex.tcl
! @dirrm lib/sqlite
! include/sqlite.h
  %%PORTDOCS%%share/doc/sqlite/arch.html
  %%PORTDOCS%%share/doc/sqlite/arch.png
  %%PORTDOCS%%share/doc/sqlite/c_interface.html
  %%PORTDOCS%%share/doc/sqlite/changes.html
  %%PORTDOCS%%share/doc/sqlite/crosscompile.html
! %%PORTDOCS%%share/doc/sqlite/dynload.html
! %%PORTDOCS%%share/doc/sqlite/fileformat.html
  %%PORTDOCS%%share/doc/sqlite/index.html
  %%PORTDOCS%%share/doc/sqlite/lang.html
  %%PORTDOCS%%share/doc/sqlite/mingw.html
  %%PORTDOCS%%share/doc/sqlite/opcode.html
  %%PORTDOCS%%share/doc/sqlite/sqlite.html
  %%PORTDOCS%%share/doc/sqlite/tclsqlite.html
  %%PORTDOCS%%share/doc/sqlite/vdbe.html
--- 1,23 ----
  bin/sqlite
! include/sqlite.h
  lib/libsqlite.a
! lib/libsqlite.la
  lib/libsqlite.so
! lib/libsqlite.so.0
  %%PORTDOCS%%share/doc/sqlite/arch.html
  %%PORTDOCS%%share/doc/sqlite/arch.png
  %%PORTDOCS%%share/doc/sqlite/c_interface.html
  %%PORTDOCS%%share/doc/sqlite/changes.html
  %%PORTDOCS%%share/doc/sqlite/crosscompile.html
! %%PORTDOCS%%share/doc/sqlite/download.html
! %%PORTDOCS%%share/doc/sqlite/faq.html
  %%PORTDOCS%%share/doc/sqlite/index.html
  %%PORTDOCS%%share/doc/sqlite/lang.html
+ %%PORTDOCS%%share/doc/sqlite/lemon.html
  %%PORTDOCS%%share/doc/sqlite/mingw.html
  %%PORTDOCS%%share/doc/sqlite/opcode.html
+ %%PORTDOCS%%share/doc/sqlite/report1.txt
+ %%PORTDOCS%%share/doc/sqlite/speed.html
  %%PORTDOCS%%share/doc/sqlite/sqlite.html
  %%PORTDOCS%%share/doc/sqlite/tclsqlite.html
  %%PORTDOCS%%share/doc/sqlite/vdbe.html
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020720183219.GA5216>