- Update to 2.8.14

PR:		ports/68143
Submitted by:	Rui Lopes <rui@ruilopes.com>
Approved by:	maintainer timeout (14 days)

5 files changed, 47 insertions, 50 deletions

diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index a9d79fb8d91c..4fd903e360ea 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -12,10 +12,9 @@
 # SQLITE_WITH_TCL83 and SQLITE_WITH_TCL84.
 
 PORTNAME=	sqlite
-PORTVERSION=	2.8.13
-PORTREVISION=	1
+PORTVERSION=	2.8.14
 CATEGORIES=	databases
-MASTER_SITES=	http://www.hwaci.com/sw/sqlite/
+MASTER_SITES=	http://www.sqlite.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	gh@ghaering.de
@@ -40,14 +39,14 @@ WITH_TCL=	YES
 .endif
 
 .if defined(WITH_TCL)
-LIB_DEPENDS=	tcl${TCL_SHORT_V}:${PORTSDIR}/lang/tcl${TCL_SHORT_V}
+LIB_DEPENDS+=	tcl${TCL_SHORT_V}:${PORTSDIR}/lang/tcl${TCL_SHORT_V}
 PLIST_SUB+=	WITH_TCL=""
 .else
 PLIST_SUB+=	WITH_TCL="@comment "
 .endif
 
 .if !defined(NOPORTDOCS)
-BUILD_DEPENDS=	tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_SHORT_V}
+BUILD_DEPENDS+=	tclsh${TCL_V}:${PORTSDIR}/lang/tcl${TCL_SHORT_V}
 MAKE_ARGS+=	TCLSH=tclsh${TCL_V}
 MAKE_ENV+=	TCL_VER=${TCL_V}
 .endif
@@ -57,6 +56,7 @@ USE_LIBTOOL_VER=	13
 GNU_CONFIGURE=	YES
 USE_REINPLACE=	YES
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-hints=freebsd.hints
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 ALL_TARGET=	all
 #.if defined(WITH_TCL)
 #ALL_TARGET+=	libtclsqlite.la
@@ -73,9 +73,6 @@ DOCFILES=	arch.html arch.png c_interface.html changes.html \
 		opcode.html quickstart.html report1.txt speed.html \
 		sqlite.html tclsqlite.html vdbe.html
 
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
-EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
-
 post-patch:
 	${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
 			 -e "s|%%LIBTOOL%%|${LIBTOOL}|g" \
diff --git a/databases/sqlite2/distinfo b/databases/sqlite2/distinfo
index 176dc738bc7a..d7da79b7fe0a 100644
--- a/databases/sqlite2/distinfo
+++ b/databases/sqlite2/distinfo
@@ -1,2 +1,2 @@
-MD5 (sqlite-2.8.13.tar.gz) = 628fa52b5580b38ade75985dd4ba46dd
-SIZE (sqlite-2.8.13.tar.gz) = 956008
+MD5 (sqlite-2.8.14.tar.gz) = 113ce31cc31e0ab671bab590122e272a
+SIZE (sqlite-2.8.14.tar.gz) = 955231
diff --git a/databases/sqlite2/files/patch-Makefile.in b/databases/sqlite2/files/patch-Makefile.in
index 1920b06dac4c..59b3aabecbb9 100644
--- a/databases/sqlite2/files/patch-Makefile.in
+++ b/databases/sqlite2/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sun Feb 29 09:07:56 2004
-+++ Makefile.in	Sun Mar 28 15:41:51 2004
+--- Makefile.in.orig	Fri Mar 26 23:16:32 2004
++++ Makefile.in	Sun Jun 20 13:22:21 2004
 @@ -33,7 +33,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
@@ -9,7 +9,7 @@
  RELEASE = @ALLOWRELEASE@
  
  # libtool compile/link/install
-@@ -184,12 +184,12 @@
+@@ -188,12 +188,12 @@
  
  libsqlite.la:	$(LIBOBJ)
  	$(LTLINK) -o libsqlite.la $(LIBOBJ) ${RELEASE} -rpath @exec_prefix@/lib \
@@ -24,7 +24,7 @@
  
  sqlite@TARGET_EXEEXT@:	$(TOP)/src/shell.c libsqlite.la sqlite.h
  	$(LTLINK) $(READLINE_FLAGS) -o sqlite $(TOP)/src/shell.c \
-@@ -365,67 +365,67 @@
+@@ -372,67 +372,67 @@
  	./testfixture $(TOP)/test/quick.test
  
  index.html:	$(TOP)/www/index.tcl last_change
@@ -112,21 +112,21 @@
  
  
  # Files to be published on the website.
-@@ -459,13 +459,19 @@
+@@ -466,13 +466,19 @@
  
  install:	sqlite libsqlite.la sqlite.h
- 	$(INSTALL) -d $(DESTDIR)/$(exec_prefix)/lib
--	$(LTINSTALL) libsqlite.la $(DESTDIR)/$(exec_prefix)/lib
+ 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
+-	$(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
 +	$(INSTALL) .libs/libsqlite.a $(exec_prefix)/lib
 +	$(INSTALL) .libs/libsqlite.so $(exec_prefix)/lib
 +	$(INSTALL) .libs/libsqlite.so.2 $(exec_prefix)/lib
- 	$(INSTALL) -d $(DESTDIR)/$(exec_prefix)/bin
--	$(LTINSTALL) sqlite $(DESTDIR)/$(exec_prefix)/bin
+ 	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
+-	$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
 +	$(INSTALL) .libs/sqlite $(exec_prefix)/bin
- 	$(INSTALL) -d $(DESTDIR)/$(prefix)/include
- 	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)/$(prefix)/include
--	$(INSTALL) -d $(DESTDIR)/$(exec_prefix)/lib/pkgconfig; 
--	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)/$(exec_prefix)/lib/pkgconfig; 
+ 	$(INSTALL) -d $(DESTDIR)$(prefix)/include
+ 	$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
+-	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
+-	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; 
 +	$(INSTALL) -d $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig; 
 +	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig; 
 +
diff --git a/databases/sqlite2/pkg-descr b/databases/sqlite2/pkg-descr
index 391d99ee6abf..3cdcbd6b2daf 100644
--- a/databases/sqlite2/pkg-descr
+++ b/databases/sqlite2/pkg-descr
@@ -4,4 +4,4 @@ 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/
+WWW: http://www.sqlite.org/
diff --git a/databases/sqlite2/pkg-plist b/databases/sqlite2/pkg-plist
index f512c9e45354..aa4afe667438 100644
--- a/databases/sqlite2/pkg-plist
+++ b/databases/sqlite2/pkg-plist
@@ -7,29 +7,29 @@ libdata/pkgconfig/sqlite.pc
 %%WITH_TCL%%lib/sqlite/libtclsqlite.so
 %%WITH_TCL%%lib/sqlite/pkgIndex.tcl
 %%WITH_TCL%%@dirrm lib/sqlite
-%%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/conflict.html
-%%PORTDOCS%%share/doc/sqlite/datatypes.html
-%%PORTDOCS%%share/doc/sqlite/download.html
-%%PORTDOCS%%share/doc/sqlite/faq.html
-%%PORTDOCS%%share/doc/sqlite/fileformat.html
-%%PORTDOCS%%share/doc/sqlite/formatchng.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/nulls.html
-%%PORTDOCS%%share/doc/sqlite/omitted.html
-%%PORTDOCS%%share/doc/sqlite/opcode.html
-%%PORTDOCS%%share/doc/sqlite/quickstart.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
-%%PORTDOCS%%@dirrm share/doc/sqlite
-%%PORTDOCS%%share/examples/sqlite/example.tcl
-%%PORTDOCS%%@dirrm share/examples/sqlite
+%%PORTDOCS%%%%DOCSDIR%%/arch.html
+%%PORTDOCS%%%%DOCSDIR%%/arch.png
+%%PORTDOCS%%%%DOCSDIR%%/c_interface.html
+%%PORTDOCS%%%%DOCSDIR%%/changes.html
+%%PORTDOCS%%%%DOCSDIR%%/conflict.html
+%%PORTDOCS%%%%DOCSDIR%%/datatypes.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%%/mingw.html
+%%PORTDOCS%%%%DOCSDIR%%/nulls.html
+%%PORTDOCS%%%%DOCSDIR%%/omitted.html
+%%PORTDOCS%%%%DOCSDIR%%/opcode.html
+%%PORTDOCS%%%%DOCSDIR%%/quickstart.html
+%%PORTDOCS%%%%DOCSDIR%%/report1.txt
+%%PORTDOCS%%%%DOCSDIR%%/speed.html
+%%PORTDOCS%%%%DOCSDIR%%/sqlite.html
+%%PORTDOCS%%%%DOCSDIR%%/tclsqlite.html
+%%PORTDOCS%%%%DOCSDIR%%/vdbe.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/example.tcl
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%