diff options
| author | Alexander Nedotsukov <bland@FreeBSD.org> | 2003-10-14 07:04:51 +0000 |
|---|---|---|
| committer | Alexander Nedotsukov <bland@FreeBSD.org> | 2003-10-14 07:04:51 +0000 |
| commit | f63553817ac97144c006b6052b605222954c40d7 (patch) | |
| tree | bd42abc4d2d232b3cfe2288440e02fd67b3ccaa3 /converters/libiconv | |
| parent | Update to 2.4.1. (diff) | |
- Starting from FreeBSD 4.6 we have nl_langinfo(CODESET) supported. Therefore
we must map codeset name rather than locale name on recent systems.
- Use %%DOCSDIR%%
Notes
Notes:
svn path=/head/; revision=91137
Diffstat (limited to 'converters/libiconv')
| -rw-r--r-- | converters/libiconv/Makefile | 2 | ||||
| -rw-r--r-- | converters/libiconv/files/patch-libcharset::lib::config.charset | 36 | ||||
| -rw-r--r-- | converters/libiconv/pkg-plist | 10 |
3 files changed, 42 insertions, 6 deletions
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index a6376648915b..d4266c06c8b3 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -7,7 +7,7 @@ PORTNAME= libiconv PORTVERSION= 1.9.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= converters devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/converters/libiconv/files/patch-libcharset::lib::config.charset b/converters/libiconv/files/patch-libcharset::lib::config.charset new file mode 100644 index 000000000000..f8a0de94984d --- /dev/null +++ b/converters/libiconv/files/patch-libcharset::lib::config.charset @@ -0,0 +1,36 @@ +--- libcharset/lib/config.charset.orig Thu Jan 30 03:43:59 2003 ++++ libcharset/lib/config.charset Tue Oct 14 15:20:56 2003 +@@ -246,8 +246,8 @@ + #echo "sun_eu_greek ?" # what is this? + echo "UTF-8 UTF-8" + ;; +- freebsd* | os2*) +- # FreeBSD 4.2 doesn't have nl_langinfo(CODESET); therefore ++ freebsd4.[0-5] | os2*) ++ # FreeBSD up to 4.6 doesn't have nl_langinfo(CODESET); therefore + # localcharset.c falls back to using the full locale name + # from the environment variables. + # Likewise for OS/2. OS/2 has XFree86 just like FreeBSD. Just +@@ -282,6 +282,22 @@ + echo "ja_JP.SJIS SHIFT_JIS" + echo "ja_JP.Shift_JIS SHIFT_JIS" + echo "ko_KR.EUC EUC-KR" ++ ;; ++ freebsd*) ++ echo "US-ASCII ASCII" ++ echo "ISO8859-1 ISO-8859-1" ++ echo "ISO8859-2 ISO-8859-2" ++ echo "ISO8859-4 ISO-8859-4" ++ echo "ISO8859-5 ISO-8859-5" ++ echo "ISO8859-7 ISO-8859-7" ++ echo "ISO8859-9 ISO-8859-9" ++ echo "ISO8859-13 ISO-8859-13" ++ echo "ISO8859-15 ISO-8859-15" ++ echo "eucCN GB2312" ++ echo "eucJP EUC-JP" ++ echo "eucKR EUC-KR" ++ echo "Big5 BIG5" ++ echo "SJIS SHIFT_JIS" + ;; + netbsd*) + echo "646 ASCII" diff --git a/converters/libiconv/pkg-plist b/converters/libiconv/pkg-plist index d17aade6e30b..b2d589c71c79 100644 --- a/converters/libiconv/pkg-plist +++ b/converters/libiconv/pkg-plist @@ -9,8 +9,8 @@ lib/libiconv.a lib/libiconv.so lib/libiconv.so.3 libdata/charset.alias -share/doc/libiconv/iconv.1.html -share/doc/libiconv/iconv.3.html -share/doc/libiconv/iconv_close.3.html -share/doc/libiconv/iconv_open.3.html -@dirrm share/doc/libiconv +%%DOCSDIR%%/iconv.1.html +%%DOCSDIR%%/iconv.3.html +%%DOCSDIR%%/iconv_close.3.html +%%DOCSDIR%%/iconv_open.3.html +@dirrm %%DOCSDIR%% |