databases category: Remove $PTHREAD_LIBS

Note: virtuoso did not pass check-plist from before, so it was fixed.

approved by:	PTHREAD blanket

29 files changed, 42 insertions, 62 deletions

diff --git a/databases/animenfo-client-gtk/Makefile b/databases/animenfo-client-gtk/Makefile
index 8fa35c78ea67..2a5ea8700b71 100644
--- a/databases/animenfo-client-gtk/Makefile
+++ b/databases/animenfo-client-gtk/Makefile
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 USES=		pkgconfig gettext gmake tar:tgz
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS+=	${CPPFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_FILES=	bin/animenfo-client-gtk
diff --git a/databases/beansdb/Makefile b/databases/beansdb/Makefile
index 4f557a3ad28a..906c408216c6 100644
--- a/databases/beansdb/Makefile
+++ b/databases/beansdb/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Yet another distributed key-value storage system from Douban Inc
 
 GNU_CONFIGURE=	yes
 USE_CSTD=	gnu89
-CFLAGS+=	${PTHREAD_LIBS}
+CFLAGS+=	-lpthread
 
 PLIST_FILES=	bin/beansdb \
 		man/man1/beansdb.1.gz
diff --git a/databases/dbconnect/Makefile b/databases/dbconnect/Makefile
index 3f5d8638a00c..ec44e4aeeff6 100644
--- a/databases/dbconnect/Makefile
+++ b/databases/dbconnect/Makefile
@@ -16,8 +16,8 @@ GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf
 USE_LDCONFIG=	yes
 
-CXXFLAGS+=	${PTHREAD_CFLAGS} -fPIC -DFREEBSD
-LDFLAG+=	${PTHREAD_LIBS}
+CXXFLAGS+=	-fPIC -DFREEBSD
+LDFLAG+=	-lpthread
 
 OPTIONS_DEFINE=	MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile
index 5f8514785f41..f141a337bb05 100644
--- a/databases/fastdb/Makefile
+++ b/databases/fastdb/Makefile
@@ -17,9 +17,7 @@ OPTIONS_DEFINE=	DOCS
 
 USES=		gmake dos2unix
 USE_GCC=	any
-MAKE_ENV=	OSTYPE="${OPSYS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+MAKE_ENV=	OSTYPE="${OPSYS}"
 MAKEFILE=	makefile
 USE_LDCONFIG=	yes
 DOS2UNIX_FILES=	${MAKEFILE}
diff --git a/databases/fastdb/files/patch-makefile b/databases/fastdb/files/patch-makefile
index da5badacfcc9..03beab8ee91d 100644
--- a/databases/fastdb/files/patch-makefile
+++ b/databases/fastdb/files/patch-makefile
@@ -23,8 +23,8 @@
  else
 -TFLAGS=-pthread
 -THRLIBS=-pthread
-+TFLAGS=-D_REENTRANT ${PTHREAD_CFLAGS}
-+THRLIBS=${PTHREAD_LIBS}
++TFLAGS=-D_REENTRANT
++THRLIBS=-lpthread
  SUFF=_r
  endif
  
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index 4e01080eff96..0ff89f68fa86 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -38,8 +38,7 @@ CONFIGURE_ARGS=	--with-system-editline \
 		--with-fbsbin=${PREFIX}/sbin \
 		--with-fbsecure-db=${LOCALSTATEDIR} \
 		--with-fbudf=${LIBEXECDIR}/UDF
-CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread"
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile
index f275dd4d38c0..c4f8be29c20a 100644
--- a/databases/lmdb/Makefile
+++ b/databases/lmdb/Makefile
@@ -14,7 +14,7 @@ COMMENT=	OpenLDAP Lightning Memory-Mapped Database
 CFLAGS+=	-DMDB_DSYNC=O_SYNC -Dfdatasync=fsync
 WRKSRC=		${WRKDIR}/mdb-mdb/libraries/liblmdb
 MAKE_ENV+=	CC="${CC}"
-MAKE_ENV+=	XCFLAGS="${CFLAGS} ${PTHREAD_LIBS}" prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
+MAKE_ENV+=	XCFLAGS="${CFLAGS} -lpthread" prefix="${PREFIX}" INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 MAKE_ENV+=	INSTALL_LIB="${INSTALL_LIB}" INSTALL_DATA="${INSTALL_DATA}" INSTALL_MAN="${INSTALL_MAN}"
 
 USE_LDCONFIG=	yes
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
index 2f02aa88d257..33c9f05610ea 100644
--- a/databases/mysql-q4m/Makefile
+++ b/databases/mysql-q4m/Makefile
@@ -20,7 +20,7 @@ USE_PERL5=	run
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -DDBUG_OFF
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--libdir="${PREFIX}/lib/mysql/plugin" \
 		--with-mysql="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)"
diff --git a/databases/mysql2odbc/Makefile b/databases/mysql2odbc/Makefile
index 3ca7ede3a789..ea095505d793 100644
--- a/databases/mysql2odbc/Makefile
+++ b/databases/mysql2odbc/Makefile
@@ -16,8 +16,7 @@ CONFIGURE_ARGS=	--with-unixodbc=${LOCALBASE}
 USES=		libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--libdir=${PREFIX}/mysql2odbc
-CPPFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 INSTALL_TARGET=	install-strip
 
 USE_LDCONFIG=	yes
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index 12e6b881a8ed..fde7df76e11d 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -14,8 +14,8 @@ LICENSE=	LGPL21
 
 USES=		gmake libtool readline
 
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS} -L${WRKSRC}/lib -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${WRKSRC}/lib -L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-backends="${CONFIGURE_MODULES}"
 
diff --git a/databases/oracle_odbc_driver/Makefile b/databases/oracle_odbc_driver/Makefile
index 18f84998ce71..5cfea8cef47a 100644
--- a/databases/oracle_odbc_driver/Makefile
+++ b/databases/oracle_odbc_driver/Makefile
@@ -27,7 +27,4 @@ CONFIGURE_ENV=	ORACLE_HOME="${ORACLE_HOME}" \
 LIBS+=		`${CAT} ${ORACLE_HOME}/lib/sysliblist`
 USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/-lclntst8 -lcompat -lpthread -lm/-lclntst8 -lcompat ${PTHREAD_LIBS} -lm/' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile
index ce0407fc2b65..4c7b2caaad97 100644
--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@@ -26,8 +26,7 @@ GNU_CONFIGURE=	yes
 USES=		gmake
 
 CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --enable-evdns
-CONFIGURE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
-		PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread"
 
 PGBOUNCER_USER?=	pgbouncer
 PGBOUNCER_GROUP?=	pgbouncer
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index c02c12caedf6..02cb8afb92dc 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -46,11 +46,9 @@ CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/include \
 		--enable-thread-safety
 CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		PTHREAD_LIBS="-lpthread" \
 		LDFLAGS_SL="${LDFLAGS_SL}"
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 
 PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
 
diff --git a/databases/postgresql90-contrib/Makefile b/databases/postgresql90-contrib/Makefile
index 92611266159a..9cca5ec1324d 100644
--- a/databases/postgresql90-contrib/Makefile
+++ b/databases/postgresql90-contrib/Makefile
@@ -21,7 +21,7 @@ INSTALL_DIRS=	contrib
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl
-LDFLAGS+=	${PTHREAD_LIBS} -L${PREFIX}/lib
+LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/contrib/README
diff --git a/databases/postgresql91-contrib/Makefile b/databases/postgresql91-contrib/Makefile
index 98e2ae013877..c85e76a29ee4 100644
--- a/databases/postgresql91-contrib/Makefile
+++ b/databases/postgresql91-contrib/Makefile
@@ -21,7 +21,7 @@ INSTALL_DIRS=	contrib
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl
-LDFLAGS+=	${PTHREAD_LIBS} -L${PREFIX}/lib
+LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 1a096b2c510c..da2613395366 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -47,11 +47,9 @@ CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/include \
 		--enable-thread-safety
 CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		PTHREAD_LIBS="-lpthread" \
 		LDFLAGS_SL="${LDFLAGS_SL}"
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 
 PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
 
diff --git a/databases/postgresql92-contrib/Makefile b/databases/postgresql92-contrib/Makefile
index 1047bf52b967..a90f71b3397a 100644
--- a/databases/postgresql92-contrib/Makefile
+++ b/databases/postgresql92-contrib/Makefile
@@ -21,7 +21,7 @@ INSTALL_DIRS=	contrib
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl
-LDFLAGS+=	${PTHREAD_LIBS} -L${PREFIX}/lib
+LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index db0eb3f479c3..b3747e07315c 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -47,11 +47,9 @@ CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
 		--with-includes=${PREFIX}/include \
 		--enable-thread-safety
 CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		PTHREAD_LIBS="-lpthread" \
 		LDFLAGS_SL="${LDFLAGS_SL}"
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 
 PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
 
diff --git a/databases/postgresql93-contrib/Makefile b/databases/postgresql93-contrib/Makefile
index 605edd19a521..403a664f8f1d 100644
--- a/databases/postgresql93-contrib/Makefile
+++ b/databases/postgresql93-contrib/Makefile
@@ -21,7 +21,7 @@ INSTALL_DIRS=	contrib
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --disable-nls
-LDFLAGS+=	${PTHREAD_LIBS} -L${PREFIX}/lib
+LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
diff --git a/databases/postgresql94-contrib/Makefile b/databases/postgresql94-contrib/Makefile
index 99da6574930f..7fa9b0e4575b 100644
--- a/databases/postgresql94-contrib/Makefile
+++ b/databases/postgresql94-contrib/Makefile
@@ -20,7 +20,7 @@ INSTALL_DIRS=	contrib
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
 CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --disable-nls --with-uuid=bsd
-LDFLAGS+=	${PTHREAD_LIBS} -L${PREFIX}/lib
+LDFLAGS+=	-lpthread -L${PREFIX}/lib
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile
index b1e77ac4e908..d13a66ede1e5 100644
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@@ -1,6 +1,5 @@
 # Created by: Kimura Fuyuki <fuyuki@nigredo.org>
 # $FreeBSD$
-#    $MCom: ports-stable/databases/qdbm/Makefile,v 1.6 2008/03/29 20:07:25 ahze Exp $
 
 PORTNAME=	qdbm
 PORTVERSION=	1.8.78
@@ -20,22 +19,21 @@ USES+=		iconv
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-iconv \
 		--enable-pthread
-CFLAGS+=	${PTHREAD_CFLAGS}
-CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 MAKE_ARGS=	RELCFLAGS="${CFLAGS}" \
 		MYDATADIR="${DOCSDIR}" MYDOCS="${PORTDOCS}"
 
 PORTDOCS=	ChangeLog NEWS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.in
 
 post-build:
-	cd ${WRKSRC}/lab; \
-	${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${ICONV_LIB}" fmtcnv031127
+	(cd ${WRKSRC}/lab && ${MAKE} CC="${CC}" CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${ICONV_LIB}" \
+		fmtcnv031127)
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lab/fmtcnv031127 ${STAGEDIR}${PREFIX}/bin
@@ -46,7 +44,6 @@ LIB_DEPENDS+=	libqdbm.so:${PORTSDIR}/databases/qdbm
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/java|${JAVA_HOME}|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 .if ${SLAVEPORT}=="ruby"
 	@${FIND} ${WRKSRC} -type f | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
diff --git a/databases/rdfdb/Makefile b/databases/rdfdb/Makefile
index bf8da50dcd1a..899435f54dae 100644
--- a/databases/rdfdb/Makefile
+++ b/databases/rdfdb/Makefile
@@ -21,7 +21,7 @@ WRKSRC=		${WRKDIR}/rdfdb
 USES=		gmake
 MAKEFILE=	makefile
 ALL_TARGET=
-CFLAGS+=	${PTHREAD_CFLAGS} -Wno-return-type
+CFLAGS+=	-Wno-return-type
 SUB_LIST+=	RDFDB_PORT="${RDFDB_PORT}" RDFDB_DIR="${RDFDB_DIR}"
 USE_RC_SUBR=	rdfdb-server
 
@@ -31,7 +31,6 @@ PLIST_FILES=	bin/rdfdb
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
-		-e 's,%%PTHREAD_LIBS%%,${PTHREAD_LIBS:S/"//g},g' \
 		-e 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},g'\
 		-e 's,%%BDB_LIB_NAME%%,${BDB_LIB_NAME},g' \
 		${WRKSRC}/makefile
diff --git a/databases/rdfdb/files/patch-makefile b/databases/rdfdb/files/patch-makefile
index 9c9e4931e03b..07e4bf890d89 100644
--- a/databases/rdfdb/files/patch-makefile
+++ b/databases/rdfdb/files/patch-makefile
@@ -9,7 +9,7 @@ $FreeBSD$
 -CPPFLAGS = $(INCLUDES) -L  /usr/local/BerkeleyDB.3.1/lib/
 +CC ?= gcc -g 
 +INCLUDES = -I %%BDB_INCLUDE_DIR%% -I expat/xmltok -I expat/xmlparse
-+LIBS     = -l%%BDB_LIB_NAME%% %%PTHREAD_LIBS%%
++LIBS     = -l%%BDB_LIB_NAME%% -lpthread
 +CPPFLAGS += ${CFLAGS} $(INCLUDES) -L  %%LOCALBASE%%/lib
  
  OBJS =  utils/hash.o \
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index b3320e40839f..8b389e40d1b1 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -48,7 +48,7 @@ USES+=		tcl:build
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo
+LDFLAGS+=	-L${LOCALBASE}/lib -lpthread -lm -lexecinfo
 
 CONFLICTS?=	redis-2.*
 
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 5b1305a22002..6de54c88e890 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -42,7 +42,7 @@ USES+=		tcl:build
 .endif
 
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lm -lexecinfo
+LDFLAGS+=	-L${LOCALBASE}/lib -lpthread -lm -lexecinfo
 
 CONFLICTS?=	redis-devel-2.*
 
diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile
index 8d490d9e9932..9a3fe1b181de 100644
--- a/databases/sqlclient/Makefile
+++ b/databases/sqlclient/Makefile
@@ -24,8 +24,7 @@ USES+=	pgsql
 USE_MYSQL=yes
 USE_SQLITE=yes
 
-CFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
+LDFLAGS+=	-lpthread
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DIR=${GNUSTEP_LOCAL_ROOT}
 DEFAULT_LIBVERSION=	1.5
 DEFAULT_LIBVERSION2=	1.5.0
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 3732da434b3c..eab7db77763e 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -65,7 +65,7 @@ post-patch:
 	@${ECHO} "" > ${WRKSRC}/freebsd.hints
 .endif
 .if ${PORT_OPTIONS:MTHREADS}
-	@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 ${PTHREAD_LIBS}\"" \
+	@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -lpthread\"" \
 		>> ${WRKSRC}/freebsd.hints
 .endif
 
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index 2331cd78ead4..12d305bf661d 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -125,7 +125,7 @@ STMT_CPPFLAGS=	-DSQLITE_ENABLE_STMT_SCANSTATUS=1
 EXTENSION_CONFIGURE_ENABLE=	dynamic-extensions
 
 THREADS_CONFIGURE_ENABLE=	threadsafe
-THREADS_LDFLAGS=	${PTHREAD_LIBS}
+THREADS_LDFLAGS=		-lpthread
 
 ICU_BUILD_DEPENDS=	${LOCALBASE}/bin/icu-config:${PORTSDIR}/devel/icu
 ICU_LIB_DEPENDS=	libicudata.so:${PORTSDIR}/devel/icu
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index 1e539b9ab769..3e6685b32c34 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	virtuoso
 PORTVERSION=	7.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}
@@ -38,7 +38,7 @@ CONFIGURE_ARGS=	--with-readline\
 		--with-layout=freebsd\
 		--datadir="${PREFIX}"\
 		--localstatedir="${PREFIX}"
-CPPFLAGS+=	-std=gnu89 ${IODBC_CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-std=gnu89 ${IODBC_CPPFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	PATH=${LOCALBASE}/bin:${PATH}\
 		ISQL=isql-vt
@@ -52,9 +52,7 @@ CHECK_PORT=	nc -z localhost $$\1 2>\&1
 OPTIONS_DEFINE=		IMAGEMAGICK KERBEROS LDAP IODBC
 
 post-patch:
-	${REINPLACE_CMD}\
-		-e 's,-lpthreads,${PTHREAD_LIBS},g'\
-		-e 's,-lruby,-lruby${RUBY_VER:S,.,,},g'\
+	${REINPLACE_CMD} -e 's,-lruby,-lruby${RUBY_VER:S,.,,},g'\
 			${WRKSRC}/configure
 	${FIND} ${WRKSRC} -name '*.sh' | ${XARGS} ${GREP} -l 'netstat -an.*grep LISTEN' |\
 	    ${XARGS} ${REINPLACE_CMD}\
@@ -63,7 +61,8 @@ post-patch:
 
 post-install:
 	${FIND} ${STAGEDIR} -name "*.ini" -exec ${MV} {} {}.sample \; -print
-	${RMDIR} ${STAGEDIR}/${PREFIX}/virtuoso/doc/html
+	${RMDIR} ${STAGEDIR}${PREFIX}/virtuoso/doc/html \
+		${STAGEDIR}${PREFIX}/lib/virtuoso/hosting
 
 check:
 	${SETENV} -u HOST ${MAKE_ENV} ${MAKE} -C ${WRKSRC} check