Index: head/databases/sqlite2/Makefile
===================================================================
--- head/databases/sqlite2/Makefile	(revision 382351)
+++ head/databases/sqlite2/Makefile	(revision 382352)
@@ -1,88 +1,90 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sqlite
 PORTVERSION=	2.8.17
 PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SQL database engine in a C library
 
 GNU_CONFIGURE=	yes
 USES=		gmake libtool pkgconfig readline
 USE_LDCONFIG=	YES
 
 CONFIGURE_ARGS=	--with-hints=freebsd.hints
 
 DOCSDIR=	${PREFIX}/share/doc/sqlite2
 EXAMPLESDIR=	${PREFIX}/share/examples/sqlite2
 
 EXTRACT_AFTER_ARGS=	--exclude CVS
 
 OPTIONS_DEFINE=	TCL THREADS DOCS EXAMPLES
 
 .if !exists(/usr/lib/libreadline.so)
 MAKE_ARGS=	READLINE_FLAGS="-DHAVE_READLINE=1 -I${LOCALBASE}/include -L${LOCALBASE}/lib"
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTCL}
 USES+=		tcl
 .else
 .if ${PORT_OPTIONS:MDOCS}
 USES+=		tcl:build
 .endif
 .endif
 
 .if ${PORT_OPTIONS:MTCL}
 CATEGORIES+=	lang tcl
 COMMENT+=	with TCL wrapper
 MAKE_ARGS+=	TCLSH=${TCLSH}
 MAKE_ENV+=	TCL_VER=${TCL_VER}
 PLIST_SUB+=	WITH_TCLWRAPPER=""
 .else
 PLIST_SUB+=	WITH_TCLWRAPPER="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 MAKE_ARGS+=	TCLSH=${TCLSH}
 MAKE_ENV+=	TCL_VER=${TCL_VER}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
 		${WRKSRC}/Makefile.in
 .if ${PORT_OPTIONS:MTCL} || !empty(PORT_OPTIONS:MDOCS)
 	@${ECHO} "config_TARGET_TCL_INC=\"-I${TCL_INCLUDEDIR}\"" \
 		> ${WRKSRC}/freebsd.hints
 	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_VER:S/.//}\"" \
 		>> ${WRKSRC}/freebsd.hints
 .else
 	@${ECHO} "" > ${WRKSRC}/freebsd.hints
 .endif
 .if ${PORT_OPTIONS:MTHREADS}
-	@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -lpthread\"" \
+	@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1\"" \
+		>> ${WRKSRC}/freebsd.hints
+	@${ECHO} "config_TARGET_LIBS=\"-lpthread\"" \
 		>> ${WRKSRC}/freebsd.hints
 .endif
 
 post-build:
 .if ${PORT_OPTIONS:MDOCS}
 	@${ECHO_MSG} "===> Building docs"
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} doc)
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MTCL}
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-tcl)
 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${STAGEDIR}${PREFIX}/lib/sqlite
 .endif
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/example.tcl ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/databases/sqlite2/files/patch-Makefile.in
===================================================================
--- head/databases/sqlite2/files/patch-Makefile.in	(revision 382351)
+++ head/databases/sqlite2/files/patch-Makefile.in	(revision 382352)
@@ -1,17 +1,26 @@
---- Makefile.in.orig	Sat Mar 27 08:16:32 2004
-+++ Makefile.in	Sun Nov 21 04:32:00 2004
+--- Makefile.in.orig	2005-04-23 18:43:23.000000000 -0400
++++ Makefile.in	2015-03-26 18:36:07.358178000 -0400
+@@ -38,7 +38,7 @@
+ 
+ # libtool compile/link/install
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(TCC)
+-LTLINK = $(LIBTOOL) --mode=link $(TCC)
++LTLINK = $(LIBTOOL) --mode=link $(TCC) @TARGET_LIBS@
+ LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
+ 
+ # Compiler options needed for programs that use the TCL library.
 @@ -471,8 +471,12 @@
  	$(LTINSTALL) sqlite $(DESTDIR)$(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)/$(exec_prefix)/libdata/pkgconfig
 +	$(INSTALL) -m 0644 sqlite.pc $(DESTDIR)/$(exec_prefix)/libdata/pkgconfig
 +
 +install-tcl:	libtclsqlite.la
 +	$(INSTALL) -d $(DESTDIR)$(prefix)/lib/sqlite
 +	$(LTINSTALL) libtclsqlite.la $(DESTDIR)$(prefix)/lib/sqlite
  
  clean:	
  	rm -f *.lo *.la *.o sqlite@TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*