aboutsummaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2013-09-04 18:06:07 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2013-09-04 18:06:07 +0000
commit642be1b81d8342d3a3323f43bcf5a0bd87a5d363 (patch)
treef71b3671c7729b9cbc9368cea2f2fede7b20d5c8 /net-im
parentbcaced2c93b58d27ca266602f4049df6ba6becb3 (diff)
Notes
Diffstat (limited to 'net-im')
-rw-r--r--net-im/imspector/Makefile2
-rw-r--r--net-im/imspector/files/patch-Makefile2
-rw-r--r--net-im/libpurple/Makefile2
-rw-r--r--net-im/licq/Makefile2
-rw-r--r--net-im/ysm/Makefile2
5 files changed, 6 insertions, 4 deletions
diff --git a/net-im/imspector/Makefile b/net-im/imspector/Makefile
index b38fc17dff81..f29ffec506c8 100644
--- a/net-im/imspector/Makefile
+++ b/net-im/imspector/Makefile
@@ -43,6 +43,8 @@ post-patch:
${WRKSRC}/main.cpp
@${REINPLACE_CMD} -e 's,= SSLv23_method(),= (SSL_METHOD *) SSLv23_method(),g' \
${WRKSRC}/sslstate.cpp
+ @${REINPLACE_CMD} -e 's,%%ICONV_LIB%%,${ICONV_LIB},' \
+ ${WRKSRC}/Makefile
post-install:
.for f in ${CONFIG_FILES}
diff --git a/net-im/imspector/files/patch-Makefile b/net-im/imspector/files/patch-Makefile
index 729124b9212d..ebeed6bda015 100644
--- a/net-im/imspector/files/patch-Makefile
+++ b/net-im/imspector/files/patch-Makefile
@@ -42,7 +42,7 @@
$(CXX) msnprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)
icqprotocolplugin.so: icqprotocolplugin.o libimspector.so
- $(CXX) icqprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)
-+ $(CXX) icqprotocolplugin.o libimspector.so $(PLUGIN_FLAGS) -liconv -L${LOCALBASE}/lib
++ $(CXX) icqprotocolplugin.o libimspector.so $(PLUGIN_FLAGS) %%ICONV_LIB%% -L${LOCALBASE}/lib
yahooprotocolplugin.so: yahooprotocolplugin.o libimspector.so
$(CXX) yahooprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)
ircprotocolplugin.so: ircprotocolplugin.o libimspector.so
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index f489d61dc8e0..d52f08913b69 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -311,7 +311,7 @@ post-patch:
-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-e 's|-lpanel |-lpanel -lncurses|g' \
-e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g' \
- -e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} -liconv|' \
+ -e 's|-lsilc -lsilcclient ${PTHREAD_LIBS} $$LIBDL|-lsilc -lsilcclient ${PTHREAD_LIBS} ${ICONV_LIB}|' \
-e 's|TCL_VERSION found but 8.3 required|TCL_VERSION found but ${TCLTK_VER} required|g' \
-e 's|TCL_MINOR_VERSION" -ne 3|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}|' \
${WRKSRC}/configure
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index 91463b191f0b..8cfca054ac55 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
LICQ_PORT?= net-im/licq
# workaround for installed autoconf/automake
-LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv -Wl,--export-dynamic
+LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib ${ICONV_LIB} -Wl,--export-dynamic
CPPFLAGS+= -I${LOCALBASE}/include
CFLAGS+= -I${LOCALBASE}/include
CXXFLAGS+= -Wl,--export-dynamic
diff --git a/net-im/ysm/Makefile b/net-im/ysm/Makefile
index 838a50832095..65a78d0534b2 100644
--- a/net-im/ysm/Makefile
+++ b/net-im/ysm/Makefile
@@ -17,7 +17,7 @@ USES= iconv gmake
USE_BZIP2= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -liconv
+LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB}
MAN1= ysm.1
PLIST_FILES= bin/ysm