Commit graph

42 commits

Author SHA1 Message Date
Tijl Coosemans
8814b01d9e Define ICONV_GET_ILSEQ_INVALID and ICONV_SET_ILSEQ_INVALID when mimicking
base system iconv.h.
2017-09-25 20:55:27 +00:00
Tijl Coosemans
3a55a118dd Remove iconv(), iconv_open() and iconv_close() symbols from libiconv.
These were FreeBSD specific aliases for libiconv(), libiconv_open() and
libiconv_close() that are now also provided by libc which complicates
writing configure tests that work correctly when both libc iconv and
libiconv are available.

Also, because the libiconv iconv.h header redefines iconv* to libiconv*
correct use of the header implies that the aliases aren't used.

The following ports needed fixes because there was something wrong with
the way they tried to detect or use iconv:

audio/deadbeef: Remove LIBICONV_PLUG from a source file.  It's a
compile-time option and should not be set in source code.
comms/hidapi: Use standard AM_ICONV configure macro to look for iconv.
deskutils/fbreader: Let ports framework deal with LIBICONV_PLUG.
deskutils/ljclive: Override configure test for iconv.
deskutils/owncloudclient: Add USES=iconv and patch test for iconv.
devel/aegis: Bump PORTREVISION because it no longer uses libiconv.
devel/libexplain: Add USES=iconv and override test for iconv.
devel/sdl20: Override configure test for iconv.
emulators/vmw: Replace OSVERSION checks with ICONV_LIB checks and include
<iconv.h> instead of <sys/iconv.h>.
irc/scrollz: Override configure test for iconv.
japanese/chasen-base: Override configure test for iconv and patch
configure so it no longer adds -liconv to linker flags just because it
happens to be installed.
japanses/eb: Patch configure test for iconv.
japanses/eblook: Override configure test for iconv.
java/jikes: Override configure test for iconv.
multimedia/transcode: Bump PORTREVISION because only one plugin links with
libiconv now.
net/c3270: Override configure test for iconv.
net/samba4*: Bump PORTREVISION because it no longer uses libiconv.  The
configure script will always add -liconv to the linker flags when it
happens to be installed which would be wrong but later on binaries are
linked with -Wl,--as-needed and the linker discards -liconv because it
finds iconv*() functions in libc now and no longer in libiconv.
net-mgmt/icinga-*: Remove dependency on iconv.
net-mgmt/netxms: Patch configure so it no longer adds -liconv to linker
flags just because it happens to be installed.
net/asterisk11: Patch configure so it no longer adds -liconv to linker
flags just because it happens to be installed.
net-p2p/transmission-*: Override configure test for iconv.
www/htmlcxx: Override configure test for iconv.
www/httrack: Override configure test for iconv.
www/xapian-omega: Override configure test for iconv.
x11/mrxvt(-devel): Add USES=iconv and override configure test for iconv.
x11/x3270: Override configure test for iconv.
x11-wm/jwm: Override configure test for iconv.

PR:		202838
Exp-run by:	antoine
Approved by:	portmgr (antoine)
2015-10-10 14:03:00 +00:00
Tijl Coosemans
131a6f5b8d Hide _LIBICONV_VERSION when LIBICONV_PLUG is defined.
This fixes building devel/gettext-runtime with gcc from lang/gcc*.
With base system compiler gettext includes /usr/include/iconv.h but
lang/gcc* implies -I/usr/local/include and gettext calls
libiconv_set_relocation_prefix when it sees _LIBICONV_VERSION which
isn't implemented (and isn't needed) by libc iconv.

Reported by:	Dewayne Geraghty <dewayne.geraghty@heuristicsystems.com.au>
2015-04-16 10:57:57 +00:00
Tijl Coosemans
074ea5282a converters/libiconv:
- Remove const qualifier from iconv(3) to match POSIX:
  http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html
- Patch iconv.h to expose more GNU extensions when LIBICONV_PLUG is
  defined because the base system iconv supports these extensions too.

Add/remove patches to/from ports to call iconv with non-const arguments.

This breaks some ports on FreeBSD 10 because base system iconv.h still has
the const qualifier.  Fix this by letting USES=iconv add a build dependency
on converters/libiconv so ports can use its iconv.h (with LIBICONV_PLUG
defined) instead of the base system iconv.h.

This exposed some ports that link with libiconv when it is available instead
of using libc iconv.  In these cases one of the following changes has been
made:
- patch configure scripts to test for libc iconv first
- add ac_cv_lib_iconv_libiconv=no or similar to CONFIGURE_ARGS to disable
  some configure tests
- converters/wkhtmltopdf: this includes Qt4 so add a patch from devel/qt4
- lang/gcc5-aux: respect CFLAGS and friends during configure such that
  LIBICONV_PLUG is defined in the iconv test, also switch to external
  gettext
- mail/gnarwl: replace patches with CPPFLAGS/LIBS
- multimedia/ffmpeg2theora: remove iconv test from SConstruct and use
  ICONV_LIB in port Makefile instead, also fix a bug in subtitles.c
- net-im/licq: finish conversion to cmake
- net-mgmt/bandwidthd, net-mgmt/icinga, net-mgmt/nagios, net-mgmt/nagios4:
  don't need iconv
- textproc/p5-XML-TinyXML: finish conversion to USES=perl5

Other changes:
- databases/qdbm and slaves: respect CFLAGS and friends, also enable bzip2
  and lzo support
- games/ldmud: respect CFLAGS and friends
- graphics/inventor: replace some patches with MAKE_ARGS/MAKE_ENV to respect
  CFLAGS and friends, also remove FreeBSD/alpha patch and add missing xorg
  dependencies

PR:		199099
Exp-run by:	antoine
Approved by:	portmgr (antoine)
2015-04-15 08:20:27 +00:00
Tijl Coosemans
37442dc141 Restore a patch hunk that was removed in r373636. It fixes a reference
to the stage directory in an installed binary.

Reported by:	antoine
2014-11-30 11:04:02 +00:00
Tijl Coosemans
edb7229dd4 Split devel/gettext in devel/gettext-runtime and devel/gettext-tools. The
first contains runtime libraries such as libintl and the latter contains
developer tools such as msgfmt.  Ports that use gettext will usually need
a LIB_DEPENDS on gettext-runtime and a BUILD_DEPENDS on gettext-tools.

USES=gettext-runtime can be used to set a LIB/BUILD/RUN_DEPENDS on
devel/gettext-runtime and USES=gettext-tools can be used to set a
BUILD/RUN_DEPENDS on devel/gettext-tools.  USES=gettext is now the same
as "USES=gettext-runtime gettext-tools" meaning a LIB_DEPENDS on
devel/gettext-runtime and a BUILD_DEPENDS on devel/gettext-tools.

Update gettext to 0.19.3.

Remove :oldver from converters/libiconv and devel/gettext-runtime.  Leave
symlinks with the old library versions to avoid the need to bump
PORTREVISION on a large number of dependent ports.  When most of the
dependent ports have had normal version updates, PORTREVISION can be
bumped on the remaining ones (low number) and the links can be removed.

Fix some ports that installed files in lib/locale instead of share/locale.

PR:		194038
Reviewed by:	bapt
Exp-run:	antoine
Approved by:	portmgr (antoine)
2014-11-29 18:22:32 +00:00
Adam Weinberger
08a006d08a Rename all patches that contain '::' as a path separator, and use
'__' instead.
2014-07-29 17:12:47 +00:00
Tijl Coosemans
96557119e2 - Remove indefinite article from COMMENT.
- Enable -fvisibility=hidden.
- Add USE_CSTD=gnu89 to fix compilation with -O0 and -Oz.
- Add DOCS option.

PR:		ports/186846
Approved by:	kwm, marcus
2014-03-23 13:26:20 +00:00
Koop Mast
1042a771aa Remove extra blank line to please portlint.
Don't let the port chmod 777 ${WRKSRC}/src to prevent possible security issue.

Submitted by:	tijl@ (priv mail)
2013-07-06 17:45:15 +00:00
Koop Mast
58357934c6 Remove USE_AUTOTOOLS=libtool. This was added in r183830 because the bundled
libtool at the time didn't handle the removal of objformat correctly.
Also revert r239611. This revision was because the libtool port and the bundled
 libtool at the time detect "clang" as a valid C compiler.

PR:		ports/179753
Submitted by:	tijl@
2013-07-06 13:29:54 +00:00
Baptiste Daroussin
e7b0f97788 Fix a long standing bug of lib/charset.alias being overwritten, modified, and badly tracked by ports.
Make lib/charset.alias a file only provided by converters/libiconv
Create a new USES: charsetfix, that will modify in post patch the Makefile.in to prevent a port from modifying/overwritting the charset.alias file during make install.
Prevent devel/gettext from installing that files.
Fix a couple of ports that actually touch charset.alias during the build phase.

Based on a patch by ale (http://lists.freebsd.org/pipermail/freebsd-gnome/2012-October/027747.html)

Approved by:	kwm (gnome)
Exp-run by:	miwi
2013-03-18 11:40:04 +00:00
Koop Mast
bdfc30342b Update to 1.14.
Disable EXTRA_PATCHES since there isn't a new version of this patch for 1.14.

Ports exp-run done by linimon@

PR:		ports/165514
Submitted by:	myself
2012-04-21 19:00:29 +00:00
Joe Marcus Clarke
cb5830acfc Fix building C++ code that uses libiconv.
PR:		165348
Submitted by:	Pedro Giffuni <giffunip@tutopia.com>
2012-03-04 23:56:55 +00:00
Alexander Nedotsukov
b6036e9eea Apply patch from the upstream to prevent endless loop triggered by
incomplete UTF-8 sequence.

PR:	143575
2010-02-06 00:55:44 +00:00
Joe Marcus Clarke
2d2eff3b88 Fix with build with llvm/clang.
Submitted by:	Ryan Flynn <parseerror@gmail.com>
2009-08-15 18:07:49 +00:00
Joe Marcus Clarke
0d84bd350a Update to 1.13.1. 2009-07-04 23:49:16 +00:00
Joe Marcus Clarke
81c1e0b7ba Update to 1.13. Note: the iconv(1) utility is now licensed under GPLv3.
The library is still licensed under the LGPL.

PR:		131769
Submitted by:	Takeshi Taguchi <taguchi@iij.ad.jp> (based on)
2009-06-15 03:51:57 +00:00
Joe Marcus Clarke
4acc6fb2a4 Presenting GNOME 2.20.1 and all related works for FreeBSD. The official
GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338
2007-10-24 23:37:25 +00:00
Alexander Nedotsukov
08f2315789 Update to 1.9.2 2004-07-09 19:14:39 +00:00
Alexander Nedotsukov
6ad632c9a7 Add depricated charset names to mapping. They still required by older
4.x systems.

Reminded by: marcus
2003-10-14 08:00:14 +00:00
Alexander Nedotsukov
f63553817a - 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%%
2003-10-14 07:04:51 +00:00
Joe Marcus Clarke
6f09620e86 Don't try to install files to ${PREFIX} during the build.
Reported by:	Andrew J Caines <A.J.Caines@halplant.com>
2003-06-13 06:37:08 +00:00
Joe Marcus Clarke
c24a4bb0fc Update to 1.9.1.
PR:	52893
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
2003-06-11 17:48:42 +00:00
Alfred Perlstein
00bd16ebb7 A letter got chopped from this patchfile and caused the port
to be unable to patch.  fix it.
2002-10-28 06:03:01 +00:00
Joe Marcus Clarke
a8c0e60295 Do not create a ${PREFIX}/doc directory. Also, consolidate two patches
that modify the same file into one.

Submitted by:	bento and kris
2002-10-28 03:14:04 +00:00
Joe Marcus Clarke
b8c5a741af Update to 1.8, and retain shared lib version of 3.
Reviewed by:	sobomax
2002-06-16 19:11:11 +00:00
Joe Marcus Clarke
fade97cdc1 * Add support for Korean real-world locales
* Allow libiconv to be built on FreeBSD < 4.3
* Bump PORTREVISION

PR:		37271
Submitted by:	Hye-Shik Chang <perky@fallin.lv> (Korean locale patch)
		me (build fix)
Reviewed by:	sobomax (build fix)
2002-05-23 05:57:20 +00:00
Joe Marcus Clarke
b2c94fed6e Allow libiconv to be built by a non-root user.
PR:		36810
Submitted by:	KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp>
2002-05-14 19:28:45 +00:00
Maxim Sobolev
0e76376aa1 Use USE_LIBTOOL. 2002-04-30 08:07:33 +00:00
Joe Marcus Clarke
57cb6f4b09 Actually add the new patches from the last commit.... 2002-04-29 18:42:33 +00:00
Joe Marcus Clarke
a7bce67707 Fix a few problems in libiconv.
* Allow libcharset to find charset.alias in the correct place
* Add support for the new FreeBSD locales
* Fix potential infinite loop when conversion fails
* Bump PORTREVISION

PR:		37543, 37497
Submitted by:	Fuyuhiko Maruyama <fuyuhik8@is.titech.ac.jp> (infinite loop
		fix) marcus (everything else)
Reviewed by:	nork (infinite loop fix), sobomax
Approved by:	sobomax
2002-04-29 18:41:51 +00:00
Maxim Sobolev
0b31d075bc Iconv cleanup, stage 1a: remove `g' prefix from binaries, headers, libraries and
manpages installed by libiconv (aka GNU iconv) and add similar `b'-prefixes
into components installed by iconv (aka BSD iconv). The reason why we do this
is because unfortunately BSD iconv become abadonware (author doesn't maintain
it anymore), while number of ports that need functional iconv library grows
very fast, thus creating significant overhead due to patches needed to make
ports working with prefixed GNU iconv. For compatibility reasons create
symlinks in GNU iconv, so that all ports that expect GNU iconv to have `g'
prefix should work unmodified until all those `g'-hacks are wiped out.

Prompted by:			ache
Reviewed by (in principle):	freebsd-ports, freebsd-gnome
2002-03-18 09:43:25 +00:00
Maxim Sobolev
9909a6bc17 Don't link in libc - FreeBSD doesn't need this.
PRs:		31601, 31602, 31603, ...
Submitted by:	Ports Fury
2001-10-31 08:32:30 +00:00
Satoshi Asami
de0529967a Don't create ${PREFIX}/doc, which isn't used anyway.
Submitted by:	bento
2001-09-16 19:30:33 +00:00
Maxim Sobolev
e0e4012d5b - Remove useless USE_LIBTOOL;
- properly name shared libraries (get rid of bogus .so.X.Y convention);
- add files missed from pkg-plist (documentation);
- don't waste time building/running tests included into distribution.
2001-08-27 09:39:53 +00:00
Mikhail Teterin
86e1d75107 Upgrade to 1.7... Run included tests after the build... Maintainers
(gnome@) were informed a couple of days ago, but are impressively silent
and I've been using KDE/libxml2 linked against this library since with
no problem.

Approved by:	maintainer's silence
2001-08-26 00:53:03 +00:00
Maxim Sobolev
afa489d27a Remove patch that isn't necessary anymore. This should fix build on -current.
Submitted by:	sf
2001-06-29 10:31:07 +00:00
Maxim Sobolev
48048fd270 Unbroke on 5-CURRENT. 2001-05-29 09:32:22 +00:00
Maxim Sobolev
4debdd6a31 Update to 1.6.1.
Submitted by:	Dave Duchscher <daved@tamu.edu>
		Udo Schweigert <Udo.Schweigert@cert.siemens.de>
2001-04-02 09:05:32 +00:00
Maxim Sobolev
4fa15927d2 Update to 1.5.1.
Submitted by:	ade
2001-02-09 19:36:45 +00:00
Maxim Sobolev
e9469cf34b Update to 1.4. 2000-11-20 16:57:23 +00:00
Maxim Sobolev
f8c0bf7b1a Prefix all bits of this iconv() implementation with "g" to avoid conflict with
another iconv() in converters/iconv:

libiconv --> libgiconv
iconv.h --> giconv.h
iconv*.3 --> giconv*.3

Suggested by:	knu
2000-07-18 06:59:02 +00:00