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 /databases/freetds-devel | |
| 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 'databases/freetds-devel')
| -rw-r--r-- | databases/freetds-devel/Makefile | 3 | ||||
| -rw-r--r-- | databases/freetds-devel/files/patch-src-tds-Makefile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index 1e1c296f1f30..2ddae76ea491 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -93,7 +93,8 @@ post-patch: s|/freetds.conf|/freetds.conf.dist|g ; \ s|/locales.conf|/locales.conf.dist|g ; \ s|/pool.conf|/pool.conf.dist|g ; \ - s| common.h||g' + s| common.h||g ; \ + s|%%ICONV_LIB%%|${ICONV_LIB}|' post-install: .if !defined(NOPORTDOCS) diff --git a/databases/freetds-devel/files/patch-src-tds-Makefile b/databases/freetds-devel/files/patch-src-tds-Makefile index f38068974a2d..f0789382c90c 100644 --- a/databases/freetds-devel/files/patch-src-tds-Makefile +++ b/databases/freetds-devel/files/patch-src-tds-Makefile @@ -5,7 +5,7 @@ LIBICONV = @LIBICONV@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -+LIBS = @LIBS@ -liconv ++LIBS = @LIBS@ %%ICONV_LIB%% LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ |