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 /textproc/odt2txt | |
| 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 'textproc/odt2txt')
| -rw-r--r-- | textproc/odt2txt/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/textproc/odt2txt/Makefile b/textproc/odt2txt/Makefile index f18dac99c4d1..76d4a54bce1c 100644 --- a/textproc/odt2txt/Makefile +++ b/textproc/odt2txt/Makefile @@ -27,7 +27,8 @@ PLIST_FILES= bin/odt2txt MAN1= odt2txt.1 post-patch: - ${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' \ + -e 's#-liconv#${ICONV_LIB}#' ${WRKSRC}/Makefile do-install: ${INSTALL_PROGRAM} ${WRKSRC}/odt2txt ${PREFIX}/bin/odt2txt |