From 723cbd3b9d0bbe044741da8921368e6e3f3f6ecd Mon Sep 17 00:00:00 2001 From: tijl Date: Wed, 29 Jan 2014 20:24:49 +0000 Subject: - Add two new arguments to USES=iconv so ports can indicate they use GNU iconv extensions that the base system iconv doesn't support yet: * wchar_t: port uses the special WCHAR_T character conversion. * translit: port uses //TRANSLIT or //IGNORE conversion options. Adding one or both of these arguments makes the port depend on converters/libiconv for now. - Allow installation of converters/libiconv on FreeBSD 10+. - Use ICONV_CONFIGURE_ARG in devel/gettext instead of defining CPPFLAGS and LDFLAGS to fix compilation with libiconv installed. - Stage converters/libiconv and devel/gettext. Approved by: bapt (on trust) --- converters/libiconv/Makefile | 12 +----------- converters/libiconv/pkg-plist | 6 ++++++ 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'converters') diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 077126e0b99..319664619d6 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -11,25 +11,20 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= A character set conversion library GNU_CONFIGURE= yes -LIBTOOLFILES= configure libcharset/configure preload/configure CONFIGURE_ARGS= --enable-static \ --without-libintl-prefix \ --docdir=${DOCSDIR} -USE_LDCONFIG= yes CONFIGURE_ENV= gl_cv_cc_visibility="no" \ am_cv_func_iconv="yes" \ am_cv_proto_iconv_arg1="const" MAKE_JOBS_UNSAFE= yes - -MAN1= iconv.1 -MAN3= iconv.3 iconv_open.3 iconv_open_into.3 iconv_close.3 iconvctl.3 +USE_LDCONFIG= yes OPTIONS_DEFINE= ENCODINGS PATCHES OPTIONS_DEFAULT=ENCODINGS ENCODINGS_DESC= Include extra character sets PATCHES_DESC= Apply patches to fix CP932, add EUCJP-MS -NO_STAGE= yes .include .if ${PORT_OPTIONS:MENCODINGS} @@ -50,9 +45,4 @@ post-patch: ${WRKSRC}/libcharset/configure \ ${WRKSRC}/preload/configure -.if exists(/usr/include/iconv.h) -IGNORE= converters/libiconv should not be used with iconv from base. \ -Please fix the port which tries to use it -.endif - .include diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist index fc450fbc5b6..252f2fb756b 100644 --- a/converters/libiconv/pkg-plist +++ b/converters/libiconv/pkg-plist @@ -11,6 +11,12 @@ lib/libiconv.a lib/libiconv.la lib/libiconv.so lib/libiconv.so.3 +man/man1/iconv.1.gz +man/man3/iconv.3.gz +man/man3/iconv_open.3.gz +man/man3/iconv_open_into.3.gz +man/man3/iconv_close.3.gz +man/man3/iconvctl.3.gz %%DOCSDIR%%/iconv.1.html %%DOCSDIR%%/iconv.3.html %%DOCSDIR%%/iconv_close.3.html -- cgit