diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2013-09-04 18:06:07 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2013-09-04 18:06:07 +0000 |
| commit | 642be1b81d8342d3a3323f43bcf5a0bd87a5d363 (patch) | |
| tree | f71b3671c7729b9cbc9368cea2f2fede7b20d5c8 /net-im/imspector | |
| parent | Dancer plugin which provides an easy way implement ExtDirect APIs. (diff) | |
- Make ports use the libc provided iconv implementation on 10-CURRENT
after r254273
- Fix a bunch of ports to properly work after this
- Mark converters/libiconv as IGNORE for systems with iconv in libc
Reviewed by: bapt
Approved by: portmgr (bapt)
Discussed with: bapt, bsam (who both contributed ideas and code)
Notes
Notes:
svn path=/head/; revision=326307
Diffstat (limited to 'net-im/imspector')
| -rw-r--r-- | net-im/imspector/Makefile | 2 | ||||
| -rw-r--r-- | net-im/imspector/files/patch-Makefile | 2 |
2 files changed, 3 insertions, 1 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 |