diff options
| author | madpilot <madpilot@FreeBSD.org> | 2013-09-05 02:06:07 +0800 |
|---|---|---|
| committer | madpilot <madpilot@FreeBSD.org> | 2013-09-05 02:06:07 +0800 |
| commit | 41290677b018da2819144b0188ac8bd1b91a88e4 (patch) | |
| tree | f71b3671c7729b9cbc9368cea2f2fede7b20d5c8 /editors | |
| parent | 02239bfdfc92a832c32cc57d07d3a1a4b3fc4ad9 (diff) | |
| download | freebsd-ports-graphics-41290677b018da2819144b0188ac8bd1b91a88e4.tar.gz freebsd-ports-graphics-41290677b018da2819144b0188ac8bd1b91a88e4.tar.zst freebsd-ports-graphics-41290677b018da2819144b0188ac8bd1b91a88e4.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)
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/joe/Makefile | 2 | ||||
| -rw-r--r-- | editors/joe2/Makefile | 2 | ||||
| -rw-r--r-- | editors/texmacs/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/editors/joe/Makefile b/editors/joe/Makefile index e44535aa14a..6fdd2554998 100644 --- a/editors/joe/Makefile +++ b/editors/joe/Makefile @@ -20,7 +20,7 @@ LICENSE= GPLv1 USE_GMAKE= yes USES= iconv ncurses GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include ALL_TARGET= ${PORTNAME} diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile index 9bcf0014a4d..756b339c55d 100644 --- a/editors/joe2/Makefile +++ b/editors/joe2/Makefile @@ -21,7 +21,7 @@ CONFLICTS= joe-3* GNU_CONFIGURE= yes USE_GMAKE= yes USES= iconv -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -liconv" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib ${ICONV_LIB}" CPPFLAGS+= -I${LOCALBASE}/include ALL_TARGET= ${PORTNAME} diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile index 39ccee3c36e..7c04bb05c72 100644 --- a/editors/texmacs/Makefile +++ b/editors/texmacs/Makefile @@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --without-gs .if ${PORT_OPTIONS:MICONV} USES+= iconv -CONFIGURE_ARGS+= --with-iconv="${LOCALBASE}" +CONFIGURE_ARGS+= --with-iconv .else CONFIGURE_ARGS+= --without-iconv .endif |