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 /archivers | |
| parent | 02239bfdfc92a832c32cc57d07d3a1a4b3fc4ad9 (diff) | |
| download | freebsd-ports-gnome-41290677b018da2819144b0188ac8bd1b91a88e4.tar.gz freebsd-ports-gnome-41290677b018da2819144b0188ac8bd1b91a88e4.tar.zst freebsd-ports-gnome-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 'archivers')
| -rw-r--r-- | archivers/rpm/Makefile | 2 | ||||
| -rw-r--r-- | archivers/unrar-iconv/Makefile | 2 | ||||
| -rw-r--r-- | archivers/unrar/Makefile | 2 | ||||
| -rw-r--r-- | archivers/unzip/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile index 55ef92fa0348..c90d5f841490 100644 --- a/archivers/rpm/Makefile +++ b/archivers/rpm/Makefile @@ -28,7 +28,7 @@ MAKE_ENV= OLD_PO_FILE_INPUT=1 USES+= gettext PLIST_SUB+= NLS="" CPPFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl -liconv" +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lintl ${ICONV_LIB}" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " diff --git a/archivers/unrar-iconv/Makefile b/archivers/unrar-iconv/Makefile index 7bcc102df9a5..01f765eb8c0c 100644 --- a/archivers/unrar-iconv/Makefile +++ b/archivers/unrar-iconv/Makefile @@ -14,7 +14,7 @@ MASTERDIR= ${.CURDIR}/../unrar EXTRA_PATCHES= ${.CURDIR}/files/patch-iconv CPPFLAGS+= -DWITH_ICONV -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -liconv +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} USES+= iconv CONFLICTS= unrar-[0-9]* zh-unrar-[0-9]* diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index 99af80b9e184..adcfcd2767d5 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -21,7 +21,7 @@ CONFLICTS?= zh-unrar-[0-9].* unrar-iconv-[0-9].* MAKE_ARGS= STRIP=${STRIP_CMD} MAKEFILE= makefile.unix -USES= gmake +USES+= gmake WRKSRC= ${WRKDIR}/${PORTNAME} PLIST_FILES= bin/unrar diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index 633cb9df6dbe..1f2bf539d373 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -48,7 +48,7 @@ PATCHFILES+= unzip60-alt-iconv-utf8.patch PATCH_DIST_STRIP+= -p1 USES= iconv CFLAGS+= -I${LOCALBASE}/include -DNATIVE -MAKE_ARGS+= LFLAGS1="-L${LOCALBASE}/lib -liconv" +MAKE_ARGS+= LFLAGS1="-L${LOCALBASE}/lib ${ICONV_LIB}" .endif MAKE_ENV= LOCAL_UNZIP="${LOCAL_UNZIP}" \ |