Attachment 52130 Details for Bug 79024 – sqlite3.patch

[patch] sqlite3.patch

sqlite3.patch (text/plain), 7.38 KB, created by Marcus Grando on 2005-03-19 19:30:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Grando

Created: 2005-03-19 19:30:03 UTC

Size: 7.38 KB

patch

obsolete

>diff -ruN sqlite3.orig/Makefile sqlite3/Makefile
>--- sqlite3.orig/Makefile	Sat Dec 25 23:22:43 2004
>+++ sqlite3/Makefile	Sat Mar 19 16:04:59 2005
>@@ -11,90 +11,86 @@
> # If you want to build the TCL wrapper, you have to define SQLITE_WITH_TCL84.
> 
> PORTNAME=	sqlite
>-PORTVERSION=	3.0.8
>-PORTREVISION=	2
>+PORTVERSION=	3.1.6
>+PORTREVISION=	0
> CATEGORIES=	databases
> MASTER_SITES=	http://www.sqlite.org/
>-DISTNAME=	${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	green@FreeBSD.org
> COMMENT=	An SQL database engine in a C library w/ Tcl wrapper (beta)
> 
>+USE_GMAKE=		YES
>+USE_GNOME=		pkgconfig
>+USE_LIBTOOL_VER=	15
>+HAS_CONFIGURE=		YES
>+USE_REINPLACE=		YES
>+INSTALLS_SHLIB=		YES
>+
> DOCSDIR=	${PREFIX}/share/doc/sqlite3
> EXAMPLESDIR=	${PREFIX}/share/examples/sqlite3
> LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}3
> 
> # Defaults, for building the docs:
>-TCL_V=		8.4
>-TCL_SHORT_V=	84
>+TCL_V?=		8.4
>+
>+OPTIONS=	TCL84	"TCL wrapper for SQLITE" off
> 
>-.if defined(SQLITE_WITH_TCL84)
>-CATEGORIES+=	tcl84
>-TCL_V=		8.4
>-TCL_SHORT_V=	84
>+.include <bsd.port.pre.mk>
>+
>+.if !defined(WITHOUT_TCL84)
>+CATEGORIES+=	lang
> WITH_TCL=	YES
> .endif
> 
> .if defined(WITH_TCL)
> ALL_TARGET+=	libtclsqlite.la
> PLIST_SUB+=     WITH_TCL=""
>+CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_V}
> .else
> PLIST_SUB+=     WITH_TCL="@comment "
>+CONFIGURE_ARGS=	--disable-tcl
> .endif
> 
> .if !defined(NOPORTDOCS)
>-BUILD_DEPENDS+=	tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_SHORT_V}
>+BUILD_DEPENDS+=	tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_V:S/.//}
> MAKE_ARGS+=	TCLSH=tclsh${TCL_V}
> MAKE_ENV+=	TCL_VER=${TCL_V}
> .endif
> 
>-USE_GMAKE=	YES
>-USE_GNOME=	pkgconfig
>-USE_LIBTOOL_VER=	13
>-GNU_CONFIGURE=	YES
>-USE_REINPLACE=	YES
>-CONFIGURE_ARGS=	--prefix=${PREFIX} --with-hints=freebsd.hints
>+CONFIGURE_ARGS+=	--prefix=${PREFIX} --with-hints=freebsd.hints
> CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>-ALL_TARGET=	all
>-
>-INSTALLS_SHLIB=	YES
>+ALL_TARGET=		all
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}
>-
>-.include <bsd.port.pre.mk>
>-
>-DOCFILES!=	${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2}' pkg-plist
>+.if !defined(NOPORTDOCS)
>+PORTDOCS=	*
>+.endif
> 
> post-patch:
> 	@${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
>-			 -e "s|\./libtool|${LIBTOOL}|g" \
>-			 ${WRKSRC}/Makefile.in
>+		-e "s|\./libtool|${LIBTOOL}|g" ${WRKSRC}/Makefile.in
> 	@${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
>-	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_SHORT_V}\"" >>${WRKSRC}/freebsd.hints
>-	#@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
>+	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_V:S/.//}\"" >>${WRKSRC}/freebsd.hints
>+#	@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
> 
> post-build:
> 	# Build the docs
> .if !defined(NOPORTDOCS)
>-	cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc
>+	@(cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc)
> .endif
> 
> post-install:
> .if defined(WITH_TCL)
> 	@${MKDIR} ${PREFIX}/lib/sqlite
>-	cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
>-	    libtclsqlite3.la ${PREFIX}/lib/sqlite/
>-	@${RM} ${PREFIX}/lib/sqlite/libtclsqlite3.la
>-	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
>-	${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
>+	@(cd ${WRKSRC} && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
>+	    libtclsqlite3.la ${PREFIX}/lib/sqlite/)
>+	@${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
>+	@${INSTALL_PROGRAM} ${WRKSRC}/.libs/tclsqlite3 ${PREFIX}/bin
> .endif
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
>-.for file in ${DOCFILES}
>-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
>-.endfor
>+	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
> 	@${MKDIR} ${EXAMPLESDIR}
>-	${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
>+	@${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
> .endif
> 
> .include <bsd.port.post.mk>
>diff -ruN sqlite3.orig/distinfo sqlite3/distinfo
>--- sqlite3.orig/distinfo	Thu Dec 23 02:26:40 2004
>+++ sqlite3/distinfo	Sat Mar 19 14:57:15 2005
>@@ -1,2 +1,2 @@
>-MD5 (sqlite-3.0.8.tar.gz) = b7dff1ec9bf4d08928c039b278630ba7
>-SIZE (sqlite-3.0.8.tar.gz) = 1288859
>+MD5 (sqlite-3.1.6.tar.gz) = 34e77a82ca7c1a7f5ff00a1939075fa8
>+SIZE (sqlite-3.1.6.tar.gz) = 1337475
>diff -ruN sqlite3.orig/files/patch-Makefile.in sqlite3/files/patch-Makefile.in
>--- sqlite3.orig/files/patch-Makefile.in	Thu Dec 23 06:25:45 2004
>+++ sqlite3/files/patch-Makefile.in	Sat Mar 19 16:06:41 2005
>@@ -1,11 +1,15 @@
>---- Makefile.in.orig	Thu Oct  7 00:03:05 2004
>-+++ Makefile.in	Thu Dec 23 17:17:22 2004
>-@@ -543,12 +543,13 @@
>- install:	sqlite3 libsqlite3.la sqlite3.h
>- 	$(INSTALL) -d $(DESTDIR)$(libdir)
>- 	$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
>-+	rm $(DESTDIR)$(exec_prefix)/lib/libsqlite3.la
>- 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
>+--- Makefile.in.orig	Fri Mar 11 14:50:32 2005
>++++ Makefile.in	Sat Mar 19 16:06:28 2005
>+@@ -212,7 +212,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)
>+ 
>+ Makefile: $(TOP)/Makefile.in
>+ 	./config.status
>+@@ -611,8 +611,8 @@
>  	$(LTINSTALL) sqlite3 $(DESTDIR)$(exec_prefix)/bin
>  	$(INSTALL) -d $(DESTDIR)$(prefix)/include
>  	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include
>@@ -14,5 +18,5 @@
> +	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/libdata/pkgconfig; 
> +	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(exec_prefix)/libdata/pkgconfig; 
>  
>- clean:	
>- 	rm -f *.lo *.la *.o sqlite3@TARGET_EXEEXT@ libsqlite3.la
>+ tcl_install:	libtclsqlite3.la
>+ 	tclsh $(TOP)/tclinstaller.tcl $(VERSION)
>diff -ruN sqlite3.orig/pkg-plist sqlite3/pkg-plist
>--- sqlite3.orig/pkg-plist	Thu Dec 23 08:20:35 2004
>+++ sqlite3/pkg-plist	Sat Mar 19 15:48:47 2005
>@@ -10,42 +10,5 @@
> %%WITH_TCL%%lib/sqlite/libtclsqlite3.a
> %%WITH_TCL%%lib/sqlite/pkgIndex.tcl
> %%WITH_TCL%%@dirrm lib/sqlite
>-%%PORTDOCS%%%%DOCSDIR%%/affinity.html
>-%%PORTDOCS%%%%DOCSDIR%%/arch.html
>-%%PORTDOCS%%%%DOCSDIR%%/arch2.gif
>-%%PORTDOCS%%%%DOCSDIR%%/c_interface.html
>-%%PORTDOCS%%%%DOCSDIR%%/capi3.html
>-%%PORTDOCS%%%%DOCSDIR%%/capi3ref.html
>-%%PORTDOCS%%%%DOCSDIR%%/changes.html
>-%%PORTDOCS%%%%DOCSDIR%%/conflict.html
>-%%PORTDOCS%%%%DOCSDIR%%/copyright-release.html
>-%%PORTDOCS%%%%DOCSDIR%%/copyright-release.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/copyright.html
>-%%PORTDOCS%%%%DOCSDIR%%/datatype3.html
>-%%PORTDOCS%%%%DOCSDIR%%/datatypes.html
>-%%PORTDOCS%%%%DOCSDIR%%/docs.html
>-%%PORTDOCS%%%%DOCSDIR%%/download.html
>-%%PORTDOCS%%%%DOCSDIR%%/faq.html
>-%%PORTDOCS%%%%DOCSDIR%%/fileformat.html
>-%%PORTDOCS%%%%DOCSDIR%%/formatchng.html
>-%%PORTDOCS%%%%DOCSDIR%%/index.html
>-%%PORTDOCS%%%%DOCSDIR%%/lang.html
>-%%PORTDOCS%%%%DOCSDIR%%/lemon.html
>-%%PORTDOCS%%%%DOCSDIR%%/lockingv3.html
>-%%PORTDOCS%%%%DOCSDIR%%/mingw.html
>-%%PORTDOCS%%%%DOCSDIR%%/nulls.html
>-%%PORTDOCS%%%%DOCSDIR%%/oldnews.html
>-%%PORTDOCS%%%%DOCSDIR%%/omitted.html
>-%%PORTDOCS%%%%DOCSDIR%%/opcode.html
>-%%PORTDOCS%%%%DOCSDIR%%/quickstart.html
>-%%PORTDOCS%%%%DOCSDIR%%/report1.txt
>-%%PORTDOCS%%%%DOCSDIR%%/speed.html
>-%%PORTDOCS%%%%DOCSDIR%%/sqlite.gif
>-%%PORTDOCS%%%%DOCSDIR%%/sqlite.html
>-%%PORTDOCS%%%%DOCSDIR%%/support.html
>-%%PORTDOCS%%%%DOCSDIR%%/tclsqlite.html
>-%%PORTDOCS%%%%DOCSDIR%%/vdbe.html
>-%%PORTDOCS%%%%DOCSDIR%%/version3.html
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%
> %%PORTDOCS%%%%EXAMPLESDIR%%/example.tcl
> %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%

Actions: View | Diff

Attachments on bug 79024: 52130 | 52131