diff options
| author | John Marino <marino@FreeBSD.org> | 2015-03-24 18:19:23 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2015-03-24 18:19:23 +0000 |
| commit | b2053786ce53da051a1e5756f7cbe55aa50180dc (patch) | |
| tree | d22ee47f309af4f98bfeb96fd87674677e46b434 /net-im | |
| parent | 266f7e411b0de527c9763fb14af2aa0e226051cc (diff) | |
| download | ports-b2053786ce53da051a1e5756f7cbe55aa50180dc.tar.gz ports-b2053786ce53da051a1e5756f7cbe55aa50180dc.zip | |
4 ports categories: Remove $PTHREAD_LIBS
Categories: www, ftp, net-im, net-mgmt
approved by: PTHREAD blanket
Notes
Notes:
svn path=/head/; revision=382150
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/freetalk/Makefile | 2 | ||||
| -rw-r--r-- | net-im/libpurple/Makefile | 5 | ||||
| -rw-r--r-- | net-im/licq/Makefile | 2 | ||||
| -rw-r--r-- | net-im/pidgin-skype/Makefile | 4 | ||||
| -rw-r--r-- | net-im/telepathy-salut/Makefile | 3 |
5 files changed, 7 insertions, 9 deletions
diff --git a/net-im/freetalk/Makefile b/net-im/freetalk/Makefile index 4a2c30e423f0..e709aac5f1f7 100644 --- a/net-im/freetalk/Makefile +++ b/net-im/freetalk/Makefile @@ -21,7 +21,7 @@ USES= pkgconfig USE_GNOME= glib20 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} +LDFLAGS+= -lpthread -L${LOCALBASE}/lib OPTIONS_SUB= yes diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index 56d7a46343d5..2def4cb4c144 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -317,9 +317,8 @@ pre-everything:: post-patch: @${REINPLACE_CMD} \ - -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \ - -e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} ${ICONV_LIB}|' \ - ${WRKSRC}/configure + -e 's|-lpthread $$LIBDL|-lpthread ${ICONV_LIB}|' \ + ${WRKSRC}/configure .if defined(PIDGIN_SLAVE) @${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|' diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index 646cf55bc987..4dba02d02883 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME} LICQ_PORT?= net-im/licq # workaround for installed autoconf/automake -LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib ${ICONV_LIB} -Wl,--export-dynamic +LDFLAGS+= -lpthread -L${LOCALBASE}/lib ${ICONV_LIB} -Wl,--export-dynamic CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -Wl,--export-dynamic -DGTEST_USE_OWN_TR1_TUPLE diff --git a/net-im/pidgin-skype/Makefile b/net-im/pidgin-skype/Makefile index acc5d471d1bb..0d65c0da5b36 100644 --- a/net-im/pidgin-skype/Makefile +++ b/net-im/pidgin-skype/Makefile @@ -33,14 +33,14 @@ ${DISTFILES}: upload-tarball: build-tarball scp ${DISTFILES} freefall.freebsd.org:public_distfiles/ -mycflags= -shared -fPIC -DPIC ${PTHREAD_CFLAGS} \ +mycflags= -shared -fPIC -DPIC \ -I${LOCALBASE}/include \ -I${LOCALBASE}/include/libpurple \ -I${LOCALBASE}/include/pidgin \ -I${LOCALBASE}/include/glib-2.0 \ -I${LOCALBASE}/lib/glib-2.0/include \ -DPURPLE_PLUGINS -mylibs= ${PTHREAD_LIBS} +mylibs= -lpthread # DBUS: No DBUS here, does not work with Skype 2.1 beta # NLS: While the build works and enables translations, diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile index 96b960acb5c6..07b29bad014a 100644 --- a/net-im/telepathy-salut/Makefile +++ b/net-im/telepathy-salut/Makefile @@ -21,8 +21,7 @@ USE_GNOME= glib20 libxslt:build USE_OPENSSL= yes USE_SQLITE= 3 CONFIGURE_ARGS= --disable-Werror --enable-avahi-tests=no -CPPFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= ${PTHREAD_LIBS} +LDFLAGS+= -lpthread INSTALL_TARGET= install-strip PLIST_SUB+= VERSION=${PORTVERSION} |