Clean up SQLite and related ports.

o Move databases/sqlite to databases/sqlite2.
o Fix dependency on databases/sqlite.
o Update sqlite2 to 2.8.15.
o Bump PORTREVISION, accordingly.

Approved by:	portmgr, maintainers of sqlite and related ports

1 files changed, 17 insertions, 23 deletions

diff --git a/databases/sqlite34/Makefile b/databases/sqlite34/Makefile
index aa3b9201e7c6..6f9dd668b4d9 100644
--- a/databases/sqlite34/Makefile
+++ b/databases/sqlite34/Makefile
@@ -8,8 +8,7 @@
 
 # By default, this port depends on TCL for building docs. If you want to build
 # without TCL (and thus get no docs), define NOPORTDOCS.
-# If you want to build the TCL wrapper, you have to choose between
-# SQLITE_WITH_TCL83 and SQLITE_WITH_TCL84.
+# If you want to build the TCL wrapper, you have to define SQLITE_WITH_TCL84.
 
 PORTNAME=	sqlite
 PORTVERSION=	3.0.8
@@ -22,7 +21,7 @@ COMMENT=	An SQL database engine in a C library w/ Tcl wrapper (beta)
 
 DOCSDIR=	${PREFIX}/share/doc/sqlite3
 EXAMPLESDIR=	${PREFIX}/share/examples/sqlite3
-NO_LATEST_LINK=	yes
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}3
 
 # Defaults, for building the docs:
 TCL_V=		8.4
@@ -36,10 +35,7 @@ WITH_TCL=	YES
 .endif
 
 .if defined(WITH_TCL)
-LIB_DEPENDS+=	tcl${TCL_SHORT_V}:${PORTSDIR}/lang/tcl${TCL_SHORT_V}
-PLIST_SUB+=	WITH_TCL=""
-.else
-PLIST_SUB+=	WITH_TCL="@comment "
+ALL_TARGET+=	libtclsqlite.la
 .endif
 
 .if !defined(NOPORTDOCS)
@@ -55,21 +51,22 @@ 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+=	libtclsqlite3.la tclsqlite3
-.endif
 
 INSTALLS_SHLIB=	YES
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+.include <bsd.port.pre.mk>
+
+DOCFILES!=	${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2}' pkg-plist
+
 post-patch:
-	${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
-			 -e "s|%%LIBTOOL%%|${LIBTOOL}|g" \
+	@${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
+			 -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_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
 
 post-build:
 	# Build the docs
@@ -77,8 +74,6 @@ post-build:
 	cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc
 .endif
 
-DOCFILES=	${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2 }' < pkg-plist
-
 post-install:
 .if defined(WITH_TCL)
 	@${MKDIR} ${PREFIX}/lib/sqlite
@@ -90,12 +85,11 @@ post-install:
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	for f in `${DOCFILES}`; do \
-		${INSTALL_DATA} ${WRKSRC}/doc/$${f} ${DOCSDIR}; \
-	done
+.for file in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
+.endfor
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
-
+	${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>