From owner-svn-ports-all@FreeBSD.ORG Wed Mar 25 09:34:04 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E566623C; Wed, 25 Mar 2015 09:34:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD9A7F48; Wed, 25 Mar 2015 09:34:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2P9Y4WF057601; Wed, 25 Mar 2015 09:34:04 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2P9XruC057499; Wed, 25 Mar 2015 09:33:53 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201503250933.t2P9XruC057499@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Wed, 25 Mar 2015 09:33:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382201 - in head/databases: animenfo-client-gtk beansdb dbconnect fastdb fastdb/files firebird25-server lmdb mysql-q4m mysql2odbc opendbx oracle_odbc_driver pgbouncer postgresql84-serv... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Mar 2015 09:34:05 -0000 Author: marino Date: Wed Mar 25 09:33:52 2015 New Revision: 382201 URL: https://svnweb.freebsd.org/changeset/ports/382201 QAT: https://qat.redports.org/buildarchive/r382201/ Log: databases category: Remove $PTHREAD_LIBS Note: virtuoso did not pass check-plist from before, so it was fixed. approved by: PTHREAD blanket Modified: head/databases/animenfo-client-gtk/Makefile head/databases/beansdb/Makefile head/databases/dbconnect/Makefile head/databases/fastdb/Makefile head/databases/fastdb/files/patch-makefile head/databases/firebird25-server/Makefile head/databases/lmdb/Makefile head/databases/mysql-q4m/Makefile head/databases/mysql2odbc/Makefile head/databases/opendbx/Makefile head/databases/oracle_odbc_driver/Makefile head/databases/pgbouncer/Makefile head/databases/postgresql84-server/Makefile head/databases/postgresql90-contrib/Makefile head/databases/postgresql91-contrib/Makefile head/databases/postgresql91-server/Makefile head/databases/postgresql92-contrib/Makefile head/databases/postgresql92-server/Makefile head/databases/postgresql93-contrib/Makefile head/databases/postgresql94-contrib/Makefile head/databases/qdbm/Makefile head/databases/rdfdb/Makefile head/databases/rdfdb/files/patch-makefile head/databases/redis-devel/Makefile head/databases/redis/Makefile head/databases/sqlclient/Makefile head/databases/sqlite2/Makefile head/databases/sqlite3/Makefile head/databases/virtuoso/Makefile Modified: head/databases/animenfo-client-gtk/Makefile ============================================================================== --- head/databases/animenfo-client-gtk/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/animenfo-client-gtk/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/beansdb/Makefile ============================================================================== --- head/databases/beansdb/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/beansdb/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -11,7 +11,7 @@ COMMENT= Yet another distributed key-val GNU_CONFIGURE= yes USE_CSTD= gnu89 -CFLAGS+= ${PTHREAD_LIBS} +CFLAGS+= -lpthread PLIST_FILES= bin/beansdb \ man/man1/beansdb.1.gz Modified: head/databases/dbconnect/Makefile ============================================================================== --- head/databases/dbconnect/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/dbconnect/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/fastdb/Makefile ============================================================================== --- head/databases/fastdb/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/fastdb/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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} Modified: head/databases/fastdb/files/patch-makefile ============================================================================== --- head/databases/fastdb/files/patch-makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/fastdb/files/patch-makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/firebird25-server/Makefile ============================================================================== --- head/databases/firebird25-server/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/firebird25-server/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/lmdb/Makefile ============================================================================== --- head/databases/lmdb/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/lmdb/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -14,7 +14,7 @@ COMMENT= OpenLDAP Lightning Memory-Mappe 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 Modified: head/databases/mysql-q4m/Makefile ============================================================================== --- head/databases/mysql-q4m/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/mysql-q4m/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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)" Modified: head/databases/mysql2odbc/Makefile ============================================================================== --- head/databases/mysql2odbc/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/mysql2odbc/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -16,8 +16,7 @@ CONFIGURE_ARGS= --with-unixodbc=${LOCALB 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 Modified: head/databases/opendbx/Makefile ============================================================================== --- head/databases/opendbx/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/opendbx/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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}" Modified: head/databases/oracle_odbc_driver/Makefile ============================================================================== --- head/databases/oracle_odbc_driver/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/oracle_odbc_driver/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -27,7 +27,4 @@ CONFIGURE_ENV= ORACLE_HOME="${ORACLE_HOM 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 Modified: head/databases/pgbouncer/Makefile ============================================================================== --- head/databases/pgbouncer/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/pgbouncer/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/postgresql84-server/Makefile ============================================================================== --- head/databases/postgresql84-server/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/postgresql84-server/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -46,11 +46,9 @@ CONFIGURE_ARGS+=--with-libraries=${PREFI --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} Modified: head/databases/postgresql90-contrib/Makefile ============================================================================== --- head/databases/postgresql90-contrib/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/postgresql90-contrib/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/postgresql91-contrib/Makefile ============================================================================== --- head/databases/postgresql91-contrib/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/postgresql91-contrib/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/postgresql91-server/Makefile ============================================================================== --- head/databases/postgresql91-server/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/postgresql91-server/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -47,11 +47,9 @@ CONFIGURE_ARGS+=--with-libraries=${PREFI --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} Modified: head/databases/postgresql92-contrib/Makefile ============================================================================== --- head/databases/postgresql92-contrib/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/postgresql92-contrib/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/postgresql92-server/Makefile ============================================================================== --- head/databases/postgresql92-server/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/postgresql92-server/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -47,11 +47,9 @@ CONFIGURE_ARGS+=--with-libraries=${PREFI --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} Modified: head/databases/postgresql93-contrib/Makefile ============================================================================== --- head/databases/postgresql93-contrib/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/postgresql93-contrib/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/postgresql94-contrib/Makefile ============================================================================== --- head/databases/postgresql94-contrib/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/postgresql94-contrib/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/qdbm/Makefile ============================================================================== --- head/databases/qdbm/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/qdbm/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -1,6 +1,5 @@ # Created by: Kimura Fuyuki # $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}/dat 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 \ Modified: head/databases/rdfdb/Makefile ============================================================================== --- head/databases/rdfdb/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/rdfdb/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/rdfdb/files/patch-makefile ============================================================================== --- head/databases/rdfdb/files/patch-makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/rdfdb/files/patch-makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 \ Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/redis-devel/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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.* Modified: head/databases/redis/Makefile ============================================================================== --- head/databases/redis/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/redis/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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.* Modified: head/databases/sqlclient/Makefile ============================================================================== --- head/databases/sqlclient/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/sqlclient/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/sqlite2/Makefile ============================================================================== --- head/databases/sqlite2/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/sqlite2/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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 Modified: head/databases/sqlite3/Makefile ============================================================================== --- head/databases/sqlite3/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/sqlite3/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -125,7 +125,7 @@ STMT_CPPFLAGS= -DSQLITE_ENABLE_STMT_SCAN 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 Modified: head/databases/virtuoso/Makefile ============================================================================== --- head/databases/virtuoso/Makefile Wed Mar 25 08:30:27 2015 (r382200) +++ head/databases/virtuoso/Makefile Wed Mar 25 09:33:52 2015 (r382201) @@ -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