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 /deskutils/fbreader | |
| parent | bcaced2c93b58d27ca266602f4049df6ba6becb3 (diff) | |
| download | ports-642be1b81d8342d3a3323f43bcf5a0bd87a5d363.tar.gz ports-642be1b81d8342d3a3323f43bcf5a0bd87a5d363.zip | |
- 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 'deskutils/fbreader')
| -rw-r--r-- | deskutils/fbreader/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile index 8bc1729774c6..664f7ef1075e 100644 --- a/deskutils/fbreader/Makefile +++ b/deskutils/fbreader/Makefile @@ -56,7 +56,7 @@ post-patch: @${REINPLACE_CMD} -e '/^CFLAGS/s,-pipe.*$$,${CFLAGS} -DDO_ICONV_CAST -DLIBICONV_PLUG,' \ -e '/^CC/d;/^LD/d;/QTINCLUDE/s,-I.*$$,-I${QT_INCDIR},;s,libpng ,libpng15 ,' \ ${WRKSRC}/makefiles/arch/desktop.mk - @${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,-liconv,' \ + @${REINPLACE_CMD} -e 's,-O3,,;s,-ldl,${ICONV_LIB},' \ ${WRKSRC}/makefiles/config.mk ${WRKSRC}/zlibrary/core/Makefile @${REINPLACE_CMD} -e 's,/usr,${PREFIX},' ${WRKSRC}/fbreader/desktop/Makefile @${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} \ |