10:00 Tobias C. Berner (tcberner) 

framework: cleanup conditional-indentations in Mk/

Run Tools/scripts/indent_make_if.pl on all of Mk.

These white space changes contribute greatly to the readability of those files.
As we have a version control system, finding out the reasons for the changes
prior to these white space changes is still easily possible

Differential Revision:	https://reviews.freebsd.org/D35024
Reviewed by:		portmgr (rene, bapt)

    aa25396

09:29 Rene Ladan (rene) 

Mk: release portmgr maintainership of most USES files

Differential Revision: https://reviews.freebsd.org/D34936

Reviewed by:	desktop (tcberner), portmgr (tcberner), ruby (yasu), tijl

    767d81e

14:27 Mathieu Arnold (mat) 

framework: Remove $FreeBSD$

Where appropriate fiddle with a few other things.

    5d33e04

20:55 tijl 

Define ICONV_GET_ILSEQ_INVALID and ICONV_SET_ILSEQ_INVALID when mimicking
base system iconv.h.

 

13:28 tijl 

Remove check for unsupported versions of FreeBSD and add some comments.

Submitted by:	John Hein <john.hein@microsemi.com>

 

07:24 rene 

Remove support for FreeBSD < 10.3 from Mk/*

This does not yet convert the files to bmake.

Reviewed by:	mat
Differential Revision:	https://reviews.freebsd.org/D9016

 

13:36 tijl 

Always add -DLIBICONV_PLUG to CPPFLAGS and friends when the base system
iconv(3) is used.  Adding it only when LOCALBASE/include/iconv.h exists is
not enough because this is tested before dependencies are installed and
they may pull in converters/libiconv.

PR:		209302
Exp-run by:	antoine
Approved by:	portmgr (antoine)

 

20:53 marino 

Mk/Iconv.mk: Remove DragonFly exception

This file has been locally patched in dports for over a year.  The
exception hasn't been valid since DragonFly 4.0.

Approved by:	erwin@ (portmgr)

 

01:23 bapt 

Remove the now unneeded ${PORTSDIR} from dependency definition in
The infrastructure Makefiles

PR:		206569
Exp run by:	antoine
Differential Revision:	D5047

 

07:36 bapt 

Readd PORTSDIR for now we will only start removing them after 2016Q1 is branched

This gives more time for tools to get updated, available in packages etc before
bothering users

 

16:49 bapt 

Drop the necessity to add ${PORTSDIR} to dependency line

Modify make describe to automatically prepend ${PORTSDIR} if the path for the
port is not absolute

Checked with poudriere, portmaster, portupgrade

PR:		203685
Exp-run by:	antoine
Differential Revision:	https://reviews.freebsd.org/D3866

 

14:03 tijl 

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)

 

15:44 rakuco 

Uses/iconv.mk: Set iconv-related CMake variables.

The way we deal with iconv in base and ports across different FreeBSD
releases is complicated: 9.x does not have iconv.h in base, 10.1 has it with
a different prototype for iconv(3) and later versions have the right
iconv(3) prototype. And, in some cases (USES=iconv:{translit,wchar_t}), we
must always use the libiconv port.

This is why there are so many checks in Uses/iconv.mk: we need to know the
situation we currently have in order to decide whether to pull iconv from
converters/libiconv, whether to just use its header (and pull the library
from base) or whether to use everything from base.

r384038 adjusted several CMake-based ports, but did so in a way that was not
very scalable and required a few intrusive patches to some ports. Most ports
that have both USES=cmake and USES=iconv use variations of FindIconv.cmake
that behave similarly. This change passes the header and library values we
really want to use to CMake using the most common variable names, bypassing
the calls to find_path() and find_library() that would sometimes end up
finding the wrong file. The few ports that use different variable names have
had their Makefiles adjusted (we manually pass the values we want via
CMAKE_ARGS).

Other changes:
- chinese/fcitx: Explicitly set LIBICONV_LIBC_HAS_ICONV_OPEN=OFF as we
  always want the version from ports because of USES=iconv:wchar_t.
- editors/calligra: Explicitly use iconv:translit because Kexi needs it.
- irc/weechat and irc/weechat-devel: The FindIconv.cmake patches could not
  be entirely removed because the check_library_exists() calls are wrong.
  Sent upstream: https://github.com/weechat/weechat/pull/513
- textproc/ctpp2: Use iconv:translit when the TRANSLITERATE option is used.

PORTREVISION has been bumped in editors/calligra and textproc/ctpp2 because
their dependency list has changed in 10.2 and later as the ports version is
always used now.

PR:		202798
Reviewed by:	antoine, tijl
Approved by:	portmgr (antoine)

 

13:50 theraven 

Update GNUstep ports to their latest versions.
Also fix a few bits of generic infrastructure along the way.

Approved by:	bapt (mentor)
Differential Revision:	https://reviews.freebsd.org/D2961

 

16:53 tijl 

Use base system iconv.h again on FreeBSD stable/10.

 

10:57 tijl 

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>

 

08:20 tijl 

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)

 

22:02 antoine 

Use new LIB_DEPENDS syntax instead of a compat symlink

With hat:	portmgr

 

16:36 tijl 

Change the way USES is handled:
- Loop over USES twice, once to define all *_ARGS variables and once to
  include Uses/*.mk.  This allows all Uses/*.mk to examine arguments given
  to other USES entries.
- Always define *_ARGS (possibly empty) and replace commas with spaces.

Similar for _USES_POST.

Adjust all Uses/*.mk:
- defined(u_ARGS) becomes !empty(u_ARGS)
- Eliminate helper variables like _*_ARGS=${*_ARGS:C/,/ /g}
- Some Uses/*.mk used ":" as argument separator instead of ",", but no port
  used this form
- Uses/cran.mk: remove unused variable VALID_ARGS and USES+=fortran which
  has no effect
- Uses/twisted.mk: simplify handling of the case where neither "build" nor
  "run" arguments have been specified

PR:		193931
Exp-run by:	antoine
Approved by:	portmgr (antoine)

 

10:31 gerald 

Move MAINTAINER lines to the end of the initial comment block and
make things a bit more consistent.

Approved by:	portmgr (bapt)

 

20:24 tijl 

- 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)

 

15:05 uqs 

Allow users to install converters/libiconv on 10.x systems if they
decided to build world with WITHOUT_ICONV set. There's no need for
this check to be based on OSVERSION.

Some users (i.e. me), report subtle application breakages with the
iconv-from-src that disappear when iconv-from-ports is installed.
Allow for a bridge till these issues are sorted out.

Approved by:	portmgr (bdrewery)

 

19:49 bsam 

Introduce variable ICONV_PREFIX at Mk/Uses/iconv.mk. The default for
pre 100043 is ${LOCALBASE} and /usr otherwise. Convert all ports to
new variable usage.

Approved by:	portmgr (bapt, implicit)

 

20:18 bsam 

. introduce ICONV_CONFIGURE_BASE variable at Mk/Uses/iconv.mk. It's value is
  "--with-libiconv=${LOCALBASE}" at systems pre OSVERSION 100043 and "" (null)
  otherwise;
. convert all ports which has CONFIGURE_ARGS=--with-libiconv=${LOCALBASE}.

Approved by:	portmgr (bapt, implicit)

 

18:06 madpilot 

- 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)

 

05:41 bsam 

1. Introduce using iconv with arguments:
. lib (default, implicit);
. build,
. patch.

The default is the same, all existing ports stay valid.

2. Introduce variable ICONV_CMD with default to ${LOCALBASE}/bin/iconv.
It is intended to get the value of /usr/bin/iconv at recent 10.x.

3. Adopt all ports to using USES+= icomv:build and iconv:patch and
change iconv (executable) at Makefile commands to ${ICONV_CMD} at those ports.

Submitted by:	bsam (me, via e-mail)
Approved by:	portmgr (bapt)

 

20:50 bapt 

Use new LIB_DEPENDS format

Reported by:	mandree

 

20:44 mva 

Introduces USES= iconv to replace USE_ICONV.

It takes no arguments.

This deprecates USE_ICONV, please convert your ports.
USE_ICONV will be removed as soon as it is no more used in
the ports tree.

Approved by:	portmgr (bapt)