Commit graph

102 commits

Author SHA1 Message Date
adam
c7919dce64 Changes 1.10:
* Added ISO-8859-11 converter.
* Updated the ISO-8859-7 converter.
* Added ATARIST converter, available through --enable-extra-encodings.
* Added BIG5-2003 converter (experimental), available through
  --enable-extra-encodings.
* Updated EUC-TW converter to include the Euro sign.
* The preloadable library has been renamed from libiconv_plug.so to
  preloadable_libiconv.so.
* Portability to mingw.
2005-07-28 15:15:17 +00:00
jlam
49d363d81d Back out previous and reset the BUILTIN_VERSION.iconv variable instead.
This should fix functioning on Linux systems that actually use GNU
libiconv as the builtin iconv implementation.
2005-06-06 01:30:56 +00:00
minskim
69002413fb Make BUILTIN_PKG.iconv follow what the comment says. 2005-06-05 22:05:00 +00:00
jmmv
0ad8b0bb46 Assume that DragonFly's native libiconv is good enough for pkgsrc, just as
we do for NetBSD.  Patch from Joerg Sonnenberger.
2005-06-05 10:00:20 +00:00
jlam
7e8aa8b98e In builtin.mk files, use _BLTN_ as the private namespace prefix. 2005-06-05 09:25:37 +00:00
jlam
95fd1f6ec9 Massive cleanup of buildlink3.mk and builtin.mk files in pkgsrc.
Several changes are involved since they are all interrelated.  These
changes affect about 1000 files.

The first major change is rewriting bsd.builtin.mk as well as all of
the builtin.mk files to follow the new example in bsd.builtin.mk.
The loop to include all of the builtin.mk files needed by the package
is moved from bsd.builtin.mk and into bsd.buildlink3.mk.  bsd.builtin.mk
is now included by each of the individual builtin.mk files and provides
some common logic for all of the builtin.mk files.  Currently, this
includes the computation for whether the native or pkgsrc version of
the package is preferred.  This causes USE_BUILTIN.* to be correctly
set when one builtin.mk file includes another.

The second major change is teach the builtin.mk files to consider
files under ${LOCALBASE} to be from pkgsrc-controlled packages.  Most
of the builtin.mk files test for the presence of built-in software by
checking for the existence of certain files, e.g. <pthread.h>, and we
now assume that if that file is under ${LOCALBASE}, then it must be
from pkgsrc.  This modification is a nod toward LOCALBASE=/usr.  The
exceptions to this new check are the X11 distribution packages, which
are handled specially as noted below.

The third major change is providing builtin.mk and version.mk files
for each of the X11 distribution packages in pkgsrc.  The builtin.mk
file can detect whether the native X11 distribution is the same as
the one provided by pkgsrc, and the version.mk file computes the
version of the X11 distribution package, whether it's built-in or not.

The fourth major change is that the buildlink3.mk files for X11 packages
that install parts which are part of X11 distribution packages, e.g.
Xpm, Xcursor, etc., now use imake to query the X11 distribution for
whether the software is already provided by the X11 distribution.
This is more accurate than grepping for a symbol name in the imake
config files.  Using imake required sprinkling various builtin-imake.mk
helper files into pkgsrc directories.  These files are used as input
to imake since imake can't use stdin for that purpose.

The fifth major change is in how packages note that they use X11.
Instead of setting USE_X11, package Makefiles should now include
x11.buildlink3.mk instead.  This causes the X11 package buildlink3
and builtin logic to be executed at the correct place for buildlink3.mk
and builtin.mk files that previously set USE_X11, and fixes packages
that relied on buildlink3.mk files to implicitly note that X11 is
needed.  Package buildlink3.mk should also include x11.buildlink3.mk
when linking against the package libraries requires also linking
against the X11 libraries.  Where it was obvious, redundant inclusions
of x11.buildlink3.mk have been removed.
2005-06-01 18:02:37 +00:00
jlam
bb7c443e62 Don't set artificial restrictions on which platforms can build this
package.  Linux, like NetBSD, should be able to build this package,
even if it has a built-in iconv implementation.
2005-05-24 04:36:51 +00:00
jlam
25a0a13e76 Rewrite to use find-libs.mk rename several variables to begin with
_BLNK_ to properly namespace those variables, and rewrite BUILTIN_PKG.iconv
computation to use one fewer awk invocation.
2005-05-24 04:22:24 +00:00
minskim
9f22a18128 Simplify a condition. 2005-05-22 01:22:47 +00:00
minskim
a55cb6f4fb Use the iconv library in glibc on Linux even if USE_GNU_ICONV is set. 2005-05-22 00:01:36 +00:00
tv
f816d81489 Remove USE_BUILDLINK3 and NO_BUILDLINK; these are no longer used. 2005-04-11 21:44:48 +00:00
agc
3cae5c07e4 Add RMD160 digests in addition to SHA1 ones 2005-02-23 16:12:33 +00:00
adam
d8f810b26b Revision bump 2004-11-24 11:15:30 +00:00
adam
c228b99461 Added a patch for japanese support (PR/25845) 2004-11-24 09:34:11 +00:00
adam
2cc9d83272 Changes 1.9.2:
* Bug fixes
2004-11-23 12:38:00 +00:00
tv
c487cb967a Libtool fix for PR pkg/26633, and other issues. Update libtool to 1.5.10
in the process.  (More information on tech-pkg.)

Bump PKGREVISION and BUILDLINK_DEPENDS of all packages using libtool and
installing .la files.

Bump PKGREVISION (only) of all packages depending directly on the above
via a buildlink3 include.
2004-10-03 00:12:51 +00:00
jlam
1a280185e1 Mechanical changes to package PLISTs to make use of LIBTOOLIZE_PLIST.
All library names listed by *.la files no longer need to be listed
in the PLIST, e.g., instead of:

	lib/libfoo.a
	lib/libfoo.la
	lib/libfoo.so
	lib/libfoo.so.0
	lib/libfoo.so.0.1

one simply needs:

	lib/libfoo.la

and bsd.pkg.mk will automatically ensure that the additional library
names are listed in the installed package +CONTENTS file.

Also make LIBTOOLIZE_PLIST default to "yes".
2004-09-22 08:09:14 +00:00
reed
1f835283b3 Move including the ../../mk/bsd.prefs.mk and checking for Linux
to after GNU_CONFIGURE and USE_LIBTOOL being set.
This fixes the problem where the lt_cv_sys_max_cmd_len was not
added to the CONFIGURE_ENV.

Now that I think about it, I caused this problem when I added that
Linux check...
2004-08-31 19:24:42 +00:00
jlam
8d572feba3 Use the new BUILDLINK_TRANSFORM commands to more precisely state the
intended transformation: use "rm" to remove an option, "rmdir" to remove
all options containing a path starting with a given directory name, and
"rename" to rename options to something else.
2004-08-28 06:05:31 +00:00
wiz
60019e1e08 Unused. 2004-07-04 09:55:19 +00:00
reed
631e46a396 Fail if this package is to be built under Linux. This is normal
for Linux. Most (all?) Linux distros don't provide a libiconv
package, because GLIBC's iconv support is good enough.

At this time, using PKG_FAIL_REASON instead of PKG_SKIP_REASON
so we can catch examples of packages depending on this.

The builtin.mk was improved to help stop it from being used under
Linux.

This was okayed by Rene Hexel, the maintainer.

Todo: fix abiword build because it should not require this libiconv
package under Linux.
2004-06-04 05:25:38 +00:00
reed
d053f8cd8c By default, assume that the native iconv on Linux systems using
GLIBC supports GNU libiconv's API. So don't depend on pkgsrc's
libiconv for it. This is normal: most other Linux distros don't
provide a libiconv package.

This was discussed on tech-pkg list over past two months. It has
helped a few users under Linux where they had some problems with
conflicts with their working iconv() support provided with libc
and the libiconv package.

This was okayed by maintainer, Rene Hexel.

This still needs some improvement. Some packages still try to
force libiconv usage even though not needed.
2004-06-04 05:21:14 +00:00
danw
884bfb7d8d Revert the change to put -liconv into BUILDLINK_LDFLAGS.iconv (which
breaks some things on Darwin) and fix audio/musicpd so it doesn't need
it (by faking out a configure check that gets confused by the
iconv_open -> libiconv_open renaming)
2004-05-20 16:13:05 +00:00
seb
00cc0486ea Garbage collect BUILDLINK_PKGBASE.<pkg> from buildlink3: it is not anymore
used since revision 1.139 of mk/buildlink3/bsd.buildlink3.mk.
2004-05-17 21:32:33 +00:00
snj
5362f01ef1 Add ${BUILDLINK_LDADD.iconv} to BUILDLINK_LDFLAGS.iconv. 2004-05-03 02:22:24 +00:00
tv
faaed608d9 nb2: use $(INSTALL), not $(INSTALL_DATA), for a library in an autoconfiscated
package.
2004-04-28 15:19:04 +00:00
jlam
8da51b0fbe Do previous in a different way. We want USE_GNU_ICONV to always use
a GNU libiconv, whether it be builtin or not, and PREFER_{NATIVE,PKGSRC}
can be used to decide which iconv we use if USE_GNU_ICONV isn't defined.
On NetBSD, the native iconv implementation (if it exists) is considered
GNUish enough unless USE_GNU_ICONV is explicitly defined.
2004-04-26 04:53:23 +00:00
snj
a886bcf21f If USE_GNU_ICONV is defined, don't use builtin libiconv if ICONV_TYPE is
native.
2004-04-26 00:28:39 +00:00
jschauma
4c5fe4eef7 Apparently cp(1) under Irix does not like to overwrite symbolic links.
This causes the package to fail to install, as this section is executed
a second time.
Use pax instead and all's peachy.
2004-04-02 19:08:37 +00:00
jlam
6d92080aa2 Match the template builtin.mk file in bsd.builtin.mk, and make the two
packages that use builtin.mk files (graphics/xpm and pkgtools/x11-links)
use the new format correctly.
2004-03-29 05:43:28 +00:00
jlam
426cc1ce72 Add a BUILDLINK_PKGBASE.<pkg> definition where it's not equal to <pkg>,
e.g. "BUILDLINK_PKGBASE.gtk?= gtk+".  This is mandated by the example
buildlink[23].mk files in bsd.buildlink[23].mk.
2004-03-29 05:05:32 +00:00
jlam
59bdf89739 If the ${PKGBASE} of a package doesn't match the token passed to
BUILDLINK_PACKAGES, then set BUILDLINK_PKGBASE.<pkg> explicitly so that
we can map from <pkg> to BUILDLINK_PKGBASE.<pkg>.
2004-03-16 18:23:26 +00:00
jlam
d0b4c54eb6 Split out the code that deals with checking whether the software is
built-in or not into a separate builtin.mk file.  The code to deal
checking for built-in software is much simpler to deal with in pkgsrc.

The buildlink3.mk file for a package will be of the usual format
regardless of the package, which makes it simpler for packagers to
update a package.

The builtin.mk file for a package must define a single yes/no variable
USE_BUILTIN.<pkg> that is used by bsd.buildlink3.mk to decide whether
to use the built-in software or to use the pkgsrc software.
2004-03-10 17:57:14 +00:00
snj
e26c9c6b59 Use ${CP} instead of cp. From Georg Schwarz in PR pkg/24634. 2004-03-02 05:01:38 +00:00
jlam
bf6e059da4 Reorder some lines so that BUILDLINK_USE_BUILTIN.<pkg> set in the
environment overrides all other settings.
2004-02-18 16:35:27 +00:00
jlam
ec993afa1a LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs
relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.
2004-02-14 17:21:32 +00:00
jlam
d2b62c66fb Create a new variable PREFER_NATIVE that has the opposite semantics
as PREFER_PKGSRC.  Preferences are determined by the most specific
instance of the package in either PREFER_PKGSRC or PREFER_NATIVE.  If
a package is specified in neither or in both variables, then PREFER_PKGSRC
has precedence over PREFER_NATIVE.
2004-02-12 02:35:06 +00:00
jlam
1edfa505ed Reorganize code so that any dependencies are checked as part of deciding
whether the software is built-in or not.  This facilitates implementing
the forthcoming PKGSRC_NATIVE variable.
2004-02-12 01:59:37 +00:00
jlam
74747843b7 Replace ICONV_IS_GNU with ICONV_TYPE, which can be checked to be either
"gnu" or "native".
2004-02-11 12:17:58 +00:00
jlam
7c68eb548f Move the INCOMPAT_FOO checks to a more natural location within the
block that decides whether package FOO is built-in or not.  If the
platform is listed in IMCOMPAT_FOO, then treat FOO as being not
built-in.
2004-02-11 11:30:49 +00:00
jlam
7699290f10 If we're passing through MAKEFLAGS variables whose values may contain
spaces, use the :Q modifier instead of double-quoting the value.  This
avoids breakage when executing the just-in-time su targets.
2004-02-06 19:04:24 +00:00
jlam
317cc72791 Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
2004-02-05 07:17:14 +00:00
jlam
e7133cac25 Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its
value outside of buildlink-related files.
2004-02-05 07:06:15 +00:00
jlam
07a9d8dfb2 Support a new global variable:
BUILDLINK_PREFER_PKGSRC
	This variable determines whether or not to prefer the pkgsrc
	versions of software that is also present in the base system.

	This variable is multi-state:
		defined, or "yes"	always prefer the pkgsrc versions
		not defined, or "no"	only use the pkgsrc versions if
					needed by dependency requirements

	This can also take a list of packages for which to prefer the
	pkgsrc-installed software.  The package names may be found by
	consulting the value added to BUILDLINK_PACKAGES in the
	buildlink[23].mk files for that package.
2004-02-05 06:58:02 +00:00
jlam
01a5abff01 Support BUILDLINK_DEPENDS.<pkg> being a list of values. 2004-01-24 03:12:31 +00:00
tron
1c3192189f Don't use "-Wl" on platforms which define "_USE_RPATH" to "no". This
fixes build problems under Darwin.
2004-01-15 23:04:00 +00:00
grant
1bd16c080f kill leading whitespace, s/Libiconv/libiconv/ 2004-01-13 09:42:05 +00:00
jlam
27458276fc Use l:foo: instead of S:...: to remove a library. 2004-01-06 19:13:13 +00:00
jlam
2c03f435c8 bl3ify 2004-01-05 11:17:10 +00:00
jlam
d279e6f535 Use S/+$// instead of C/\+$// to save a backslash. Very highly
recommended by seb :)
2004-01-05 11:05:44 +00:00